diff --git a/.gitignore b/.gitignore
index 0596fac50..9d8b98edb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,8 +34,6 @@ share/python-wheels/
 MANIFEST
 
 # PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
 
@@ -62,23 +60,10 @@ cover/
 *.mo
 *.pot
 
-# Crew stuff:
-demo_stands/
-
-# Django stuff:
+# Logs
 *.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-db/*sqlite3
-*_stand/
 backend/logs/*
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
+backend/app/logs
 
 # Sphinx documentation
 docs/_build/
@@ -95,42 +80,14 @@ profile_default/
 ipython_config.py
 
 # pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
 # .python-version
 
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
 # pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
 .pdm.toml
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+# PEP 582
 __pypackages__/
 
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
 # Environments
 *.env
 .env
@@ -138,17 +95,13 @@ celerybeat.pid
 # env.* 会误伤 backend/alembic/env.py，故只忽略根目录下的 env.*
 /env.*
 !frontend/lib/core/config/env.ts    # 允许前端配置文件
-src/ENV/
 venv/
 ENV/
 env/
 env.bak/
 venv.bak/
-.django_venv
-.crew_venv
 *venv
 venvs/
-run_program/manager.env
 !src/.env
 !src/debug.env
 
@@ -183,10 +136,6 @@ dmypy.json
 cython_debug/
 
 # PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 
 # VSCode
@@ -195,8 +144,6 @@ cython_debug/
 # Logging files
 log.txt
 .telemetry_log/
-
-backend/langgraph_app.*
 backend/app/logs
 *.jsonl
 
@@ -221,17 +168,11 @@ api_keys.json
 .secrets.baseline.scan.json
 .secrets.baseline.tmp
 
-# Additional tool
-additional_tools/
-make_scripts/backups
-
 # Savefiles
 **/savefiles
 
 # FRONTEND GIT ignore
 
-
-
 # Compiled output
 frontend/dist
 frontend/tmp
@@ -281,13 +222,7 @@ frontend/typings
 frontend/.DS_Store
 Thumbs.db
 
-executions
-openai-realtime-console
-src/django_app/staticfiles/*
-
-
-#knowledge data
-knowledge/graph_data/
+/executions
 
 # IDE/Editor folders
 .claude/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c531b17ce..fb5477fb1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,8 +29,7 @@ repos:
       - id: ruff-format
         files: ^backend/
 
-  # Backend - Ruff check (强制检查，不允许错误)
-  # 注意：此 hook 会检查整个 backend 目录，确保没有 lint 错误
+  # Backend - Ruff strict check
   - repo: local
     hooks:
       - id: backend-ruff-check
@@ -39,22 +38,10 @@ repos:
         language: system
         files: ^backend/.*\.py$
         pass_filenames: false
-        always_run: false  # 只在有 Python 文件更改时运行
-        stages: [commit]
+        always_run: false
+        stages: [pre-commit]
 
-  # Python - Type checking (mypy runs in Backend CI job only; skipped in pre-commit)
-  # - repo: https://github.com/pre-commit/mirrors-mypy
-  #   rev: v1.13.0
-  #   hooks:
-  #     - id: mypy
-  #       files: ^backend/app/
-  #       args: [--ignore-missing-imports]
-  #       additional_dependencies:
-  #         - types-requests
-  #         - types-PyYAML
-
-  # Frontend - ESLint (强制检查，不允许错误)
-  # 注意：此 hook 会检查整个 frontend 目录，确保没有 lint 错误
+  # Frontend - ESLint + TypeScript type-check + Prettier format check
   - repo: local
     hooks:
       - id: frontend-lint
@@ -63,8 +50,26 @@ repos:
         language: system
         files: ^frontend/.*\.(ts|tsx|js|jsx)$
         pass_filenames: false
-        always_run: false  # 只在有前端文件更改时运行
-        stages: [commit]
+        always_run: false
+        stages: [pre-commit]
+
+      - id: frontend-type-check
+        name: Frontend TypeScript Check
+        entry: bash -c 'cd frontend && bun run type-check || exit 1'
+        language: system
+        files: ^frontend/.*\.(ts|tsx)$
+        pass_filenames: false
+        always_run: false
+        stages: [pre-commit]
+
+      - id: frontend-format-check
+        name: Frontend Prettier Check
+        entry: bash -c 'cd frontend && bun run format:check || exit 1'
+        language: system
+        files: ^frontend/.*\.(ts|tsx|js|jsx|json|css|md)$
+        pass_filenames: false
+        always_run: false
+        stages: [pre-commit]
 
 # CI configuration
 ci:
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 29640ebe7..5b91822e6 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -28,8 +28,8 @@ This document provides detailed instructions for setting up and running the JoyS
 Using Docker (recommended):
 
 ```bash
-cd backend/docker
-./start.sh
+cd deploy
+docker compose -f docker-compose-middleware.yml up -d
 ```
 
 Or manually start PostgreSQL and Redis on your system.
diff --git a/README.md b/README.md
index 32cf6a2e1..2c52b49c7 100644
--- a/README.md
+++ b/README.md
@@ -220,11 +220,15 @@ All modes support remote deployment scenarios:
 
 **Key design principles:**
 
+- **Single source of truth for value domains** — `core/contracts/` defines every canonical value (status, error code, trigger source) as Literal types + set constants; no magic strings
+- **Engine protocol + registry** — all execution engines implement `ExecutionEngine` Protocol; `EngineRegistry` maps `runtime_kind` to engine instances; adding a new engine is a 3-file change
+- **Two-phase event bus** — Phase 1 (persistence + state transition) shares a DB transaction and commits atomically; Phase 2 (WebSocket + task sync) fans out in parallel
+- **Centralized state machines** — 6 entity state machines (`Agent`, `Version`, `Release`, `Run`, `Execution`, `Task`) with `transition_*()` as the only status-mutation functions
+- **Normalized error system** — `AppError.to_payload()` produces a canonical `ErrorDescriptor` (`{code, message, data, source, retryable, user_action}`) consumed identically across HTTP, WebSocket, SSE, and DB
+- **Port/Adapter boundaries** — `core/ports/` defines Protocol interfaces; `services/` provides implementations; `core/` never imports concrete services
+- **OTel-backed observation** — `ObservationCollector` injected into `ExecutionContext`; spans exported to both DB and WebSocket for real-time trace display
 - **Graph-based execution** — every agent workflow is a stateful LangGraph, enabling pause, resume, and branch
-- **Unified Run Center** — Chat, Copilot, and Skill Creator share a single event-sourced run lifecycle (Run → Event → Snapshot)
-- **Unified WebSocket layer** — BaseWsClient abstract class; Chat / Run / Notification clients share lifecycle, auth (ws-token), and reconnect logic
-- **Full-chain trace_id propagation** — contextvars-based request tracing from HTTP/WS entry through LangGraph to persistence
-- **Glass-box observability** — real-time Langfuse tracing of every agent decision and state transition
+- **Unified WebSocket layer** — BaseWsClient abstract class; Execution / Notification clients share lifecycle, auth (ws-token), and reconnect logic
 - **RAII sandbox isolation** — per-user Docker containers with automatic handle release, zero state leakage
 - **Canonical model identifiers** — full-stack (provider_name, model_name) resolution via ModelService → ModelFactory
 - **Layered skill system** — skills are versioned units that compose into workflows without coupling
@@ -262,6 +266,10 @@ All modes support remote deployment scenarios:
 
 | Tag | Feature | What it means |
 |-----|---------|---------------|
+| **NEW** | **Architecture Hardening** | 5-layer execution architecture with Engine Protocol, EngineRegistry, two-phase EventBus, centralized state machines, and Port/Adapter boundaries |
+| **NEW** | **Unified Error Contract** | `AppError.to_payload()` produces canonical `ErrorDescriptor` consumed identically across HTTP, WS, SSE, and DB; frontend `ApiError` mirrors the shape with typed `source`/`retryable`/`userAction` |
+| **NEW** | **State Machine Centralization** | 6 entity state machines (`Agent`, `Version`, `Release`, `Run`, `Execution`, `Task`) with `transition_*()` as the only status-mutation functions |
+| **NEW** | **Observation Tracing** | OTel-backed `ObservationCollector` injected into `ExecutionContext`; spans exported to DB and WebSocket for real-time trace display |
 | **NEW** | **Run Center Architecture** | Chat & Copilot fully integrated into Run Center — run details, session recovery, and live event replay on page refresh |
 | **NEW** | **Dark Mode & Preferences** | System / Light / Dark theme switching; redesigned profile page with language & theme preferences |
 | **NEW** | **Unified WebSocket Layer** | BaseWsClient abstract class — Chat, Run, and Notification clients share lifecycle, auth (ws-token), and reconnect logic |
diff --git a/README_CN.md b/README_CN.md
index e9e4219c6..5b69d34b1 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -220,11 +220,15 @@
 
 **核心设计原则：**
 
+- **值域唯一来源** —— `core/contracts/` 以 Literal 类型 + set 常量定义所有规范化值（状态、错误码、触发来源），杜绝魔术字符串
+- **引擎协议 + 注册表** —— 所有执行引擎实现 `ExecutionEngine` Protocol；`EngineRegistry` 将 `runtime_kind` 映射到引擎实例；添加新引擎只需改 3 个文件
+- **两阶段事件总线** —— 第 1 阶段（持久化 + 状态变迁）共享 DB 事务，原子提交；第 2 阶段（WebSocket + 任务同步）并行扇出
+- **集中化状态机** —— 6 个实体状态机（`Agent`、`Version`、`Release`、`Run`、`Execution`、`Task`），`transition_*()` 是唯一的状态修改入口
+- **规范化错误系统** —— `AppError.to_payload()` 输出规范的 `ErrorDescriptor`（`{code, message, data, source, retryable, user_action}`），HTTP/WS/SSE/DB 各传输路径一致消费
+- **端口/适配器边界** —— `core/ports/` 定义 Protocol 接口；`services/` 提供实现；`core/` 不导入具体服务
+- **OTel 观测追踪** —— `ObservationCollector` 注入 `ExecutionContext`；span 导出到 DB 和 WebSocket，支持实时追踪展示
 - **图式执行** —— 每个 Agent 工作流都是有状态的 LangGraph，支持暂停、恢复与分支
-- **统一 Run Center** —— Chat、Copilot、Skill Creator 共享同一套事件溯源运行生命周期（Run → Event → Snapshot）
-- **统一 WebSocket 层** —— BaseWsClient 抽象基类；Chat / Run / Notification 三端客户端共享生命周期、认证（ws-token）与重连逻辑
-- **trace_id 全链路追踪** —— 基于 contextvars 的请求追踪，从 HTTP/WS 入口贯穿 LangGraph 直至持久化
-- **白盒可观测性** —— 基于 Langfuse 实时追踪每一步 Agent 决策与状态流转
+- **统一 WebSocket 层** —— BaseWsClient 抽象基类；Execution / Notification 客户端共享生命周期、认证与重连逻辑
 - **RAII 沙箱隔离** —— 用户级 Docker 容器，句柄自动释放，会话间零状态泄露
 - **规范化模型标识** —— 全栈统一 (provider_name, model_name) 解析路径：ModelService → ModelFactory
 - **分层技能体系** —— 技能是版本化单元，可自由组合成工作流，互不耦合
@@ -262,6 +266,10 @@
 
 | 标签 | 功能 | 一句话说明 |
 |------|------|-----------|
+| **NEW** | **架构硬化** | 5 层执行架构：引擎协议 + EngineRegistry + 两阶段事件总线 + 集中化状态机 + 端口/适配器边界 |
+| **NEW** | **统一错误契约** | `AppError.to_payload()` 输出规范 `ErrorDescriptor`，HTTP/WS/SSE/DB 一致消费；前端 `ApiError` 镜像类型化 `source`/`retryable`/`userAction` |
+| **NEW** | **状态机集中化** | 6 个实体状态机（Agent、Version、Release、Run、Execution、Task），`transition_*()` 为唯一状态修改入口 |
+| **NEW** | **观测追踪** | 基于 OTel 的 `ObservationCollector` 注入 ExecutionContext；span 导出到 DB 和 WebSocket，支持实时追踪 |
 | **NEW** | **Run Center 架构** | Chat 与 Copilot 全面迁入 Run Center——支持运行详情查看、会话恢复、页面刷新后实时事件回放 |
 | **NEW** | **深色模式与偏好设置** | 系统/浅色/深色三种主题切换；重新设计个人资料页面，新增语言与主题偏好 |
 | **NEW** | **统一 WebSocket 层** | 引入 BaseWsClient 抽象基类——Chat、Run、Notification 三端客户端共享生命周期、认证（ws-token）与重连逻辑 |
diff --git a/backend/README.md b/backend/README.md
index 5e52191c6..7de1b066e 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -48,6 +48,38 @@ cd backend
 uv run uvicorn app.main:app --reload --host 0.0.0.0 --port 8000
 ```
 
+## 项目结构
+
+```
+app/
+├── api/v1/                  # REST 路由模块
+├── common/
+│   └── app_errors.py        # 统一异常层次 + ErrorDescriptor 序列化
+├── core/
+│   ├── contracts/           # 值域唯一来源（DefinitionKind、RuntimeKind、ErrorCode、ErrorSource 等）
+│   ├── engine/              # 执行引擎协议、注册表、4 个内建引擎（CLI/Graph/Code/Copilot）
+│   ├── events/              # 两阶段事件总线（ExecutionEventBus）+ 4 个内建订阅者
+│   ├── state_machines/      # 集中化状态机（6 个实体的转换规则）
+│   ├── observation/         # OTel-backed 观测追踪（注入 ExecutionContext）
+│   ├── ports/               # Protocol 接口，解耦 core/ 与 services/
+│   ├── agent/               # CLI agent 后端（claude_code、codex、openclaw）
+│   ├── copilot/             # Copilot 服务
+│   ├── graph/               # DeepAgents 图构建器 + 代码执行器
+│   ├── skill/               # 技能系统（渐进式加载）
+│   ├── model/               # 模型提供商 + 凭据管理
+│   ├── tools/               # 工具解析器 + MCP 集成
+│   └── a2a/                 # Agent-to-Agent 协议
+├── models/                  # SQLAlchemy ORM 模型
+├── repositories/            # 数据访问层
+├── schemas/                 # Pydantic 请求/响应 Schema
+├── services/                # 服务层（DispatchService、ExecutionOrchestrator、40+ 模块）
+├── websocket/               # WebSocket 处理器（/ws/executions、/ws/notifications、/ws/openclaw）
+├── templates/               # 邮件模板（Jinja2）
+└── utils/                   # 共享工具
+```
+
+> 完整架构文档：[`docs/ARCHITECTURE.md`](../docs/ARCHITECTURE.md) | [中文版](../docs/ARCHITECTURE_CN.md)
+
 ## API 文档
 
 - Swagger UI: http://localhost:8000/docs
diff --git a/backend/alembic/versions/20260415_000000_b4b3b2b1b0a9_add_mission_agent_execution_tables.py b/backend/alembic/versions/20260415_000000_b4b3b2b1b0a9_add_mission_agent_execution_tables.py
new file mode 100644
index 000000000..f02456dbb
--- /dev/null
+++ b/backend/alembic/versions/20260415_000000_b4b3b2b1b0a9_add_mission_agent_execution_tables.py
@@ -0,0 +1,274 @@
+"""add_mission_agent_execution_tables
+
+Revision ID: b4b3b2b1b0a9
+Revises: 0f7082711f20
+Create Date: 2026-04-15 00:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "b4b3b2b1b0a9"
+down_revision: Union[str, None] = "0f7082711f20"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # --- Enum types ---
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE missionstatus AS ENUM ('backlog','todo','in_progress','in_review','done','blocked','cancelled');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE missionpriority AS ENUM ('none','low','medium','high','urgent');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE agentstatus AS ENUM ('idle','working','blocked','error','offline');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE missionexecutionstatus AS ENUM ('queued','dispatched','running','interrupt_wait','approval_wait','completed','failed','cancelled');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE executionsource AS ENUM ('mission','chat','graph','coordinator','api');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+
+    # --- missions ---
+    op.create_table(
+        "missions",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "workspace_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("workspaces.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("title", sa.String(500), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("objective", sa.Text(), nullable=True),
+        sa.Column(
+            "status",
+            postgresql.ENUM(
+                "backlog",
+                "todo",
+                "in_progress",
+                "in_review",
+                "done",
+                "blocked",
+                "cancelled",
+                name="missionstatus",
+                create_type=False,
+            ),
+            nullable=False,
+            server_default="backlog",
+        ),
+        sa.Column(
+            "priority",
+            postgresql.ENUM("none", "low", "medium", "high", "urgent", name="missionpriority", create_type=False),
+            nullable=False,
+            server_default="none",
+        ),
+        sa.Column("assignee_type", sa.String(50), nullable=True),
+        sa.Column("assignee_id", postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column("creator_id", sa.String(255), sa.ForeignKey("user.id", ondelete="CASCADE"), nullable=False),
+        sa.Column(
+            "parent_mission_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("missions.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column("current_execution_id", postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column("due_date", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("position", sa.Float(), nullable=False, server_default="0.0"),
+        sa.Column("tags", postgresql.JSONB(), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_index("missions_workspace_status_idx", "missions", ["workspace_id", "status"])
+    op.create_index("missions_assignee_idx", "missions", ["assignee_type", "assignee_id"])
+    op.create_index("missions_creator_idx", "missions", ["creator_id", "created_at"])
+
+    # --- agent_profiles ---
+    op.create_table(
+        "agent_profiles",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "workspace_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("workspaces.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("name", sa.String(255), nullable=False),
+        sa.Column("avatar", sa.String(500), nullable=True),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("runtime_type", sa.String(50), nullable=False),
+        sa.Column(
+            "status",
+            postgresql.ENUM("idle", "working", "blocked", "error", "offline", name="agentstatus", create_type=False),
+            nullable=False,
+            server_default="offline",
+        ),
+        sa.Column("max_concurrent_tasks", sa.Integer(), nullable=False, server_default="1"),
+        sa.Column("skill_ids", postgresql.JSONB(), nullable=True),
+        sa.Column("instructions", sa.Text(), nullable=True),
+        sa.Column("custom_env", postgresql.JSONB(), nullable=True),
+        sa.Column("runtime_config", postgresql.JSONB(), nullable=True),
+        sa.Column("visibility", sa.String(50), nullable=False, server_default="workspace"),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_index("agent_profiles_workspace_idx", "agent_profiles", ["workspace_id"])
+    op.create_index("agent_profiles_workspace_status_idx", "agent_profiles", ["workspace_id", "status"])
+
+    # --- executions ---
+    op.create_table(
+        "executions",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "workspace_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("workspaces.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("user_id", sa.String(255), sa.ForeignKey("user.id", ondelete="CASCADE"), nullable=False),
+        sa.Column(
+            "source",
+            postgresql.ENUM(
+                "mission", "chat", "graph", "coordinator", "api", name="executionsource", create_type=False
+            ),
+            nullable=False,
+        ),
+        sa.Column("source_id", sa.String(255), nullable=True),
+        sa.Column(
+            "status",
+            postgresql.ENUM(
+                "queued",
+                "dispatched",
+                "running",
+                "interrupt_wait",
+                "approval_wait",
+                "completed",
+                "failed",
+                "cancelled",
+                name="missionexecutionstatus",
+                create_type=False,
+            ),
+            nullable=False,
+            server_default="queued",
+        ),
+        sa.Column("title", sa.String(500), nullable=True),
+        sa.Column(
+            "mission_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("missions.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column(
+            "agent_profile_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("agent_profiles.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column(
+            "parent_execution_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("executions.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column("result_summary", postgresql.JSONB(), nullable=True),
+        sa.Column("error_code", sa.String(100), nullable=True),
+        sa.Column("error_message", sa.Text(), nullable=True),
+        sa.Column("runtime_type", sa.String(50), nullable=False),
+        sa.Column("runtime_config", postgresql.JSONB(), nullable=True),
+        sa.Column("container_id", sa.String(255), nullable=True),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("finished_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("last_heartbeat_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("last_seq", sa.BigInteger(), nullable=False, server_default="0"),
+        sa.Column("prior_session_id", sa.String(255), nullable=True),
+        sa.Column("session_id", sa.String(255), nullable=True),
+        sa.Column("work_dir", sa.String(500), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_index("executions_workspace_status_idx", "executions", ["workspace_id", "status"])
+    op.create_index("executions_mission_idx", "executions", ["mission_id"])
+    op.create_index("executions_agent_profile_idx", "executions", ["agent_profile_id"])
+    op.create_index("executions_parent_idx", "executions", ["parent_execution_id"])
+    op.create_index("executions_user_created_idx", "executions", ["user_id", "created_at"])
+
+    # --- execution_events ---
+    op.create_table(
+        "execution_events",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "execution_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("executions.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column("seq", sa.BigInteger(), nullable=False),
+        sa.Column("event_type", sa.String(100), nullable=False),
+        sa.Column("payload", postgresql.JSONB(), nullable=False, server_default="{}"),
+        sa.Column("trace_id", postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column("observation_id", postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column("parent_observation_id", postgresql.UUID(as_uuid=True), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_unique_constraint("uq_execution_events_exec_seq", "execution_events", ["execution_id", "seq"])
+    op.create_index("execution_events_exec_created_idx", "execution_events", ["execution_id", "created_at"])
+
+    # --- execution_snapshots ---
+    op.create_table(
+        "execution_snapshots",
+        sa.Column(
+            "execution_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("executions.id", ondelete="CASCADE"),
+            primary_key=True,
+        ),
+        sa.Column("last_seq", sa.BigInteger(), nullable=False, server_default="0"),
+        sa.Column("status", sa.String(100), nullable=False),
+        sa.Column("projection", postgresql.JSONB(), nullable=False, server_default="{}"),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("execution_snapshots")
+    op.drop_table("execution_events")
+    op.drop_table("executions")
+    op.drop_table("agent_profiles")
+    op.drop_table("missions")
+    op.execute("DROP TYPE IF EXISTS executionsource")
+    op.execute("DROP TYPE IF EXISTS missionexecutionstatus")
+    op.execute("DROP TYPE IF EXISTS agentstatus")
+    op.execute("DROP TYPE IF EXISTS missionpriority")
+    op.execute("DROP TYPE IF EXISTS missionstatus")
diff --git a/backend/alembic/versions/20260416_000000_c5c4c3c2c1c0_add_mission_comments.py b/backend/alembic/versions/20260416_000000_c5c4c3c2c1c0_add_mission_comments.py
new file mode 100644
index 000000000..c39a6113c
--- /dev/null
+++ b/backend/alembic/versions/20260416_000000_c5c4c3c2c1c0_add_mission_comments.py
@@ -0,0 +1,111 @@
+"""add_mission_comments
+
+Revision ID: c5c4c3c2c1c0
+Revises: b4b3b2b1b0a9
+Create Date: 2026-04-16 00:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "c5c4c3c2c1c0"
+down_revision: Union[str, None] = "b4b3b2b1b0a9"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # --- Enum types ---
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE commentauthortype AS ENUM ('member','agent');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+    op.execute("""
+    DO $$ BEGIN
+        CREATE TYPE commenttype AS ENUM ('comment','status_change','progress_update','system');
+    EXCEPTION
+        WHEN duplicate_object THEN null;
+    END $$;
+    """)
+
+    # --- mission_comments ---
+    op.create_table(
+        "mission_comments",
+        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
+        sa.Column(
+            "mission_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("missions.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column(
+            "workspace_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("workspaces.id", ondelete="CASCADE"),
+            nullable=False,
+        ),
+        sa.Column(
+            "author_type",
+            postgresql.ENUM("member", "agent", name="commentauthortype", create_type=False),
+            nullable=False,
+        ),
+        sa.Column("author_id", sa.String(255), nullable=False),
+        sa.Column("content", sa.Text(), nullable=False),
+        sa.Column(
+            "type",
+            postgresql.ENUM(
+                "comment", "status_change", "progress_update", "system", name="commenttype", create_type=False
+            ),
+            nullable=False,
+            server_default="comment",
+        ),
+        sa.Column(
+            "parent_comment_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("mission_comments.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_index("mission_comments_mission_created_idx", "mission_comments", ["mission_id", "created_at"])
+    op.create_index("mission_comments_workspace_idx", "mission_comments", ["workspace_id"])
+    op.create_index("mission_comments_author_idx", "mission_comments", ["author_type", "author_id"])
+    op.create_index("mission_comments_parent_idx", "mission_comments", ["parent_comment_id"])
+
+    # --- Add trigger_comment_id to executions ---
+    op.add_column(
+        "executions",
+        sa.Column(
+            "trigger_comment_id",
+            postgresql.UUID(as_uuid=True),
+            sa.ForeignKey("mission_comments.id", ondelete="SET NULL"),
+            nullable=True,
+        ),
+    )
+    op.create_index("executions_trigger_comment_idx", "executions", ["trigger_comment_id"])
+
+    # --- Dedup guard: at most one pending execution per (mission, agent) ---
+    op.execute("""
+    CREATE UNIQUE INDEX uq_executions_mission_agent_pending
+    ON executions (mission_id, agent_profile_id)
+    WHERE status IN ('queued', 'dispatched');
+    """)
+
+
+def downgrade() -> None:
+    op.execute("DROP INDEX IF EXISTS uq_executions_mission_agent_pending")
+    op.drop_index("executions_trigger_comment_idx", table_name="executions")
+    op.drop_column("executions", "trigger_comment_id")
+    op.drop_table("mission_comments")
+    op.execute("DROP TYPE IF EXISTS commenttype")
+    op.execute("DROP TYPE IF EXISTS commentauthortype")
diff --git a/backend/alembic/versions/20260418_000000_d6d5d4d3d2d1_remove_mission_blocked_status.py b/backend/alembic/versions/20260418_000000_d6d5d4d3d2d1_remove_mission_blocked_status.py
new file mode 100644
index 000000000..05a5d63a8
--- /dev/null
+++ b/backend/alembic/versions/20260418_000000_d6d5d4d3d2d1_remove_mission_blocked_status.py
@@ -0,0 +1,46 @@
+"""remove_mission_blocked_status
+
+Revision ID: d6d5d4d3d2d1
+Revises: c5c4c3c2c1c0
+Create Date: 2026-04-18 00:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+revision: str = "d6d5d4d3d2d1"
+down_revision: Union[str, None] = "c5c4c3c2c1c0"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # Move any blocked missions to todo before dropping the enum value
+    op.execute("UPDATE missions SET status = 'todo' WHERE status = 'blocked'")
+
+    # Drop the default before changing type — PG can't auto-cast the default
+    op.execute("ALTER TABLE missions ALTER COLUMN status DROP DEFAULT")
+
+    # PostgreSQL cannot DROP a value from an existing enum, so recreate it
+    op.execute("ALTER TYPE missionstatus RENAME TO missionstatus_old")
+    op.execute("CREATE TYPE missionstatus AS ENUM ('backlog','todo','in_progress','in_review','done','cancelled')")
+    op.execute("ALTER TABLE missions ALTER COLUMN status TYPE missionstatus USING status::text::missionstatus")
+    op.execute("DROP TYPE missionstatus_old")
+
+    # Restore the default
+    op.execute("ALTER TABLE missions ALTER COLUMN status SET DEFAULT 'backlog'")
+
+
+def downgrade() -> None:
+    op.execute("ALTER TABLE missions ALTER COLUMN status DROP DEFAULT")
+
+    op.execute("ALTER TYPE missionstatus RENAME TO missionstatus_old")
+    op.execute(
+        "CREATE TYPE missionstatus AS ENUM ('backlog','todo','in_progress','in_review','done','blocked','cancelled')"
+    )
+    op.execute("ALTER TABLE missions ALTER COLUMN status TYPE missionstatus USING status::text::missionstatus")
+    op.execute("DROP TYPE missionstatus_old")
+
+    op.execute("ALTER TABLE missions ALTER COLUMN status SET DEFAULT 'backlog'")
diff --git a/backend/alembic/versions/20260418_000001_e7e6e5e4e3e2_add_mission_auto_approve.py b/backend/alembic/versions/20260418_000001_e7e6e5e4e3e2_add_mission_auto_approve.py
new file mode 100644
index 000000000..51778181c
--- /dev/null
+++ b/backend/alembic/versions/20260418_000001_e7e6e5e4e3e2_add_mission_auto_approve.py
@@ -0,0 +1,29 @@
+"""add_mission_auto_approve
+
+Revision ID: e7e6e5e4e3e2
+Revises: d6d5d4d3d2d1
+Create Date: 2026-04-18 00:00:01.000000
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision: str = "e7e6e5e4e3e2"
+down_revision: Union[str, None] = "d6d5d4d3d2d1"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "missions",
+        sa.Column("auto_approve", sa.Boolean(), nullable=False, server_default=sa.text("false")),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("missions", "auto_approve")
diff --git a/backend/alembic/versions/20260418_000002_f8f7f6f5f4f3_add_current_execution_fk.py b/backend/alembic/versions/20260418_000002_f8f7f6f5f4f3_add_current_execution_fk.py
new file mode 100644
index 000000000..3e7a1d876
--- /dev/null
+++ b/backend/alembic/versions/20260418_000002_f8f7f6f5f4f3_add_current_execution_fk.py
@@ -0,0 +1,31 @@
+"""Add FK constraint on missions.current_execution_id -> executions.id"""
+
+from typing import Union
+
+from alembic import op
+
+revision: str = "f8f7f6f5f4f3"
+down_revision: Union[str, None] = "e7e6e5e4e3e2"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.execute("""
+        UPDATE missions
+        SET current_execution_id = NULL
+        WHERE current_execution_id IS NOT NULL
+          AND current_execution_id NOT IN (SELECT id FROM executions)
+    """)
+    op.create_foreign_key(
+        "fk_missions_current_execution_id",
+        "missions",
+        "executions",
+        ["current_execution_id"],
+        ["id"],
+        ondelete="SET NULL",
+    )
+
+
+def downgrade() -> None:
+    op.drop_constraint("fk_missions_current_execution_id", "missions", type_="foreignkey")
diff --git a/backend/alembic/versions/20260418_000003_a9a8a7a6a5a4_drop_source_id_column.py b/backend/alembic/versions/20260418_000003_a9a8a7a6a5a4_drop_source_id_column.py
new file mode 100644
index 000000000..9442c8732
--- /dev/null
+++ b/backend/alembic/versions/20260418_000003_a9a8a7a6a5a4_drop_source_id_column.py
@@ -0,0 +1,20 @@
+"""Drop redundant source_id column from executions table."""
+
+from typing import Union
+
+from alembic import op
+
+revision: str = "a9a8a7a6a5a4"
+down_revision: Union[str, None] = "f8f7f6f5f4f3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.drop_column("executions", "source_id")
+
+
+def downgrade() -> None:
+    import sqlalchemy as sa
+
+    op.add_column("executions", sa.Column("source_id", sa.String(255), nullable=True))
diff --git a/backend/alembic/versions/20260421_000000_b1b2b3b4b5b6_create_agents_table.py b/backend/alembic/versions/20260421_000000_b1b2b3b4b5b6_create_agents_table.py
new file mode 100644
index 000000000..9b9736c77
--- /dev/null
+++ b/backend/alembic/versions/20260421_000000_b1b2b3b4b5b6_create_agents_table.py
@@ -0,0 +1,36 @@
+"""Create agents table."""
+
+from typing import Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import UUID
+
+from alembic import op
+
+revision: str = "b1b2b3b4b5b6"
+down_revision: Union[str, None] = "a9a8a7a6a5a4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "agents",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("workspace_id", UUID(as_uuid=True), sa.ForeignKey("workspaces.id"), nullable=False),
+        sa.Column("name", sa.String(255), nullable=False),
+        sa.Column("slug", sa.String(255), nullable=False),
+        sa.Column("description", sa.Text(), nullable=True),
+        sa.Column("avatar", sa.String(500), nullable=True),
+        sa.Column("status", sa.String(20), nullable=False, server_default="draft"),
+        sa.Column("current_draft_version_id", UUID(as_uuid=True), nullable=True),
+        sa.Column("active_release_id", UUID(as_uuid=True), nullable=True),
+        sa.Column("created_by", sa.String(255), sa.ForeignKey("user.id"), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.UniqueConstraint("workspace_id", "slug", name="uq_agents_workspace_id_slug"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_table("agents")
diff --git a/backend/alembic/versions/20260421_000001_c2c3c4c5c6c7_create_agent_versions_table.py b/backend/alembic/versions/20260421_000001_c2c3c4c5c6c7_create_agent_versions_table.py
new file mode 100644
index 000000000..0abdff4c1
--- /dev/null
+++ b/backend/alembic/versions/20260421_000001_c2c3c4c5c6c7_create_agent_versions_table.py
@@ -0,0 +1,44 @@
+"""Create agent_versions table and add FK from agents.current_draft_version_id."""
+
+from typing import Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision: str = "c2c3c4c5c6c7"
+down_revision: Union[str, None] = "b1b2b3b4b5b6"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "agent_versions",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("agent_id", UUID(as_uuid=True), sa.ForeignKey("agents.id", ondelete="CASCADE"), nullable=False),
+        sa.Column("version_number", sa.Integer(), nullable=False),
+        sa.Column("status", sa.String(20), nullable=False, server_default="draft"),
+        sa.Column("source_kind", sa.String(20), nullable=False, server_default="manual"),
+        sa.Column("definition_kind", sa.String(20), nullable=False),
+        sa.Column("definition_payload", JSONB(), nullable=False, server_default="{}"),
+        sa.Column("capability_manifest", JSONB(), nullable=False, server_default="{}"),
+        sa.Column("changelog", sa.Text(), nullable=True),
+        sa.Column("created_by", sa.String(255), sa.ForeignKey("user.id"), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), nullable=False, server_default=sa.func.now()),
+        sa.UniqueConstraint("agent_id", "version_number", name="uq_agent_versions_agent_id_version_number"),
+    )
+
+    op.create_foreign_key(
+        "fk_agents_current_draft_version_id",
+        "agents",
+        "agent_versions",
+        ["current_draft_version_id"],
+        ["id"],
+    )
+
+
+def downgrade() -> None:
+    op.drop_constraint("fk_agents_current_draft_version_id", "agents", type_="foreignkey")
+    op.drop_table("agent_versions")
diff --git a/backend/alembic/versions/20260421_000002_d3d4d5d6d7d8_drop_agent_profiles.py b/backend/alembic/versions/20260421_000002_d3d4d5d6d7d8_drop_agent_profiles.py
new file mode 100644
index 000000000..9dcfb4ba5
--- /dev/null
+++ b/backend/alembic/versions/20260421_000002_d3d4d5d6d7d8_drop_agent_profiles.py
@@ -0,0 +1,28 @@
+"""drop agent_profiles table
+
+Revision ID: d3d4d5d6d7d8
+Revises: c2c3c4c5c6c7
+Create Date: 2026-04-21
+"""
+
+from alembic import op
+
+revision = "d3d4d5d6d7d8"
+down_revision = "c2c3c4c5c6c7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # Drop the FK index on executions first, then the FK constraint,
+    # before dropping the referenced table.
+    # Use IF EXISTS at SQL level — Python try/except won't work because a
+    # failed statement aborts the entire PostgreSQL transaction.
+    op.execute("DROP INDEX IF EXISTS executions_agent_profile_idx")
+    op.execute("ALTER TABLE executions DROP CONSTRAINT IF EXISTS executions_agent_profile_id_fkey")
+    op.execute("ALTER TABLE executions DROP CONSTRAINT IF EXISTS fk_executions_agent_profile_id_agent_profiles")
+    op.drop_table("agent_profiles")
+
+
+def downgrade():
+    pass  # no data migration, no rollback
diff --git a/backend/alembic/versions/20260421_000003_e4e5e6e7e8e9_create_agent_releases.py b/backend/alembic/versions/20260421_000003_e4e5e6e7e8e9_create_agent_releases.py
new file mode 100644
index 000000000..b2e671505
--- /dev/null
+++ b/backend/alembic/versions/20260421_000003_e4e5e6e7e8e9_create_agent_releases.py
@@ -0,0 +1,40 @@
+"""create agent_releases table and add FK on agents.active_release_id"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision = "e4e5e6e7e8e9"
+down_revision = "d3d4d5d6d7d8"
+
+
+def upgrade():
+    op.create_table(
+        "agent_releases",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("agent_version_id", UUID(as_uuid=True), sa.ForeignKey("agent_versions.id"), nullable=False),
+        sa.Column("release_number", sa.Integer, nullable=False),
+        sa.Column("status", sa.String(20), nullable=False, server_default="building"),
+        sa.Column("runtime_kind", sa.String(20), nullable=False),
+        sa.Column("builder_kind", sa.String(20), nullable=True),
+        sa.Column("executable_ref", JSONB, nullable=True),
+        sa.Column("runtime_binding", JSONB, nullable=False, server_default="{}"),
+        sa.Column("published_by", sa.String(255), sa.ForeignKey("user.id"), nullable=True),
+        sa.Column("published_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("retired_at", sa.DateTime(timezone=True), nullable=True),
+        sa.UniqueConstraint("agent_version_id", "release_number", name="uq_agent_releases_version_number"),
+    )
+    # Add the circular FK from agents.active_release_id -> agent_releases.id
+    op.create_foreign_key(
+        "fk_agents_active_release",
+        "agents",
+        "agent_releases",
+        ["active_release_id"],
+        ["id"],
+    )
+
+
+def downgrade():
+    op.drop_constraint("fk_agents_active_release", "agents", type_="foreignkey")
+    op.drop_table("agent_releases")
diff --git a/backend/alembic/versions/20260421_000004_f5f6f7f8f9f0_drop_graph_deployment_version.py b/backend/alembic/versions/20260421_000004_f5f6f7f8f9f0_drop_graph_deployment_version.py
new file mode 100644
index 000000000..2f0156e45
--- /dev/null
+++ b/backend/alembic/versions/20260421_000004_f5f6f7f8f9f0_drop_graph_deployment_version.py
@@ -0,0 +1,23 @@
+"""drop graph_deployment_version
+
+Revision ID: f5f6f7f8f9f0
+Revises: e4e5e6e7e8e9
+Create Date: 2026-04-21
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "f5f6f7f8f9f0"
+down_revision = "e4e5e6e7e8e9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.execute("DROP TABLE IF EXISTS graph_deployment_version CASCADE")
+
+
+def downgrade() -> None:
+    pass
diff --git a/backend/alembic/versions/20260421_000005_a1b2c3d4e5f6_create_threads_messages.py b/backend/alembic/versions/20260421_000005_a1b2c3d4e5f6_create_threads_messages.py
new file mode 100644
index 000000000..dcbdc4a0b
--- /dev/null
+++ b/backend/alembic/versions/20260421_000005_a1b2c3d4e5f6_create_threads_messages.py
@@ -0,0 +1,38 @@
+"""create threads and messages tables"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision = "aa11bb22cc33"
+down_revision = "f5f6f7f8f9f0"
+
+
+def upgrade():
+    op.create_table(
+        "threads",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("agent_id", UUID(as_uuid=True), sa.ForeignKey("agents.id"), nullable=False),
+        sa.Column("workspace_id", UUID(as_uuid=True), sa.ForeignKey("workspaces.id"), nullable=False),
+        sa.Column("title", sa.String(500), nullable=True),
+        sa.Column("status", sa.String(20), nullable=False, server_default="active"),
+        sa.Column("created_by", sa.String(255), sa.ForeignKey("user.id"), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+    op.create_table(
+        "thread_messages",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("thread_id", UUID(as_uuid=True), sa.ForeignKey("threads.id", ondelete="CASCADE"), nullable=False),
+        sa.Column("run_id", UUID(as_uuid=True), nullable=True),  # FK added in Phase 4
+        sa.Column("execution_id", UUID(as_uuid=True), nullable=True),  # FK added in Phase 4
+        sa.Column("role", sa.String(20), nullable=False),
+        sa.Column("content", JSONB, nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+
+
+def downgrade():
+    op.drop_table("thread_messages")
+    op.drop_table("threads")
diff --git a/backend/alembic/versions/20260421_000006_b2c3d4e5f6a7_drop_conversations.py b/backend/alembic/versions/20260421_000006_b2c3d4e5f6a7_drop_conversations.py
new file mode 100644
index 000000000..f9a956e5a
--- /dev/null
+++ b/backend/alembic/versions/20260421_000006_b2c3d4e5f6a7_drop_conversations.py
@@ -0,0 +1,15 @@
+"""drop conversations table"""
+
+from alembic import op
+
+revision = "bb22cc33dd44"
+down_revision = "aa11bb22cc33"
+
+
+def upgrade():
+    op.execute("ALTER TABLE messages DROP CONSTRAINT IF EXISTS fk_messages_thread_id_conversations")
+    op.drop_table("conversations")
+
+
+def downgrade():
+    pass
diff --git a/backend/alembic/versions/20260421_000007_c3d4e5f6a7b8_drop_legacy_execution_tables.py b/backend/alembic/versions/20260421_000007_c3d4e5f6a7b8_drop_legacy_execution_tables.py
new file mode 100644
index 000000000..922584217
--- /dev/null
+++ b/backend/alembic/versions/20260421_000007_c3d4e5f6a7b8_drop_legacy_execution_tables.py
@@ -0,0 +1,31 @@
+"""drop legacy execution tables"""
+
+from alembic import op
+
+revision = "cc33dd44ee55"
+down_revision = "bb22cc33dd44"
+
+
+def upgrade():
+    # Use SQL-level IF EXISTS / CASCADE — Python try/except won't work
+    # because a failed statement aborts the entire PostgreSQL transaction.
+
+    # 1. Drop snapshot tables first (they depend on main tables)
+    op.execute("DROP TABLE IF EXISTS execution_snapshots")
+    op.execute("DROP TABLE IF EXISTS agent_run_snapshots")
+
+    # 2. Drop event tables
+    op.execute("DROP TABLE IF EXISTS execution_events CASCADE")
+    op.execute("DROP TABLE IF EXISTS agent_run_events CASCADE")
+
+    # 3. Remove FK from missions table
+    op.execute("ALTER TABLE missions DROP CONSTRAINT IF EXISTS fk_missions_current_execution")
+    op.execute("ALTER TABLE missions DROP COLUMN IF EXISTS current_execution_id")
+
+    # 4. Drop main tables (CASCADE handles any remaining dependent FKs)
+    op.execute("DROP TABLE IF EXISTS executions CASCADE")
+    op.execute("DROP TABLE IF EXISTS agent_runs CASCADE")
+
+
+def downgrade():
+    pass
diff --git a/backend/alembic/versions/20260421_000008_d4e5f6a7b8c9_create_new_execution_chain.py b/backend/alembic/versions/20260421_000008_d4e5f6a7b8c9_create_new_execution_chain.py
new file mode 100644
index 000000000..1f87d3c01
--- /dev/null
+++ b/backend/alembic/versions/20260421_000008_d4e5f6a7b8c9_create_new_execution_chain.py
@@ -0,0 +1,74 @@
+"""create new execution chain tables"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision = "dd44ee55ff66"
+down_revision = "cc33dd44ee55"
+
+
+def upgrade():
+    op.create_table(
+        "agent_runs",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("release_id", UUID(as_uuid=True), sa.ForeignKey("agent_releases.id"), nullable=False),
+        sa.Column("workspace_id", UUID(as_uuid=True), sa.ForeignKey("workspaces.id"), nullable=False),
+        sa.Column("thread_id", UUID(as_uuid=True), sa.ForeignKey("threads.id"), nullable=True),
+        sa.Column("mission_id", UUID(as_uuid=True), sa.ForeignKey("missions.id"), nullable=True),
+        sa.Column("trigger_source", sa.String(20), nullable=False),
+        sa.Column("goal", sa.Text, nullable=True),
+        sa.Column("input_payload", JSONB, nullable=True),
+        sa.Column("status", sa.String(20), nullable=False, server_default="queued"),
+        sa.Column("current_execution_id", UUID(as_uuid=True), nullable=True),  # FK added after executions
+        sa.Column("result_summary", sa.Text, nullable=True),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("ended_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("created_by", sa.String(255), sa.ForeignKey("user.id"), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+
+    op.create_table(
+        "executions",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("run_id", UUID(as_uuid=True), sa.ForeignKey("agent_runs.id"), nullable=False),
+        sa.Column("parent_execution_id", UUID(as_uuid=True), sa.ForeignKey("executions.id"), nullable=True),
+        sa.Column("attempt_index", sa.Integer, nullable=False, server_default="1"),
+        sa.Column("executor_kind", sa.String(20), nullable=False),
+        sa.Column("runtime_session_ref", sa.String(500), nullable=True),
+        sa.Column("status", sa.String(20), nullable=False, server_default="pending"),
+        sa.Column("error", JSONB, nullable=True),
+        sa.Column("metrics", JSONB, nullable=True),
+        sa.Column("started_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("ended_at", sa.DateTime(timezone=True), nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.UniqueConstraint("run_id", "attempt_index", name="uq_executions_run_attempt"),
+    )
+
+    # Circular FK: agent_runs.current_execution_id -> executions.id
+    op.create_foreign_key(
+        "fk_agent_runs_current_execution",
+        "agent_runs",
+        "executions",
+        ["current_execution_id"],
+        ["id"],
+    )
+
+    op.create_table(
+        "execution_events",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("execution_id", UUID(as_uuid=True), sa.ForeignKey("executions.id"), nullable=False),
+        sa.Column("sequence_no", sa.Integer, nullable=False),
+        sa.Column("event_type", sa.String(50), nullable=False),
+        sa.Column("payload", JSONB, nullable=False, server_default="{}"),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+        sa.UniqueConstraint("execution_id", "sequence_no", name="uq_execution_events_seq"),
+    )
+
+
+def downgrade():
+    op.drop_table("execution_events")
+    op.drop_constraint("fk_agent_runs_current_execution", "agent_runs", type_="foreignkey")
+    op.drop_table("executions")
+    op.drop_table("agent_runs")
diff --git a/backend/alembic/versions/20260421_000009_e5f6a7b8c9d0_add_message_fks.py b/backend/alembic/versions/20260421_000009_e5f6a7b8c9d0_add_message_fks.py
new file mode 100644
index 000000000..814cfcfda
--- /dev/null
+++ b/backend/alembic/versions/20260421_000009_e5f6a7b8c9d0_add_message_fks.py
@@ -0,0 +1,16 @@
+"""add run_id and execution_id FKs on thread_messages"""
+
+from alembic import op
+
+revision = "ee55ff66aa77"
+down_revision = "dd44ee55ff66"
+
+
+def upgrade():
+    op.create_foreign_key("fk_messages_run", "thread_messages", "agent_runs", ["run_id"], ["id"])
+    op.create_foreign_key("fk_messages_execution", "thread_messages", "executions", ["execution_id"], ["id"])
+
+
+def downgrade():
+    op.drop_constraint("fk_messages_execution", "thread_messages", type_="foreignkey")
+    op.drop_constraint("fk_messages_run", "thread_messages", type_="foreignkey")
diff --git a/backend/alembic/versions/20260421_000010_f6a7b8c9d0e1_create_artifacts.py b/backend/alembic/versions/20260421_000010_f6a7b8c9d0e1_create_artifacts.py
new file mode 100644
index 000000000..1feb81dfc
--- /dev/null
+++ b/backend/alembic/versions/20260421_000010_f6a7b8c9d0e1_create_artifacts.py
@@ -0,0 +1,25 @@
+"""create artifacts table"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision = "ff66aa77bb88"
+down_revision = "ee55ff66aa77"
+
+
+def upgrade():
+    op.create_table(
+        "artifacts",
+        sa.Column("id", UUID(as_uuid=True), server_default=sa.text("gen_random_uuid()"), primary_key=True),
+        sa.Column("execution_id", UUID(as_uuid=True), sa.ForeignKey("executions.id"), nullable=False),
+        sa.Column("kind", sa.String(50), nullable=False),
+        sa.Column("uri", sa.Text, nullable=False),
+        sa.Column("metadata", JSONB, nullable=True),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()"), nullable=False),
+    )
+
+
+def downgrade():
+    op.drop_table("artifacts")
diff --git a/backend/alembic/versions/20260421_000011_z1a2b3c4d5e6_drop_legacy_graph_tables.py b/backend/alembic/versions/20260421_000011_z1a2b3c4d5e6_drop_legacy_graph_tables.py
new file mode 100644
index 000000000..11adf4b45
--- /dev/null
+++ b/backend/alembic/versions/20260421_000011_z1a2b3c4d5e6_drop_legacy_graph_tables.py
@@ -0,0 +1,15 @@
+"""drop legacy graph tables"""
+
+from alembic import op
+
+revision = "z1a2b3c4d5e6"
+down_revision = "ff66aa77bb88"
+
+
+def upgrade():
+    for table in ["graph_node_secrets", "graph_executions", "graph_edges", "graph_nodes", "graphs"]:
+        op.execute(f"DROP TABLE IF EXISTS {table} CASCADE")
+
+
+def downgrade():
+    pass
diff --git a/backend/alembic/versions/20260422_000000_g8h9i0j1k2l3_rename_missions_to_tasks.py b/backend/alembic/versions/20260422_000000_g8h9i0j1k2l3_rename_missions_to_tasks.py
new file mode 100644
index 000000000..0ac830cb4
--- /dev/null
+++ b/backend/alembic/versions/20260422_000000_g8h9i0j1k2l3_rename_missions_to_tasks.py
@@ -0,0 +1,59 @@
+"""rename missions to tasks"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import UUID
+
+from alembic import op
+
+revision = "g8h9i0j1k2l3"
+down_revision = "z1a2b3c4d5e6"
+
+
+def upgrade():
+    # Rename table
+    op.rename_table("missions", "tasks")
+
+    # Rename columns
+    op.alter_column("tasks", "assignee_id", new_column_name="agent_id")
+    op.alter_column("tasks", "objective", new_column_name="goal")
+    op.alter_column("tasks", "parent_mission_id", new_column_name="parent_task_id")
+
+    # Drop assignee_type column (tasks always belong to agents)
+    op.execute("ALTER TABLE tasks DROP COLUMN IF EXISTS assignee_type")
+
+    # Drop current_execution_id (replaced by latest_run_id)
+    # May already be dropped by a prior migration (_000007).
+    op.execute("ALTER TABLE tasks DROP COLUMN IF EXISTS current_execution_id")
+
+    # Add latest_run_id column
+    op.add_column("tasks", sa.Column("latest_run_id", UUID(as_uuid=True), nullable=True))
+    op.create_foreign_key("fk_tasks_latest_run", "tasks", "agent_runs", ["latest_run_id"], ["id"])
+
+    # Add FK from agent_id to agents table
+    # Clean up orphaned references first (old assignee_id values from agent_profiles)
+    op.execute("""
+        UPDATE tasks SET agent_id = NULL
+        WHERE agent_id IS NOT NULL
+          AND agent_id NOT IN (SELECT id FROM agents)
+    """)
+    op.create_foreign_key("fk_tasks_agent", "tasks", "agents", ["agent_id"], ["id"])
+
+    # Add FK from parent_task_id to tasks table
+    op.create_foreign_key("fk_tasks_parent", "tasks", "tasks", ["parent_task_id"], ["id"], ondelete="SET NULL")
+
+    # Update agent_runs table: rename mission_id FK reference
+    op.alter_column("agent_runs", "mission_id", new_column_name="task_id")
+
+    # Update indexes — use SQL-level IF EXISTS to avoid transaction aborts
+    op.execute("DROP INDEX IF EXISTS missions_workspace_status_idx")
+    op.create_index("tasks_workspace_status_idx", "tasks", ["workspace_id", "status"])
+
+    op.execute("DROP INDEX IF EXISTS missions_assignee_idx")
+    op.create_index("tasks_agent_idx", "tasks", ["agent_id"])
+
+    op.execute("DROP INDEX IF EXISTS missions_creator_idx")
+    op.create_index("tasks_creator_idx", "tasks", ["creator_id", "created_at"])
+
+
+def downgrade():
+    pass  # no rollback in greenfield
diff --git a/backend/alembic/versions/20260422_000001_h1i2j3k4l5m6_rename_comments_to_activities.py b/backend/alembic/versions/20260422_000001_h1i2j3k4l5m6_rename_comments_to_activities.py
new file mode 100644
index 000000000..86325412f
--- /dev/null
+++ b/backend/alembic/versions/20260422_000001_h1i2j3k4l5m6_rename_comments_to_activities.py
@@ -0,0 +1,121 @@
+"""Rename mission_comments to task_activities and update enums.
+
+Revision ID: h1i2j3k4l5m6
+Revises: g8h9i0j1k2l3
+Create Date: 2026-04-22
+"""
+
+from alembic import op
+
+revision = "h1i2j3k4l5m6"
+down_revision = "g8h9i0j1k2l3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # 1. Rename table
+    op.rename_table("mission_comments", "task_activities")
+
+    # 2. Rename columns
+    op.alter_column("task_activities", "parent_comment_id", new_column_name="parent_activity_id")
+    op.alter_column("task_activities", "mission_id", new_column_name="task_id")
+
+    # 3. Rename enum types
+    op.execute("ALTER TYPE commentauthortype RENAME TO activityauthortype")
+    op.execute("ALTER TYPE commenttype RENAME TO activitytype")
+
+    # 4. Rename indexes
+    op.execute("ALTER INDEX IF EXISTS mission_comments_mission_created_idx RENAME TO task_activities_task_created_idx")
+    op.execute("ALTER INDEX IF EXISTS mission_comments_workspace_idx RENAME TO task_activities_workspace_idx")
+    op.execute("ALTER INDEX IF EXISTS mission_comments_author_idx RENAME TO task_activities_author_idx")
+    op.execute("ALTER INDEX IF EXISTS mission_comments_parent_idx RENAME TO task_activities_parent_idx")
+
+    # 5. Rename foreign key constraints
+    op.execute("""
+        DO $$
+        DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (
+                SELECT conname FROM pg_constraint
+                WHERE conrelid = 'task_activities'::regclass
+                  AND conname LIKE 'mission_comments%'
+            ) LOOP
+                EXECUTE 'ALTER TABLE task_activities RENAME CONSTRAINT '
+                    || quote_ident(r.conname)
+                    || ' TO '
+                    || quote_ident(REPLACE(r.conname, 'mission_comments', 'task_activities'));
+            END LOOP;
+        END $$;
+    """)
+
+    # 6. Rename self-referencing FK column name in constraint
+    op.execute("""
+        DO $$
+        DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (
+                SELECT conname FROM pg_constraint
+                WHERE conrelid = 'task_activities'::regclass
+                  AND conname LIKE '%parent_comment%'
+            ) LOOP
+                EXECUTE 'ALTER TABLE task_activities RENAME CONSTRAINT '
+                    || quote_ident(r.conname)
+                    || ' TO '
+                    || quote_ident(REPLACE(r.conname, 'parent_comment', 'parent_activity'));
+            END LOOP;
+        END $$;
+    """)
+
+
+def downgrade() -> None:
+    # Reverse all renames
+    op.execute("""
+        DO $$
+        DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (
+                SELECT conname FROM pg_constraint
+                WHERE conrelid = 'task_activities'::regclass
+                  AND conname LIKE '%parent_activity%'
+            ) LOOP
+                EXECUTE 'ALTER TABLE task_activities RENAME CONSTRAINT '
+                    || quote_ident(r.conname)
+                    || ' TO '
+                    || quote_ident(REPLACE(r.conname, 'parent_activity', 'parent_comment'));
+            END LOOP;
+        END $$;
+    """)
+
+    op.execute("""
+        DO $$
+        DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (
+                SELECT conname FROM pg_constraint
+                WHERE conrelid = 'task_activities'::regclass
+                  AND conname LIKE 'task_activities%'
+            ) LOOP
+                EXECUTE 'ALTER TABLE task_activities RENAME CONSTRAINT '
+                    || quote_ident(r.conname)
+                    || ' TO '
+                    || quote_ident(REPLACE(r.conname, 'task_activities', 'mission_comments'));
+            END LOOP;
+        END $$;
+    """)
+
+    op.execute("ALTER INDEX IF EXISTS task_activities_parent_idx RENAME TO mission_comments_parent_idx")
+    op.execute("ALTER INDEX IF EXISTS task_activities_author_idx RENAME TO mission_comments_author_idx")
+    op.execute("ALTER INDEX IF EXISTS task_activities_workspace_idx RENAME TO mission_comments_workspace_idx")
+    op.execute("ALTER INDEX IF EXISTS task_activities_task_created_idx RENAME TO mission_comments_mission_created_idx")
+
+    op.execute("ALTER TYPE activitytype RENAME TO commenttype")
+    op.execute("ALTER TYPE activityauthortype RENAME TO commentauthortype")
+
+    op.alter_column("task_activities", "task_id", new_column_name="mission_id")
+    op.alter_column("task_activities", "parent_activity_id", new_column_name="parent_comment_id")
+    op.rename_table("task_activities", "mission_comments")
diff --git a/backend/alembic/versions/20260422_101551_333df7a8ab82_rename_mission_enums_to_task_enums.py b/backend/alembic/versions/20260422_101551_333df7a8ab82_rename_mission_enums_to_task_enums.py
new file mode 100644
index 000000000..6f05f2c4d
--- /dev/null
+++ b/backend/alembic/versions/20260422_101551_333df7a8ab82_rename_mission_enums_to_task_enums.py
@@ -0,0 +1,45 @@
+"""rename mission enums to task enums
+
+Revision ID: 333df7a8ab82
+Revises: h1i2j3k4l5m6
+Create Date: 2026-04-22 10:15:51.632056+00:00
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "333df7a8ab82"
+down_revision: Union[str, None] = "h1i2j3k4l5m6"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("""
+    DO $$
+    BEGIN
+        IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'missionstatus') THEN
+            ALTER TYPE missionstatus RENAME TO taskstatus;
+        END IF;
+        IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'missionpriority') THEN
+            ALTER TYPE missionpriority RENAME TO taskpriority;
+        END IF;
+    END $$;
+    """)
+
+
+def downgrade() -> None:
+    op.execute("""
+    DO $$
+    BEGIN
+        IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'taskstatus') THEN
+            ALTER TYPE taskstatus RENAME TO missionstatus;
+        END IF;
+        IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'taskpriority') THEN
+            ALTER TYPE taskpriority RENAME TO missionpriority;
+        END IF;
+    END $$;
+    """)
diff --git a/backend/alembic/versions/20260422_103600_444df7a8ab83_add_status_enums_and_fix_fk_constraints.py b/backend/alembic/versions/20260422_103600_444df7a8ab83_add_status_enums_and_fix_fk_constraints.py
new file mode 100644
index 000000000..ad4173017
--- /dev/null
+++ b/backend/alembic/versions/20260422_103600_444df7a8ab83_add_status_enums_and_fix_fk_constraints.py
@@ -0,0 +1,201 @@
+"""add status enums and fix FK constraints
+
+Revision ID: 556fa9cacd05
+Revises: 444df7a8ab83
+Create Date: 2026-04-22 10:36:00.000000+00:00
+
+Changes:
+- Create DB enum types: agent_status, agent_version_status, agent_release_status,
+  agent_run_status, execution_status
+- Migrate status columns from varchar to enum types
+- Fix agents.created_by  ondelete: SET NULL → CASCADE  (NOT NULL + SET NULL = crash)
+- Fix agent_versions.created_by  ondelete: SET NULL → CASCADE (same issue)
+- Fix thread_messages.run_id / execution_id FKs: add ondelete=SET NULL
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "556fa9cacd05"
+down_revision: Union[str, None] = "444df7a8ab83"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+# ---------------------------------------------------------------------------
+# helpers
+# ---------------------------------------------------------------------------
+
+
+def _create_enum(name: str, *values: str) -> None:
+    """CREATE TYPE <name> AS ENUM (...) — idempotent via IF NOT EXISTS."""
+    quoted = ", ".join(f"'{v}'" for v in values)
+    op.execute(f"CREATE TYPE {name} AS ENUM ({quoted})")
+
+
+def _drop_enum(name: str) -> None:
+    op.execute(f"DROP TYPE IF EXISTS {name}")
+
+
+# ---------------------------------------------------------------------------
+# upgrade
+# ---------------------------------------------------------------------------
+
+
+def upgrade() -> None:
+    # ------------------------------------------------------------------
+    # 1. Create enum types
+    # ------------------------------------------------------------------
+    _create_enum("agent_status", "draft", "active", "archived")
+    _create_enum("agent_version_status", "draft", "frozen")
+    _create_enum("agent_release_status", "building", "ready", "failed", "retired")
+    _create_enum("agent_run_status", "queued", "running", "succeeded", "failed", "cancelled")
+    _create_enum("execution_status", "pending", "running", "succeeded", "failed", "cancelled")
+
+    # ------------------------------------------------------------------
+    # 2. Migrate status columns varchar → enum  (using USING cast)
+    # ------------------------------------------------------------------
+    # agents
+    op.execute("ALTER TABLE agents ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agents ALTER COLUMN status TYPE agent_status USING status::agent_status")
+    op.execute("ALTER TABLE agents ALTER COLUMN status SET DEFAULT 'draft'::agent_status")
+
+    # agent_versions
+    op.execute("ALTER TABLE agent_versions ALTER COLUMN status DROP DEFAULT")
+    op.execute(
+        "ALTER TABLE agent_versions ALTER COLUMN status TYPE agent_version_status USING status::agent_version_status"
+    )
+    op.execute("ALTER TABLE agent_versions ALTER COLUMN status SET DEFAULT 'draft'::agent_version_status")
+
+    # agent_releases
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status DROP DEFAULT")
+    op.execute(
+        "ALTER TABLE agent_releases ALTER COLUMN status TYPE agent_release_status USING status::agent_release_status"
+    )
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status SET DEFAULT 'building'::agent_release_status")
+
+    # agent_runs
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status TYPE agent_run_status USING status::agent_run_status")
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status SET DEFAULT 'queued'::agent_run_status")
+
+    # executions
+    op.execute("ALTER TABLE executions ALTER COLUMN status DROP DEFAULT")
+    op.execute(
+        "ALTER TABLE executions "
+        "ALTER COLUMN status TYPE execution_status "
+        "USING (CASE "
+        "  WHEN status IN ('queued', 'dispatched') THEN 'pending' "
+        "  WHEN status = 'completed' THEN 'succeeded' "
+        "  ELSE status "
+        "END)::execution_status"
+    )
+    op.execute("ALTER TABLE executions ALTER COLUMN status SET DEFAULT 'pending'::execution_status")
+
+    # 3. Fix agents.created_by: drop old FK (no ondelete) → re-add CASCADE
+    #    The actual name in DB is "fk_agents_created_by_user".
+    # ------------------------------------------------------------------
+    op.drop_constraint("fk_agents_created_by_user", "agents", type_="foreignkey")
+    op.create_foreign_key(
+        "fk_agents_created_by",
+        "agents",
+        "user",
+        ["created_by"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+
+    # ------------------------------------------------------------------
+    # 4. Fix agent_versions.created_by (same issue, actual: "fk_agent_versions_created_by_user")
+    # ------------------------------------------------------------------
+    op.drop_constraint("fk_agent_versions_created_by_user", "agent_versions", type_="foreignkey")
+    op.create_foreign_key(
+        "fk_agent_versions_created_by",
+        "agent_versions",
+        "user",
+        ["created_by"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+
+    # ------------------------------------------------------------------
+    # 5. Fix thread_messages.run_id / execution_id: drop old FKs (no
+    #    ondelete), re-add with ondelete=SET NULL.
+    #    Old names from migration ee55ff66aa77: fk_messages_run / fk_messages_execution
+    # ------------------------------------------------------------------
+    op.drop_constraint("fk_messages_run", "thread_messages", type_="foreignkey")
+    op.create_foreign_key(
+        "fk_thread_messages_run_id",
+        "thread_messages",
+        "agent_runs",
+        ["run_id"],
+        ["id"],
+        ondelete="SET NULL",
+    )
+
+    op.drop_constraint("fk_messages_execution", "thread_messages", type_="foreignkey")
+    op.create_foreign_key(
+        "fk_thread_messages_execution_id",
+        "thread_messages",
+        "executions",
+        ["execution_id"],
+        ["id"],
+        ondelete="SET NULL",
+    )
+
+
+# ---------------------------------------------------------------------------
+# downgrade
+# ---------------------------------------------------------------------------
+
+
+def downgrade() -> None:
+    # Restore thread_messages FKs without ondelete
+    op.drop_constraint("fk_thread_messages_execution_id", "thread_messages", type_="foreignkey")
+    op.create_foreign_key("fk_messages_execution", "thread_messages", "executions", ["execution_id"], ["id"])
+
+    op.drop_constraint("fk_thread_messages_run_id", "thread_messages", type_="foreignkey")
+    op.create_foreign_key("fk_messages_run", "thread_messages", "agent_runs", ["run_id"], ["id"])
+
+    # Restore agent_versions.created_by FK without ondelete
+    op.drop_constraint("fk_agent_versions_created_by", "agent_versions", type_="foreignkey")
+    op.create_foreign_key(None, "agent_versions", "user", ["created_by"], ["id"])
+
+    # Restore agents.created_by FK without ondelete
+    op.drop_constraint("fk_agents_created_by", "agents", type_="foreignkey")
+    op.create_foreign_key(None, "agents", "user", ["created_by"], ["id"])
+
+    # Revert status columns enum → varchar
+    # executions
+    op.execute("ALTER TABLE executions ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE executions ALTER COLUMN status TYPE varchar(20) USING status::text")
+    op.execute("ALTER TABLE executions ALTER COLUMN status SET DEFAULT 'queued'")
+
+    # agent_runs
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status TYPE varchar(20) USING status::text")
+    op.execute("ALTER TABLE agent_runs ALTER COLUMN status SET DEFAULT 'queued'")
+
+    # agent_releases
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status TYPE varchar(20) USING status::text")
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status SET DEFAULT 'building'")
+
+    # agent_versions
+    op.execute("ALTER TABLE agent_versions ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agent_versions ALTER COLUMN status TYPE varchar(20) USING status::text")
+    op.execute("ALTER TABLE agent_versions ALTER COLUMN status SET DEFAULT 'draft'")
+
+    # agents
+    op.execute("ALTER TABLE agents ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TABLE agents ALTER COLUMN status TYPE varchar(20) USING status::text")
+    op.execute("ALTER TABLE agents ALTER COLUMN status SET DEFAULT 'draft'")
+
+    # Drop enum types
+    _drop_enum("execution_status")
+    _drop_enum("agent_run_status")
+    _drop_enum("agent_release_status")
+    _drop_enum("agent_version_status")
+    _drop_enum("agent_status")
diff --git a/backend/alembic/versions/20260422_110000_444df7a8ab83_add_todo_and_in_review_to_taskstatus_enum.py b/backend/alembic/versions/20260422_110000_444df7a8ab83_add_todo_and_in_review_to_taskstatus_enum.py
new file mode 100644
index 000000000..0e4ee3713
--- /dev/null
+++ b/backend/alembic/versions/20260422_110000_444df7a8ab83_add_todo_and_in_review_to_taskstatus_enum.py
@@ -0,0 +1,26 @@
+"""add todo and in_review to taskstatus enum
+
+Revision ID: 444df7a8ab83
+Revises: 333df7a8ab82
+Create Date: 2026-04-22 11:00:00.000000+00:00
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "444df7a8ab83"
+down_revision: Union[str, None] = "333df7a8ab82"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("ALTER TYPE taskstatus ADD VALUE IF NOT EXISTS 'todo'")
+    op.execute("ALTER TYPE taskstatus ADD VALUE IF NOT EXISTS 'in_review'")
+
+
+def downgrade() -> None:
+    pass  # PostgreSQL cannot remove enum values
diff --git a/backend/alembic/versions/20260422_120000_667ab8bcde06_unify_status_vocabulary_queued_to_pending_and_building_to_pending.py b/backend/alembic/versions/20260422_120000_667ab8bcde06_unify_status_vocabulary_queued_to_pending_and_building_to_pending.py
new file mode 100644
index 000000000..10efd4266
--- /dev/null
+++ b/backend/alembic/versions/20260422_120000_667ab8bcde06_unify_status_vocabulary_queued_to_pending_and_building_to_pending.py
@@ -0,0 +1,32 @@
+"""unify status vocabulary queued to pending and building to pending
+
+Revision ID: 667ab8bcde06
+Revises: 556fa9cacd05
+Create Date: 2026-04-22 12:00:00.000000+00:00
+
+Changes:
+- agent_run_status enum: rename 'queued' -> 'pending'
+- agent_release_status enum: rename 'building' -> 'pending'
+
+NOTE: ALTER TYPE ... RENAME VALUE requires PostgreSQL 10+.
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "667ab8bcde06"
+down_revision: Union[str, None] = "556fa9cacd05"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("ALTER TYPE agent_run_status RENAME VALUE 'queued' TO 'pending'")
+    op.execute("ALTER TYPE agent_release_status RENAME VALUE 'building' TO 'pending'")
+
+
+def downgrade() -> None:
+    op.execute("ALTER TYPE agent_run_status RENAME VALUE 'pending' TO 'queued'")
+    op.execute("ALTER TYPE agent_release_status RENAME VALUE 'pending' TO 'building'")
diff --git a/backend/alembic/versions/20260422_130000_778bc9cdef07_add_dispatched_and_approval_wait_to_execution_status.py b/backend/alembic/versions/20260422_130000_778bc9cdef07_add_dispatched_and_approval_wait_to_execution_status.py
new file mode 100644
index 000000000..32704b160
--- /dev/null
+++ b/backend/alembic/versions/20260422_130000_778bc9cdef07_add_dispatched_and_approval_wait_to_execution_status.py
@@ -0,0 +1,33 @@
+"""add dispatched and approval_wait to execution_status enum
+
+Revision ID: 778bc9cdef07
+Revises: 667ab8bcde06
+Create Date: 2026-04-22 13:00:00.000000+00:00
+
+Changes:
+- execution_status enum: add 'dispatched' and 'approval_wait' values
+  These states are actively written by execution_runner.py / definitions.py
+  but were missing from the DB enum, causing runtime errors on first write.
+
+NOTE: ALTER TYPE ... ADD VALUE requires PostgreSQL 9.1+.
+      Enum values cannot be removed in PostgreSQL (downgrade is a no-op).
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "778bc9cdef07"
+down_revision: Union[str, None] = "667ab8bcde06"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("ALTER TYPE execution_status ADD VALUE IF NOT EXISTS 'dispatched'")
+    op.execute("ALTER TYPE execution_status ADD VALUE IF NOT EXISTS 'approval_wait'")
+
+
+def downgrade() -> None:
+    pass  # Cannot remove enum values in PostgreSQL
diff --git a/backend/alembic/versions/20260424_000000_889cd0def08_remove_pending_from_agent_release_status.py b/backend/alembic/versions/20260424_000000_889cd0def08_remove_pending_from_agent_release_status.py
new file mode 100644
index 000000000..8ebb24b33
--- /dev/null
+++ b/backend/alembic/versions/20260424_000000_889cd0def08_remove_pending_from_agent_release_status.py
@@ -0,0 +1,58 @@
+"""remove pending from agent_release_status enum
+
+Revision ID: 889cd0def08
+Revises: 778bc9cdef07
+Create Date: 2026-04-24 00:00:00.000000+00:00
+
+Changes:
+- agent_release_status enum: remove 'pending' (never used in practice)
+- Set server_default to 'ready' (matches ORM default and service behavior)
+
+PostgreSQL cannot DROP a value from an enum, so we recreate the type.
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+revision: str = "889cd0def08"
+down_revision: Union[str, None] = "778bc9cdef07"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # 1. Drop the default so the column has no dependency on the enum during swap
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status DROP DEFAULT")
+
+    # 2. Rename old enum out of the way
+    op.execute("ALTER TYPE agent_release_status RENAME TO agent_release_status_old")
+
+    # 3. Create new enum without 'pending'
+    op.execute("CREATE TYPE agent_release_status AS ENUM ('ready', 'failed', 'retired')")
+
+    # 4. Swap column type (no rows should have 'pending'; fail loudly if they do)
+    op.execute(
+        "ALTER TABLE agent_releases "
+        "ALTER COLUMN status TYPE agent_release_status "
+        "USING status::text::agent_release_status"
+    )
+
+    # 5. Set correct default
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status SET DEFAULT 'ready'::agent_release_status")
+
+    # 6. Drop old enum
+    op.execute("DROP TYPE agent_release_status_old")
+
+
+def downgrade() -> None:
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status DROP DEFAULT")
+    op.execute("ALTER TYPE agent_release_status RENAME TO agent_release_status_old")
+    op.execute("CREATE TYPE agent_release_status AS ENUM ('pending', 'ready', 'failed', 'retired')")
+    op.execute(
+        "ALTER TABLE agent_releases "
+        "ALTER COLUMN status TYPE agent_release_status "
+        "USING status::text::agent_release_status"
+    )
+    op.execute("ALTER TABLE agent_releases ALTER COLUMN status SET DEFAULT 'pending'::agent_release_status")
+    op.execute("DROP TYPE agent_release_status_old")
diff --git a/backend/alembic/versions/20260425_000000_990de1ef09_add_draft_agent_runs.py b/backend/alembic/versions/20260425_000000_990de1ef09_add_draft_agent_runs.py
new file mode 100644
index 000000000..284637e43
--- /dev/null
+++ b/backend/alembic/versions/20260425_000000_990de1ef09_add_draft_agent_runs.py
@@ -0,0 +1,49 @@
+"""add draft agent runs
+
+Revision ID: 990de1ef09
+Revises: 889cd0def08
+Create Date: 2026-04-25 00:00:00.000000+00:00
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import UUID
+
+from alembic import op
+
+revision: str = "990de1ef09"
+down_revision: Union[str, None] = "889cd0def08"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column("agent_runs", sa.Column("agent_version_id", UUID(as_uuid=True), nullable=True))
+    op.create_foreign_key(
+        "fk_agent_runs_agent_version_id",
+        "agent_runs",
+        "agent_versions",
+        ["agent_version_id"],
+        ["id"],
+    )
+    op.alter_column("agent_runs", "release_id", existing_type=UUID(as_uuid=True), nullable=True)
+    op.create_check_constraint(
+        "ck_agent_runs_release_or_version",
+        "agent_runs",
+        "(release_id IS NOT NULL) <> (agent_version_id IS NOT NULL)",
+    )
+    op.create_index(
+        "ix_agent_runs_agent_version_id",
+        "agent_runs",
+        ["agent_version_id"],
+    )
+
+
+def downgrade() -> None:
+    op.drop_constraint("ck_agent_runs_release_or_version", "agent_runs", type_="check")
+    op.drop_index("ix_agent_runs_agent_version_id", table_name="agent_runs")
+    op.execute("DELETE FROM agent_runs WHERE release_id IS NULL")
+    op.alter_column("agent_runs", "release_id", existing_type=UUID(as_uuid=True), nullable=False)
+    op.drop_constraint("fk_agent_runs_agent_version_id", "agent_runs", type_="foreignkey")
+    op.drop_column("agent_runs", "agent_version_id")
diff --git a/backend/alembic/versions/20260426_000000_aab1c2d3e4f5_fix_active_agents_without_release.py b/backend/alembic/versions/20260426_000000_aab1c2d3e4f5_fix_active_agents_without_release.py
new file mode 100644
index 000000000..62fe9852e
--- /dev/null
+++ b/backend/alembic/versions/20260426_000000_aab1c2d3e4f5_fix_active_agents_without_release.py
@@ -0,0 +1,28 @@
+"""fix agents with status='active' but no active release
+
+Revision ID: aab1c2d3e4f5
+Revises: 990de1ef09
+Create Date: 2026-04-26 00:00:00.000000+00:00
+
+Changes:
+- Data-only migration: revert agents to 'draft' when status is 'active'
+  but active_release_id is NULL (out-of-sync state from retire_release
+  not syncing status prior to this fix).
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+revision: str = "aab1c2d3e4f5"
+down_revision: Union[str, None] = "990de1ef09"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.execute("UPDATE agents SET status = 'draft' WHERE status = 'active' AND active_release_id IS NULL")
+
+
+def downgrade() -> None:
+    pass
diff --git a/backend/alembic/versions/20260427_000000_bb1cc2dd3ee4_add_encrypted_custom_env_to_agents.py b/backend/alembic/versions/20260427_000000_bb1cc2dd3ee4_add_encrypted_custom_env_to_agents.py
new file mode 100644
index 000000000..7d7db2695
--- /dev/null
+++ b/backend/alembic/versions/20260427_000000_bb1cc2dd3ee4_add_encrypted_custom_env_to_agents.py
@@ -0,0 +1,29 @@
+"""add encrypted_custom_env to agents
+
+Revision ID: bb1cc2dd3ee4
+Revises: aab1c2d3e4f5
+Create Date: 2026-04-27 00:00:00.000000+00:00
+
+Changes:
+- Add encrypted_custom_env (Text, nullable) to agents table for
+  per-agent API key overrides, replacing the dropped agent_profiles.custom_env.
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision: str = "bb1cc2dd3ee4"
+down_revision: Union[str, None] = "aab1c2d3e4f5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.add_column("agents", sa.Column("encrypted_custom_env", sa.Text(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("agents", "encrypted_custom_env")
diff --git a/backend/alembic/versions/20260427_140000_cc3dd4ee5ff6_unify_execution_error_payload.py b/backend/alembic/versions/20260427_140000_cc3dd4ee5ff6_unify_execution_error_payload.py
new file mode 100644
index 000000000..50ff64c7d
--- /dev/null
+++ b/backend/alembic/versions/20260427_140000_cc3dd4ee5ff6_unify_execution_error_payload.py
@@ -0,0 +1,40 @@
+"""unify execution error payload"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from alembic import op
+
+revision = "cc3dd4ee5ff6"
+down_revision = "bb1cc2dd3ee4"
+
+
+def upgrade():
+    op.add_column("executions", sa.Column("error", postgresql.JSONB(astext_type=sa.Text()), nullable=True))
+    op.execute(
+        """
+        UPDATE executions
+        SET error = jsonb_build_object(
+            'code', COALESCE(error_code, 'EXECUTION_FAILED'),
+            'message', COALESCE(error_message, 'Execution failed'),
+            'data', NULL
+        )
+        WHERE error_code IS NOT NULL OR error_message IS NOT NULL
+        """
+    )
+    op.drop_column("executions", "error_code")
+    op.drop_column("executions", "error_message")
+
+
+def downgrade():
+    op.add_column("executions", sa.Column("error_message", sa.Text(), nullable=True))
+    op.add_column("executions", sa.Column("error_code", sa.String(length=100), nullable=True))
+    op.execute(
+        """
+        UPDATE executions
+        SET error_code = error->>'code',
+            error_message = error->>'message'
+        WHERE error IS NOT NULL
+        """
+    )
+    op.drop_column("executions", "error")
diff --git a/backend/alembic/versions/20260428_000000_dd4ee5ff6aa7_add_traces_and_observations_tables.py b/backend/alembic/versions/20260428_000000_dd4ee5ff6aa7_add_traces_and_observations_tables.py
new file mode 100644
index 000000000..5fb163d04
--- /dev/null
+++ b/backend/alembic/versions/20260428_000000_dd4ee5ff6aa7_add_traces_and_observations_tables.py
@@ -0,0 +1,80 @@
+"""add traces and observations tables"""
+
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+
+from alembic import op
+
+revision = "dd4ee5ff6aa7"
+down_revision = "cc3dd4ee5ff6"
+
+
+def upgrade():
+    op.create_table(
+        "traces",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column("name", sa.String(255), nullable=False),
+        sa.Column("workspace_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("start_time", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("end_time", sa.DateTime(timezone=True)),
+        sa.Column("status", sa.String(20), nullable=False, server_default="running"),
+        sa.Column("input", JSONB),
+        sa.Column("output", JSONB),
+        sa.Column("metadata", JSONB),
+        sa.Column("environment", sa.String(50), server_default="debug"),
+        sa.Column("tags", sa.ARRAY(sa.String), server_default="{}"),
+        sa.Column("release", sa.String(255)),
+        sa.Column("version", sa.String(100)),
+        sa.Column("session_id", sa.String(255)),
+        sa.Column("bookmarked", sa.Boolean, server_default="false"),
+        sa.Column("public", sa.Boolean, server_default="false"),
+        sa.Column("total_observations", sa.Integer, server_default="0"),
+        sa.Column("total_tokens", sa.Integer, server_default="0"),
+        sa.Column("total_cost", sa.Numeric(12, 6)),
+        sa.Column("duration_ms", sa.Integer),
+        sa.Column("execution_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("agent_version_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("user_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
+    )
+    op.create_index("ix_traces_workspace_created", "traces", ["workspace_id", "created_at"])
+    op.create_index("ix_traces_execution", "traces", ["execution_id"], unique=True)
+    op.create_index("ix_traces_session", "traces", ["session_id", "created_at"])
+
+    op.create_table(
+        "observations",
+        sa.Column("id", UUID(as_uuid=True), primary_key=True),
+        sa.Column("trace_id", UUID(as_uuid=True), sa.ForeignKey("traces.id", ondelete="CASCADE"), nullable=False),
+        sa.Column("parent_observation_id", UUID(as_uuid=True)),
+        sa.Column("type", sa.String(20), nullable=False),
+        sa.Column("name", sa.String(500), nullable=False),
+        sa.Column("level", sa.String(10), nullable=False, server_default="DEFAULT"),
+        sa.Column("status_message", sa.Text),
+        sa.Column("environment", sa.String(50), server_default="debug"),
+        sa.Column("start_time", sa.DateTime(timezone=True), nullable=False),
+        sa.Column("end_time", sa.DateTime(timezone=True)),
+        sa.Column("completion_start_time", sa.DateTime(timezone=True)),
+        sa.Column("input", JSONB),
+        sa.Column("output", JSONB),
+        sa.Column("metadata", JSONB),
+        sa.Column("model", sa.String(100)),
+        sa.Column("model_parameters", JSONB),
+        sa.Column("usage_details", JSONB),
+        sa.Column("cost_details", JSONB),
+        sa.Column("prompt_name", sa.String(255)),
+        sa.Column("prompt_version", sa.Integer),
+        sa.Column("tool_definitions", JSONB),
+        sa.Column("tool_calls", JSONB),
+        sa.Column("tool_call_names", sa.ARRAY(sa.String)),
+        sa.Column("execution_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("workspace_id", UUID(as_uuid=True), nullable=False),
+        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
+    )
+    op.create_index("ix_observations_trace_time", "observations", ["trace_id", "start_time"])
+    op.create_index("ix_observations_parent", "observations", ["parent_observation_id"])
+    op.create_index("ix_observations_trace_type", "observations", ["trace_id", "type"])
+
+
+def downgrade():
+    op.drop_table("observations")
+    op.drop_table("traces")
diff --git a/backend/alembic/versions/20260429_000000_ee5ff6aa7bb8_extend_release_status.py b/backend/alembic/versions/20260429_000000_ee5ff6aa7bb8_extend_release_status.py
new file mode 100644
index 000000000..67c0bc9d6
--- /dev/null
+++ b/backend/alembic/versions/20260429_000000_ee5ff6aa7bb8_extend_release_status.py
@@ -0,0 +1,56 @@
+"""extend agent_release_status enum with active and superseded
+
+Revision ID: ee5ff6aa7bb8
+Revises: dd4ee5ff6aa7
+Create Date: 2026-04-29 00:00:00.000000+00:00
+
+Changes:
+- agent_release_status enum: add 'active' and 'superseded' values
+- Backfill: each agent's active_release_id row -> 'active'
+- Backfill: sibling 'ready' rows (same agent, has active sibling) -> 'superseded'
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+
+revision: str = "ee5ff6aa7bb8"
+down_revision: Union[str, None] = "dd4ee5ff6aa7"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.get_context().autocommit_block():
+        op.execute("ALTER TYPE agent_release_status ADD VALUE IF NOT EXISTS 'active'")
+        op.execute("ALTER TYPE agent_release_status ADD VALUE IF NOT EXISTS 'superseded'")
+
+    op.execute(
+        """
+        UPDATE agent_releases r
+           SET status = 'active'
+          FROM agents a
+         WHERE a.active_release_id = r.id
+           AND r.status = 'ready'
+        """
+    )
+
+    op.execute(
+        """
+        UPDATE agent_releases r
+           SET status = 'superseded'
+          FROM agent_versions v
+         WHERE r.agent_version_id = v.id
+           AND r.status = 'ready'
+           AND EXISTS (
+                SELECT 1 FROM agent_releases r2
+                  JOIN agent_versions v2 ON r2.agent_version_id = v2.id
+                 WHERE v2.agent_id = v.agent_id
+                   AND r2.status = 'active'
+           )
+        """
+    )
+
+
+def downgrade() -> None:
+    op.execute("UPDATE agent_releases SET status = 'ready' WHERE status IN ('active', 'superseded')")
diff --git a/backend/alembic/versions/20260429_100000_ff6aa7bb8cc9_drop_observation_tool_call_names.py b/backend/alembic/versions/20260429_100000_ff6aa7bb8cc9_drop_observation_tool_call_names.py
new file mode 100644
index 000000000..60261dc41
--- /dev/null
+++ b/backend/alembic/versions/20260429_100000_ff6aa7bb8cc9_drop_observation_tool_call_names.py
@@ -0,0 +1,31 @@
+"""drop dead tool_call_names column from observations
+
+Revision ID: ff6aa7bb8cc9
+Revises: ee5ff6aa7bb8
+Create Date: 2026-04-29 10:00:00.000000+00:00
+
+Changes:
+- Drop tool_call_names column from observations table (never populated)
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+
+from alembic import op
+
+revision: str = "ff6aa7bb8cc9"
+down_revision: Union[str, None] = "ee5ff6aa7bb8"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.drop_column("observations", "tool_call_names")
+
+
+def downgrade() -> None:
+    op.add_column(
+        "observations",
+        sa.Column("tool_call_names", sa.ARRAY(sa.String), nullable=True),
+    )
diff --git a/backend/alembic/versions/20260430_000000_1a2b3c4d5e6f_unify_agent_run_metadata.py b/backend/alembic/versions/20260430_000000_1a2b3c4d5e6f_unify_agent_run_metadata.py
new file mode 100644
index 000000000..92b8ff12b
--- /dev/null
+++ b/backend/alembic/versions/20260430_000000_1a2b3c4d5e6f_unify_agent_run_metadata.py
@@ -0,0 +1,89 @@
+"""unify_agent_run_metadata
+
+Revision ID: 1a2b3c4d5e6f
+Revises:
+Create Date: 2026-04-30 18:32:00.000000
+
+"""
+
+import sqlalchemy as sa
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1a2b3c4d5e6f"
+down_revision = "ff6aa7bb8cc9"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # 1. Add new columns
+    op.add_column("agent_runs", sa.Column("trigger_medium", sa.String(length=20), nullable=True))
+    op.add_column("agent_runs", sa.Column("run_purpose", sa.String(length=20), nullable=True))
+
+    # 2. Data Migration: single-pass CASE to map old trigger_source → new axes
+    op.execute("""
+        UPDATE agent_runs SET
+            trigger_medium = CASE trigger_source
+                WHEN 'task' THEN 'system'
+                WHEN 'chat' THEN 'api'
+                WHEN 'api' THEN 'api'
+                WHEN 'scheduler' THEN 'scheduler'
+                WHEN 'draft_test' THEN 'ui'
+                WHEN 'draft_copilot' THEN 'ui'
+                WHEN 'copilot' THEN 'ui'
+                WHEN 'debug' THEN 'ui'
+                ELSE 'api'
+            END,
+            run_purpose = CASE trigger_source
+                WHEN 'task' THEN 'production'
+                WHEN 'chat' THEN 'production'
+                WHEN 'api' THEN 'production'
+                WHEN 'scheduler' THEN 'production'
+                WHEN 'draft_test' THEN 'draft_test'
+                WHEN 'draft_copilot' THEN 'internal_builder'
+                WHEN 'copilot' THEN 'internal_builder'
+                WHEN 'debug' THEN 'debug'
+                ELSE 'production'
+            END
+    """)
+
+    # 3. Make new columns non-nullable
+    op.alter_column("agent_runs", "trigger_medium", existing_type=sa.String(length=20), nullable=False)
+    op.alter_column("agent_runs", "run_purpose", existing_type=sa.String(length=20), nullable=False)
+
+    # 4. Drop old column
+    op.drop_column("agent_runs", "trigger_source")
+
+    # 5. Clean up old executor kinds and definition kinds
+    op.execute("UPDATE executions SET executor_kind = 'build_copilot' WHERE executor_kind = 'copilot'")
+    op.execute(
+        "UPDATE agent_versions SET definition_kind = 'sandbox_cli' WHERE definition_kind IN ('claude_code', 'codex', 'openclaw')"
+    )
+
+
+def downgrade():
+    # 1. Add old column
+    op.add_column("agent_runs", sa.Column("trigger_source", sa.String(length=20), nullable=True))
+
+    # 2. Revert Data Migration: single-pass CASE
+    op.execute("""
+        UPDATE agent_runs SET
+            trigger_source = CASE
+                WHEN trigger_medium = 'system' AND run_purpose = 'production' THEN 'task'
+                WHEN trigger_medium = 'api' AND run_purpose = 'production' THEN 'chat'
+                WHEN trigger_medium = 'scheduler' AND run_purpose = 'production' THEN 'scheduler'
+                WHEN trigger_medium = 'ui' AND run_purpose = 'draft_test' THEN 'draft_test'
+                WHEN trigger_medium = 'ui' AND run_purpose = 'internal_builder' THEN 'draft_copilot'
+                WHEN trigger_medium = 'ui' AND run_purpose = 'debug' THEN 'debug'
+                ELSE 'api'
+            END
+    """)
+
+    # 3. Make old column non-nullable
+    op.alter_column("agent_runs", "trigger_source", existing_type=sa.String(length=20), nullable=False)
+
+    # 4. Drop new columns
+    op.drop_column("agent_runs", "run_purpose")
+    op.drop_column("agent_runs", "trigger_medium")
diff --git a/backend/alembic/versions/20260430_010000_b2af1f3e0215_refactor_agent_kinds.py b/backend/alembic/versions/20260430_010000_b2af1f3e0215_refactor_agent_kinds.py
new file mode 100644
index 000000000..eb1caee86
--- /dev/null
+++ b/backend/alembic/versions/20260430_010000_b2af1f3e0215_refactor_agent_kinds.py
@@ -0,0 +1,68 @@
+"""refactor_agent_kinds
+
+Revision ID: b2af1f3e0215
+Revises: 1a2b3c4d5e6f
+Create Date: 2026-04-30
+
+Renames definition_kind->engine_kind, executor_kind->engine_kind.
+Remaps values: graph->langgraph_visual, code->langgraph_code,
+sandbox_cli->(split by runtime_binding), graph/code runtime->server.
+"""
+
+from alembic import op
+
+revision = "b2af1f3e0215"
+down_revision = "1a2b3c4d5e6f"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # 1. agent_versions: rename column + remap values
+    op.alter_column("agent_versions", "definition_kind", new_column_name="engine_kind")
+    op.execute("UPDATE agent_versions SET engine_kind = 'langgraph_visual' WHERE engine_kind = 'graph'")
+    op.execute("UPDATE agent_versions SET engine_kind = 'langgraph_code' WHERE engine_kind = 'code'")
+    # sandbox_cli -> split by runtime_binding from linked releases (UPDATE FROM avoids correlated subquery)
+    op.execute("""
+        UPDATE agent_versions av
+        SET engine_kind = COALESCE(ar.runtime_type, 'claude_code')
+        FROM (
+            SELECT DISTINCT ON (agent_version_id)
+                agent_version_id,
+                runtime_binding->>'runtime_type' AS runtime_type
+            FROM agent_releases
+            ORDER BY agent_version_id, created_at DESC
+        ) ar
+        WHERE ar.agent_version_id = av.id
+          AND av.engine_kind = 'sandbox_cli'
+    """)
+    # Any sandbox_cli rows with no releases default to claude_code
+    op.execute("""
+        UPDATE agent_versions
+        SET engine_kind = 'claude_code'
+        WHERE engine_kind = 'sandbox_cli'
+    """)
+
+    # 2. agent_releases: remap runtime_kind values
+    op.execute("UPDATE agent_releases SET runtime_kind = 'server' WHERE runtime_kind IN ('graph', 'code')")
+
+    # 3. executions: rename column (values already correct: claude_code, codex, openclaw, build_copilot)
+    op.alter_column("executions", "executor_kind", new_column_name="engine_kind")
+
+
+def downgrade():
+    # 3. executions: restore column name
+    op.alter_column("executions", "engine_kind", new_column_name="executor_kind")
+
+    # 2. agent_releases: restore runtime_kind values (best-effort)
+    # Cannot distinguish graph vs code from runtime_kind alone, default to graph
+    op.execute("UPDATE agent_releases SET runtime_kind = 'graph' WHERE runtime_kind = 'server'")
+
+    # 1. agent_versions: restore column name + remap values
+    op.execute("UPDATE agent_versions SET engine_kind = 'graph' WHERE engine_kind = 'langgraph_visual'")
+    op.execute("UPDATE agent_versions SET engine_kind = 'code' WHERE engine_kind = 'langgraph_code'")
+    op.execute("""
+        UPDATE agent_versions SET engine_kind = 'sandbox_cli'
+        WHERE engine_kind IN ('claude_code', 'codex', 'openclaw')
+    """)
+    op.alter_column("agent_versions", "engine_kind", new_column_name="definition_kind")
diff --git a/backend/app/MODEL.md b/backend/app/MODEL.md
index 88794a092..ba30a3b45 100644
--- a/backend/app/MODEL.md
+++ b/backend/app/MODEL.md
@@ -227,12 +227,14 @@ backend/app/
 - `POST /api/v1/models/instances` - 创建模型实例配置
 - `GET /api/v1/models/instances` - 获取模型实例配置列表
 - `POST /api/v1/models/test-output` - 测试模型输出
+- `POST /api/v1/models/test-output-stream` - 测试模型输出（SSE 流式）
 
 ### 模型供应商 API
 
 - `GET /api/v1/model-providers` - 获取所有供应商列表
 - `GET /api/v1/model-providers/{provider_name}` - 获取单个供应商详情
 - `POST /api/v1/model-providers/sync` - 同步供应商、模型和认证信息
+- `POST /api/v1/model-providers/custom` - 添加自定义供应商
 
 ### 模型凭据 API
 
@@ -279,7 +281,7 @@ backend/app/
 ## 注意事项
 
 1. **全局可见性**: 当前实现中，模型实例和凭据对所有用户和工作空间可见（user_id 和 workspace_id 为 NULL 的记录）
-2. **认证**: 当前代码中用户认证部分被注释，使用匿名用户ID，后续需要恢复认证机制
+2. **认证**: 所有 API 端点使用 `get_current_user` 依赖进行用户认证
 3. **同步机制**: 供应商和模型信息通过工厂模式从代码同步到数据库
 4. **凭据管理**: 凭据加密存储，解密操作只在 Service 层进行
 
@@ -290,7 +292,6 @@ backend/app/
 - [Repository 层文档](./repositories/MODEL.md)
 - [Model 层文档](./models/MODEL.md)
 - [Core 层文档](./core/model/MODEL.md)
-- [Core 层详细文档](./core/model/README_CN.md)
 
 ## 未来改进
 
diff --git a/backend/app/SKILL.md b/backend/app/SKILL.md
index 36b46ff9e..386826ab4 100644
--- a/backend/app/SKILL.md
+++ b/backend/app/SKILL.md
@@ -132,7 +132,7 @@ Model Layer (models/skill.py)
 **权限检查逻辑：**
 ```python
 if skill.owner_id and skill.owner_id != current_user_id and not skill.is_public:
-    raise ForbiddenException("You don't have permission to access this skill")
+    raise AccessDeniedError("You don't have permission to access this skill")
 ```
 
 ### 3. 创建技能
@@ -335,9 +335,9 @@ if skill.owner_id and skill.owner_id != current_user_id and not skill.is_public:
 
 技能模块使用以下自定义异常：
 
-- `NotFoundException`: 资源不存在（如技能或文件不存在）
-- `ForbiddenException`: 权限不足（如非拥有者尝试修改技能）
-- `BadRequestException`: 请求参数错误（如同名技能已存在）
+- `NotFoundError`: 资源不存在（如技能或文件不存在）
+- `AccessDeniedError`: 权限不足（如非拥有者尝试修改技能）
+- `InvalidRequestError`: 请求参数错误（如同名技能已存在）
 
 所有异常都在 `SkillService` 层抛出，由 API 层的全局异常处理器统一处理。
 
diff --git a/backend/app/api/schemas.py b/backend/app/api/schemas.py
index 6a00aac60..88b7159b3 100644
--- a/backend/app/api/schemas.py
+++ b/backend/app/api/schemas.py
@@ -4,54 +4,36 @@
 from pydantic import BaseModel, ConfigDict, Field
 
 
-class BadRequestResponse(BaseModel):
-    model_config = ConfigDict(json_schema_extra={"example": {"detail": "Bad request", "error_code": "BAD_REQUEST"}})
-
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
-
-
-class NotFoundResponse(BaseModel):
-    model_config = ConfigDict(json_schema_extra={"example": {"detail": "Not found", "error_code": "NOT_FOUND"}})
-
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
-
-
-class UnauthorizedResponse(BaseModel):
-    model_config = ConfigDict(
-        json_schema_extra={"example": {"detail": "Unauthorized access", "error_code": "UNAUTHORIZED"}}
-    )
-
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
-
-
-class UnauthenticatedResponse(BaseModel):
+class AppErrorPayloadSchema(BaseModel):
     model_config = ConfigDict(
-        json_schema_extra={"example": {"detail": "Unauthenticated access", "error_code": "UNAUTHENTICATED"}}
+        json_schema_extra={
+            "example": {
+                "code": "BAD_REQUEST",
+                "message": "请求错误",
+                "data": {"detail": "Bad request"},
+                "source": "api",
+                "retryable": False,
+            }
+        }
     )
 
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
-
-
-class ValidationErrorResponse(BaseModel):
-    model_config = ConfigDict(
-        json_schema_extra={"example": {"detail": "Validation error", "error_code": "VALIDATION_ERROR"}}
+    code: str = Field(..., description="Stable application error code")
+    message: str = Field(..., description="User-facing error summary")
+    data: Optional[dict] = Field(None, description="Structured error metadata")
+    source: str = Field("internal", description="Error origin: api, engine, runtime, auth, validation, etc.")
+    retryable: bool = Field(False, description="Whether the client should retry the request")
+    user_action: Optional[str] = Field(
+        None, description="Suggested user action: retry, configure_model, relogin, fix_input, contact_support"
     )
+    detail: Optional[str] = Field(None, description="Detailed diagnostic message")
 
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
-
-
-class InternalServerErrorResponse(BaseModel):
-    model_config = ConfigDict(
-        json_schema_extra={"example": {"detail": "Internal server error", "error_code": "INTERNAL_SERVER_ERROR"}}
-    )
 
-    detail: str = Field(..., description="Error detail message")
-    error_code: Optional[str] = Field(None, description="Error code for categorization")
+BadRequestResponse = AppErrorPayloadSchema
+NotFoundResponse = AppErrorPayloadSchema
+UnauthorizedResponse = AppErrorPayloadSchema
+UnauthenticatedResponse = AppErrorPayloadSchema
+ValidationErrorResponse = AppErrorPayloadSchema
+InternalServerErrorResponse = AppErrorPayloadSchema
 
 
 class HealthResponse(BaseModel):
diff --git a/backend/app/api/v1/MODEL.md b/backend/app/api/v1/MODEL.md
index 157f0195f..2f67306b3 100644
--- a/backend/app/api/v1/MODEL.md
+++ b/backend/app/api/v1/MODEL.md
@@ -50,6 +50,15 @@
   - `workspaceId`: 工作空间ID（可选）
 - **返回**: 模型输出结果
 
+#### 5. 测试模型输出（流式）
+- **端点**: `POST /api/v1/models/test-output-stream`
+- **功能**: 以 SSE 流式方式测试指定模型的输出
+- **请求体**:
+  - `model_name`: 模型名称
+  - `input`: 输入文本
+  - `workspaceId`: 工作空间ID（可选）
+- **返回**: SSE 事件流
+
 ### 模型供应商 API (`model_providers.py`)
 
 #### 1. 获取所有供应商列表
@@ -79,6 +88,11 @@
   - 同步认证信息（从 .env 读取并同步到 model_credential 表，全局记录）
 - **返回**: 同步结果统计
 
+#### 4. 添加自定义供应商
+- **端点**: `POST /api/v1/model-providers/custom`
+- **功能**: 一步创建自定义供应商（含 provider + credential + model_instance）
+- **返回**: 创建结果
+
 ### 模型凭据 API (`model_credentials.py`)
 
 #### 1. 创建或更新凭据
@@ -140,7 +154,7 @@ Repository 层 (ModelInstanceRepository, ModelProviderRepository, ModelCredentia
 
 ## 注意事项
 
-1. **认证**: 当前代码中用户认证部分被注释，使用匿名用户ID，后续需要恢复认证机制
+1. **认证**: 所有 API 端点使用 `get_current_user` 依赖进行用户认证
 2. **全局可见性**: 模型实例和凭据对所有用户和工作空间可见（user_id 和 workspace_id 为 NULL 的记录）
 3. **凭据加密**: 所有凭据在存储前都会进行加密处理
 4. **同步机制**: 供应商和模型信息通过工厂模式从代码同步到数据库
diff --git a/backend/app/api/v1/__init__.py b/backend/app/api/v1/__init__.py
index 8bd3e1831..50d7db723 100644
--- a/backend/app/api/v1/__init__.py
+++ b/backend/app/api/v1/__init__.py
@@ -6,15 +6,15 @@
 
 from fastapi import APIRouter
 
+from .agent_runs import router as agent_runs_router
+from .agents import router as agents_router
 from .artifacts import router as artifacts_router
 from .auth import router as auth_router
-from .conversations import router as conversations_router
+from .copilot import router as copilot_router
 from .custom_tools import router as custom_tools_router
 from .environment import router as environment_router
+from .executions import router as executions_router
 from .files import router as files_router
-from .graph_code import router as graph_code_router
-from .graph_deployments import router as graph_deployments_router
-from .graphs import router as graphs_router
 from .mcp import router as mcp_router
 from .memory import router as memory_router
 from .model_credentials import router as model_credentials_router
@@ -22,39 +22,36 @@
 from .model_usage import router as model_usage_router
 from .models import router as models_router
 from .oauth import router as oauth_router
-from .openapi_graph import router as openapi_graph_router
 from .openclaw_chat import router as openclaw_chat_router
 from .openclaw_devices import router as openclaw_devices_router
 from .openclaw_instances import router as openclaw_instances_router
 from .openclaw_proxy import router as openclaw_proxy_router
 from .organizations import router as organizations_router
-from .runs import router as runs_router
 from .sandboxes import router as sandboxes_router
 from .skill_collaborators import router as skill_collaborators_router
 from .skill_versions import router as skill_versions_router
 from .skills import router as skills_router
+from .task_activities import router as task_activities_router
+from .tasks import router as tasks_router
+from .threads import router as threads_router
 from .tokens import router as tokens_router
 from .tools import router as tools_router
 from .traces import router as traces_router
 from .users import router as users_router
 from .version import router as version_router
-from .workspace_files import router as workspace_files_router
-from .workspace_folders import router as workspace_folders_router
 from .workspaces import router as workspaces_router
 
 ROUTERS = [
     sandboxes_router,
     auth_router,
     artifacts_router,
-    conversations_router,
     files_router,
     memory_router,
     oauth_router,
     organizations_router,
-    runs_router,
+    agent_runs_router,
+    copilot_router,
     workspaces_router,
-    workspace_folders_router,
-    workspace_files_router,
     custom_tools_router,
     tools_router,
     mcp_router,
@@ -62,13 +59,10 @@
     model_credentials_router,
     models_router,
     model_usage_router,
-    graph_code_router,
-    graph_deployments_router,
     skills_router,
     skill_versions_router,
     skill_collaborators_router,
     tokens_router,
-    graphs_router,
     traces_router,
     users_router,
     environment_router,
@@ -76,8 +70,12 @@
     openclaw_chat_router,
     openclaw_devices_router,
     openclaw_proxy_router,
-    openapi_graph_router,
     version_router,
+    tasks_router,
+    executions_router,
+    agents_router,
+    task_activities_router,
+    threads_router,
 ]
 
 
diff --git a/backend/app/api/v1/agent_runs.py b/backend/app/api/v1/agent_runs.py
new file mode 100644
index 000000000..0f0ab2abe
--- /dev/null
+++ b/backend/app/api/v1/agent_runs.py
@@ -0,0 +1,197 @@
+"""Agent Runs API."""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AccessDeniedError
+from app.common.dependencies import CurrentUser, get_current_user, require_workspace_role
+from app.core.database import get_db
+from app.models.agent import Agent, AgentRelease, AgentVersion
+from app.models.auth import AuthUser as User
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.agent_run import (
+    AgentRunResponse,
+    CreateAgentRunRequest,
+    CreateDraftAgentRunRequest,
+)
+from app.services.agent_run_service import AgentRunService
+from app.services.dispatch_service import DispatchService
+from app.services.workspace_permission import check_workspace_access
+
+router = APIRouter(prefix="/v1/runs", tags=["Runs"])
+
+
+def _to_response(run) -> AgentRunResponse:
+    return AgentRunResponse.model_validate(run)
+
+
+async def _get_release_workspace_id(db: AsyncSession, release_id: uuid.UUID) -> uuid.UUID | None:
+    return (
+        await db.execute(
+            select(Agent.workspace_id)
+            .join(AgentVersion, AgentVersion.agent_id == Agent.id)
+            .join(AgentRelease, AgentRelease.agent_version_id == AgentVersion.id)
+            .where(AgentRelease.id == release_id)
+        )
+    ).scalar_one_or_none()
+
+
+async def _require_workspace_access(
+    db: AsyncSession,
+    workspace_id: uuid.UUID,
+    current_user: User,
+    role: WorkspaceMemberRole,
+) -> None:
+    has_access = await check_workspace_access(db, workspace_id, current_user, role)
+    if not has_access:
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
+
+
+@router.get("", response_model=BaseResponse[List[AgentRunResponse]])
+async def list_runs(
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID | None = Query(None),
+    release_id: uuid.UUID | None = Query(None),
+    task_id: uuid.UUID | None = Query(None),
+    agent_id: uuid.UUID | None = Query(None),
+    trigger_medium: str | None = Query(None),
+    run_purpose: str | None = Query(None),
+    status: str | None = Query(None),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[AgentRunResponse]]:
+    """List runs filtered by workspace_id, release_id, task_id, or agent_id."""
+    service = AgentRunService(db)
+    runs = await service.list_runs(
+        workspace_id=workspace_id,
+        release_id=release_id,
+        task_id=task_id,
+        agent_id=agent_id,
+        trigger_medium=trigger_medium,
+        run_purpose=run_purpose,
+        status=status,
+    )
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[_to_response(r) for r in runs],
+    )
+
+
+@router.post("", response_model=BaseResponse[AgentRunResponse])
+async def create_run(
+    request: CreateAgentRunRequest,
+    current_user: CurrentUser,
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentRunResponse]:
+    """Create a new agent run via the unified orchestrator."""
+    workspace_id = await _get_release_workspace_id(db, request.release_id)
+    if not workspace_id:
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
+    await _require_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
+
+    dispatch = DispatchService(db)
+    run = await dispatch.dispatch_direct(
+        release_id=request.release_id,
+        prompt=request.goal or "",
+        user_id=str(current_user.id),
+        trigger_medium=request.trigger_medium,
+        run_purpose=request.run_purpose,
+        thread_id=request.thread_id,
+        task_id=request.task_id,
+        input_payload=request.input_payload,
+    )
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Run created",
+        data=_to_response(run),
+    )
+
+
+@router.post("/draft", response_model=BaseResponse[AgentRunResponse])
+async def create_draft_run(
+    request: CreateDraftAgentRunRequest,
+    current_user: CurrentUser,
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentRunResponse]:
+    """Create a Test Lab run against an agent draft version, not an active release."""
+    await _require_workspace_access(db, request.workspace_id, current_user, WorkspaceMemberRole.member)
+
+    dispatch = DispatchService(db)
+    run = await dispatch.dispatch_draft(
+        agent_id=request.agent_id,
+        version_id=request.version_id,
+        prompt=request.goal or "",
+        user_id=str(current_user.id),
+        workspace_id=request.workspace_id,
+        input_payload=request.input_payload,
+    )
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Draft run created",
+        data=_to_response(run),
+    )
+
+
+@router.get("/{run_id}", response_model=BaseResponse[AgentRunResponse])
+async def get_run(
+    run_id: uuid.UUID,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentRunResponse]:
+    """Get a run by ID."""
+    service = AgentRunService(db)
+    run = await service.get_run(run_id)
+    await _require_workspace_access(db, run.workspace_id, current_user, WorkspaceMemberRole.viewer)
+    return BaseResponse(success=True, code=200, msg="ok", data=_to_response(run))
+
+
+@router.post("/{run_id}/cancel", response_model=BaseResponse[AgentRunResponse])
+async def cancel_run(
+    run_id: uuid.UUID,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentRunResponse]:
+    """Cancel a run."""
+    service = AgentRunService(db)
+    existing_run = await service.get_run(run_id)
+    await _require_workspace_access(
+        db,
+        existing_run.workspace_id,
+        current_user,
+        WorkspaceMemberRole.member,
+    )
+
+    dispatch = DispatchService(db)
+    run = await dispatch.cancel_run(run_id)
+    return BaseResponse(success=True, code=200, msg="Run cancelled", data=_to_response(run))
+
+
+@router.post("/{run_id}/retry", response_model=BaseResponse[AgentRunResponse])
+async def retry_run(
+    run_id: uuid.UUID,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentRunResponse]:
+    """Retry a run by creating a new execution attempt."""
+    service = AgentRunService(db)
+    existing_run = await service.get_run(run_id)
+    await _require_workspace_access(
+        db,
+        existing_run.workspace_id,
+        current_user,
+        WorkspaceMemberRole.member,
+    )
+
+    dispatch = DispatchService(db)
+    run = await dispatch.retry_run(run_id, str(current_user.id))
+    return BaseResponse(success=True, code=200, msg="Run retried", data=_to_response(run))
diff --git a/backend/app/api/v1/agents.py b/backend/app/api/v1/agents.py
new file mode 100644
index 000000000..f0f1faa8e
--- /dev/null
+++ b/backend/app/api/v1/agents.py
@@ -0,0 +1,337 @@
+"""Agents API."""
+
+from __future__ import annotations
+
+import uuid
+from typing import List, Optional
+
+from fastapi import APIRouter, Depends, Query
+from pydantic import BaseModel as PydanticBaseModel
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AccessDeniedError
+from app.common.dependencies import CurrentUser, require_workspace_role
+from app.core.database import get_db
+from app.models.agent import Agent, AgentRelease, AgentVersion
+from app.models.auth import AuthUser as User
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.agent import (
+    AgentResponse,
+    AgentSummary,
+    CreateAgentRequest,
+    UpdateAgentRequest,
+)
+from app.schemas.agent_release import (
+    AgentReleaseResponse,
+    AgentReleaseSummary,
+)
+from app.schemas.agent_version import (
+    AgentVersionResponse,
+    AgentVersionSummary,
+    CreateAgentVersionRequest,
+    UpdateAgentVersionRequest,
+)
+from app.services.agent_publish_service import AgentPublishService
+from app.services.agent_release_service import AgentReleaseService
+from app.services.agent_service import AgentService
+from app.services.agent_version_service import AgentVersionService
+from app.services.workspace_permission import check_workspace_access
+
+
+class RollbackRequest(PydanticBaseModel):
+    release_id: uuid.UUID
+
+
+class PublishAgentResponse(PydanticBaseModel):
+    agent: AgentResponse
+    release: AgentReleaseResponse
+
+
+class RollbackAgentResponse(PydanticBaseModel):
+    agent: AgentResponse
+
+
+class UnpublishAgentResponse(PydanticBaseModel):
+    agent: AgentResponse
+    release: Optional[AgentReleaseResponse] = None
+
+
+router = APIRouter(prefix="/v1/agents", tags=["Agents"])
+
+
+# ---------------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------------
+
+
+def _to_response(agent: Agent) -> AgentResponse:
+    return AgentResponse.model_validate(agent)
+
+
+def _to_summary(agent: Agent) -> AgentSummary:
+    return AgentSummary.model_validate(agent)
+
+
+def _version_to_response(v: AgentVersion) -> AgentVersionResponse:
+    return AgentVersionResponse.model_validate(v)
+
+
+def _version_to_summary(v: AgentVersion) -> AgentVersionSummary:
+    return AgentVersionSummary.model_validate(v)
+
+
+def _release_to_response(r: AgentRelease) -> AgentReleaseResponse:
+    return AgentReleaseResponse.model_validate(r)
+
+
+def _release_to_summary(r: AgentRelease) -> AgentReleaseSummary:
+    return AgentReleaseSummary.model_validate(r)
+
+
+# ---------------------------------------------------------------------------
+# Agent routes
+# ---------------------------------------------------------------------------
+
+
+@router.get("", response_model=BaseResponse[List[AgentSummary]])
+async def list_agents(
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[AgentSummary]]:
+    service = AgentService(db)
+    agents = await service.list_agents(workspace_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[_to_summary(a) for a in agents],
+    )
+
+
+@router.post("", response_model=BaseResponse[AgentResponse])
+async def create_agent(
+    request: CreateAgentRequest,
+    current_user: CurrentUser,
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentResponse]:
+    has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
+    if not has_access:
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
+
+    service = AgentService(db)
+    agent = await service.create_agent(workspace_id, str(current_user.id), request)
+    return BaseResponse(success=True, code=200, msg="Agent created", data=_to_response(agent))
+
+
+@router.get("/{agent_id}", response_model=BaseResponse[AgentResponse])
+async def get_agent(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentResponse]:
+    service = AgentService(db)
+    agent = await service.get_agent(agent_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=_to_response(agent))
+
+
+@router.patch("/{agent_id}", response_model=BaseResponse[AgentResponse])
+async def update_agent(
+    agent_id: uuid.UUID,
+    request: UpdateAgentRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentResponse]:
+    service = AgentService(db)
+    agent = await service.update_agent(agent_id, request)
+    return BaseResponse(success=True, code=200, msg="Agent updated", data=_to_response(agent))
+
+
+@router.delete("/{agent_id}", response_model=BaseResponse)
+async def delete_agent(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse:
+    service = AgentService(db)
+    await service.delete_agent(agent_id)
+    return BaseResponse(success=True, code=200, msg="Agent deleted")
+
+
+# ---------------------------------------------------------------------------
+# AgentVersion sub-routes
+# ---------------------------------------------------------------------------
+
+
+@router.get("/{agent_id}/versions", response_model=BaseResponse[List[AgentVersionSummary]])
+async def list_versions(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[AgentVersionSummary]]:
+    service = AgentVersionService(db)
+    versions = await service.list_versions(agent_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[_version_to_summary(v) for v in versions],
+    )
+
+
+@router.post("/{agent_id}/versions", response_model=BaseResponse[AgentVersionResponse])
+async def create_version(
+    agent_id: uuid.UUID,
+    request: CreateAgentVersionRequest,
+    current_user: CurrentUser,
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentVersionResponse]:
+    has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
+    if not has_access:
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
+
+    service = AgentVersionService(db)
+    version = await service.create_version(agent_id, str(current_user.id), request)
+    return BaseResponse(success=True, code=200, msg="Version created", data=_version_to_response(version))
+
+
+@router.get("/{agent_id}/versions/{version_id}", response_model=BaseResponse[AgentVersionResponse])
+async def get_version(
+    agent_id: uuid.UUID,
+    version_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentVersionResponse]:
+    service = AgentVersionService(db)
+    version = await service.get_version(version_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=_version_to_response(version))
+
+
+@router.patch("/{agent_id}/versions/{version_id}", response_model=BaseResponse[AgentVersionResponse])
+async def update_version(
+    agent_id: uuid.UUID,
+    version_id: uuid.UUID,
+    request: UpdateAgentVersionRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentVersionResponse]:
+    service = AgentVersionService(db)
+    version = await service.update_version(version_id, request, user_id=current_user.id)
+    return BaseResponse(success=True, code=200, msg="Version updated", data=_version_to_response(version))
+
+
+# ---------------------------------------------------------------------------
+# AgentRelease sub-routes
+# ---------------------------------------------------------------------------
+
+
+@router.get("/{agent_id}/releases", response_model=BaseResponse[List[AgentReleaseSummary]])
+async def list_releases(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[AgentReleaseSummary]]:
+    service = AgentReleaseService(db)
+    releases = await service.list_releases(agent_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[_release_to_summary(r) for r in releases],
+    )
+
+
+@router.get("/{agent_id}/releases/{release_id}", response_model=BaseResponse[AgentReleaseResponse])
+async def get_release(
+    agent_id: uuid.UUID,
+    release_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentReleaseResponse]:
+    service = AgentReleaseService(db)
+    release = await service.get_release(release_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=_release_to_response(release))
+
+
+@router.post("/{agent_id}/releases/{release_id}/retire", response_model=BaseResponse[AgentReleaseResponse])
+async def retire_release(
+    agent_id: uuid.UUID,
+    release_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.admin),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[AgentReleaseResponse]:
+    service = AgentPublishService(db)
+    result = await service.retire(agent_id, release_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=_release_to_response(result["release"]))
+
+
+@router.post("/{agent_id}/publish", response_model=BaseResponse[PublishAgentResponse])
+async def publish_agent(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.admin),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[PublishAgentResponse]:
+    service = AgentPublishService(db)
+    result = await service.publish(agent_id, current_user.id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=PublishAgentResponse(
+            agent=_to_response(result["agent"]),
+            release=_release_to_response(result["release"]),
+        ),
+    )
+
+
+@router.post("/{agent_id}/rollback", response_model=BaseResponse[RollbackAgentResponse])
+async def rollback_agent(
+    agent_id: uuid.UUID,
+    body: RollbackRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.admin),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[RollbackAgentResponse]:
+    service = AgentPublishService(db)
+    result = await service.rollback(agent_id, body.release_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=RollbackAgentResponse(
+            agent=_to_response(result["agent"]),
+        ),
+    )
+
+
+@router.post("/{agent_id}/unpublish", response_model=BaseResponse[UnpublishAgentResponse])
+async def unpublish_agent(
+    agent_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.admin),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[UnpublishAgentResponse]:
+    service = AgentPublishService(db)
+    result = await service.unpublish(agent_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=UnpublishAgentResponse(
+            agent=_to_response(result["agent"]),
+            release=_release_to_response(result["release"]) if result["release"] else None,
+        ),
+    )
diff --git a/backend/app/api/v1/artifacts.py b/backend/app/api/v1/artifacts.py
index ebb532e2e..ad27d995a 100644
--- a/backend/app/api/v1/artifacts.py
+++ b/backend/app/api/v1/artifacts.py
@@ -13,8 +13,8 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AppError, InternalServiceError, InvalidRequestError, NotFoundError
 from app.common.dependencies import CurrentUser
-from app.common.exceptions import AppException, BadRequestException, InternalServerException, NotFoundException
 from app.common.response import success_response
 from app.core.agent.artifacts import ArtifactResolver, FileInfo, RunInfo
 from app.core.database import get_db
@@ -91,7 +91,11 @@ async def download_artifact_file(
     """Download or preview a file from the run. Returns file with appropriate Content-Type."""
     path = resolver.get_file_path(str(current_user.id), thread_id, run_id, file_path)
     if path is None:
-        raise NotFoundException("File not found or path invalid")
+        raise NotFoundError(
+            "File not found or path invalid",
+            code="ARTIFACT_FILE_NOT_FOUND",
+            data={"thread_id": thread_id, "run_id": run_id, "file_path": file_path},
+        )
     filename = path.name
     media_type, _ = mimetypes.guess_type(str(path))
     return FileResponse(
@@ -115,7 +119,7 @@ async def live_read_file(
     user_id = str(current_user.id)
     record = await service.get_user_sandbox_record(user_id)
     if not record:
-        raise NotFoundException("No sandbox found")
+        raise NotFoundError("No sandbox found", code="SANDBOX_NOT_FOUND", data={"user_id": user_id})
 
     handle = None
     adapter = await _sandbox_pool.get(record.id)
@@ -129,7 +133,7 @@ async def live_read_file(
             adapter = handle.adapter
         except Exception as e:
             logger.warning(f"Sandbox reconnect failed for user {user_id}: {e}", exc_info=True)
-            raise NotFoundException("Sandbox not running")
+            raise NotFoundError("Sandbox not running", code="SANDBOX_NOT_RUNNING", data={"user_id": user_id})
 
     try:
         raw_read = getattr(adapter, "raw_read", None)
@@ -138,13 +142,21 @@ async def live_read_file(
         else:
             content = adapter.read(file_path)
         if content.startswith("[Error:") or content.startswith("Error:"):
-            raise NotFoundException(content)
+            raise NotFoundError(
+                content,
+                code="ARTIFACT_FILE_NOT_FOUND",
+                data={"thread_id": thread_id, "file_path": file_path},
+            )
         return PlainTextResponse(content)
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.warning(f"Live read failed for {file_path}: {e}")
-        raise InternalServerException(f"Failed to read file: {e}")
+        raise InternalServiceError(
+            "Failed to read file",
+            code="ARTIFACT_FILE_READ_FAILED",
+            data={"thread_id": thread_id, "file_path": file_path},
+        ) from e
     finally:
         if handle:
             await handle.release()
@@ -162,5 +174,9 @@ async def delete_artifact_run(
     """Delete all artifacts for the given run."""
     ok = resolver.delete_run(str(current_user.id), thread_id, run_id)
     if not ok:
-        raise BadRequestException("Delete failed or path invalid")
+        raise InvalidRequestError(
+            "Delete failed or path invalid",
+            code="ARTIFACT_RUN_DELETE_FAILED",
+            data={"thread_id": thread_id, "run_id": run_id},
+        )
     return success_response(message="Run artifacts deleted", data={"run_id": run_id})
diff --git a/backend/app/api/v1/auth.py b/backend/app/api/v1/auth.py
index a82f35946..2c7fff64b 100644
--- a/backend/app/api/v1/auth.py
+++ b/backend/app/api/v1/auth.py
@@ -10,7 +10,7 @@
 from pydantic import BaseModel, ConfigDict, EmailStr, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import AppException, UnauthorizedException
+from app.common.app_errors import AppError, AuthenticationError
 from app.common.response import success_response
 from app.core.database import AsyncSessionLocal, get_db
 from app.core.rate_limit import auth_rate_limit, strict_rate_limit
@@ -217,7 +217,7 @@ async def logout(
         try:
             current_user = await _get_current_auth_user(token, db, request)
             user_id = current_user.id
-        except AppException:
+        except AppError:
             logger.debug("Failed to resolve current user during logout", exc_info=True)
 
         if refresh_token and user_id:
@@ -357,7 +357,7 @@ async def get_session(
         # Pass request to read token from Cookie
         current_user = await _get_current_auth_user(token, db, request)
         return success_response(data={"user": _user_to_response(current_user)})
-    except AppException:
+    except AppError:
         # Return null user when unauthenticated
         return success_response(data={"user": None})
 
@@ -429,7 +429,7 @@ async def refresh_token(
         except Exception:
             logger.debug("Failed to refresh token via cookie refresh_token", exc_info=True)
 
-    raise UnauthorizedException("Invalid or expired refresh token")
+    raise AuthenticationError("Invalid or expired refresh token", code="REFRESH_TOKEN_INVALID")
 
 
 # Helpers
@@ -437,7 +437,7 @@ async def refresh_token(
 
 def _extract_bearer(auth_header: Optional[str]) -> str:
     if not auth_header or not auth_header.lower().startswith("bearer "):
-        raise UnauthorizedException("Missing bearer token")
+        raise AuthenticationError("Missing bearer token", code="BEARER_TOKEN_MISSING")
     return auth_header.split(" ", 1)[1]
 
 
@@ -450,7 +450,7 @@ async def _get_current_auth_user(
     if auth_header:
         try:
             token = _extract_bearer(auth_header)
-        except UnauthorizedException:
+        except AuthenticationError:
             logger.debug("Failed to extract bearer token from Authorization header", exc_info=True)
 
     if not token and request:
@@ -462,7 +462,7 @@ async def _get_current_auth_user(
             logger.debug("Failed to read token from cookies", exc_info=True)
 
     if not token:
-        raise UnauthorizedException("Missing credentials")
+        raise AuthenticationError("Missing credentials", code="MISSING_CREDENTIALS")
 
     user_service = AuthService(db)
 
@@ -472,7 +472,7 @@ async def _get_current_auth_user(
         user = await user_service.get_user_by_id(str(user_id))
         if user and user.is_active:
             return user
-        raise UnauthorizedException("User not found or inactive")
+        raise AuthenticationError("User not found or inactive", code="USER_INVALID")
 
     session_service = AuthSessionService(db)
     session = await session_service.get_session_by_token(token)
@@ -480,9 +480,9 @@ async def _get_current_auth_user(
         user = await user_service.user_repo.get(uuid.UUID(session.user_id))
         if user and user.is_active:
             return user
-        raise UnauthorizedException("User not found or inactive")
+        raise AuthenticationError("User not found or inactive", code="USER_INVALID")
 
-    raise UnauthorizedException("Invalid or expired token")
+    raise AuthenticationError("Invalid or expired token", code="TOKEN_INVALID")
 
 
 def _user_to_response(user: AuthUser) -> UserResponse:
diff --git a/backend/app/api/v1/chat.py b/backend/app/api/v1/chat.py
deleted file mode 100644
index f7770f06b..000000000
--- a/backend/app/api/v1/chat.py
+++ /dev/null
@@ -1,537 +0,0 @@
-"""
-Module: Chat API (Production Ready)
-
-Overview:
-- Streaming helper module reused by the chat WebSocket handler
-- Provide LangGraph event dispatch, state queries, message persistence, and result archival
-- No longer exposes a `/v1/chat` HTTP endpoint
-
-Dependencies:
-- Database: async SQLAlchemy session
-- LangGraph: v2 event stream processing
-- WebSocket chat handler: `app.websocket.chat_ws_handler`
-"""
-
-import asyncio
-import uuid
-from typing import Any, AsyncGenerator, Dict
-
-from langchain.messages import AIMessage
-from langchain_core.messages.base import BaseMessage
-from langchain_core.runnables import RunnableConfig
-from loguru import logger
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.core.database import AsyncSessionLocal
-from app.core.settings import settings
-from app.models import Conversation, Message
-from app.utils.datetime import utc_now
-from app.utils.file_event_emitter import FileEventEmitter
-from app.utils.stream_event_handler import StreamEventHandler, StreamState
-
-# LangGraph control-flow exception: do not mark trace as FAILED
-try:
-    from langgraph.errors import GraphBubbleUp
-except ImportError:
-    GraphBubbleUp = None  # type: ignore[misc, assignment]
-
-
-async def safe_get_state(
-    graph: Any, config: RunnableConfig, max_retries: int = 3, initial_delay: float = 0.1, log: Any = None
-) -> Any:
-    """
-    Safely retrieve graph state with retry logic to avoid connection conflicts.
-
-    Args:
-        graph: LangGraph graph instance
-        config: RunnableConfig configuration
-        max_retries: maximum number of retries
-        initial_delay: initial delay in seconds, doubled on each retry
-        log: optional logger
-
-    Returns:
-        Graph state snapshot
-
-    Raises:
-        Exception: if all retries are exhausted
-    """
-    if log is None:
-        log = logger
-
-    last_error = None
-    delay = initial_delay
-
-    for attempt in range(max_retries):
-        try:
-            snap = await graph.aget_state(config)
-            return snap
-        except Exception as e:
-            last_error = e
-            error_msg = str(e)
-
-            # check for connection conflict error
-            is_connection_error = (
-                "another command is already in progress" in error_msg.lower() or "connection" in error_msg.lower()
-            )
-
-            # last attempt — stop retrying
-            if attempt >= max_retries - 1:
-                break
-
-            # connection error — wait and retry
-            if is_connection_error:
-                log.debug(
-                    f"Connection conflict detected (attempt {attempt + 1}/{max_retries}), "
-                    f"retrying after {delay:.2f}s delay"
-                )
-                await asyncio.sleep(delay)
-                delay *= 2  # exponential backoff
-            else:
-                # non-connection error — log warning but still retry (may be transient)
-                log.warning(f"Failed to get state (attempt {attempt + 1}/{max_retries}): {e}")
-                await asyncio.sleep(delay)
-                delay *= 2
-
-    # all retries exhausted
-    log.error(f"Failed to get state after {max_retries} attempts: {last_error}")
-    if last_error is not None:
-        raise last_error
-    raise RuntimeError("Failed to get state after all retries")
-
-
-# ==================== Persistence Logic ====================
-
-
-async def save_run_result(
-    thread_id: str,
-    state: StreamState,
-    log,
-    *,
-    graph_id: str | None = None,
-    workspace_id: str | None = None,
-    user_id: str | None = None,
-    graph_name: str | None = None,
-) -> None:
-    """
-    Persist run results.
-
-    Use a fresh DB session to ensure the connection is available even when
-    called from a finally block. Also batch-persist Trace + Observations.
-    """
-    # --- 1. persist messages ---
-    if state.assistant_content or state.all_messages:
-        if not state.all_messages and state.assistant_content:
-            log.warning(f"Using fallback content accumulation for thread {thread_id}")
-            state.all_messages = [AIMessage(content=state.assistant_content)]
-
-        if state.all_messages:
-            try:
-                async with AsyncSessionLocal() as session:
-                    await save_assistant_message(thread_id, state.all_messages, session, update_conversation=True)
-                    log.info(f"Persisted messages for thread {thread_id}")
-            except asyncio.CancelledError:
-                log.warning(f"Save run result cancelled for thread {thread_id}")
-            except Exception as e:
-                log.error(f"Failed to persist messages for thread {thread_id}: {e}")
-
-    # --- 2. persist Trace + Observations (transaction-safe) ---
-    all_observations = state.get_all_observations()
-    if all_observations:
-        try:
-            await _persist_trace_data(
-                state,
-                log,
-                observations=all_observations,
-                graph_id=graph_id,
-                workspace_id=workspace_id,
-                user_id=user_id,
-                graph_name=graph_name,
-            )
-        except asyncio.CancelledError:
-            log.debug(f"Trace persistence cancelled for thread {thread_id}")
-        except Exception as e:
-            log.warning(f"Failed to persist trace data for thread {thread_id}: {e}")
-
-
-async def _persist_trace_data(
-    state: StreamState,
-    log,
-    *,
-    observations: list | None = None,
-    graph_id: str | None = None,
-    workspace_id: str | None = None,
-    user_id: str | None = None,
-    graph_name: str | None = None,
-) -> None:
-    """
-    Batch-write accumulated Observation data from StreamState to the database.
-
-    Transaction-safe: uses session.begin() for atomicity.
-    Incomplete observations are marked INTERRUPTED by state.get_all_observations().
-    """
-    from datetime import datetime, timezone
-
-    from app.models.execution_trace import (
-        ExecutionObservation,
-        ExecutionTrace,
-        ObservationLevel,
-        ObservationStatus,
-        ObservationType,
-        TraceStatus,
-    )
-    from app.utils.stream_event_handler import ObsLevel, ObsStatus, ObsType
-
-    all_obs = observations if observations is not None else state.get_all_observations()
-    if not all_obs:
-        return
-
-    # determine trace status
-    if state.has_error:
-        trace_status = TraceStatus.FAILED
-    elif state.interrupted:
-        trace_status = TraceStatus.INTERRUPTED
-    elif state.stopped:
-        trace_status = TraceStatus.FAILED
-    else:
-        trace_status = TraceStatus.COMPLETED
-
-    now = datetime.now(timezone.utc)
-    trace_start = datetime.fromtimestamp(state.trace_start_time / 1000, tz=timezone.utc)
-    duration_ms = int(now.timestamp() * 1000 - state.trace_start_time)
-
-    # aggregate token statistics
-    total_tokens = 0
-    for obs_rec in all_obs:
-        if obs_rec.type == ObsType.GENERATION and obs_rec.total_tokens:
-            total_tokens += obs_rec.total_tokens
-
-    # build ExecutionTrace ORM object
-    trace_uuid = uuid.UUID(state.trace_id)
-    trace = ExecutionTrace(
-        id=trace_uuid,
-        workspace_id=uuid.UUID(workspace_id) if workspace_id else None,
-        graph_id=uuid.UUID(graph_id) if graph_id else None,
-        thread_id=state.thread_id,
-        user_id=user_id,
-        name=graph_name or "graph_execution",
-        status=trace_status,
-        start_time=trace_start,
-        end_time=now,
-        duration_ms=duration_ms,
-        total_tokens=total_tokens or None,
-    )
-
-    # enum mapping
-    type_map = {
-        ObsType.SPAN: ObservationType.SPAN,
-        ObsType.GENERATION: ObservationType.GENERATION,
-        ObsType.TOOL: ObservationType.TOOL,
-        ObsType.EVENT: ObservationType.EVENT,
-    }
-    level_map = {
-        ObsLevel.DEBUG: ObservationLevel.DEBUG,
-        ObsLevel.DEFAULT: ObservationLevel.DEFAULT,
-        ObsLevel.WARNING: ObservationLevel.WARNING,
-        ObsLevel.ERROR: ObservationLevel.ERROR,
-    }
-    status_map = {
-        ObsStatus.RUNNING: ObservationStatus.RUNNING,
-        ObsStatus.COMPLETED: ObservationStatus.COMPLETED,
-        ObsStatus.FAILED: ObservationStatus.FAILED,
-        ObsStatus.INTERRUPTED: ObservationStatus.INTERRUPTED,
-    }
-
-    # build ExecutionObservation ORM objects
-    db_observations = []
-    for rec in all_obs:
-        obs = ExecutionObservation(
-            id=uuid.UUID(rec.id),
-            trace_id=trace_uuid,
-            parent_observation_id=uuid.UUID(rec.parent_observation_id) if rec.parent_observation_id else None,
-            type=type_map.get(rec.type, ObservationType.EVENT),
-            name=rec.name,
-            level=level_map.get(rec.level, ObservationLevel.DEFAULT),
-            status=status_map.get(rec.status, ObservationStatus.COMPLETED),
-            status_message=rec.status_message,
-            start_time=datetime.fromtimestamp(rec.start_time / 1000, tz=timezone.utc),
-            end_time=datetime.fromtimestamp(rec.end_time / 1000, tz=timezone.utc) if rec.end_time else None,
-            duration_ms=rec.duration_ms,
-            completion_start_time=(
-                datetime.fromtimestamp(rec.completion_start_time / 1000, tz=timezone.utc)
-                if rec.completion_start_time
-                else None
-            ),
-            input=rec.input_data,
-            output=rec.output_data,
-            model_name=rec.model_name,
-            model_provider=rec.model_provider,
-            model_parameters=rec.model_parameters,
-            prompt_tokens=rec.prompt_tokens,
-            completion_tokens=rec.completion_tokens,
-            total_tokens=rec.total_tokens,
-            metadata_=rec.metadata,
-            version=rec.version,
-        )
-        db_observations.append(obs)
-
-    # transaction-safe batch insert
-    async with AsyncSessionLocal() as session:
-        async with session.begin():
-            session.add(trace)
-            session.add_all(db_observations)
-        # commit is automatic when begin() context exits
-    log.info(f"Persisted trace {state.trace_id} with {len(db_observations)} observations | thread={state.thread_id}")
-
-
-# ==================== Database Operations ====================
-
-
-async def get_or_create_conversation(
-    thread_id: str | None,
-    message: str,
-    user_id: str,
-    metadata: dict | None,
-    db: AsyncSession,
-) -> tuple[str, Conversation]:
-    if not thread_id:
-        # No thread_id provided, create new conversation
-        thread_id = str(uuid.uuid4())
-        conversation = Conversation(
-            thread_id=thread_id,
-            user_id=user_id,
-            title=message[:50] if len(message) > 50 else message,
-            meta_data=metadata or {},
-        )
-        db.add(conversation)
-        await db.commit()
-        return thread_id, conversation
-    else:
-        # Thread_id provided, try to find existing conversation
-        result = await db.execute(
-            select(Conversation).where(Conversation.thread_id == thread_id, Conversation.user_id == user_id)
-        )
-        conv = result.scalar_one_or_none()
-        if not conv:
-            # Conversation not found - create new one with the provided thread_id
-            # This allows frontend to generate thread_id and let backend create conversation on first message
-            conversation = Conversation(
-                thread_id=thread_id,
-                user_id=user_id,
-                title=message[:50] if len(message) > 50 else message,
-                meta_data=metadata or {},
-            )
-            db.add(conversation)
-            await db.commit()
-            await db.refresh(conversation)
-            return thread_id, conversation
-        return thread_id, conv
-
-
-async def get_user_config(user_id: str, thread_id: str):
-    """Retrieve user configuration (RunnableConfig for LangGraph)."""
-    from app.core.agent.langfuse_callback import get_langfuse_callbacks
-    from app.core.trace_context import get_trace_id
-
-    config: RunnableConfig = {
-        "configurable": {"thread_id": thread_id, "user_id": str(user_id), "trace_id": get_trace_id()},
-        "recursion_limit": 300,
-        "callbacks": get_langfuse_callbacks(enabled=settings.langfuse_enabled),
-    }
-
-    return config, {}
-
-
-async def save_user_message(thread_id: str, message: str, metadata: dict | None, db: AsyncSession):
-    user_message = Message(
-        thread_id=thread_id,
-        role="user",
-        content=message,
-        meta_data=metadata or {},
-    )
-    db.add(user_message)
-    await db.commit()
-
-
-async def save_assistant_message(
-    thread_id: str, messages: list[BaseMessage], db: AsyncSession, update_conversation: bool = True
-):
-    """Save assistant message, extracting tool calls if present."""
-    # find the last AI message
-    ai_msg = next((m for m in reversed(messages) if isinstance(m, AIMessage)), None)
-    if not ai_msg:
-        return
-
-    meta_data = dict(ai_msg.additional_kwargs) if ai_msg.additional_kwargs else {}
-
-    # extract tool calls (simplified — a strict implementation would match subsequent ToolMessages by ID)
-    if hasattr(ai_msg, "tool_calls") and ai_msg.tool_calls:
-        tool_calls_data = []
-        for tc in ai_msg.tool_calls:
-            tool_calls_data.append({"name": tc.get("name"), "arguments": tc.get("args"), "id": tc.get("id")})
-        meta_data["tool_calls"] = tool_calls_data
-
-    message = Message(
-        thread_id=thread_id,
-        role="assistant",
-        content=str(ai_msg.content) if ai_msg.content else "",
-        meta_data=meta_data,
-    )
-    db.add(message)
-
-    if update_conversation:
-        result = await db.execute(select(Conversation).where(Conversation.thread_id == thread_id))
-        if conv := result.scalar_one_or_none():
-            conv.updated_at = utc_now()
-    await db.commit()
-
-
-async def _clear_interrupt_marker(thread_id: str, log: Any) -> None:
-    """Clear the interrupted_graph_id marker from Conversation metadata."""
-    try:
-        async with AsyncSessionLocal() as session:
-            result_query = await session.execute(select(Conversation).where(Conversation.thread_id == thread_id))
-            if conv := result_query.scalar_one_or_none():
-                if conv.meta_data and "interrupted_graph_id" in conv.meta_data:
-                    del conv.meta_data["interrupted_graph_id"]
-                    await session.commit()
-                    log.debug(f"Cleared interrupt marker from conversation | thread_id={thread_id}")
-    except asyncio.CancelledError:
-        log.debug(f"Clear interrupt marker cancelled for thread {thread_id} (connection closing)")
-    except Exception as e:
-        log.warning(f"Failed to clear interrupt marker for conversation | thread_id={thread_id} | error={e}")
-
-
-# ==================== Message Enrichment ====================
-
-
-def _enrich_message(message: str, metadata: dict, *, is_new_thread: bool, log, endpoint: str) -> str:
-    """Append edit_skill_id context (first message only) and file info to user message."""
-    enriched = message
-
-    # Only inject editing context on the first message of a new thread
-    edit_skill_id = metadata.get("edit_skill_id")
-    if edit_skill_id and is_new_thread:
-        log.info(f"[{endpoint}] edit-skill mode: edit_skill_id={edit_skill_id}")
-        enriched += (
-            f"\n\n[Editing Mode] The user wants to modify an existing skill (ID: {edit_skill_id}). "
-            f"The skill files have been pre-loaded into the sandbox. "
-            f"Read the existing files first, then apply the user's requested changes."
-        )
-
-    files = metadata.get("files", [])
-    if files:
-        log.info(f"[{endpoint}] found {len(files)} attached file(s): {files}")
-        file_lines = "\n".join([f"- {f['filename']}: {f['path']}" for f in files])
-        enriched += f"\n\nAttached files:\n{file_lines}\nUse the read_file tool to read the content of these files."
-        log.info(f"[{endpoint}] message enriched with file paths, length={len(enriched)}")
-
-    return enriched
-
-
-# ==================== Event Dispatch Helpers ====================
-
-
-def _extract_run_ids(event_dict: dict) -> tuple[str, str | None]:
-    """
-    Extract run_id and parent_run_id from a LangGraph v2 event.
-
-    Each LangGraph v2 astream_events event contains:
-    - run_id: unique identifier for the event (UUID or str)
-    - parent_ids: list ordered from root to immediate parent
-
-    All values are normalised to str to avoid UUID-as-dict-key issues.
-    """
-    raw_run_id = event_dict.get("run_id")
-    run_id = str(raw_run_id) if raw_run_id else ""
-    parent_ids = event_dict.get("parent_ids", [])
-    parent_run_id = str(parent_ids[-1]) if parent_ids else None
-    return run_id, parent_run_id
-
-
-async def _dispatch_stream_event(
-    event: Any,
-    handler: StreamEventHandler,
-    state: StreamState,
-    file_emitter: FileEventEmitter | None = None,
-) -> AsyncGenerator[str, None]:
-    """
-    Translate a single LangGraph v2 astream_events event into SSE strings.
-
-    Yields zero or more SSE strings. Callers: ``async for sse in _dispatch_stream_event(...): yield sse``.
-    file_emitter is only passed by chat_stream (not chat_resume).
-    """
-    event_dict: dict[str, Any]
-    if isinstance(event, dict):
-        event_dict = event  # type: ignore[assignment]
-    else:
-        event_dict = {"event": str(type(event).__name__), "data": event} if event else {}
-
-    event_type = event_dict.get("event")
-    event_name = event_dict.get("name", "")
-    metadata = event_dict.get("metadata", {}) if isinstance(event_dict.get("metadata"), dict) else {}
-    langgraph_node = metadata.get("langgraph_node")
-
-    is_node_event = langgraph_node is not None or (
-        event_name
-        and "node" in event_name.lower()
-        and "tool" not in event_name.lower()
-        and "model" not in event_name.lower()
-        and "llm" not in event_name.lower()
-        and "chat" not in event_name.lower()
-    )
-
-    run_id, parent_run_id = _extract_run_ids(event_dict)
-
-    if event_type == "on_chat_model_start":
-        yield await handler.handle_chat_model_start(event_dict, state, run_id, parent_run_id)
-
-    elif event_type == "on_chat_model_stream":
-        if sse := await handler.handle_chat_model_stream(event_dict, state, run_id, parent_run_id):
-            yield sse
-
-    elif event_type == "on_chat_model_end":
-        yield await handler.handle_chat_model_end(event_dict, state, run_id, parent_run_id)
-
-    elif event_type == "on_tool_start":
-        yield await handler.handle_tool_start(event_dict, state, run_id, parent_run_id)
-
-    elif event_type == "on_tool_end":
-        yield await handler.handle_tool_end(event_dict, state, run_id, parent_run_id)
-
-    elif event_type == "on_chain_start" and is_node_event:
-        yield await handler.handle_node_start(event_dict, state, run_id, parent_run_id)
-
-    elif event_type == "on_chain_end":
-        if is_node_event:
-            result = await handler.handle_node_end(event_dict, state, run_id, parent_run_id)
-            if isinstance(result, list):
-                for event_str in result:
-                    if event_str and event_str.strip():
-                        yield event_str.strip() + "\n\n"
-            elif isinstance(result, str) and result.strip():
-                yield result
-
-        data_raw: Any = event_dict.get("data", {})
-        data: Dict[str, Any] = data_raw if isinstance(data_raw, dict) else {}  # type: ignore[assignment]
-        output = data.get("output") if isinstance(data, dict) else None
-        if output and isinstance(output, dict) and "messages" in output:
-            msgs = output["messages"]
-            from langgraph.types import Overwrite
-
-            state.all_messages = msgs.value if isinstance(msgs, Overwrite) else msgs
-
-    # Drain file events (chat_stream only)
-    if file_emitter is not None:
-        for file_evt in file_emitter.drain():
-            yield handler.format_sse(
-                "file_event",
-                {
-                    "action": file_evt.action,
-                    "path": file_evt.path,
-                    "size": file_evt.size,
-                    "timestamp": file_evt.timestamp,
-                },
-                state.thread_id,
-                state,
-            )
diff --git a/backend/app/api/v1/conversations.py b/backend/app/api/v1/conversations.py
deleted file mode 100644
index 44357d34b..000000000
--- a/backend/app/api/v1/conversations.py
+++ /dev/null
@@ -1,927 +0,0 @@
-"""
-Module: Conversations API
-
-Overview:
-- Provides conversation create, query, update, delete (soft/hard delete)
-- Provides message pagination, checkpoint retrieval, and conversation reset
-- Supports conversation data export/import and full-text search
-- Provides per-user conversation statistics
-
-Routes:
-- POST /conversations: Create conversation
-- GET /conversations: Get conversation list (paginated)
-- DELETE /conversations/all: Delete all historical conversations (soft/hard)
-- GET /conversations/{thread_id}: Get conversation details
-- PATCH /conversations/{thread_id}: Update conversation
-- DELETE /conversations/{thread_id}: Delete conversation (soft/hard)
-- POST /conversations/{thread_id}/reset: Reset conversation (clear messages and checkpoints)
-- GET /conversations/{thread_id}/messages: Get conversation messages (paginated)
-- GET /conversations/{thread_id}/checkpoints: Get conversation checkpoints
-- GET /conversations/{thread_id}/export: Export conversation (hidden from OpenAPI)
-- POST /conversations/import: Import conversation (hidden from OpenAPI)
-- POST /conversations/search: Search conversations and messages
-- GET /conversations/users/stats: Get current user's conversation statistics
-
-Dependencies:
-- Auth: CurrentUser
-- Database: AsyncSession (Depends(get_db))
-- Graph: LangGraph checkpoints via checkpointer
-- Utilities: utc_now, SQLAlchemy select/func, etc.
-
-Requests/Responses:
-- Pagination: PaginationParams, PageResult[T]
-- Conversation/Message models: ConversationCreate/Update/Response/DetailResponse, MessageResponse
-- Others: CheckpointResponse, ConversationExportResponse, ConversationImportRequest, SearchRequest/Response, UserStatsResponse
-- Unified response: BaseResponse[T]
-
-Error codes:
-- 404: Conversation not found or not owned by current user
-- 400: Invalid parameters or import/export failure
-- 500: Internal server error
-"""
-
-import uuid
-
-from fastapi import APIRouter, Depends, Query
-from langchain_core.runnables import RunnableConfig
-from loguru import logger
-from sqlalchemy import delete, func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import CurrentUser
-from app.common.exceptions import InternalServerException, raise_not_found_error
-from app.common.pagination import ConversationMessagesPaginationParams, PageResult, PaginationParams, Paginator
-from app.core.agent.checkpointer.checkpointer import get_checkpointer
-from app.core.database import get_db
-from app.models import Conversation, Message
-from app.schemas import (
-    BaseResponse,
-    CheckpointResponse,
-    ConversationCreate,
-    ConversationDetailResponse,
-    ConversationExportResponse,
-    ConversationImportRequest,
-    ConversationMessageResponse,
-    ConversationResponse,
-    ConversationUpdate,
-    SearchRequest,
-    SearchResponse,
-    UserStatsResponse,
-)
-from app.utils.datetime import utc_now
-
-router = APIRouter(prefix="/v1/conversations", tags=["Conversations"])
-
-
-# ==================== Helper functions ====================
-
-
-async def verify_conversation_ownership(thread_id: str, user_id: str, db: AsyncSession) -> Conversation:
-    """Verify conversation ownership"""
-    result = await db.execute(
-        select(Conversation).where(Conversation.thread_id == thread_id, Conversation.user_id == user_id)
-    )
-    conversation = result.scalar_one_or_none()
-    if not conversation:
-        raise_not_found_error("Conversation")
-    # At this point, conversation is guaranteed to be non-None
-    assert conversation is not None
-    return conversation
-
-
-# ==================== Conversation management endpoints ====================
-
-
-@router.post(
-    "",
-    response_model=BaseResponse[ConversationResponse],
-    summary="Create conversation",
-    description="Create a new conversation for the current user.",
-    responses={
-        401: {"description": "Unauthorized"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def create_conversation(
-    conv: ConversationCreate,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[ConversationResponse]:
-    """
-    Create a new conversation
-
-    Args:
-        conv: Conversation creation request
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[ConversationResponse]: Conversation response
-    """
-    conversation = Conversation(
-        thread_id=str(uuid.uuid4()),
-        user_id=current_user.id,  # Use current user ID
-        title=conv.title,
-        meta_data=conv.metadata or {},
-    )
-    db.add(conversation)
-    await db.commit()
-    await db.refresh(conversation)
-
-    return BaseResponse(
-        success=True,
-        code=201,
-        msg="Conversation created successfully",
-        data=ConversationResponse(
-            id=conversation.id,
-            thread_id=conversation.thread_id,
-            user_id=conversation.user_id,
-            title=conversation.title,
-            metadata=conversation.meta_data or {},
-            created_at=conversation.created_at,
-            updated_at=conversation.updated_at,
-            message_count=0,
-        ),
-    )
-
-
-@router.get(
-    "",
-    response_model=BaseResponse[PageResult[ConversationResponse]],
-    summary="List conversations",
-    description="List the current user's conversations with pagination.",
-    responses={
-        401: {"description": "Unauthorized"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def list_conversations(
-    current_user: CurrentUser,
-    page: int = Query(default=1, ge=1, description="Page number"),
-    page_size: int = Query(default=20, ge=1, le=100, description="Items per page"),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[PageResult[ConversationResponse]]:
-    """
-    Get the current user's conversation list
-
-    Args:
-        current_user: Current user
-        page: Page number (starting from 1)
-        page_size: Number of items per page
-        db: Database session
-
-    Returns:
-        BaseResponse[PageResult[ConversationResponse]]: Paginated conversation list
-    """
-    # Create PaginationParams from query parameters
-    page_query = PaginationParams(page=page, page_size=page_size)
-
-    paginator = Paginator(db)
-    page_result = await paginator.paginate(
-        select(Conversation)
-        .where(Conversation.user_id == current_user.id, Conversation.is_active == 1)
-        .order_by(Conversation.updated_at.desc()),
-        page_query,
-    )
-    conversations = page_result.items
-
-    response_list = []
-    for conv in conversations:
-        # Get message count
-        count_result = await db.execute(select(func.count(Message.id)).where(Message.thread_id == conv.thread_id))
-        message_count = count_result.scalar() or 0
-
-        response_list.append(
-            ConversationResponse(
-                id=conv.id,
-                thread_id=conv.thread_id,
-                user_id=conv.user_id,
-                title=conv.title,
-                metadata=conv.meta_data or {},
-                created_at=conv.created_at,
-                updated_at=conv.updated_at,
-                message_count=message_count,
-            )
-        )
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Fetched conversation list successfully",
-        data=PageResult(
-            items=response_list,
-            total=page_result.total,
-            page=page_result.page,
-            page_size=page_result.page_size,
-            pages=page_result.pages,
-        ),
-    )
-
-
-@router.delete(
-    "/all",
-    summary="Delete all historical conversations",
-    description="Delete all conversations for the current user. Supports soft delete or hard delete.",
-    responses={
-        401: {"description": "Unauthorized"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def delete_all_conversations(
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-    hard_delete: bool = True,
-) -> BaseResponse:
-    """Delete all historical conversations for the current user
-
-    Args:
-        current_user: Current authenticated user
-        db: Database session
-        hard_delete: Whether to hard delete (permanent), defaults to True
-
-    Returns:
-        BaseResponse: Delete result
-    """
-    # Get all conversations for the current user
-    result = await db.execute(
-        select(Conversation).where(Conversation.user_id == current_user.id, Conversation.is_active == 1)
-    )
-    conversations = result.scalars().all()
-
-    if not conversations:
-        return BaseResponse(
-            success=True,
-            code=200,
-            msg="No conversations to delete",
-            data={"deleted_count": 0},
-        )
-
-    deleted_count = 0
-
-    if hard_delete:
-        # Hard delete: remove all conversations and related data
-        from app.core.agent.checkpointer.checkpointer import delete_thread_checkpoints
-
-        for conversation in conversations:
-            try:
-                # delete checkpoints
-                await delete_thread_checkpoints(conversation.thread_id)
-            except Exception as e:
-                logger.warning(f"Failed to delete checkpoints for {conversation.thread_id}: {e}")
-
-            # delete conversation (messages are cascade-deleted)
-            await db.delete(conversation)
-            deleted_count += 1
-    else:
-        # Soft delete: mark all conversations as inactive
-        for conversation in conversations:
-            conversation.is_active = 0
-            deleted_count += 1
-
-    await db.commit()
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg=f"Deleted {deleted_count} conversations successfully",
-        data={
-            "deleted_count": deleted_count,
-            "hard_delete": hard_delete,
-        },
-    )
-
-
-@router.get(
-    "/{thread_id}",
-    response_model=BaseResponse[ConversationDetailResponse],
-    summary="Get conversation details",
-    description="Get conversation details by thread_id for the current user.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def get_conversation(
-    thread_id: str,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[ConversationDetailResponse]:
-    """
-    Get a single conversation's details
-
-    Args:
-        thread_id: Thread ID
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[ConversationDetailResponse]: Conversation details
-    """
-    # Verify conversation ownership
-    conversation = await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    messages_result = await db.execute(
-        select(Message).where(Message.thread_id == thread_id).order_by(Message.created_at)
-    )
-    messages = messages_result.scalars().all()
-
-    conv_response = ConversationResponse(
-        id=conversation.id,
-        thread_id=conversation.thread_id,
-        user_id=conversation.user_id,
-        title=conversation.title,
-        metadata=conversation.meta_data or {},
-        created_at=conversation.created_at,
-        updated_at=conversation.updated_at,
-        message_count=len(messages),
-    )
-
-    messages_data = [
-        {
-            "id": msg.id,
-            "role": msg.role,
-            "content": msg.content,
-            "metadata": msg.meta_data or {},
-            "created_at": msg.created_at.isoformat(),
-        }
-        for msg in messages
-    ]
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Fetched conversation details successfully",
-        data=ConversationDetailResponse(conversation=conv_response, messages=messages_data),
-    )
-
-
-@router.patch(
-    "/{thread_id}",
-    response_model=BaseResponse[dict],
-    summary="Update conversation",
-    description="Update conversation title and/or metadata.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def update_conversation(
-    thread_id: str,
-    update: ConversationUpdate,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[dict]:
-    """
-    Update conversation information
-
-    Args:
-        thread_id: Thread ID
-        update: Update payload
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[dict]: Update status
-    """
-    # Verify conversation ownership
-    conversation = await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    if update.title is not None:
-        conversation.title = update.title
-    if update.metadata is not None:
-        conversation.meta_data = update.metadata
-
-    conversation.updated_at = utc_now()
-    await db.commit()
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Conversation updated successfully",
-        data={"status": "updated", "thread_id": thread_id},
-    )
-
-
-@router.delete(
-    "/{thread_id}",
-    response_model=BaseResponse[dict],
-    summary="Delete conversation",
-    description="Delete a conversation (soft delete or hard delete). Hard delete removes all related data.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def delete_conversation(
-    thread_id: str,
-    current_user: CurrentUser,
-    hard_delete: bool = True,
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Delete conversation (soft or hard delete), hard delete by default
-
-    Args:
-        thread_id: Thread ID
-        hard_delete: Whether to hard delete
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[dict]: Delete status
-    """
-    # Verify conversation ownership
-    conversation = await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    if hard_delete:
-        # Hard delete: remove all related data
-        # Delete checkpoints first
-        from app.core.agent.checkpointer.checkpointer import delete_thread_checkpoints
-
-        try:
-            await delete_thread_checkpoints(thread_id)
-        except Exception as e:
-            logger.warning(f"Failed to delete checkpoints: {e}")
-
-        # Delete conversation (messages are cascade-deleted)
-        await db.delete(conversation)
-    else:
-        # Soft delete
-        conversation.is_active = 0
-
-    await db.commit()
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Conversation deleted successfully",
-        data={"status": "deleted", "thread_id": thread_id},
-    )
-
-
-@router.post(
-    "/{thread_id}/reset",
-    response_model=BaseResponse[dict],
-    summary="Reset conversation",
-    description="Clear all checkpoints and messages, but keep the conversation record.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def reset_conversation(
-    thread_id: str,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[dict]:
-    """
-    Reset conversation: clear all checkpoints and messages, but keep the conversation record
-
-    After reset, the conversation returns to the initial state and can start over.
-
-    Args:
-        thread_id: Thread ID
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[dict]: Reset status
-    """
-    # Verify conversation ownership
-    conversation = await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    try:
-        # 1. Delete LangGraph checkpoints
-        from app.core.agent.checkpointer.checkpointer import delete_thread_checkpoints
-
-        await delete_thread_checkpoints(thread_id)
-        logger.info(f"✅ Deleted LangGraph checkpoints for thread: {thread_id}")
-
-        # 2. Delete all message records
-        result = await db.execute(delete(Message).where(Message.thread_id == thread_id))
-        # get deleted row count (SQLAlchemy 2.0+ Result has rowcount attribute)
-        deleted_count = getattr(result, "rowcount", 0)
-        logger.info(f"✅ Deleted {deleted_count} messages for thread: {thread_id}")
-
-        # 3. Update conversation timestamp
-        conversation.updated_at = utc_now()
-
-        await db.commit()
-
-        return BaseResponse(
-            success=True,
-            code=200,
-            msg=f"Conversation reset; deleted {deleted_count} messages",
-            data={
-                "status": "reset",
-                "thread_id": thread_id,
-                "deleted_count": deleted_count,
-            },
-        )
-
-    except Exception as e:
-        await db.rollback()
-        logger.error(f"Failed to reset conversation {thread_id}: {e}")
-        raise InternalServerException("Failed to reset conversation") from e
-
-
-# ==================== Message management endpoints ====================
-
-
-@router.get(
-    "/{thread_id}/messages",
-    response_model=BaseResponse[PageResult[ConversationMessageResponse]],
-    summary="List conversation messages",
-    description="Get a paginated list of messages in the conversation.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def get_messages(
-    thread_id: str,
-    current_user: CurrentUser,
-    page_query: ConversationMessagesPaginationParams = Depends(),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[PageResult[ConversationMessageResponse]]:
-    """
-    Get conversation message history
-
-    Args:
-        thread_id: Thread ID
-        current_user: Current user
-        page_query: Pagination parameters (page, page_size)
-        db: Database session
-
-    Returns:
-        BaseResponse[PageResult[ConversationMessageResponse]]: Paginated message list
-    """
-    # Verify conversation ownership
-    await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    paginator = Paginator(db)
-    page_result = await paginator.paginate(
-        select(Message).where(Message.thread_id == thread_id).order_by(Message.created_at.desc()),
-        page_query,
-    )
-    messages = page_result.items
-
-    message_list = [
-        ConversationMessageResponse(
-            id=msg.id,
-            role=msg.role,
-            content=msg.content,
-            metadata=msg.meta_data or {},
-            created_at=msg.created_at,
-        )
-        for msg in reversed(list(messages))
-    ]
-
-    logger.debug(f"Loaded {len(message_list)} messages for thread {thread_id}")
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Fetched message list successfully",
-        data=PageResult(
-            items=message_list,
-            total=page_result.total,
-            page=page_result.page,
-            page_size=page_result.page_size,
-            pages=page_result.pages,
-        ),
-    )
-
-
-@router.get(
-    "/{thread_id}/checkpoints",
-    response_model=BaseResponse[CheckpointResponse],
-    summary="Get conversation checkpoints",
-    description="Retrieve checkpoints from LangGraph state history.",
-    responses={
-        401: {"description": "Unauthorized"},
-        404: {"description": "Conversation not found"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def get_checkpoints(
-    thread_id: str,
-    current_user: CurrentUser,
-    limit: int = 10,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[CheckpointResponse]:
-    """
-    Get all conversation checkpoints
-
-    Args:
-        thread_id: Thread ID
-        limit: Number of checkpoints to return
-
-    Returns:
-        BaseResponse[CheckpointResponse]: Checkpoints response
-    """
-    # Verify conversation ownership
-    await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    config: RunnableConfig = {"configurable": {"thread_id": thread_id, "user_id": str(current_user.id)}}
-    try:
-        checkpointer = get_checkpointer()
-        if not checkpointer:
-            raise RuntimeError("Checkpointer not initialized")
-        checkpoints = []
-        async for checkpoint_tuple in checkpointer.alist(config):
-            cp_config = checkpoint_tuple.config or {}
-            cp = checkpoint_tuple.checkpoint or {}
-            checkpoints.append(
-                {
-                    "checkpoint_id": cp_config.get("configurable", {}).get("checkpoint_id"),
-                    "values": cp.get("channel_values", {}),
-                    "next": [],
-                    "metadata": checkpoint_tuple.metadata,
-                    "created_at": checkpoint_tuple.metadata.get("created_at") if checkpoint_tuple.metadata else None,
-                }
-            )
-            if len(checkpoints) >= limit:
-                break
-
-        return BaseResponse(
-            success=True,
-            code=200,
-            msg="Fetched checkpoints successfully",
-            data=CheckpointResponse(thread_id=thread_id, checkpoints=checkpoints),
-        )
-    except Exception as e:
-        logger.error(f"Get checkpoints error: {e}")
-        raise InternalServerException("Failed to fetch checkpoints") from e
-
-
-# ==================== Export/Import endpoints ====================
-
-
-@router.get("/{thread_id}/export", response_model=BaseResponse[ConversationExportResponse], include_in_schema=False)
-async def export_conversation(
-    thread_id: str,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Export conversation data
-
-    Args:
-        thread_id: Thread ID
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[ConversationExportResponse]: Exported data
-    """
-    # Verify conversation ownership
-    conversation = await verify_conversation_ownership(thread_id, current_user.id, db)
-
-    messages_result = await db.execute(
-        select(Message).where(Message.thread_id == thread_id).order_by(Message.created_at)
-    )
-    messages = messages_result.scalars().all()
-
-    # Get LangGraph state
-    config: RunnableConfig = {"configurable": {"thread_id": thread_id, "user_id": str(current_user.id)}}
-    try:
-        checkpointer = get_checkpointer()
-        if checkpointer:
-            checkpoint_tuple = await checkpointer.aget_tuple(config)
-            if checkpoint_tuple and checkpoint_tuple.checkpoint:
-                state_values = checkpoint_tuple.checkpoint.get("channel_values", {})
-            else:
-                state_values = None
-        else:
-            state_values = None
-    except Exception:
-        state_values = None
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Conversation exported successfully",
-        data=ConversationExportResponse(
-            conversation={
-                "thread_id": conversation.thread_id,
-                "user_id": conversation.user_id,
-                "title": conversation.title,
-                "metadata": conversation.meta_data or {},
-                "created_at": conversation.created_at.isoformat(),
-                "updated_at": conversation.updated_at.isoformat(),
-            },
-            messages=[
-                {
-                    "role": msg.role,
-                    "content": msg.content,
-                    "metadata": msg.meta_data or {},
-                    "created_at": msg.created_at.isoformat(),
-                }
-                for msg in messages
-            ],
-            state=state_values,
-        ),
-    )
-
-
-@router.post("/import", include_in_schema=False)
-async def import_conversation(
-    request: ConversationImportRequest,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(
-        get_db,
-    ),
-):
-    """
-    Import conversation data
-
-    Args:
-        request: Import request
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[dict]: Import status
-    """
-    data = request.data
-    thread_id = str(uuid.uuid4())
-
-    # Create conversation
-    conversation = Conversation(
-        thread_id=thread_id,
-        user_id=current_user.id,
-        title=data["conversation"]["title"],
-        meta_data=data["conversation"].get("metadata", {}),
-    )
-    db.add(conversation)
-
-    # Import messages
-    for msg_data in data["messages"]:
-        message = Message(
-            thread_id=thread_id,
-            role=msg_data["role"],
-            content=msg_data["content"],
-            meta_data=msg_data.get("metadata", {}),
-        )
-        db.add(message)
-
-    await db.commit()
-
-    # Restore LangGraph state (best-effort)
-    if "state" in data and data["state"]:
-        config: RunnableConfig = {"configurable": {"thread_id": thread_id, "user_id": str(current_user.id)}}
-        try:
-            checkpointer = get_checkpointer()
-            if checkpointer:
-                import uuid as _uuid
-
-                from langgraph.checkpoint.base import empty_checkpoint
-
-                checkpoint = empty_checkpoint()
-                checkpoint["id"] = str(_uuid.uuid4())
-                checkpoint["channel_values"] = data["state"]
-                await checkpointer.aput(config, checkpoint, {"source": "input"}, {})
-        except Exception as e:
-            logger.warning(f"Could not restore state: {e}")
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Conversation imported successfully",
-        data={"thread_id": thread_id, "status": "imported"},
-    )
-
-
-# ==================== Search endpoints ====================
-
-
-@router.post(
-    "/search",
-    response_model=BaseResponse[SearchResponse],
-    summary="Search conversations and messages",
-    description="Search messages content and related conversation titles for the current user.",
-    responses={
-        401: {"description": "Unauthorized"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def search_conversations(
-    request: SearchRequest,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[SearchResponse]:
-    """
-    Search conversations and messages
-
-    Args:
-        request: Search request
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[SearchResponse]: Search results
-    """
-    # Use SQLite LIKE search
-    result = await db.execute(
-        select(Message)
-        .join(Conversation, Message.thread_id == Conversation.thread_id)
-        .where(Message.content.like(f"%{request.query}%"), Conversation.user_id == current_user.id)
-        .order_by(Message.created_at.desc())
-        .offset(request.skip)
-        .limit(request.limit)
-    )
-    messages = result.scalars().all()
-
-    results = []
-    for msg in messages:
-        conv_result = await db.execute(select(Conversation).where(Conversation.thread_id == msg.thread_id))
-        conversation = conv_result.scalar_one_or_none()
-
-        results.append(
-            {
-                "message_id": msg.id,
-                "thread_id": msg.thread_id,
-                "conversation_title": conversation.title if conversation else "",
-                "role": msg.role,
-                "content": msg.content,
-                "created_at": msg.created_at.isoformat(),
-            }
-        )
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Search completed",
-        data=SearchResponse(query=request.query, results=results),
-    )
-
-
-# ==================== Statistics endpoints ====================
-
-
-@router.get(
-    "/users/stats",
-    response_model=BaseResponse[UserStatsResponse],
-    summary="Get user statistics",
-    description="Get statistics about the current user's conversations and messages.",
-    responses={
-        401: {"description": "Unauthorized"},
-        500: {"description": "Internal server error"},
-    },
-)
-async def get_user_stats(
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[UserStatsResponse]:
-    """
-    Get user statistics
-
-    Args:
-        current_user: Current user
-        db: Database session
-
-    Returns:
-        BaseResponse[UserStatsResponse]: User statistics
-    """
-    # total conversations
-    conv_result = await db.execute(
-        select(func.count(Conversation.id)).where(Conversation.user_id == current_user.id, Conversation.is_active == 1)
-    )
-    total_conversations = conv_result.scalar() or 0
-
-    # total messages
-    msg_result = await db.execute(
-        select(func.count(Message.id))
-        .join(Conversation, Message.thread_id == Conversation.thread_id)
-        .where(Conversation.user_id == current_user.id)
-    )
-    total_messages = msg_result.scalar() or 0
-
-    # recent conversations
-    recent_result = await db.execute(
-        select(Conversation)
-        .where(Conversation.user_id == current_user.id, Conversation.is_active == 1)
-        .order_by(Conversation.updated_at.desc())
-        .limit(5)
-    )
-    recent_conversations = recent_result.scalars().all()
-
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Fetched statistics successfully",
-        data=UserStatsResponse(
-            user_id=str(current_user.id),
-            total_conversations=total_conversations,
-            total_messages=total_messages,
-            recent_conversations=[
-                {"thread_id": conv.thread_id, "title": conv.title, "updated_at": conv.updated_at.isoformat()}
-                for conv in recent_conversations
-            ],
-        ),
-    )
diff --git a/backend/app/api/v1/copilot.py b/backend/app/api/v1/copilot.py
new file mode 100644
index 000000000..b66c8f11e
--- /dev/null
+++ b/backend/app/api/v1/copilot.py
@@ -0,0 +1,48 @@
+"""Copilot API — execution-engine dispatch."""
+
+from fastapi import APIRouter, Depends
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.dependencies import CurrentUser
+from app.core.database import get_db
+from app.schemas import BaseResponse
+from app.schemas.copilot import CopilotRunRequest, CopilotRunResponse
+from app.services.dispatch_service import DispatchService
+
+router = APIRouter(prefix="/v1/copilot", tags=["copilot"])
+
+
+@router.post("/run", response_model=BaseResponse[CopilotRunResponse])
+async def copilot_run(
+    body: CopilotRunRequest,
+    current_user: CurrentUser,
+    db: AsyncSession = Depends(get_db),
+):
+    """Dispatch copilot through the execution engine for persistent history.
+
+    Returns run_id + execution_id. Subscribe to the execution WebSocket
+    for real-time events (same as any other execution).
+    """
+    dispatch = DispatchService(db)
+    run = await dispatch.dispatch_copilot_draft(
+        agent_id=body.agent_id,
+        version_id=body.version_id,
+        workspace_id=body.workspace_id,
+        prompt=body.prompt,
+        user_id=str(current_user.id),
+        graph_context=body.graph_context,
+        conversation_history=body.conversation_history,
+        mode=body.mode,
+        provider_name=body.provider_name,
+        model_name=body.model_name,
+    )
+
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Copilot run created",
+        data=CopilotRunResponse(
+            run_id=str(run.id),
+            execution_id=str(run.current_execution_id),
+        ),
+    )
diff --git a/backend/app/api/v1/custom_tools.py b/backend/app/api/v1/custom_tools.py
index 96d24371e..ff7f8028f 100644
--- a/backend/app/api/v1/custom_tools.py
+++ b/backend/app/api/v1/custom_tools.py
@@ -13,6 +13,7 @@
 from pydantic import BaseModel, ConfigDict, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, NotFoundError
 from app.common.dependencies import get_current_user
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
@@ -95,10 +96,14 @@ async def get_custom_tool(
     service = CustomToolService(db)
     tool = await service.repo.get(tool_id)
     if not tool:
-        return {"success": False, "error": "Not found"}
+        raise NotFoundError("Custom tool not found", code="CUSTOM_TOOL_NOT_FOUND", data={"tool_id": str(tool_id)})
     # verify ownership
     if tool.owner_id != current_user.id:
-        return {"success": False, "error": "Forbidden"}
+        raise AccessDeniedError(
+            "You can only view your own tools",
+            code="CUSTOM_TOOL_VIEW_FORBIDDEN",
+            data={"tool_id": str(tool_id)},
+        )
     return {"success": True, "data": _serialize(tool)}
 
 
diff --git a/backend/app/api/v1/executions.py b/backend/app/api/v1/executions.py
new file mode 100644
index 000000000..0808064c4
--- /dev/null
+++ b/backend/app/api/v1/executions.py
@@ -0,0 +1,257 @@
+"""Executions API."""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any, Dict, List, Optional
+
+from fastapi import APIRouter, Depends, Query
+from pydantic import BaseModel
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
+from app.common.dependencies import CurrentUser, get_current_user
+from app.core.database import get_db
+from app.models.agent_run import AgentRun
+from app.models.auth import AuthUser as User
+from app.models.execution import Artifact, Execution
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.artifact import ArtifactResponse
+from app.schemas.execution import (
+    ExecutionEventItemResponse,
+    ExecutionEventResponse,
+    ExecutionEventsPageResponse,
+    ExecutionResponse,
+)
+from app.schemas.task import InjectMessageRequest
+from app.services.dispatch_service import DispatchService
+from app.services.execution_service import ExecutionService
+from app.services.workspace_permission import check_workspace_access
+
+
+class DebugRunRequest(BaseModel):
+    agent_version_id: uuid.UUID
+    agent_id: uuid.UUID
+    prompt: str
+    workspace_id: uuid.UUID
+    variables: Optional[Dict[str, Any]] = None
+
+
+router = APIRouter(prefix="/v1/executions", tags=["Executions"])
+
+
+@router.post("/debug", response_model=BaseResponse)
+async def dispatch_debug_run(
+    body: DebugRunRequest,
+    current_user: CurrentUser,
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse:
+    """Start a debug run with observation tracing enabled."""
+    from app.services.execution_orchestrator import ExecutionOrchestrator
+
+    has_access = await check_workspace_access(db, body.workspace_id, current_user, WorkspaceMemberRole.member)
+    if not has_access:
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
+
+    orchestrator = ExecutionOrchestrator(db)
+    run = await orchestrator.dispatch_debug(
+        agent_id=body.agent_id,
+        version_id=body.agent_version_id,
+        prompt=body.prompt,
+        user_id=str(current_user.id),
+        workspace_id=body.workspace_id,
+        variables=body.variables,
+    )
+
+    execution_id = run.current_execution_id
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data={
+            "execution_id": str(execution_id),
+            "run_id": str(run.id),
+            "ws_topic": f"execution:{execution_id}",
+        },
+    )
+
+
+def _to_response(execution) -> ExecutionResponse:
+    return ExecutionResponse.model_validate(execution)
+
+
+def _event_to_response(event) -> ExecutionEventResponse:
+    return ExecutionEventResponse.model_validate(event)
+
+
+async def _get_run_workspace_id(db: AsyncSession, run_id: uuid.UUID) -> uuid.UUID | None:
+    return (await db.execute(select(AgentRun.workspace_id).where(AgentRun.id == run_id))).scalar_one_or_none()
+
+
+async def _get_execution_workspace_id(db: AsyncSession, execution_id: uuid.UUID) -> uuid.UUID | None:
+    return (
+        await db.execute(
+            select(AgentRun.workspace_id)
+            .join(Execution, Execution.run_id == AgentRun.id)
+            .where(Execution.id == execution_id)
+        )
+    ).scalar_one_or_none()
+
+
+async def _require_execution_workspace_access(
+    db: AsyncSession,
+    workspace_id: uuid.UUID,
+    current_user: User,
+    role: WorkspaceMemberRole,
+) -> None:
+    has_access = await check_workspace_access(db, workspace_id, current_user, role)
+    if not has_access:
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
+
+
+@router.get("", response_model=BaseResponse[List[ExecutionResponse]])
+async def list_executions(
+    current_user: User = Depends(get_current_user),
+    run_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[ExecutionResponse]]:
+    """List all executions for a run."""
+    workspace_id = await _get_run_workspace_id(db, run_id)
+    if not workspace_id:
+        raise NotFoundError("Run not found", code="RUN_NOT_FOUND", data={"run_id": str(run_id)})
+    await _require_execution_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
+
+    service = ExecutionService(db)
+    executions = await service.list_executions(run_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[_to_response(e) for e in executions],
+    )
+
+
+@router.get("/{execution_id}", response_model=BaseResponse[ExecutionResponse])
+async def get_execution(
+    execution_id: uuid.UUID,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ExecutionResponse]:
+    """Get an execution by ID."""
+    workspace_id = await _get_execution_workspace_id(db, execution_id)
+    if not workspace_id:
+        raise NotFoundError(
+            "Execution not found",
+            code="EXECUTION_NOT_FOUND",
+            data={"execution_id": str(execution_id)},
+        )
+    await _require_execution_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
+
+    service = ExecutionService(db)
+    execution = await service.get_execution(execution_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=_to_response(execution))
+
+
+@router.get("/{execution_id}/events", response_model=BaseResponse[ExecutionEventsPageResponse])
+async def list_execution_events(
+    execution_id: uuid.UUID,
+    after_seq: int = Query(0, ge=0),
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ExecutionEventsPageResponse]:
+    """List execution events after a sequence number."""
+    workspace_id = await _get_execution_workspace_id(db, execution_id)
+    if not workspace_id:
+        raise NotFoundError(
+            "Execution not found",
+            code="EXECUTION_NOT_FOUND",
+            data={"execution_id": str(execution_id)},
+        )
+    await _require_execution_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
+
+    service = ExecutionService(db)
+    events = await service.list_events_after(
+        execution_id,
+        str(current_user.id),
+        after_seq=after_seq,
+        limit=500,
+    )
+    items = [
+        ExecutionEventItemResponse(
+            id=event.id,
+            execution_id=event.execution_id,
+            seq=event.sequence_no,
+            event_type=event.event_type,
+            payload=event.payload,
+            created_at=event.created_at,
+        )
+        for event in events
+    ]
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=ExecutionEventsPageResponse(
+            execution_id=execution_id,
+            events=items,
+            next_after_seq=max((item.seq for item in items), default=after_seq),
+        ),
+    )
+
+
+@router.get("/{execution_id}/artifacts", response_model=BaseResponse[List[ArtifactResponse]])
+async def list_artifacts(
+    execution_id: uuid.UUID,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[ArtifactResponse]]:
+    """List all artifacts for an execution."""
+    workspace_id = await _get_execution_workspace_id(db, execution_id)
+    if not workspace_id:
+        raise NotFoundError(
+            "Execution not found",
+            code="EXECUTION_NOT_FOUND",
+            data={"execution_id": str(execution_id)},
+        )
+    await _require_execution_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
+
+    result = await db.execute(
+        select(Artifact).where(Artifact.execution_id == execution_id).order_by(Artifact.created_at)
+    )
+    artifacts = list(result.scalars().all())
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[ArtifactResponse.model_validate(a) for a in artifacts],
+    )
+
+
+@router.post("/{execution_id}/message", response_model=BaseResponse)
+async def inject_message(
+    execution_id: uuid.UUID,
+    body: InjectMessageRequest,
+    current_user: User = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse:
+    """Inject a message into a running execution."""
+    workspace_id = await _get_execution_workspace_id(db, execution_id)
+    if not workspace_id:
+        raise NotFoundError(
+            "Execution not found",
+            code="EXECUTION_NOT_FOUND",
+            data={"execution_id": str(execution_id)},
+        )
+
+    await _require_execution_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
+
+    dispatch = DispatchService(db)
+    try:
+        await dispatch.send_message(execution_id, body.message)
+    except NotImplementedError as exc:
+        raise InvalidRequestError(str(exc), code="EXECUTION_MESSAGE_UNSUPPORTED")
+    except RuntimeError as exc:
+        raise InvalidRequestError(str(exc), code="EXECUTION_MESSAGE_REJECTED")
+    return BaseResponse(success=True, code=200, msg="ok", data={"status": "sent"})
diff --git a/backend/app/api/v1/files.py b/backend/app/api/v1/files.py
index bbd6558b7..66b932149 100644
--- a/backend/app/api/v1/files.py
+++ b/backend/app/api/v1/files.py
@@ -31,14 +31,16 @@
 import asyncio
 import base64
 import mimetypes
+import mimetypes as mimetypes_module
 from pathlib import Path
 
-from fastapi import APIRouter, File, Request, UploadFile
+from fastapi import APIRouter, File, Query, Request, UploadFile
+from fastapi.responses import Response
 from loguru import logger
 from pydantic import BaseModel
 
+from app.common.app_errors import AppError, InternalServiceError, InvalidRequestError, NotFoundError
 from app.common.dependencies import CurrentUser
-from app.common.exceptions import AppException, BadRequestException, InternalServerException, NotFoundException
 from app.core.agent.backends.constants import (
     DEFAULT_WORKING_DIR,
     SANDBOX_UPLOADS_SUBDIR,
@@ -166,8 +168,10 @@ def _validate_file_content(filename: str, content: bytes) -> None:
     content_start = content[: max(len(sig) for sig in expected_signatures)]
     if not any(content_start.startswith(sig) for sig in expected_signatures):
         logger.warning(f"File content validation failed for {filename}: got {content_start[:16].hex()}")
-        raise BadRequestException(
+        raise InvalidRequestError(
             f"File content does not match declared type: {file_ext}",
+            code="FILE_CONTENT_TYPE_MISMATCH",
+            data={"filename": filename, "file_type": file_ext},
         )
 
 
@@ -175,7 +179,11 @@ def _validate_file_type(filename: str, content_type: str | None) -> None:
     """Validate file type (extension and MIME type)."""
     file_ext = Path(filename).suffix.lower()
     if file_ext and file_ext not in ALLOWED_EXTENSIONS:
-        raise BadRequestException(f"File type {file_ext} is not supported")
+        raise InvalidRequestError(
+            f"File type {file_ext} is not supported",
+            code="FILE_TYPE_UNSUPPORTED",
+            data={"filename": filename, "file_type": file_ext},
+        )
     if content_type:
         inferred_type, _ = mimetypes.guess_type(filename)
         if inferred_type and content_type != inferred_type:
@@ -198,26 +206,32 @@ def _validate_file_upload(
     filename: str,
     content: bytes,
     content_type: str | None,
-) -> tuple[str, None] | tuple[None, BadRequestException]:
+) -> tuple[str, None] | tuple[None, InvalidRequestError]:
     """Validate file upload (size, type, content). Returns (safe_filename, None) or (None, error)."""
     if len(content) == 0:
-        return None, BadRequestException("File cannot be empty")
+        return None, InvalidRequestError(
+            "File cannot be empty",
+            code="FILE_EMPTY",
+            data={"filename": filename},
+        )
 
     if len(content) > MAX_FILE_SIZE_BYTES:
-        return None, BadRequestException(
-            f"File size exceeds maximum allowed size ({MAX_FILE_SIZE_BYTES / 1024 / 1024}MB)"
+        return None, InvalidRequestError(
+            f"File size exceeds maximum allowed size ({MAX_FILE_SIZE_BYTES / 1024 / 1024}MB)",
+            code="FILE_TOO_LARGE",
+            data={"filename": filename, "max_size_bytes": MAX_FILE_SIZE_BYTES},
         )
 
     safe_filename = sanitize_filename(filename)
 
     try:
         _validate_file_type(safe_filename, content_type)
-    except BadRequestException as e:
+    except InvalidRequestError as e:
         return None, e
 
     try:
         _validate_file_content(safe_filename, content)
-    except BadRequestException as e:
+    except InvalidRequestError as e:
         return None, e
 
     return safe_filename, None
@@ -264,7 +278,11 @@ async def upload_file(
             await asyncio.to_thread(handle.adapter.mkdir, CONTAINER_UPLOADS_PATH)
             result = await asyncio.to_thread(handle.adapter.write_overwrite, container_path, content)
             if getattr(result, "error", None):
-                raise InternalServerException(f"Failed to write file: {result.error}")
+                raise InternalServiceError(
+                    "Failed to write file",
+                    code="FILE_WRITE_FAILED",
+                    data={"filename": safe_filename, "error": str(result.error)},
+                )
 
         logger.info(
             f"File uploaded to sandbox: user={current_user.id}, "
@@ -282,14 +300,18 @@ async def upload_file(
                 message=f"File {safe_filename} has been uploaded to your working directory",
             ),
         )
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.error(
             f"Failed to upload file: user={current_user.id}, filename={original_filename}, ip={client_ip}, error={e}",
             exc_info=True,
         )
-        raise InternalServerException("Failed to upload file, please try again later") from e
+        raise InternalServiceError(
+            "Failed to upload file, please try again later",
+            code="FILE_UPLOAD_FAILED",
+            data={"filename": original_filename},
+        ) from e
 
 
 @router.get(
@@ -326,20 +348,30 @@ async def list_files(current_user: CurrentUser) -> BaseResponse[FileListResponse
         )
     except Exception as e:
         logger.error(f"Failed to list files: {e}", exc_info=True)
-        raise InternalServerException("Failed to list files, please try again later") from e
+        raise InternalServiceError(
+            "Failed to list files, please try again later",
+            code="FILE_LIST_FAILED",
+            data={"user_id": str(current_user.id)},
+        ) from e
 
 
 @router.get(
     "/read/{filename}",
-    response_model=BaseResponse[dict],
     summary="Read file content",
-    description="Read the content of a file in the user's sandbox upload directory.",
+    description="Read the content of a file in the user's sandbox upload directory. "
+    "Use mode=raw to get raw binary content with correct Content-Type header.",
+    response_model=None,
     responses={
         404: {"description": "File not found"},
         500: {"description": "Failed to read file"},
     },
 )
-async def read_file(request: Request, filename: str, current_user: CurrentUser) -> BaseResponse[dict]:
+async def read_file(
+    request: Request,
+    filename: str,
+    current_user: CurrentUser,
+    mode: str = Query("json", description="'json' (default) or 'raw'"),
+) -> BaseResponse[dict] | Response:
     """Read file content from the user's sandbox via adapter API."""
     client_ip = get_client_ip(request)
 
@@ -347,11 +379,41 @@ async def read_file(request: Request, filename: str, current_user: CurrentUser)
         safe_filename = sanitize_filename(filename)
         container_path = get_container_path(safe_filename)
 
+        if mode == "raw":
+            # Raw mode: return binary bytes with correct Content-Type header
+            async with await _get_sandbox_handle(str(current_user.id)) as handle:
+                content = await asyncio.to_thread(handle.adapter.raw_read, container_path)
+
+            if content.startswith("[Error:") or content.startswith("Error:"):
+                raise NotFoundError(
+                    "File not found",
+                    code="FILE_NOT_FOUND",
+                    data={"filename": safe_filename},
+                )
+
+            # raw_read returns text; encode back to bytes via latin-1 to preserve binary data
+            content_bytes = content.encode("latin-1")
+
+            mime, _ = mimetypes_module.guess_type(safe_filename)
+
+            logger.info(f"File read (raw): user={current_user.id}, filename={safe_filename}, ip={client_ip}")
+
+            return Response(
+                content=content_bytes,
+                media_type=mime or "application/octet-stream",
+                headers={"Content-Disposition": f'inline; filename="{safe_filename}"'},
+            )
+
+        # Default JSON mode
         async with await _get_sandbox_handle(str(current_user.id)) as handle:
             content = await asyncio.to_thread(handle.adapter.raw_read, container_path)
 
         if content.startswith("[Error:") or content.startswith("Error:"):
-            raise NotFoundException("File not found")
+            raise NotFoundError(
+                "File not found",
+                code="FILE_NOT_FOUND",
+                data={"filename": safe_filename},
+            )
 
         # raw_read returns text; for binary files it may be garbled
         is_binary = False
@@ -369,14 +431,18 @@ async def read_file(request: Request, filename: str, current_user: CurrentUser)
             msg="Read file successfully",
             data={"filename": safe_filename, "content": content, "is_binary": is_binary},
         )
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.error(
             f"Failed to read file: user={current_user.id}, filename={filename}, ip={client_ip}, error={e}",
             exc_info=True,
         )
-        raise InternalServerException("Failed to read file, please try again later") from e
+        raise InternalServiceError(
+            "Failed to read file, please try again later",
+            code="FILE_READ_FAILED",
+            data={"filename": filename},
+        ) from e
 
 
 @router.delete(
@@ -401,7 +467,11 @@ async def delete_file(request: Request, filename: str, current_user: CurrentUser
             ok = await asyncio.to_thread(handle.adapter.delete, container_path)
 
         if not ok:
-            raise NotFoundException(f"File not found: {filename}")
+            raise NotFoundError(
+                "File not found",
+                code="FILE_NOT_FOUND",
+                data={"filename": safe_filename},
+            )
 
         logger.info(f"File deleted: user={current_user.id}, filename={safe_filename}, ip={client_ip}")
 
@@ -411,14 +481,18 @@ async def delete_file(request: Request, filename: str, current_user: CurrentUser
             msg="File deleted successfully",
             data={"filename": safe_filename, "message": f"File {safe_filename} has been deleted"},
         )
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.error(
             f"Failed to delete file: user={current_user.id}, filename={filename}, ip={client_ip}, error={e}",
             exc_info=True,
         )
-        raise InternalServerException("Failed to delete file, please try again later") from e
+        raise InternalServiceError(
+            "Failed to delete file, please try again later",
+            code="FILE_DELETE_FAILED",
+            data={"filename": filename},
+        ) from e
 
 
 @router.delete(
@@ -448,8 +522,12 @@ async def clear_all_files(request: Request, current_user: CurrentUser) -> BaseRe
             msg="Cleared files successfully",
             data={"message": "Cleared working directory"},
         )
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.error(f"Failed to clear files: user={current_user.id}, ip={client_ip}, error={e}", exc_info=True)
-        raise InternalServerException("Failed to clear files, please try again later") from e
+        raise InternalServiceError(
+            "Failed to clear files, please try again later",
+            code="FILE_CLEAR_FAILED",
+            data={"user_id": str(current_user.id)},
+        ) from e
diff --git a/backend/app/api/v1/graph_code.py b/backend/app/api/v1/graph_code.py
deleted file mode 100644
index 9500b9af8..000000000
--- a/backend/app/api/v1/graph_code.py
+++ /dev/null
@@ -1,190 +0,0 @@
-"""Graph Code API — save and run user LangGraph code.
-
-Routes are nested under ``/api/v1/graphs`` and add code-specific
-operations as sub-resources of an existing graph:
-
-- ``POST /api/v1/graphs/{graph_id}/code/save``  — persist code
-- ``POST /api/v1/graphs/{graph_id}/code/run``   — execute code and return result
-"""
-
-import asyncio
-import re
-import uuid
-from typing import Any, Dict, Optional
-
-from fastapi import APIRouter, Depends
-from loguru import logger
-from pydantic import BaseModel, Field
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.common.exceptions import NotFoundException
-from app.core.code_executor import execute_code
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.models.workspace import WorkspaceMemberRole
-from app.services.graph_service import GraphService
-
-router = APIRouter(prefix="/v1/graphs", tags=["Graph Code"])
-
-# Execution timeout for ainvoke (seconds)
-RUN_TIMEOUT = 30.0
-
-
-# ---------------------------------------------------------------------------
-# Request / response models
-# ---------------------------------------------------------------------------
-
-
-class CodeSaveRequest(BaseModel):
-    code: str = Field(..., description="Python code to save")
-    name: Optional[str] = Field(default=None, description="Optional graph name update")
-
-
-class CodeRunRequest(BaseModel):
-    input: Optional[Dict[str, Any]] = Field(
-        default=None,
-        description="Initial state input for the graph",
-    )
-
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-
-def _sanitize_error(msg: str) -> str:
-    """Remove server file paths from error messages."""
-    return re.sub(r"/[^\s\"']+/", "<path>/", msg)
-
-
-# ---------------------------------------------------------------------------
-# Endpoints
-# ---------------------------------------------------------------------------
-
-
-@router.post("/{graph_id}/code/save")
-async def save_code(
-    graph_id: uuid.UUID,
-    payload: CodeSaveRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """Persist user code to ``graph.variables``.
-
-    Requires member (write) permission.
-    """
-    service = GraphService(db)
-    graph = await service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException(f"Graph {graph_id} not found")
-
-    # Permission check: need member role to save
-    await service._ensure_access(graph, current_user, WorkspaceMemberRole.member)
-
-    variables = dict(graph.variables or {})
-    variables["graph_mode"] = "code"
-    variables["code_content"] = payload.code
-    graph.variables = variables
-
-    if payload.name is not None:
-        graph.name = payload.name
-
-    await db.commit()
-
-    logger.info(
-        f"[GraphCodeAPI] Saved code | graph_id={graph_id} | code_len={len(payload.code)} | user={current_user.id}"
-    )
-    return {"success": True}
-
-
-@router.post("/{graph_id}/code/run")
-async def run_code(
-    graph_id: uuid.UUID,
-    payload: CodeRunRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """Execute user code: exec → StateGraph → compile → invoke.
-
-    Requires viewer permission. Execution has a 30s timeout.
-    """
-    service = GraphService(db)
-    graph = await service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException(f"Graph {graph_id} not found")
-
-    # Permission check: need viewer role to run
-    await service._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-
-    code = (graph.variables or {}).get("code_content", "")
-    if not code.strip():
-        return {
-            "success": False,
-            "message": "No code to execute. Save your code first.",
-        }
-
-    try:
-        # Step 1: exec user code → get StateGraph (has its own 10s timeout)
-        state_graph = execute_code(code)
-
-        # Step 2: compile
-        compiled = state_graph.compile()
-
-        # Step 3: invoke with timeout
-        initial_state = payload.input or {}
-        result = await asyncio.wait_for(
-            compiled.ainvoke(initial_state),  # type: ignore[arg-type]
-            timeout=RUN_TIMEOUT,
-        )
-
-        logger.info(f"[GraphCodeAPI] Code run success | graph_id={graph_id}")
-        return {
-            "success": True,
-            "data": {
-                "result": _serialize_result(result),
-            },
-        }
-
-    except SyntaxError as e:
-        return {
-            "success": False,
-            "message": f"Syntax error at line {e.lineno}: {e.msg}",
-        }
-    except ImportError as e:
-        return {
-            "success": False,
-            "message": str(e),
-        }
-    except TimeoutError:
-        return {
-            "success": False,
-            "message": "Execution timed out. Check for infinite loops or long-running operations.",
-        }
-    except ValueError as e:
-        return {
-            "success": False,
-            "message": str(e),
-        }
-    except Exception as e:
-        logger.error(f"[GraphCodeAPI] Code run failed | graph_id={graph_id} | error={e}")
-        return {
-            "success": False,
-            "message": _sanitize_error(f"Runtime error: {type(e).__name__}: {e}"),
-        }
-
-
-def _serialize_result(result: Any) -> Any:
-    """Best-effort serialization of graph execution result."""
-    if result is None:
-        return None
-    if isinstance(result, dict):
-        return {k: _serialize_result(v) for k, v in result.items()}
-    if isinstance(result, (list, tuple)):
-        return [_serialize_result(item) for item in result]
-    if isinstance(result, (str, int, float, bool)):
-        return result
-    try:
-        return str(result)
-    except Exception:
-        return f"<{type(result).__name__}>"
diff --git a/backend/app/api/v1/graph_deployments.py b/backend/app/api/v1/graph_deployments.py
deleted file mode 100644
index 6d0e1c797..000000000
--- a/backend/app/api/v1/graph_deployments.py
+++ /dev/null
@@ -1,205 +0,0 @@
-"""
-Graph deployment version API
-"""
-
-import uuid
-from typing import Any, Dict, Optional
-
-from fastapi import APIRouter, Depends, Request
-from loguru import logger
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.schemas.graph_deployment_version import (
-    GraphDeploymentVersionListResponse,
-    GraphDeploymentVersionResponseCamel,
-    GraphDeploymentVersionStateResponse,
-    GraphDeployRequest,
-    GraphRenameVersionRequest,
-    GraphRevertResponse,
-)
-from app.services.graph_deployment_version_service import GraphDeploymentVersionService
-
-router = APIRouter(prefix="/v1/graphs", tags=["Graph Deployments"])
-
-
-def _bind_log(request: Request, **kwargs):
-    trace_id = getattr(request.state, "trace_id", "-")
-    return logger.bind(trace_id=trace_id, **kwargs)
-
-
-@router.get("/{graph_id}/deploy", response_model=Dict[str, Any])
-async def get_deployment_status(
-    graph_id: uuid.UUID,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Get deployment status."""
-    log = _bind_log(request, graph_id=str(graph_id))
-    log.info("Getting deployment status for graph: {}", graph_id)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.get_deployment_status(graph_id, current_user)
-
-
-@router.post("/{graph_id}/deploy", response_model=Dict[str, Any])
-async def deploy_graph(
-    graph_id: uuid.UUID,
-    request: Request,
-    body: Optional[GraphDeployRequest] = None,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Deploy a graph."""
-    log = _bind_log(request, graph_id=str(graph_id))
-    log.info("Deploying graph: {}", graph_id)
-
-    service = GraphDeploymentVersionService(db)
-    name = body.name if body else None
-
-    result = await service.deploy(graph_id, current_user, name)
-
-    return {
-        "success": result.success,
-        "message": result.message,
-        "version": result.version,
-        "isActive": result.isActive,
-        "needsRedeployment": result.needsRedeployment,
-    }
-
-
-@router.delete("/{graph_id}/deploy", response_model=Dict[str, Any])
-async def undeploy_graph(
-    graph_id: uuid.UUID,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Undeploy a graph."""
-    log = _bind_log(request, graph_id=str(graph_id))
-    log.info("Undeploying graph: {}", graph_id)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.undeploy(graph_id, current_user)
-
-
-@router.get("/{graph_id}/deployments", response_model=GraphDeploymentVersionListResponse)
-async def list_deployment_versions(
-    graph_id: uuid.UUID,
-    request: Request,
-    page: int = 1,
-    page_size: int = 10,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """List all deployment versions (paginated)."""
-    log = _bind_log(request, graph_id=str(graph_id))
-    log.info("Listing deployment versions for graph: {} (page={}, page_size={})", graph_id, page, page_size)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.list_versions(graph_id, current_user, page=page, page_size=page_size)
-
-
-@router.get("/{graph_id}/deployments/{version}", response_model=GraphDeploymentVersionResponseCamel)
-async def get_deployment_version(
-    graph_id: uuid.UUID,
-    version: int,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Get a specific deployment version."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Getting deployment version: {} v{}", graph_id, version)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.get_version(graph_id, version, current_user)
-
-
-@router.get("/{graph_id}/deployments/{version}/state", response_model=GraphDeploymentVersionStateResponse)
-async def get_deployment_version_state(
-    graph_id: uuid.UUID,
-    version: int,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Get a specific deployment version's full state (for preview)."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Getting deployment version state: {} v{}", graph_id, version)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.get_version_state(graph_id, version, current_user)
-
-
-@router.patch("/{graph_id}/deployments/{version}", response_model=GraphDeploymentVersionResponseCamel)
-async def rename_deployment_version(
-    graph_id: uuid.UUID,
-    version: int,
-    body: GraphRenameVersionRequest,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Rename a deployment version."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Renaming deployment version: {} v{} to '{}'", graph_id, version, body.name)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.rename_version(graph_id, version, body.name, current_user)
-
-
-@router.post("/{graph_id}/deployments/{version}/activate", response_model=Dict[str, Any])
-async def activate_deployment_version(
-    graph_id: uuid.UUID,
-    version: int,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Activate a deployment version."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Activating deployment version: {} v{}", graph_id, version)
-
-    service = GraphDeploymentVersionService(db)
-    activated = await service.activate_version(graph_id, version, current_user)
-
-    return {
-        "success": True,
-        "deployedAt": activated.createdAt,
-    }
-
-
-@router.post("/{graph_id}/deployments/{version}/revert", response_model=GraphRevertResponse)
-async def revert_to_deployment_version(
-    graph_id: uuid.UUID,
-    version: int,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Revert to a specific deployment version."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Reverting to deployment version: {} v{}", graph_id, version)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.revert_to_version(graph_id, version, current_user)
-
-
-@router.delete("/{graph_id}/deployments/{version}", response_model=Dict[str, Any])
-async def delete_deployment_version(
-    graph_id: uuid.UUID,
-    version: int,
-    request: Request,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    """Delete a deployment version."""
-    log = _bind_log(request, graph_id=str(graph_id), version=version)
-    log.info("Deleting deployment version: {} v{}", graph_id, version)
-
-    service = GraphDeploymentVersionService(db)
-    return await service.delete_version(graph_id, version, current_user)
diff --git a/backend/app/api/v1/graphs.py b/backend/app/api/v1/graphs.py
deleted file mode 100644
index 215538b04..000000000
--- a/backend/app/api/v1/graphs.py
+++ /dev/null
@@ -1,639 +0,0 @@
-"""
-Graph API (path: /api/v1/graphs)
-"""
-
-import time
-import uuid
-from typing import Any, Dict, List, Optional
-
-from fastapi import APIRouter, Depends, Query, Request
-from loguru import logger
-from pydantic import BaseModel, Field
-from sqlalchemy import func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.common.exceptions import ForbiddenException, NotFoundException
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.models.graph import AgentGraph, GraphNode
-from app.models.workspace import WorkspaceMemberRole
-from app.repositories.agent_run import AgentRunRepository
-from app.repositories.workspace import WorkspaceRepository
-from app.services.graph_service import GraphService
-
-router = APIRouter(prefix="/v1/graphs", tags=["Graphs"])
-
-
-def _bind_log(request: Request, **kwargs):
-    trace_id = getattr(request.state, "trace_id", "-")
-    return logger.bind(trace_id=trace_id, **kwargs)
-
-
-class GraphStatePayload(BaseModel):
-    """Graph state payload."""
-
-    nodes: List[Dict[str, Any]] = Field(default_factory=list, description="Node list")
-    edges: List[Dict[str, Any]] = Field(default_factory=list, description="Edge list")
-    viewport: Optional[Dict[str, Any]] = Field(default=None, description="Viewport info")
-    variables: Optional[Dict[str, Any]] = Field(default=None, description="Graph variables (e.g. context variables)")
-    # optional graph creation params (for upsert mode)
-    name: Optional[str] = Field(default=None, max_length=200, description="Graph name (for creating a new graph)")
-    workspaceId: Optional[uuid.UUID] = Field(default=None, description="Workspace ID (for creating a new graph)")
-
-
-class CreateGraphRequest(BaseModel):
-    """Create graph request."""
-
-    name: str = Field(..., min_length=1, max_length=200, description="Graph name")
-    description: Optional[str] = Field(default=None, max_length=2000, description="Graph description")
-    color: Optional[str] = Field(default=None, max_length=2000, description="Color")
-    workspaceId: Optional[uuid.UUID] = Field(default=None, description="Workspace ID")
-    folderId: Optional[uuid.UUID] = Field(default=None, description="Folder ID")
-    parentId: Optional[uuid.UUID] = Field(default=None, description="Parent graph ID")
-    variables: Optional[Dict[str, Any]] = Field(default_factory=dict, description="Variables")
-
-
-class UpdateGraphRequest(BaseModel):
-    """Update graph request."""
-
-    name: Optional[str] = Field(default=None, min_length=1, max_length=200, description="Graph name")
-    description: Optional[str] = Field(default=None, max_length=2000, description="Graph description")
-    color: Optional[str] = Field(default=None, max_length=2000, description="Color")
-    folderId: Optional[uuid.UUID] = Field(default=None, description="Folder ID")
-    parentId: Optional[uuid.UUID] = Field(default=None, description="Parent graph ID")
-    isDeployed: Optional[bool] = Field(default=None, description="Whether deployed")
-
-
-async def _ensure_workspace_member(
-    *,
-    db: AsyncSession,
-    workspace_id: uuid.UUID,
-    current_user: User,
-    min_role: WorkspaceMemberRole,
-) -> None:
-    """
-    Ensure the user is a workspace member with sufficient permissions.
-
-    Args:
-        db: database session
-        workspace_id: workspace ID
-        current_user: current user
-        min_role: minimum required role
-
-    Raises:
-        NotFoundException: if the workspace does not exist
-        ForbiddenException: if the user is not a member or lacks permission
-    """
-    from app.services.workspace_permission import check_workspace_access
-
-    # check workspace existence
-    workspace_repo = WorkspaceRepository(db)
-    workspace = await workspace_repo.get(workspace_id)
-    if not workspace:
-        raise NotFoundException("Workspace not found")
-
-    # check access permission
-    has_access = await check_workspace_access(db, workspace_id, current_user, min_role)
-    if not has_access:
-        raise ForbiddenException("No access to workspace or insufficient permission")
-
-
-def _serialize_graph_row(graph: AgentGraph, node_count: int = 0) -> Dict[str, Any]:
-    """
-    Serialize a graph object to a dict.
-
-    Args:
-        graph: graph object
-        node_count: node count (optional)
-
-    Returns:
-        Serialized dict
-    """
-    return {
-        "id": str(graph.id),
-        "userId": str(graph.user_id),
-        "workspaceId": str(graph.workspace_id) if graph.workspace_id else None,
-        "folderId": str(graph.folder_id) if graph.folder_id else None,
-        "parentId": str(graph.parent_id) if graph.parent_id else None,
-        "name": graph.name,
-        "description": graph.description,
-        "color": graph.color,
-        "isDeployed": graph.is_deployed,
-        "variables": graph.variables or {},
-        "createdAt": graph.created_at.isoformat() if graph.created_at else None,
-        "updatedAt": graph.updated_at.isoformat() if graph.updated_at else None,
-        "nodeCount": node_count,
-    }
-
-
-@router.get("")
-async def list_graphs(
-    request: Request,
-    workspace_id: Optional[uuid.UUID] = Query(default=None, alias="workspaceId"),
-    parent_id: Optional[uuid.UUID] = Query(default=None, alias="parentId"),
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    List graphs.
-
-    Filtering logic:
-    - Default (no workspace_id): list all graphs owned by the current user (personal graphs)
-    - If workspace_id is provided:
-      - Check that the user has access to the workspace (at least viewer)
-      - If authorized, return all graphs in the workspace (not limited to user-created ones)
-      - If unauthorized, return an empty list
-    - If parentId is provided: list sub-graphs under the specified parent graph
-    """
-    service = GraphService(db)
-
-    log = _bind_log(request, user_id=str(current_user.id))
-
-    log.info(f"graph.list start workspace_id={workspace_id} parent_id={parent_id}")
-
-    # if workspace_id is provided, check permission and return all workspace graphs
-    if workspace_id:
-        # check that the user has access (at least viewer)
-        await _ensure_workspace_member(
-            db=db,
-            workspace_id=workspace_id,
-            current_user=current_user,
-            min_role=WorkspaceMemberRole.viewer,
-        )
-        # return all graphs in the workspace (not limited to user)
-        query = select(AgentGraph).where(
-            AgentGraph.workspace_id == workspace_id,
-            AgentGraph.deleted_at.is_(None),
-        )
-        if parent_id is not None:
-            query = query.where(AgentGraph.parent_id == parent_id)
-        query = query.order_by(AgentGraph.created_at.desc(), AgentGraph.id.desc())
-        result = await db.execute(query)
-        graphs = list(result.scalars().all())
-    else:
-        # no workspace_id — return user-owned graphs (personal graphs)
-        graphs = await service.graph_repo.list_by_user_with_filters(
-            user_id=current_user.id,
-            parent_id=parent_id,
-            workspace_id=None,
-        )
-
-    # batch-query node counts for each graph
-    graph_ids = [graph.id for graph in graphs]
-    node_counts: Dict[Any, int] = {}
-    if graph_ids:
-        # use GROUP BY to query all node counts in one shot
-        count_query = (
-            select(GraphNode.graph_id, func.count(GraphNode.id).label("count"))
-            .where(GraphNode.graph_id.in_(graph_ids))
-            .group_by(GraphNode.graph_id)
-        )
-        result = await db.execute(count_query)
-        for row in result:
-            count_val = getattr(row, "count", 0)
-            node_counts[row.graph_id] = int(count_val) if not callable(count_val) else count_val()  # type: ignore[call-overload]
-
-    log.info(f"graph.list success count={len(graphs)}")
-    return {"data": [_serialize_graph_row(graph, node_counts.get(graph.id, 0)) for graph in graphs]}
-
-
-@router.get("/deployed")
-async def list_deployed_graphs(
-    request: Request,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    List deployed graphs accessible to the current user.
-
-    Includes:
-    1. Deployed graphs created by the user
-    2. Deployed graphs in workspaces the user has access to (at least viewer)
-
-    Filters:
-    - is_deployed = True
-    - User is the graph owner, or user has workspace access
-    """
-    from sqlalchemy import or_
-
-    from app.models.workspace import WorkspaceMemberRole
-    from app.repositories.workspace import WorkspaceRepository
-    from app.services.workspace_permission import check_workspace_access
-
-    log = _bind_log(request, user_id=str(current_user.id))
-    log.info("graph.list_deployed start")
-
-    workspace_repo = WorkspaceRepository(db)
-    user_workspaces = await workspace_repo.list_for_user(current_user.id)
-    accessible_workspace_ids = [ws.id for ws in user_workspaces]
-
-    conditions = [AgentGraph.is_deployed, AgentGraph.deleted_at.is_(None)]
-
-    user_owned_condition = AgentGraph.user_id == str(current_user.id)
-
-    if accessible_workspace_ids:
-        workspace_condition = AgentGraph.workspace_id.in_(accessible_workspace_ids)
-        graph_condition = or_(user_owned_condition, workspace_condition)
-    else:
-        graph_condition = user_owned_condition
-
-    conditions.append(graph_condition)  # type: ignore[arg-type]
-
-    query = select(AgentGraph).where(*conditions).order_by(AgentGraph.created_at.desc())
-    result = await db.execute(query)
-    all_graphs = list(result.scalars().all())
-
-    filtered_graphs = []
-    for graph in all_graphs:
-        if graph.user_id == str(current_user.id):
-            filtered_graphs.append(graph)
-        elif graph.workspace_id:
-            has_access = await check_workspace_access(
-                db,
-                graph.workspace_id,
-                current_user,
-                WorkspaceMemberRole.viewer,
-            )
-            if has_access:
-                filtered_graphs.append(graph)
-
-    graphs = filtered_graphs
-
-    graph_ids = [graph.id for graph in graphs]
-    node_counts: Dict[Any, int] = {}
-    if graph_ids:
-        count_query = (
-            select(GraphNode.graph_id, func.count(GraphNode.id).label("count"))
-            .where(GraphNode.graph_id.in_(graph_ids))
-            .group_by(GraphNode.graph_id)
-        )
-        result = await db.execute(count_query)
-        for row in result:
-            count_val = getattr(row, "count", 0)
-            node_counts[row.graph_id] = int(count_val) if not callable(count_val) else count_val()  # type: ignore[call-overload]
-
-    log.info(f"graph.list_deployed success count={len(graphs)}")
-    return {"data": [_serialize_graph_row(graph, node_counts.get(graph.id, 0)) for graph in graphs]}
-
-
-@router.post("")
-async def create_graph(
-    request: Request,
-    payload: CreateGraphRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    Create a new graph.
-
-    - personal graph: created by the current user
-    - workspace graph: requires workspace write permission (member+)
-    """
-    log = _bind_log(request, user_id=str(current_user.id))
-    parent_id = payload.parentId
-    workspace_id = payload.workspaceId
-
-    # workspace_id may be None (personal graph)
-
-    if workspace_id:
-        await _ensure_workspace_member(
-            db=db,
-            workspace_id=workspace_id,
-            current_user=current_user,
-            min_role=WorkspaceMemberRole.member,
-        )
-
-    service = GraphService(db)
-    graph = await service.create_graph(
-        name=payload.name.strip(),
-        user_id=current_user.id,
-        workspace_id=workspace_id,
-        folder_id=payload.folderId,
-        parent_id=parent_id,
-        description=payload.description.strip() if payload.description else None,
-        color=payload.color,
-        variables=payload.variables,
-    )
-    await db.commit()
-    log.info(f"graph.create success graph_id={graph.id} workspace_id={workspace_id} parent_id={parent_id}")
-    return {"data": _serialize_graph_row(graph)}
-
-
-@router.get("/{graph_id}")
-async def get_graph(
-    graph_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    Get graph details including nodes and edges.
-
-    Returns:
-        {
-            "data": {
-                "id": "...",
-                "name": "...",
-                "nodes": [...],
-                "edges": [...],
-                "viewport": {...},
-                ...
-            }
-        }
-    """
-    service = GraphService(db)
-    data = await service.get_graph_detail(graph_id, current_user)
-    return {"data": data}
-
-
-@router.put("/{graph_id}")
-async def update_graph(
-    graph_id: uuid.UUID,
-    payload: UpdateGraphRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """Update graph metadata (name/description/color/folderId/parentId/isDeployed)."""
-    service = GraphService(db)
-    graph = await service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-
-    # permission check
-    await service._ensure_access(graph, current_user, WorkspaceMemberRole.member)
-
-    update_data: Dict[str, Any] = {}
-    fields_set: set[str] = getattr(payload, "model_fields_set", set())
-
-    if payload.name is not None:
-        update_data["name"] = payload.name.strip()
-    if "description" in fields_set:
-        update_data["description"] = payload.description
-    if payload.color is not None:
-        update_data["color"] = payload.color
-    if "folderId" in fields_set:
-        # if folderId is provided, verify it exists and belongs to the current workspace
-        if payload.folderId is not None:
-            from app.repositories.workspace_folder import WorkflowFolderRepository
-
-            folder_repo = WorkflowFolderRepository(db)
-            folder = await folder_repo.get(payload.folderId)
-            if not folder:
-                raise NotFoundException(f"Folder with id {payload.folderId} not found")
-            # ensure folder belongs to the graph's workspace
-            if graph.workspace_id and folder.workspace_id != graph.workspace_id:
-                from app.common.exceptions import BadRequestException
-
-                raise BadRequestException(
-                    f"Folder {payload.folderId} does not belong to workspace {graph.workspace_id}"
-                )
-        # allow setting to None to clear the folder association
-        update_data["folder_id"] = payload.folderId
-    if "parentId" in fields_set:
-        # if parentId is provided, verify it exists (allow None to clear the parent relationship)
-        if payload.parentId is not None:
-            parent_graph = await service.graph_repo.get(payload.parentId)
-            if not parent_graph:
-                raise NotFoundException(f"Parent graph with id {payload.parentId} not found")
-        # allow setting to None to clear the parent graph relationship
-        update_data["parent_id"] = payload.parentId
-    if payload.isDeployed is not None:
-        update_data["is_deployed"] = payload.isDeployed
-
-    if update_data:
-        await service.graph_repo.update(graph_id, update_data)
-        await db.commit()
-
-    graph2 = await service.graph_repo.get(graph_id)
-    if not graph2:
-        raise NotFoundException("Graph not found")
-    return {"data": _serialize_graph_row(graph2)}
-
-
-@router.delete("/{graph_id}")
-async def delete_graph(
-    graph_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """Delete a graph (requires member permission, i.e. write access)."""
-    service = GraphService(db)
-    graph = await service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-
-    # permission check:
-    # - personal graph: only the owner can delete
-    # - workspace graph: requires at least member permission (write access)
-    if graph.workspace_id:
-        # workspace graph: requires member permission to delete
-        await service._ensure_access(
-            graph,
-            current_user,
-            required_role=WorkspaceMemberRole.member,
-        )
-    else:
-        # personal graph: only the owner can delete
-        if graph.user_id != current_user.id:
-            raise ForbiddenException("Only graph owner can delete personal graph")
-
-    await service.graph_repo.soft_delete(graph_id)
-    await db.commit()
-    return {"success": True}
-
-
-@router.get("/{graph_id}/state")
-async def load_graph_state(
-    graph_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    Load graph state (nodes and edges).
-
-    Returns:
-        {
-            "success": true,
-            "data": {
-                "nodes": [...],
-                "edges": [...],
-                "viewport": {...}
-            }
-        }
-    """
-    service = GraphService(db)
-    state = await service.load_graph_state(graph_id, current_user)
-    return {"success": True, "data": state}
-
-
-@router.post("/{graph_id}/state")
-async def save_graph_state(
-    request: Request,
-    graph_id: uuid.UUID,
-    payload: GraphStatePayload,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """
-    Save graph state (nodes and edges) — supports upsert mode.
-
-    If the graph does not exist, automatically create a new one (requires name parameter).
-
-    Accepts frontend format:
-    {
-        "nodes": [...],
-        "edges": [...],
-        "viewport": {...},
-        "name": "optional, for creating a new graph",
-        "workspaceId": "optional, for creating a new graph"
-    }
-    """
-    log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-    service = GraphService(db)
-
-    # workspace_id may be None (personal graph)
-    workspace_id = payload.workspaceId
-
-    result = await service.save_graph_state(
-        graph_id=graph_id,
-        nodes=payload.nodes,
-        edges=payload.edges,
-        viewport=payload.viewport,
-        variables=payload.variables,
-        current_user=current_user,
-        # upsert parameters
-        name=payload.name,
-        workspace_id=workspace_id,
-    )
-
-    # explicitly commit the transaction to persist data
-    # note: get_db() does not auto-commit; an explicit commit() is required
-    await db.commit()
-
-    log.info(f"graph.state.save success nodes={len(payload.nodes)} edges={len(payload.edges)}")
-    return {"success": True, **result}
-
-
-@router.put("/{graph_id}/state")
-async def save_graph_state_put(
-    request: Request,
-    graph_id: uuid.UUID,
-    payload: GraphStatePayload,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """PUT alias for saving graph state."""
-    return await save_graph_state(request, graph_id, payload, db, current_user)
-
-
-# ==================== Compile (pre-build + cache warm) ====================
-
-
-@router.post("/{graph_id}/compile")
-async def compile_graph(
-    request: Request,
-    graph_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-) -> Dict[str, Any]:
-    """Compile a graph and warm the cache; return build time. Execution uses the cache if not expired."""
-    service = GraphService(db)
-    graph = await service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-    await service._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-    start = time.time()
-    try:
-        await service.create_graph_by_graph_id(
-            graph_id=graph_id,
-            user_id=current_user.id,
-            current_user=current_user,
-        )
-        build_time_ms = (time.time() - start) * 1000
-        return {"ok": True, "build_time_ms": round(build_time_ms, 2)}
-    except Exception as e:
-        log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-        log.error(f"graph.compile failed: {e}")
-        raise
-
-
-# ==================== Copilot Endpoints ====================
-
-
-@router.get("/{graph_id}/copilot/history")
-async def get_copilot_history(
-    request: Request,
-    graph_id: uuid.UUID,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-    log.info("copilot.history.get start")
-
-    graph_service = GraphService(db)
-    graph = await graph_service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-    await graph_service._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-
-    repo = AgentRunRepository(db)
-    runs = await repo.list_recent_runs_for_user(
-        user_id=str(current_user.id),
-        agent_name="copilot",
-        graph_id=graph_id,
-        limit=100,
-    )
-
-    messages = []
-    for run in reversed(list(runs)):  # oldest first
-        snapshot = await repo.get_snapshot(run.id)
-        if not snapshot or not snapshot.projection:
-            continue
-        p = snapshot.projection
-        messages.append(
-            {
-                "role": "user",
-                "content": run.title or "",
-                "created_at": run.created_at.isoformat() if run.created_at else None,
-            }
-        )
-        messages.append(
-            {
-                "role": "assistant",
-                "content": p.get("result_message") or p.get("content", ""),
-                "created_at": run.updated_at.isoformat() if run.updated_at else None,
-                "actions": p.get("result_actions", []),
-                "thought_steps": p.get("thought_steps", []),
-                "tool_calls": p.get("tool_calls", []),
-            }
-        )
-
-    log.info(f"copilot.history.get success messages_count={len(messages)}")
-    return {"data": {"graph_id": str(graph_id), "messages": messages}}
-
-
-@router.delete("/{graph_id}/copilot/history")
-async def clear_copilot_history(
-    request: Request,
-    graph_id: uuid.UUID,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-    log.info("copilot.history.clear start")
-
-    graph_service = GraphService(db)
-    graph = await graph_service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-    await graph_service._ensure_access(graph, current_user, WorkspaceMemberRole.member)
-
-    repo = AgentRunRepository(db)
-    deleted = await repo.delete_runs_for_graph(
-        user_id=str(current_user.id),
-        agent_name="copilot",
-        graph_id=graph_id,
-    )
-
-    log.info(f"copilot.history.clear success deleted={deleted}")
-    return {"success": True}
diff --git a/backend/app/api/v1/mcp.py b/backend/app/api/v1/mcp.py
index cba65c8e1..1e3fe3b88 100644
--- a/backend/app/api/v1/mcp.py
+++ b/backend/app/api/v1/mcp.py
@@ -14,8 +14,8 @@
 from pydantic import BaseModel, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError, NotFoundError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import BadRequestException, NotFoundException
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.services.mcp_client_service import McpConnectionConfig, get_mcp_client
@@ -387,8 +387,10 @@ async def execute_tool(
 
     if not tool:
         # get_mcp_tool_with_instance already logs detailed warnings
-        raise NotFoundException(
-            f"MCP tool '{request.toolName}' not found on server '{request.serverName}' or server is not accessible"
+        raise NotFoundError(
+            f"MCP tool '{request.toolName}' not found on server '{request.serverName}' or server is not accessible",
+            code="MCP_TOOL_NOT_FOUND",
+            data={"server_name": request.serverName, "tool_name": request.toolName},
         )
 
     try:
@@ -405,4 +407,8 @@ async def execute_tool(
             f"toolName={request.toolName}, error={str(e)}",
             exc_info=True,
         )
-        raise BadRequestException(f"Tool execution failed: {str(e)}")
+        raise InvalidRequestError(
+            f"Tool execution failed: {str(e)}",
+            code="MCP_TOOL_EXECUTION_FAILED",
+            data={"server_name": request.serverName, "tool_name": request.toolName},
+        )
diff --git a/backend/app/api/v1/memory/memory.py b/backend/app/api/v1/memory/memory.py
index 8b62aa705..d048913a6 100644
--- a/backend/app/api/v1/memory/memory.py
+++ b/backend/app/api/v1/memory/memory.py
@@ -24,14 +24,14 @@
     UserMemoryCreateSchema,
     UserMemorySchema,
 )
-from app.common.dependencies import get_current_user
-from app.common.exceptions import (
-    AppException,
-    BadRequestException,
-    InternalServerException,
-    NotFoundException,
-    ValidationException,
+from app.common.app_errors import (
+    AppError,
+    InternalServiceError,
+    InvalidRequestError,
+    NotFoundError,
+    RequestValidationAppError,
 )
+from app.common.dependencies import get_current_user
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.schemas.memory import UserMemory
@@ -87,7 +87,7 @@ def parse_topics(
         return [topic.strip() for topic in topics.split(",") if topic.strip()]
 
     except Exception as e:
-        raise ValidationException(f"Invalid topics format: {e}")
+        raise RequestValidationAppError(f"Invalid topics format: {e}")
 
 
 @router.post(
@@ -142,7 +142,11 @@ async def create_memory(
     )
 
     if not user_memory:
-        raise InternalServerException("Failed to create memory")
+        raise InternalServiceError(
+            "Failed to create memory",
+            code="MEMORY_CREATE_FAILED",
+            data={"user_id": payload.user_id},
+        )
 
     return UserMemorySchema.from_dict(_normalize_memory_dict(user_memory))  # type: ignore
 
@@ -168,7 +172,11 @@ async def delete_memory(
     db = MemoryService(db_session)
     success = await db.delete_user_memory(memory_id=memory_id, user_id=str(current_user.id))
     if not success:
-        raise NotFoundException(f"Memory with ID {memory_id} not found")
+        raise NotFoundError(
+            "Memory not found",
+            code="MEMORY_NOT_FOUND",
+            data={"memory_id": memory_id},
+        )
     return None
 
 
@@ -193,7 +201,11 @@ async def delete_memories(
     current_user: User = Depends(get_current_user),
 ) -> None:
     if not request.memory_ids:
-        raise BadRequestException("memory_ids must not be empty")
+        raise InvalidRequestError(
+            "memory_ids must not be empty",
+            code="MEMORY_IDS_EMPTY",
+            data={"memory_ids": request.memory_ids},
+        )
     db = MemoryService(db_session)
     await db.delete_user_memories(memory_ids=request.memory_ids, user_id=str(current_user.id))
     return None
@@ -285,7 +297,11 @@ async def get_memory(
 
     user_memory = await db.get_user_memory(memory_id=memory_id, user_id=str(current_user.id), deserialize=False)
     if not user_memory:
-        raise NotFoundException(f"Memory with ID {memory_id} not found")
+        raise NotFoundError(
+            "Memory not found",
+            code="MEMORY_NOT_FOUND",
+            data={"memory_id": memory_id},
+        )
 
     return UserMemorySchema.from_dict(_normalize_memory_dict(user_memory))  # type: ignore
 
@@ -351,7 +367,11 @@ async def update_memory(
         deserialize=False,
     )
     if not user_memory:
-        raise InternalServerException("Failed to update memory")
+        raise InternalServiceError(
+            "Failed to update memory",
+            code="MEMORY_UPDATE_FAILED",
+            data={"memory_id": memory_id, "user_id": payload.user_id},
+        )
 
     return UserMemorySchema.from_dict(_normalize_memory_dict(user_memory))  # type: ignore
 
@@ -387,14 +407,17 @@ async def optimize_memories(
         from app.services.model_service import ModelService
 
         if not request.model:
-            raise BadRequestException(
+            raise InvalidRequestError(
                 "Model is required. Specify 'model' in format 'provider:model_name' (e.g., 'openai:gpt-4o-mini').",
+                code="MEMORY_OPTIMIZATION_MODEL_REQUIRED",
             )
 
         provider_name, model_name = parse_model_ref(request.model)
         if not model_name:
-            raise BadRequestException(
+            raise InvalidRequestError(
                 "Invalid model format. Specify 'model' in format 'provider:model_name' (e.g., 'openai:gpt-4o-mini').",
+                code="MEMORY_OPTIMIZATION_MODEL_INVALID",
+                data={"model": request.model},
             )
 
         model_service = ModelService(db_session)
@@ -419,7 +442,11 @@ async def optimize_memories(
         user_id = request.user_id or str(current_user.id)
         memories_before = await memory_manager.aget_user_memories(user_id=user_id)
         if not memories_before:
-            raise NotFoundException(f"No memories found for user {user_id}")
+            raise NotFoundError(
+                "No memories found for user",
+                code="MEMORY_NOT_FOUND",
+                data={"user_id": user_id},
+            )
 
         # Count tokens before optimization
         strategy = SummarizeStrategy()
@@ -469,8 +496,12 @@ async def optimize_memories(
             reduction_percentage=reduction_percentage,
         )
 
-    except AppException:
+    except AppError:
         raise
     except Exception as e:
         logger.error(f"Failed to optimize memories for user {request.user_id}: {str(e)}")
-        raise InternalServerException(f"Failed to optimize memories: {str(e)}")
+        raise InternalServiceError(
+            "Failed to optimize memories",
+            code="MEMORY_OPTIMIZATION_FAILED",
+            data={"user_id": request.user_id or str(current_user.id)},
+        ) from e
diff --git a/backend/app/api/v1/model_providers.py b/backend/app/api/v1/model_providers.py
index 1df3a48b9..1187086d4 100644
--- a/backend/app/api/v1/model_providers.py
+++ b/backend/app/api/v1/model_providers.py
@@ -74,9 +74,13 @@ async def get_provider(
     provider = await service.get_provider(provider_name)
 
     if not provider:
-        from app.common.exceptions import NotFoundException
+        from app.common.app_errors import NotFoundError
 
-        raise NotFoundException(f"Provider not found: {provider_name}")
+        raise NotFoundError(
+            "Provider not found",
+            code="MODEL_PROVIDER_NOT_FOUND",
+            data={"provider_name": provider_name},
+        )
 
     return success_response(data=provider, message="Provider details retrieved")
 
diff --git a/backend/app/api/v1/models.py b/backend/app/api/v1/models.py
index b2177c9e8..7111a06c4 100644
--- a/backend/app/api/v1/models.py
+++ b/backend/app/api/v1/models.py
@@ -10,6 +10,7 @@
 from pydantic import BaseModel, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError
 from app.common.dependencies import get_current_user
 from app.common.response import success_response
 from app.core.database import get_db
@@ -67,9 +68,11 @@ async def list_available_models(
     try:
         model_type_enum = ModelType(model_type)
     except ValueError:
-        from app.common.exceptions import BadRequestException
-
-        raise BadRequestException(f"Unsupported model type: {model_type}")
+        raise InvalidRequestError(
+            f"Unsupported model type: {model_type}",
+            code="MODEL_TYPE_UNSUPPORTED",
+            data={"model_type": model_type},
+        )
 
     service = ModelService(db)
     models = await service.get_available_models(model_type=model_type_enum, user_id=current_user.id)
@@ -86,9 +89,11 @@ async def create_model_instance(
     try:
         model_type_enum = ModelType(payload.model_type)
     except ValueError:
-        from app.common.exceptions import BadRequestException
-
-        raise BadRequestException(f"Unsupported model type: {payload.model_type}")
+        raise InvalidRequestError(
+            f"Unsupported model type: {payload.model_type}",
+            code="MODEL_TYPE_UNSUPPORTED",
+            data={"model_type": payload.model_type},
+        )
 
     service = ModelService(db)
     instance = await service.create_model_instance_config(
diff --git a/backend/app/api/v1/oauth.py b/backend/app/api/v1/oauth.py
index 78f4b830b..a1cbf3d76 100644
--- a/backend/app/api/v1/oauth.py
+++ b/backend/app/api/v1/oauth.py
@@ -15,6 +15,7 @@
 import secrets
 from datetime import datetime, timedelta, timezone
 from typing import Any, Dict, List, Optional
+from urllib.parse import urlencode
 
 from fastapi import APIRouter, Depends, Query, Request
 from fastapi.responses import RedirectResponse
@@ -22,8 +23,9 @@
 from pydantic import BaseModel
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError
 from app.common.dependencies import get_db
-from app.common.exceptions import BadRequestException
+from app.common.response import success_response
 from app.core.oauth import get_oauth_config, get_protocol_handler
 from app.core.redis import RedisClient
 from app.core.security import create_access_token, create_csrf_token, generate_refresh_token
@@ -73,7 +75,7 @@ async def oauth_authorize(
     request: Request,
     callback_url: Optional[str] = Query(None, description="Redirect URL after successful login"),
     db: AsyncSession = Depends(get_db),
-) -> RedirectResponse:
+) -> Dict[str, Any]:
     """
     Start OAuth authorization flow.
 
@@ -106,19 +108,20 @@ async def oauth_authorize(
         except Exception as e:
             logger.warning(f"{LOG_PREFIX} Failed to store state in Redis: {e}")
 
-    # Generate authorization URL
-    try:
-        authorization_url, _ = await oauth_service.generate_authorization_url(
-            provider_name=provider,
-            redirect_uri=redirect_uri,
-            state=state,
-        )
-    except Exception as e:
-        logger.error(f"{LOG_PREFIX} Failed to generate authorization URL: {e}")
-        raise BadRequestException(f"Failed to initiate OAuth flow: {str(e)}")
+    authorization_url, resolved_state = await oauth_service.generate_authorization_url(
+        provider_name=provider,
+        redirect_uri=redirect_uri,
+        state=state,
+    )
 
-    logger.info(f"{LOG_PREFIX} Redirecting to {provider} authorization")
-    return RedirectResponse(url=authorization_url, status_code=302)
+    logger.info(f"{LOG_PREFIX} Generated authorization URL for {provider}")
+    return success_response(
+        data={
+            "authorization_url": authorization_url,
+            "state": resolved_state,
+        },
+        message="OAuth authorization URL generated",
+    )
 
 
 @router.get("/{provider}/callback")
@@ -146,13 +149,13 @@ async def oauth_callback(
     # Handle user denial
     if error:
         logger.warning(f"{LOG_PREFIX} OAuth error: {error} - {error_description}")
-        return _redirect_with_error(frontend_url, "oauth_denied", error_description or error)
+        return _redirect_with_error(frontend_url, "OAUTH_ACCESS_DENIED", error_description or error)
 
     # 2. Load provider config (needed to detect protocol)
     provider_config = oauth_config.get_provider(provider)
     if not provider_config:
         logger.error(f"{LOG_PREFIX} Provider not found: {provider}")
-        return _redirect_with_error(frontend_url, "provider_not_found")
+        return _redirect_with_error(frontend_url, "OAUTH_PROVIDER_NOT_FOUND")
 
     # 1. Validate state (JD SSO can skip; it relies on Cookie, not auth code)
     callback_url = oauth_config.settings.default_redirect_url
@@ -162,16 +165,16 @@ async def oauth_callback(
         # Validate when state is present
         state_data, callback_url = await _validate_state(state, oauth_config)
         if state_data is None:
-            return _redirect_with_error(frontend_url, "invalid_state")
+            return _redirect_with_error(frontend_url, "OAUTH_STATE_INVALID")
 
         # Validate provider match
         if state_data.get("provider") != provider:
             logger.warning(f"{LOG_PREFIX} Provider mismatch: expected {state_data.get('provider')}, got {provider}")
-            return _redirect_with_error(frontend_url, "provider_mismatch")
+            return _redirect_with_error(frontend_url, "OAUTH_PROVIDER_MISMATCH")
     elif provider_config.protocol != "jd_sso":
         # Non-JD SSO protocols require state
         logger.warning(f"{LOG_PREFIX} Missing state parameter for {provider_config.protocol}")
-        return _redirect_with_error(frontend_url, "missing_state")
+        return _redirect_with_error(frontend_url, "OAUTH_STATE_MISSING")
 
     try:
         # 3. Use protocol handler to fetch user info
@@ -236,17 +239,17 @@ async def oauth_callback(
 
         return response
 
-    except BadRequestException:
+    except InvalidRequestError:
         raise
     except ValueError as e:
         # Validation error raised by protocol handler
         logger.error(f"{LOG_PREFIX} OAuth callback validation error: {e}")
         await db.rollback()
-        return _redirect_with_error(frontend_url, "oauth_failed", str(e))
+        return _redirect_with_error(frontend_url, "OAUTH_CALLBACK_INVALID", str(e))
     except Exception as e:
         logger.error(f"{LOG_PREFIX} OAuth callback error: {e}", exc_info=True)
         await db.rollback()
-        return _redirect_with_error(frontend_url, "oauth_failed", str(e))
+        return _redirect_with_error(frontend_url, "OAUTH_CALLBACK_FAILED", str(e))
 
 
 # ==================== User OAuth Account Management ====================
@@ -336,11 +339,12 @@ def _get_client_ip(request: Request) -> str:
     return ip
 
 
-def _redirect_with_error(frontend_url: str, error: str, description: Optional[str] = None) -> RedirectResponse:
+def _redirect_with_error(frontend_url: str, error_code: str, message: Optional[str] = None) -> RedirectResponse:
     """Build error redirect response."""
-    error_url = f"{frontend_url}/signin?error={error}"
-    if description:
-        error_url += f"&error_description={description}"
+    params = {"error_code": error_code}
+    if message:
+        params["error_message"] = message
+    error_url = f"{frontend_url}/signin?{urlencode(params)}"
     return RedirectResponse(url=error_url, status_code=302)
 
 
diff --git a/backend/app/api/v1/openapi_graph.py b/backend/app/api/v1/openapi_graph.py
deleted file mode 100644
index 1c2b585a2..000000000
--- a/backend/app/api/v1/openapi_graph.py
+++ /dev/null
@@ -1,181 +0,0 @@
-"""
-OpenAPI Graph routes — trigger Graph execution via PlatformToken auth
-
-Endpoints:
-- POST /v1/openapi/graph/{graphId}/run      Start execution
-- GET  /v1/openapi/graph/{executionId}/status  Query status
-- POST /v1/openapi/graph/{executionId}/abort   Abort execution
-- GET  /v1/openapi/graph/{executionId}/result   Get result
-"""
-
-from __future__ import annotations
-
-import uuid
-from typing import Any, Dict, Optional
-
-from fastapi import APIRouter, Depends, Request
-from loguru import logger
-from pydantic import BaseModel, Field
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.auth_dependency import AuthContext, get_current_user_or_token
-from app.common.exceptions import ForbiddenException
-from app.common.permissions import check_token_permission
-from app.core.database import get_db
-from app.services.openapi_graph_service import OpenApiGraphService
-
-router = APIRouter(prefix="/v1/openapi/graph", tags=["OpenAPI Graph"])
-
-
-# ─── Request / Response Models ─────────────────────────────────
-
-
-class RunGraphRequest(BaseModel):
-    """Request body for starting a Graph execution."""
-
-    variables: Optional[Dict[str, Any]] = Field(
-        default=None,
-        description="Runtime variables. message/query is used as the user message; the rest are context variables.",
-    )
-
-
-class OpenApiResponse(BaseModel):
-    """Unified response format."""
-
-    success: bool = True
-    data: Optional[Dict[str, Any]] = None
-    errCode: Optional[str] = None
-    errMsg: Optional[str] = None
-
-
-# ─── Helper ─────────────────────────────────────
-
-
-def _bind_log(request: Request, **kwargs):
-    trace_id = getattr(request.state, "trace_id", "-")
-    return logger.bind(trace_id=trace_id, **kwargs)
-
-
-def _require_graph_execute(auth: AuthContext, graph_id: uuid.UUID) -> None:
-    """Require graphs:execute scope if using token auth."""
-    if not auth.is_token_auth:
-        return
-    has_perm = check_token_permission(
-        token_scopes=auth.token_scopes or [],
-        required_scope="graphs:execute",
-        resource_type="graph",
-        resource_id=str(graph_id),
-        token_resource_type=auth.token_resource_type,
-        token_resource_id=auth.token_resource_id,
-    )
-    if not has_perm:
-        raise ForbiddenException("Token missing required scope: graphs:execute")
-
-
-# ─── Endpoints ─────────────────────────────────────
-
-
-@router.post("/{graph_id}/run")
-async def run_graph(
-    request: Request,
-    graph_id: uuid.UUID,
-    payload: RunGraphRequest = RunGraphRequest(),
-    auth: AuthContext = Depends(get_current_user_or_token),
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Start a Graph execution.
-
-    Authenticate via PlatformToken and start an async Graph execution.
-    Returns an executionId for subsequent status queries and result retrieval.
-    """
-    _require_graph_execute(auth, graph_id)
-    user = auth.user
-    log = _bind_log(request, user_id=str(user.id), graph_id=str(graph_id))
-    log.info("openapi.graph.run start")
-
-    service = OpenApiGraphService(db)
-    result = await service.run_graph(
-        graph_id=graph_id,
-        user_id=user.id,
-        variables=payload.variables,
-    )
-
-    log.info(f"openapi.graph.run success execution_id={result['executionId']}")
-    return {"success": True, "data": result}
-
-
-@router.get("/{execution_id}/status")
-async def get_execution_status(
-    request: Request,
-    execution_id: uuid.UUID,
-    auth: AuthContext = Depends(get_current_user_or_token),
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Query execution status.
-
-    Return the current status (init / executing / finish / failed).
-    """
-    user = auth.user
-    log = _bind_log(request, user_id=str(user.id), execution_id=str(execution_id))
-    log.info("openapi.graph.status start")
-
-    service = OpenApiGraphService(db)
-    result = await service.get_status(execution_id, user.id)
-
-    _require_graph_execute(auth, uuid.UUID(result["graphId"]))
-
-    log.info(f"openapi.graph.status success status={result['status']}")
-    return {"success": True, "data": result}
-
-
-@router.post("/{execution_id}/abort")
-async def abort_execution(
-    request: Request,
-    execution_id: uuid.UUID,
-    auth: AuthContext = Depends(get_current_user_or_token),
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Abort execution.
-
-    Abort a running Graph execution.
-    """
-    user = auth.user
-    log = _bind_log(request, user_id=str(user.id), execution_id=str(execution_id))
-    log.info("openapi.graph.abort start")
-
-    service = OpenApiGraphService(db)
-    result = await service.abort_execution(execution_id, user.id)
-
-    _require_graph_execute(auth, uuid.UUID(result["graphId"]))
-
-    log.info(f"openapi.graph.abort success status={result['status']}")
-    return {"success": True, "data": result}
-
-
-@router.get("/{execution_id}/result")
-async def get_execution_result(
-    request: Request,
-    execution_id: uuid.UUID,
-    auth: AuthContext = Depends(get_current_user_or_token),
-    db: AsyncSession = Depends(get_db),
-):
-    """
-    Get execution result.
-
-    Retrieve the output of a Graph execution.
-    If execution is not yet complete, output is null.
-    """
-    user = auth.user
-    log = _bind_log(request, user_id=str(user.id), execution_id=str(execution_id))
-    log.info("openapi.graph.result start")
-
-    service = OpenApiGraphService(db)
-    result = await service.get_result(execution_id, user.id)
-
-    _require_graph_execute(auth, uuid.UUID(result["graphId"]))
-
-    log.info(f"openapi.graph.result success status={result['status']}")
-    return {"success": True, "data": result}
diff --git a/backend/app/api/v1/openclaw_chat.py b/backend/app/api/v1/openclaw_chat.py
index b6dc4242f..ff072b51a 100644
--- a/backend/app/api/v1/openclaw_chat.py
+++ b/backend/app/api/v1/openclaw_chat.py
@@ -17,6 +17,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.common.dependencies import get_current_user
+from app.common.stream_errors import stream_error_event
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.services.openclaw_instance_service import OpenClawInstanceService
@@ -89,7 +90,14 @@ async def _stream_sse(url: str, headers: dict, body: dict):
                     else:
                         yield "\n"
     except Exception as e:
-        yield f"data: {{'error': '{str(e)}'}}\n\n"
+        yield stream_error_event(
+            code="OPENCLAW_STREAM_ERROR",
+            message="OpenClaw stream failed.",
+            data={"detail": str(e)},
+            source="runtime",
+            retryable=True,
+            user_action="retry",
+        )
 
 
 @router.post("/tools/invoke")
diff --git a/backend/app/api/v1/openclaw_devices.py b/backend/app/api/v1/openclaw_devices.py
index e5910c2e1..b6c4d5fce 100644
--- a/backend/app/api/v1/openclaw_devices.py
+++ b/backend/app/api/v1/openclaw_devices.py
@@ -16,6 +16,7 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError, NotFoundError, ServiceUnavailableError
 from app.common.dependencies import get_current_user
 from app.core.agent.backends.docker_check import get_docker_client
 from app.core.database import get_db
@@ -42,10 +43,23 @@ async def _docker_exec(container_id: str, cmd: list[str]) -> str:
         exit_code, output = await asyncio.to_thread(container.exec_run, cmd=cmd)
         output_str = output.decode("utf-8") if isinstance(output, bytes) else str(output)
         if exit_code != 0:
-            raise RuntimeError(f"Command failed with exit code {exit_code}: {output_str.strip()}")
+            raise ServiceUnavailableError(
+                "OpenClaw device command failed",
+                code="OPENCLAW_DEVICE_COMMAND_FAILED",
+                data={
+                    "container_id": container_id,
+                    "command": cmd,
+                    "exit_code": exit_code,
+                    "detail": output_str.strip(),
+                },
+            )
         return output_str.strip()
     except docker.errors.NotFound:
-        raise RuntimeError(f"Container {container_id} not found")
+        raise NotFoundError(
+            "OpenClaw container not found",
+            code="OPENCLAW_CONTAINER_NOT_FOUND",
+            data={"container_id": container_id},
+        )
 
 
 @router.get("")
@@ -56,7 +70,7 @@ async def list_devices(
     """List devices paired with the user's OpenClaw instance."""
     instance = await _get_running_instance(db, str(current_user.id))
     if not instance:
-        return {"success": True, "data": []}
+        raise InvalidRequestError("No running instance", code="OPENCLAW_INSTANCE_NOT_RUNNING")
 
     try:
         output = await _docker_exec(instance.container_id, ["openclaw", "devices", "list", "--json"])
@@ -64,7 +78,7 @@ async def list_devices(
         return {"success": True, "data": devices}
     except Exception as e:
         logger.warning(f"Failed to list devices for user {current_user.id}: {e}")
-        return {"success": True, "data": [], "warning": str(e)}
+        raise ServiceUnavailableError(str(e), code="OPENCLAW_DEVICE_LIST_FAILED")
 
 
 @router.post("/{device_id}/approve")
@@ -76,13 +90,13 @@ async def approve_device(
     """Approve a specific device pairing request."""
     instance = await _get_running_instance(db, str(current_user.id))
     if not instance:
-        return {"success": False, "error": "No running instance"}
+        raise InvalidRequestError("No running instance", code="OPENCLAW_INSTANCE_NOT_RUNNING")
 
     try:
         await _docker_exec(instance.container_id, ["openclaw", "devices", "approve", device_id])
         return {"success": True}
     except Exception as e:
-        return {"success": False, "error": str(e)}
+        raise ServiceUnavailableError(str(e), code="OPENCLAW_DEVICE_APPROVE_FAILED")
 
 
 @router.post("/approve-all")
@@ -93,7 +107,7 @@ async def approve_all_devices(
     """Approve all pending device pairing requests."""
     instance = await _get_running_instance(db, str(current_user.id))
     if not instance:
-        return {"success": False, "error": "No running instance"}
+        raise InvalidRequestError("No running instance", code="OPENCLAW_INSTANCE_NOT_RUNNING")
 
     try:
         output = await _docker_exec(instance.container_id, ["openclaw", "devices", "list", "--json"])
@@ -105,4 +119,4 @@ async def approve_all_devices(
                 await _docker_exec(instance.container_id, ["openclaw", "devices", "approve", device_id])
         return {"success": True}
     except Exception as e:
-        return {"success": False, "error": str(e)}
+        raise ServiceUnavailableError(str(e), code="OPENCLAW_DEVICE_APPROVE_ALL_FAILED")
diff --git a/backend/app/api/v1/openclaw_instances.py b/backend/app/api/v1/openclaw_instances.py
index ae18a0698..1b1ab9fc1 100644
--- a/backend/app/api/v1/openclaw_instances.py
+++ b/backend/app/api/v1/openclaw_instances.py
@@ -12,6 +12,7 @@
 from pydantic import BaseModel, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError, NotFoundError, ServiceUnavailableError
 from app.common.dependencies import get_current_user
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
@@ -71,7 +72,7 @@ async def start_instance(
         instance = await service.ensure_instance_running(str(current_user.id))
         return {"success": True, "data": _serialize_instance(instance)}
     except RuntimeError as exc:
-        return {"success": False, "error": str(exc)}
+        raise ServiceUnavailableError(str(exc), code="OPENCLAW_INSTANCE_START_FAILED")
 
 
 @router.post("/stop")
@@ -83,7 +84,7 @@ async def stop_instance(
     service = OpenClawInstanceService(db)
     instance = await service.stop_instance(str(current_user.id))
     if not instance:
-        return {"success": False, "error": "No instance found"}
+        raise NotFoundError("No instance found", code="OPENCLAW_INSTANCE_NOT_FOUND")
     return {"success": True, "data": _serialize_instance(instance)}
 
 
@@ -98,7 +99,7 @@ async def restart_instance(
         instance = await service.restart_instance(str(current_user.id))
         return {"success": True, "data": _serialize_instance(instance)}
     except RuntimeError as exc:
-        return {"success": False, "error": str(exc)}
+        raise ServiceUnavailableError(str(exc), code="OPENCLAW_INSTANCE_RESTART_FAILED")
 
 
 @router.delete("")
@@ -110,7 +111,7 @@ async def delete_instance(
     service = OpenClawInstanceService(db)
     deleted = await service.delete_instance(str(current_user.id))
     if not deleted:
-        return {"success": False, "error": "No instance found"}
+        raise NotFoundError("No instance found", code="OPENCLAW_INSTANCE_NOT_FOUND")
     return {"success": True}
 
 
@@ -124,11 +125,11 @@ async def sync_skills(
     instance = await service.get_instance_by_user(str(current_user.id))
 
     if not instance or not instance.container_id or instance.status != InstanceStatus.RUNNING:
-        return {"success": False, "error": "Instance is not running"}
+        raise InvalidRequestError("Instance is not running", code="OPENCLAW_INSTANCE_NOT_RUNNING")
 
     synced_count = await service.sync_skills_to_container(str(current_user.id), instance.container_id)
 
     if synced_count < 0:
-        return {"success": False, "error": "Failed to sync skills"}
+        raise ServiceUnavailableError("Failed to sync skills", code="OPENCLAW_SKILL_SYNC_FAILED")
 
     return {"success": True, "data": {"syncedCount": synced_count}}
diff --git a/backend/app/api/v1/openclaw_proxy.py b/backend/app/api/v1/openclaw_proxy.py
index b2b36ca66..a3f1dcece 100644
--- a/backend/app/api/v1/openclaw_proxy.py
+++ b/backend/app/api/v1/openclaw_proxy.py
@@ -26,6 +26,7 @@
 from app.models.auth import AuthUser as User
 from app.models.enums import InstanceStatus
 from app.services.openclaw_instance_service import OpenClawInstanceService
+from app.utils.safe_task import safe_create_task
 
 router = APIRouter(prefix="/v1/openclaw/proxy", tags=["OpenClaw Proxy"])
 
@@ -134,7 +135,10 @@ async def proxy_to_openclaw(
 
     # Auto device pair: wait for the client to connect WebSocket and then approve
     if is_entry and instance.container_id:
-        asyncio.create_task(_poll_approve_devices(instance.container_id))
+        safe_create_task(
+            _poll_approve_devices(instance.container_id),
+            name=f"device-approve-{instance.container_id[:12]}",
+        )
 
     query_params = {k: v for k, v in parse_qs(request.url.query).items()}
     if is_entry:
diff --git a/backend/app/api/v1/runs.py b/backend/app/api/v1/runs.py
deleted file mode 100644
index 388f23cc2..000000000
--- a/backend/app/api/v1/runs.py
+++ /dev/null
@@ -1,290 +0,0 @@
-"""Runs API."""
-
-from __future__ import annotations
-
-import uuid
-
-from fastapi import APIRouter, Depends, Query
-from loguru import logger
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import CurrentUser
-from app.common.exceptions import BadRequestException
-from app.core.database import get_db
-from app.models.agent_run import AgentRun, AgentRunStatus
-from app.schemas import BaseResponse
-from app.schemas.runs import (
-    AgentDefinitionResponse,
-    AgentListResponse,
-    CreateRunRequest,
-    CreateRunResponse,
-    CreateSkillCreatorRunRequest,
-    RunEventResponse,
-    RunEventsPageResponse,
-    RunListResponse,
-    RunSnapshotResponse,
-    RunSummary,
-)
-from app.services.run_reducers import agent_registry
-from app.services.run_service import RunService
-from app.utils.task_manager import task_manager
-
-router = APIRouter(prefix="/v1/runs", tags=["Runs"])
-
-
-def _to_run_summary(run: AgentRun) -> RunSummary:
-    definition = agent_registry.find(run.agent_name)
-    return RunSummary(
-        run_id=run.id,
-        status=run.status.value if hasattr(run.status, "value") else str(run.status),
-        run_type=run.run_type,
-        agent_name=run.agent_name,
-        agent_display_name=definition.display_name if definition else run.agent_name,
-        source=run.source,
-        thread_id=run.thread_id,
-        graph_id=run.graph_id,
-        title=run.title,
-        started_at=run.started_at,
-        finished_at=run.finished_at,
-        last_seq=run.last_seq,
-        error_code=run.error_code,
-        error_message=run.error_message,
-        last_heartbeat_at=run.last_heartbeat_at,
-        updated_at=run.updated_at,
-    )
-
-
-@router.get("", response_model=BaseResponse[RunListResponse])
-async def list_runs(
-    current_user: CurrentUser,
-    run_type: str | None = Query(None),
-    agent_name: str | None = Query(None),
-    status: str | None = Query(None),
-    search: str | None = Query(None, max_length=200),
-    limit: int = Query(50, ge=1, le=200),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunListResponse]:
-    service = RunService(db)
-    runs = await service.list_recent_runs(
-        user_id=str(current_user.id),
-        run_type=run_type,
-        agent_name=agent_name,
-        status=status,
-        search=search,
-        limit=limit,
-    )
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="ok",
-        data=RunListResponse(items=[_to_run_summary(run) for run in runs]),
-    )
-
-
-@router.get("/agents", response_model=BaseResponse[AgentListResponse])
-async def list_agents(
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[AgentListResponse]:
-    service = RunService(db)
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="ok",
-        data=AgentListResponse(
-            items=[
-                AgentDefinitionResponse(agent_name=definition.agent_name, display_name=definition.display_name)
-                for definition in await service.list_agents()
-            ]
-        ),
-    )
-
-
-@router.get("/active", response_model=BaseResponse[RunSummary | None])
-async def get_active_run(
-    current_user: CurrentUser,
-    agent_name: str = Query(..., min_length=1),
-    graph_id: uuid.UUID | None = Query(None),
-    thread_id: str | None = Query(None),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunSummary | None]:
-    service = RunService(db)
-    run = await service.find_latest_active_run(
-        user_id=str(current_user.id),
-        agent_name=agent_name,
-        graph_id=graph_id,
-        thread_id=thread_id,
-    )
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="ok",
-        data=_to_run_summary(run) if run else None,
-    )
-
-
-@router.get("/active/skill-creator", response_model=BaseResponse[RunSummary | None])
-async def get_active_skill_creator_run(
-    current_user: CurrentUser,
-    graph_id: uuid.UUID,
-    thread_id: str | None = Query(None),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunSummary | None]:
-    return await get_active_run(
-        current_user=current_user,
-        agent_name="skill_creator",
-        graph_id=graph_id,
-        thread_id=thread_id,
-        db=db,
-    )
-
-
-@router.post("", response_model=BaseResponse[CreateRunResponse])
-async def create_run(
-    request: CreateRunRequest,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[CreateRunResponse]:
-    service = RunService(db)
-    try:
-        run = await service.create_run(
-            user_id=str(current_user.id),
-            agent_name=request.agent_name,
-            graph_id=request.graph_id,
-            thread_id=request.thread_id,
-            message=request.message,
-            input=request.input,
-        )
-    except ValueError as exc:
-        raise BadRequestException(str(exc))
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="Run created",
-        data=CreateRunResponse(
-            run_id=run.id,
-            thread_id=run.thread_id or "",
-            status=run.status.value if hasattr(run.status, "value") else str(run.status),
-        ),
-    )
-
-
-@router.post("/skill-creator", response_model=BaseResponse[CreateRunResponse])
-async def create_skill_creator_run(
-    request: CreateSkillCreatorRunRequest,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[CreateRunResponse]:
-    return await create_run(
-        request=CreateRunRequest(
-            agent_name="skill_creator",
-            graph_id=request.graph_id,
-            message=request.message,
-            thread_id=request.thread_id,
-            input={"edit_skill_id": request.edit_skill_id},
-        ),
-        current_user=current_user,
-        db=db,
-    )
-
-
-@router.get("/{run_id}", response_model=BaseResponse[RunSummary])
-async def get_run(
-    run_id: uuid.UUID,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunSummary]:
-    service = RunService(db)
-    run = await service.get_run(run_id, str(current_user.id))
-    if run is None:
-        return BaseResponse(success=False, code=404, msg="Run not found", data=None)
-    return BaseResponse(success=True, code=200, msg="ok", data=_to_run_summary(run))
-
-
-@router.get("/{run_id}/snapshot", response_model=BaseResponse[RunSnapshotResponse])
-async def get_run_snapshot(
-    run_id: uuid.UUID,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunSnapshotResponse]:
-    service = RunService(db)
-    snapshot = await service.get_snapshot(run_id, str(current_user.id))
-    if snapshot is None:
-        return BaseResponse(success=False, code=404, msg="Snapshot not found", data=None)
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="ok",
-        data=RunSnapshotResponse(
-            run_id=run_id,
-            status=snapshot.status,
-            last_seq=snapshot.last_seq,
-            projection=snapshot.projection or {},
-        ),
-    )
-
-
-@router.get("/{run_id}/events", response_model=BaseResponse[RunEventsPageResponse])
-async def get_run_events(
-    current_user: CurrentUser,
-    run_id: uuid.UUID,
-    after_seq: int = Query(0, ge=0),
-    limit: int = Query(500, ge=1, le=1000),
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunEventsPageResponse]:
-    service = RunService(db)
-    events = await service.list_events_after(run_id, str(current_user.id), after_seq=after_seq, limit=limit)
-    return BaseResponse(
-        success=True,
-        code=200,
-        msg="ok",
-        data=RunEventsPageResponse(
-            run_id=run_id,
-            events=[
-                RunEventResponse(
-                    seq=event.seq,
-                    event_type=event.event_type,
-                    payload=event.payload or {},
-                    trace_id=event.trace_id,
-                    observation_id=event.observation_id,
-                    parent_observation_id=event.parent_observation_id,
-                    created_at=event.created_at,
-                )
-                for event in events
-            ],
-            next_after_seq=events[-1].seq if events else after_seq,
-        ),
-    )
-
-
-@router.post("/{run_id}/cancel", response_model=BaseResponse[RunSummary])
-async def cancel_run(
-    run_id: uuid.UUID,
-    current_user: CurrentUser,
-    db: AsyncSession = Depends(get_db),
-) -> BaseResponse[RunSummary]:
-    service = RunService(db)
-    run = await service.get_run(run_id, str(current_user.id))
-    if run is None:
-        return BaseResponse(success=False, code=404, msg="Run not found", data=None)
-
-    if run.thread_id and run.status in {
-        AgentRunStatus.QUEUED,
-        AgentRunStatus.RUNNING,
-        AgentRunStatus.INTERRUPT_WAIT,
-    }:
-        try:
-            await task_manager.stop_task(run.thread_id)
-        except Exception:
-            logger.debug("Failed to stop task for thread_id=%s during run cancellation", run.thread_id, exc_info=True)
-
-    run = await service.mark_status(
-        run_id=run_id,
-        user_id=str(current_user.id),
-        status=AgentRunStatus.CANCELLED,
-        error_code="cancelled",
-        error_message="Cancelled by user",
-    )
-    if run is None:
-        return BaseResponse(success=False, code=404, msg="Run not found", data=None)
-    return BaseResponse(success=True, code=200, msg="Run cancelled", data=_to_run_summary(run))
diff --git a/backend/app/api/v1/sandboxes.py b/backend/app/api/v1/sandboxes.py
index 7cce489d2..f57308024 100644
--- a/backend/app/api/v1/sandboxes.py
+++ b/backend/app/api/v1/sandboxes.py
@@ -10,8 +10,8 @@
 from sqlalchemy import func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
 from app.common.response import success_response
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
@@ -31,9 +31,9 @@ async def _verify_sandbox_ownership(sandbox_id: str, current_user: User, db: Asy
     result = await db.execute(select(UserSandbox).where(UserSandbox.id == sandbox_id))
     sb = result.scalar_one_or_none()
     if not sb:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
     if sb.user_id != str(current_user.id):
-        raise ForbiddenException("Access denied")
+        raise AccessDeniedError("Access denied", code="SANDBOX_ACCESS_DENIED", data={"sandbox_id": sandbox_id})
 
 
 # Schemas
@@ -156,7 +156,7 @@ async def get_sandbox(
     sb = result.scalar_one_or_none()
 
     if not sb:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
 
     return SandboxResponse(
         id=sb.id,
@@ -190,14 +190,18 @@ async def update_sandbox(
     if body.image is not None:
         s = body.image.strip()
         if not s:
-            raise BadRequestException("image cannot be empty")
+            raise InvalidRequestError("image cannot be empty", code="SANDBOX_IMAGE_EMPTY")
         if len(s) > 255:
-            raise BadRequestException("image must be at most 255 characters")
+            raise InvalidRequestError(
+                "image must be at most 255 characters",
+                code="SANDBOX_IMAGE_TOO_LONG",
+                data={"max_length": 255},
+            )
         image_value = s
     service = SandboxManagerService(db)
     success = await service.update_sandbox_config(sandbox_id, image=image_value)
     if not success:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
     return success_response(message="Sandbox config updated")
 
 
@@ -212,7 +216,11 @@ async def stop_sandbox(
     service = SandboxManagerService(db)
     success = await service.stop_sandbox(sandbox_id)
     if not success:
-        raise NotFoundException("Sandbox not found or already stopped")
+        raise NotFoundError(
+            "Sandbox not found or already stopped",
+            code="SANDBOX_STOP_TARGET_NOT_FOUND",
+            data={"sandbox_id": sandbox_id},
+        )
 
     return success_response(message="Sandbox stopped successfully")
 
@@ -228,7 +236,7 @@ async def restart_sandbox(
     service = SandboxManagerService(db)
     success = await service.restart_sandbox(sandbox_id)
     if not success:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
 
     return success_response(message="Sandbox scheduled for restart")
 
@@ -244,7 +252,7 @@ async def rebuild_sandbox(
     service = SandboxManagerService(db)
     success = await service.rebuild_sandbox(sandbox_id)
     if not success:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
     return success_response(message="Sandbox rebuilt successfully")
 
 
@@ -259,6 +267,6 @@ async def delete_sandbox(
     service = SandboxManagerService(db)
     success = await service.delete_sandbox(sandbox_id)
     if not success:
-        raise NotFoundException("Sandbox not found")
+        raise NotFoundError("Sandbox not found", code="SANDBOX_NOT_FOUND", data={"sandbox_id": sandbox_id})
 
     return success_response(message="Sandbox deleted successfully")
diff --git a/backend/app/api/v1/sessions.py b/backend/app/api/v1/sessions.py
deleted file mode 100644
index 7e056d574..000000000
--- a/backend/app/api/v1/sessions.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""
-Module: Sessions API (based on SessionService)
-
-Overview:
-- Provides session CRUD (create, list, get, update title, delete)
-- Provides listing messages for a specific session
-- Managed via SessionService
-
-Routes:
-- POST /sessions/new_session: Create a session
-- GET /sessions: List sessions for the current user
-- GET /sessions/{session_id}: Get a specific session
-- PATCH /sessions/{session_id}: Update session title
-- DELETE /sessions/{session_id}: Delete a session
-- GET /sessions/{session_id}/messages: Get messages for a session
-
-Dependencies:
-- Session service: SessionService (Depends(get_session_service))
-- Database session: Session (Depends(get_db))
-
-Requests/Responses:
-- Request model: SessionCreate
-- Response models: SessionResponse, MessageResponse
-- Unified errors: HTTPException
-
-Error codes:
-- 404: Session not found
-- 400: Invalid parameters or business rule failure
-"""
-
-from typing import List
-
-from fastapi import APIRouter, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import CurrentUser
-from app.common.exceptions import AppException, InternalServerException, NotFoundException
-from app.core.database import get_db
-from app.schemas.common import SessionCreate, SessionMessageResponse, SessionResponse
-from app.services.session_service import SessionService
-
-router = APIRouter()
-
-# --- Session endpoints (based on SessionService) ---
-# ----- Create -----
-# ----- Read -----
-# ----- Update -----
-# ----- Delete -----
-# ----- Messages -----
-
-
-def get_session_service(db: AsyncSession = Depends(get_db)) -> SessionService:
-    return SessionService(db)
-
-
-@router.post("/new_session", response_model=SessionResponse)
-async def create_session(
-    session_data: SessionCreate,
-    current_user: CurrentUser,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Create a new session."""
-    try:
-        return await session_service.create_session(session_data, user_id=current_user.id)
-    except AppException:
-        raise
-    except Exception as e:
-        raise InternalServerException("Failed to create session") from e
-
-
-@router.get("/", response_model=List[SessionResponse])
-async def get_sessions(
-    current_user: CurrentUser,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Get all sessions for the current user."""
-    try:
-        return await session_service.get_user_sessions(user_id=current_user.id)
-    except AppException:
-        raise
-    except Exception as e:
-        raise InternalServerException("Failed to get sessions") from e
-
-
-@router.get("/{session_id}", response_model=SessionResponse)
-async def get_session(
-    session_id: str,
-    current_user: CurrentUser,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Get a specific session."""
-    session = await session_service.get_session_for_user(session_id, user_id=current_user.id)
-    if not session:
-        raise NotFoundException("Session not found")
-    return session
-
-
-@router.patch("/{session_id}", response_model=SessionResponse)
-async def update_session_title(
-    session_id: str,
-    title: str,
-    current_user: CurrentUser,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Update session title."""
-    try:
-        updated_session = await session_service.update_session_title(session_id, title, user_id=current_user.id)
-        if not updated_session:
-            raise NotFoundException("Session not found")
-        return updated_session
-    except AppException:
-        raise
-    except Exception as e:
-        raise InternalServerException("Failed to update session title") from e
-
-
-@router.delete("/{session_id}")
-async def delete_session(
-    session_id: str,
-    current_user: CurrentUser,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Delete a session."""
-    try:
-        success = await session_service.delete_session(session_id, user_id=current_user.id)
-        if not success:
-            raise NotFoundException("Session not found")
-        return {"success": True, "message": "Session deleted successfully"}
-    except AppException:
-        raise
-    except Exception as e:
-        raise InternalServerException("Failed to delete session") from e
-
-
-@router.get("/{session_id}/messages", response_model=List[SessionMessageResponse])
-async def get_session_messages(
-    session_id: str,
-    current_user: CurrentUser,
-    limit: int = 100,
-    session_service: SessionService = Depends(get_session_service),
-):
-    """Get messages for a session."""
-    try:
-        messages = await session_service.get_session_messages(session_id, limit, user_id=current_user.id)
-        return [
-            SessionMessageResponse(
-                id=msg.id,
-                session_id=msg.thread_id,
-                content=msg.content,
-                role=msg.role,
-                metadata=msg.meta_data,
-                created_at=msg.created_at,
-            )
-            for msg in messages
-        ]
-    except AppException:
-        raise
-    except Exception as e:
-        raise InternalServerException("Failed to get session messages") from e
diff --git a/backend/app/api/v1/skill_collaborators.py b/backend/app/api/v1/skill_collaborators.py
index c0946a176..1b84368a2 100644
--- a/backend/app/api/v1/skill_collaborators.py
+++ b/backend/app/api/v1/skill_collaborators.py
@@ -7,8 +7,8 @@
 from fastapi import APIRouter, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import NotFoundError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import NotFoundException
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.schemas.skill_collaborator import (
@@ -75,11 +75,15 @@ async def add_collaborator(
         user_service = UserService(db)
         user = await user_service.get_user_by_email(payload.email.strip())
         if not user:
-            raise NotFoundException("User not found")
+            raise NotFoundError(
+                "User not found",
+                code="USER_NOT_FOUND",
+                data={"email": payload.email.strip()},
+            )
         target_user_id = user.id
 
     if not target_user_id:
-        raise NotFoundException("User not found")
+        raise NotFoundError("User not found", code="USER_NOT_FOUND")
 
     service = SkillCollaboratorService(db)
     collaborator = await service.add_collaborator(
diff --git a/backend/app/api/v1/skills.py b/backend/app/api/v1/skills.py
index 4d23dd4b5..f12ded802 100644
--- a/backend/app/api/v1/skills.py
+++ b/backend/app/api/v1/skills.py
@@ -25,15 +25,23 @@
 )
 from app.services.openclaw_instance_service import OpenClawInstanceService
 from app.services.skill_service import SkillService
+from app.utils.safe_task import safe_create_task
 
 
-async def _trigger_openclaw_skill_sync(user_id: str, db: AsyncSession):
-    """Trigger a sync of skills to the user's OpenClaw container if it is running."""
+async def _trigger_openclaw_skill_sync(user_id: str):
+    """Trigger a sync of skills to the user's OpenClaw container if it is running.
+
+    Uses its own DB session since this runs as a background task after the
+    request-scoped session is closed.
+    """
+    from app.core.database import AsyncSessionLocal
+
     try:
-        instance_service = OpenClawInstanceService(db)
-        instance = await instance_service.get_instance_by_user(user_id)
-        if instance and instance.container_id and instance.status == InstanceStatus.RUNNING:
-            await instance_service.sync_skills_to_container(user_id, instance.container_id)
+        async with AsyncSessionLocal() as db:
+            instance_service = OpenClawInstanceService(db)
+            instance = await instance_service.get_instance_by_user(user_id)
+            if instance and instance.container_id and instance.status == InstanceStatus.RUNNING:
+                await instance_service.sync_skills_to_container(user_id, instance.container_id)
     except Exception as e:
         logger.error(f"Failed to trigger openclaw skill sync for user {user_id}: {e}", exc_info=True)
 
@@ -94,9 +102,7 @@ async def create_skill(
     skill = await service.get_skill(skill.id, current_user.id)
 
     # Trigger sync to OpenClaw container
-    import asyncio
-
-    asyncio.create_task(_trigger_openclaw_skill_sync(current_user.id, db))
+    safe_create_task(_trigger_openclaw_skill_sync(current_user.id))
 
     return {
         "success": True,
@@ -154,9 +160,7 @@ async def update_skill(
     skill = await service.get_skill(skill.id, current_user.id)
 
     # Trigger sync to OpenClaw container
-    import asyncio
-
-    asyncio.create_task(_trigger_openclaw_skill_sync(current_user.id, db))
+    safe_create_task(_trigger_openclaw_skill_sync(current_user.id))
 
     return {
         "success": True,
@@ -174,12 +178,12 @@ async def delete_skill(
     service = SkillService(db)
 
     # get the skill name before deletion
-    from app.common.exceptions import NotFoundException
+    from app.common.app_errors import NotFoundError
 
     try:
         skill = await service.get_skill(skill_id, current_user.id)
         skill_name = skill.name
-    except NotFoundException:
+    except NotFoundError:
         skill_name = None
 
     await service.delete_skill(skill_id, current_user.id)
@@ -187,25 +191,22 @@ async def delete_skill(
     if skill_name:
         # Trigger incremental sync to OpenClaw container
         async def _delete_from_container():
+            from app.core.database import AsyncSessionLocal
+
             try:
-                from app.services.openclaw_instance_service import OpenClawInstanceService
-
-                instance_service = OpenClawInstanceService(db)
-                instance = await instance_service.get_instance_by_user(current_user.id)
-                if instance and instance.container_id and instance.status == InstanceStatus.RUNNING:
-                    await instance_service.delete_skill_from_container(
-                        current_user.id, instance.container_id, skill_name
-                    )
+                async with AsyncSessionLocal() as bg_db:
+                    instance_service = OpenClawInstanceService(bg_db)
+                    instance = await instance_service.get_instance_by_user(current_user.id)
+                    if instance and instance.container_id and instance.status == InstanceStatus.RUNNING:
+                        await instance_service.delete_skill_from_container(
+                            current_user.id, instance.container_id, skill_name
+                        )
             except Exception as e:
-                from loguru import logger
-
                 logger.error(
                     f"Failed to delete skill {skill_name} from container for user {current_user.id}: {e}", exc_info=True
                 )
 
-        import asyncio
-
-        asyncio.create_task(_delete_from_container())
+        safe_create_task(_delete_from_container())
 
     return {"success": True}
 
@@ -232,9 +233,7 @@ async def add_file(
     )
 
     # Trigger sync to OpenClaw container
-    import asyncio
-
-    asyncio.create_task(_trigger_openclaw_skill_sync(current_user.id, db))
+    safe_create_task(_trigger_openclaw_skill_sync(current_user.id))
 
     return {
         "success": True,
@@ -253,9 +252,7 @@ async def delete_file(
     await service.delete_file(file_id, current_user.id)
 
     # Trigger sync to OpenClaw container
-    import asyncio
-
-    asyncio.create_task(_trigger_openclaw_skill_sync(current_user.id, db))
+    safe_create_task(_trigger_openclaw_skill_sync(current_user.id))
 
     return {"success": True}
 
@@ -278,9 +275,7 @@ async def update_file(
     )
 
     # Trigger sync to OpenClaw container
-    import asyncio
-
-    asyncio.create_task(_trigger_openclaw_skill_sync(current_user.id, db))
+    safe_create_task(_trigger_openclaw_skill_sync(current_user.id))
 
     return {
         "success": True,
diff --git a/backend/app/api/v1/task_activities.py b/backend/app/api/v1/task_activities.py
new file mode 100644
index 000000000..dacd021ec
--- /dev/null
+++ b/backend/app/api/v1/task_activities.py
@@ -0,0 +1,167 @@
+"""Task Activities API."""
+
+from __future__ import annotations
+
+import uuid
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError
+from app.common.dependencies import require_workspace_role
+from app.core.database import get_db
+from app.models.auth import AuthUser as User
+from app.models.task_activity import ActivityAuthorType, ActivityType
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.task_activity import (
+    CreateTaskActivityRequest,
+    TaskActivityListResponse,
+    TaskActivityResponse,
+    UpdateTaskActivityRequest,
+)
+from app.services.task_activity_service import TaskActivityService
+from app.websocket.notification_manager import NotificationType, notification_manager
+
+router = APIRouter(prefix="/v1/tasks/{task_id}/activities", tags=["Task Activities"])
+
+
+@router.get("", response_model=BaseResponse[TaskActivityListResponse])
+async def list_activities(
+    task_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    cursor: str | None = Query(None),
+    limit: int = Query(50, ge=1, le=200),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskActivityListResponse]:
+    service = TaskActivityService(db)
+    activities, has_more, next_cursor = await service.list_activities(
+        task_id=task_id,
+        workspace_id=workspace_id,
+        cursor=cursor,
+        limit=limit,
+    )
+
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=TaskActivityListResponse(
+            items=[TaskActivityResponse.model_validate(a) for a in activities],
+            has_more=has_more,
+            next_cursor=next_cursor,
+        ),
+    )
+
+
+@router.post("", response_model=BaseResponse[TaskActivityResponse])
+async def create_activity(
+    task_id: uuid.UUID,
+    request: CreateTaskActivityRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskActivityResponse]:
+    service = TaskActivityService(db)
+    activity, task, should_dispatch, mentioned_agent_ids = await service.create_activity(
+        task_id=task_id,
+        workspace_id=workspace_id,
+        author_type=ActivityAuthorType.MEMBER,
+        author_id=str(current_user.id),
+        content=request.content,
+        activity_type=ActivityType.COMMENT,
+        parent_activity_id=request.parent_activity_id,
+    )
+
+    # Trigger executions via orchestrator
+    if should_dispatch or mentioned_agent_ids:
+        from app.services.dispatch_service import DispatchService
+
+        dispatch = DispatchService(db)
+        if should_dispatch:
+            await dispatch.dispatch_task(
+                task_id=task.id,
+                user_id=str(current_user.id),
+                prompt_override=activity.content,
+            )
+        if mentioned_agent_ids:
+            # For mentioned agents, dispatch the same task
+            await dispatch.dispatch_task(
+                task_id=task.id,
+                user_id=str(current_user.id),
+            )
+
+    # Push notification to task creator (if not the commenter)
+    if task.creator_id != str(current_user.id):
+        await notification_manager.send_to_user(
+            task.creator_id,
+            {
+                "type": NotificationType.TASK_ACTIVITY_ADDED.value,
+                "task_id": str(task_id),
+                "activity_id": str(activity.id),
+                "author_type": activity.author_type.value,
+                "author_id": activity.author_id,
+            },
+        )
+
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Activity created",
+        data=TaskActivityResponse.model_validate(activity),
+    )
+
+
+@router.patch("/{activity_id}", response_model=BaseResponse[TaskActivityResponse])
+async def update_activity(
+    task_id: uuid.UUID,
+    activity_id: uuid.UUID,
+    request: UpdateTaskActivityRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskActivityResponse]:
+    service = TaskActivityService(db)
+    activity = await service.update_activity(
+        activity_id=activity_id,
+        task_id=task_id,
+        workspace_id=workspace_id,
+        author_id=str(current_user.id),
+        content=request.content,
+    )
+
+    if not activity:
+        raise NotFoundError(
+            "Activity not found", code="TASK_ACTIVITY_NOT_FOUND", data={"activity_id": str(activity_id)}
+        )
+
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Activity updated",
+        data=TaskActivityResponse.model_validate(activity),
+    )
+
+
+@router.delete("/{activity_id}", response_model=BaseResponse[None])
+async def delete_activity(
+    task_id: uuid.UUID,
+    activity_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[None]:
+    service = TaskActivityService(db)
+    deleted = await service.delete_activity(
+        activity_id=activity_id,
+        task_id=task_id,
+        workspace_id=workspace_id,
+        author_id=str(current_user.id),
+    )
+
+    if not deleted:
+        raise NotFoundError(
+            "Activity not found", code="TASK_ACTIVITY_NOT_FOUND", data={"activity_id": str(activity_id)}
+        )
+    return BaseResponse(success=True, code=200, msg="Activity deleted", data=None)
diff --git a/backend/app/api/v1/tasks.py b/backend/app/api/v1/tasks.py
new file mode 100644
index 000000000..1fb51a336
--- /dev/null
+++ b/backend/app/api/v1/tasks.py
@@ -0,0 +1,245 @@
+"""Tasks API."""
+
+from __future__ import annotations
+
+import uuid
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
+from app.common.dependencies import CurrentUser, require_workspace_role
+from app.core.database import get_db
+from app.models.auth import AuthUser as User
+from app.models.task import Task, TaskPriority
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.task import (
+    AssignTaskRequest,
+    CreateTaskRequest,
+    DispatchTaskRequest,
+    TaskListResponse,
+    TaskSummary,
+    UpdateTaskRequest,
+)
+from app.services.task_service import TaskService
+from app.services.workspace_permission import check_workspace_access
+
+router = APIRouter(prefix="/v1/tasks", tags=["Tasks"])
+
+
+def _to_summary(t: Task) -> TaskSummary:
+    return TaskSummary(
+        id=t.id,
+        workspace_id=t.workspace_id,
+        title=t.title,
+        description=t.description,
+        goal=t.goal,
+        status=t.status.value if hasattr(t.status, "value") else str(t.status),
+        priority=t.priority.value if hasattr(t.priority, "value") else str(t.priority),
+        agent_id=t.agent_id,
+        creator_id=t.creator_id,
+        latest_run_id=t.latest_run_id,
+        parent_task_id=t.parent_task_id,
+        tags=t.tags,
+        position=t.position,
+        auto_approve=t.auto_approve,
+        due_date=t.due_date,
+        created_at=t.created_at,
+        updated_at=t.updated_at,
+    )
+
+
+@router.get("", response_model=BaseResponse[TaskListResponse])
+async def list_tasks(
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    status: str | None = Query(None),
+    parent_task_id: uuid.UUID | None = Query(None),
+    agent_id: uuid.UUID | None = Query(None),
+    limit: int = Query(50, ge=1, le=200),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskListResponse]:
+    service = TaskService(db)
+    tasks = await service.list_tasks(
+        workspace_id=workspace_id,
+        status=status,
+        parent_task_id=parent_task_id,
+        agent_id=agent_id,
+        limit=limit,
+    )
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=TaskListResponse(items=[_to_summary(t) for t in tasks]),
+    )
+
+
+@router.post("", response_model=BaseResponse[TaskSummary])
+async def create_task(
+    request: CreateTaskRequest,
+    current_user: CurrentUser,
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    service = TaskService(db)
+
+    try:
+        priority = TaskPriority(request.priority)
+    except ValueError:
+        raise InvalidRequestError(
+            f"Invalid priority: {request.priority}",
+            code="TASK_PRIORITY_INVALID",
+            data={"priority": request.priority},
+        )
+
+    has_access = await check_workspace_access(db, request.workspace_id, current_user, WorkspaceMemberRole.member)
+    if not has_access:
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
+
+    task = await service.create_task(
+        workspace_id=request.workspace_id,
+        creator_id=str(current_user.id),
+        title=request.title,
+        description=request.description,
+        goal=request.goal,
+        priority=priority,
+        agent_id=request.agent_id,
+        parent_task_id=request.parent_task_id,
+        tags=request.tags,
+        position=request.position,
+        auto_approve=request.auto_approve,
+    )
+    return BaseResponse(success=True, code=200, msg="Task created", data=_to_summary(task))
+
+
+@router.get("/meta/transitions", response_model=BaseResponse)
+async def get_transitions(
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+) -> BaseResponse:
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=TaskService.get_transitions(),
+    )
+
+
+@router.get("/{task_id}", response_model=BaseResponse[TaskSummary])
+async def get_task(
+    task_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    service = TaskService(db)
+    task = await service.get_task(task_id, workspace_id)
+    if not task:
+        raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+    return BaseResponse(success=True, code=200, msg="ok", data=_to_summary(task))
+
+
+@router.patch("/{task_id}", response_model=BaseResponse[TaskSummary])
+async def update_task(
+    task_id: uuid.UUID,
+    request: UpdateTaskRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    service = TaskService(db)
+    updates = request.model_dump(exclude_unset=True)
+    task = await service.update_task(task_id, workspace_id, **updates)
+    if not task:
+        raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+    return BaseResponse(success=True, code=200, msg="Task updated", data=_to_summary(task))
+
+
+@router.post("/{task_id}/assign", response_model=BaseResponse[TaskSummary])
+async def assign_task(
+    task_id: uuid.UUID,
+    request: AssignTaskRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    service = TaskService(db)
+    task = await service.assign_to_agent(
+        task_id=task_id,
+        workspace_id=workspace_id,
+        agent_id=request.agent_id,
+    )
+    return BaseResponse(success=True, code=200, msg="Task assigned", data=_to_summary(task))
+
+
+@router.post("/{task_id}/dispatch", response_model=BaseResponse[TaskSummary])
+async def dispatch_task(
+    task_id: uuid.UUID,
+    request: DispatchTaskRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    from app.services.dispatch_service import DispatchService
+
+    dispatch = DispatchService(db)
+    await dispatch.dispatch_task(
+        task_id=task_id,
+        user_id=str(current_user.id),
+    )
+    service = TaskService(db)
+    task = await service.get_task(task_id, workspace_id)
+    if task is None:
+        raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+    return BaseResponse(success=True, code=200, msg="Task dispatched", data=_to_summary(task))
+
+
+@router.post("/{task_id}/cancel", response_model=BaseResponse[TaskSummary])
+async def cancel_task(
+    task_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[TaskSummary]:
+    from app.services.dispatch_service import DispatchService
+
+    # Find the latest run for this task and cancel it
+    service = TaskService(db)
+    task = await service.get_task(task_id, workspace_id)
+    if not task:
+        raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+
+    if task.latest_run_id:
+        # Cancel the run through the orchestrator, which will auto-sync task status
+        dispatch = DispatchService(db)
+        try:
+            await dispatch.cancel_run(task.latest_run_id)
+        except Exception:
+            pass  # Run may already be in a terminal state
+    else:
+        # No active run — safe to transition status directly via service
+        await service.cancel_task(task)
+
+    await db.refresh(task)
+    return BaseResponse(success=True, code=200, msg="Task cancelled", data=_to_summary(task))
+
+
+@router.get("/{task_id}/runs")
+async def list_task_runs(
+    task_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse:
+    from app.schemas.agent_run import AgentRunResponse
+    from app.services.agent_run_service import AgentRunService
+
+    service = AgentRunService(db)
+    runs = await service.list_runs(workspace_id=workspace_id, task_id=task_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[AgentRunResponse.model_validate(r) for r in runs],
+    )
diff --git a/backend/app/api/v1/threads.py b/backend/app/api/v1/threads.py
new file mode 100644
index 000000000..ca11dc000
--- /dev/null
+++ b/backend/app/api/v1/threads.py
@@ -0,0 +1,244 @@
+"""Threads API."""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AccessDeniedError, InvalidRequestError
+from app.common.dependencies import CurrentUser, require_workspace_role
+from app.core.database import get_db
+from app.models.agent_run import AgentRun
+from app.models.auth import AuthUser as User
+from app.models.execution import Artifact, Execution
+from app.models.workspace import WorkspaceMemberRole
+from app.schemas import BaseResponse
+from app.schemas.artifact import ArtifactResponse
+from app.schemas.thread import (
+    ChatRequest,
+    ChatResponse,
+    CreateThreadRequest,
+    ThreadEventResponse,
+    ThreadEventsListResponse,
+    ThreadResponse,
+    ThreadSummary,
+    UpdateThreadRequest,
+)
+from app.services.dispatch_service import DispatchService
+from app.services.thread_service import ThreadService
+from app.services.workspace_permission import check_workspace_access
+
+router = APIRouter(prefix="/v1/threads", tags=["Threads"])
+
+
+# ---------------------------------------------------------------------------
+# Thread routes
+# ---------------------------------------------------------------------------
+
+
+@router.get("", response_model=BaseResponse[List[ThreadSummary]])
+async def list_threads(
+    agent_id: uuid.UUID = Query(...),
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[ThreadSummary]]:
+    service = ThreadService(db)
+    threads = await service.list_threads(agent_id)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[ThreadSummary.model_validate(t) for t in threads],
+    )
+
+
+@router.post("", response_model=BaseResponse[ThreadResponse])
+async def create_thread(
+    request: CreateThreadRequest,
+    current_user: CurrentUser,
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ThreadResponse]:
+    has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
+    if not has_access:
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
+
+    service = ThreadService(db)
+    thread = await service.create_thread(workspace_id, str(current_user.id), request)
+    return BaseResponse(success=True, code=200, msg="Thread created", data=ThreadResponse.model_validate(thread))
+
+
+@router.get("/{thread_id}", response_model=BaseResponse[ThreadResponse])
+async def get_thread(
+    thread_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ThreadResponse]:
+    service = ThreadService(db)
+    thread = await service.get_thread(thread_id)
+    return BaseResponse(success=True, code=200, msg="ok", data=ThreadResponse.model_validate(thread))
+
+
+@router.patch("/{thread_id}", response_model=BaseResponse[ThreadResponse])
+async def update_thread(
+    thread_id: uuid.UUID,
+    request: UpdateThreadRequest,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ThreadResponse]:
+    service = ThreadService(db)
+    thread = await service.update_thread(thread_id, request)
+    return BaseResponse(success=True, code=200, msg="Thread updated", data=ThreadResponse.model_validate(thread))
+
+
+@router.delete("/{thread_id}", response_model=BaseResponse[ThreadResponse])
+async def archive_thread(
+    thread_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ThreadResponse]:
+    service = ThreadService(db)
+    thread = await service.archive_thread(thread_id)
+    return BaseResponse(success=True, code=200, msg="Thread archived", data=ThreadResponse.model_validate(thread))
+
+
+# ---------------------------------------------------------------------------
+# Chat: send message + dispatch agent run (single call)
+# ---------------------------------------------------------------------------
+
+
+@router.post("/{thread_id}/chat", response_model=BaseResponse[ChatResponse])
+async def chat(
+    thread_id: uuid.UUID,
+    request: ChatRequest,
+    current_user: CurrentUser,
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ChatResponse]:
+    """Send a user message and dispatch an agent run in one call.
+
+    The user message flows through the event bus as a `user_message` event.
+    ExecutionEvent is the single source of truth.
+    """
+    has_access = await check_workspace_access(
+        db,
+        workspace_id,
+        current_user,
+        WorkspaceMemberRole.member,
+    )
+    if not has_access:
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
+
+    active_run = (
+        await db.execute(
+            select(AgentRun).where(
+                AgentRun.thread_id == thread_id,
+                AgentRun.status.in_(["pending", "running"]),
+            )
+        )
+    ).scalar_one_or_none()
+    if active_run:
+        raise InvalidRequestError(
+            "Thread has an active run, please wait for it to complete",
+            code="THREAD_ACTIVE_RUN_EXISTS",
+            data={"thread_id": str(thread_id)},
+        )
+
+    # 1. Create run + execution first (so we have execution_id for the event)
+    dispatch = DispatchService(db)
+    run = await dispatch.dispatch_chat(
+        thread_id=thread_id,
+        message=request.message,
+        user_id=str(current_user.id),
+    )
+
+    # 2. Emit user_message as the first event in this execution.
+    attachments = [att.model_dump() for att in request.attachments] if request.attachments else None
+    # dispatch_chat always creates an execution
+    assert run.current_execution_id is not None
+    await dispatch.emit_user_message(
+        run=run,
+        execution_id=run.current_execution_id,
+        message=request.message,
+        attachments=attachments,
+    )
+
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="Chat dispatched",
+        data=ChatResponse(
+            run_id=run.id,
+            execution_id=run.current_execution_id,
+        ),
+    )
+
+
+# ---------------------------------------------------------------------------
+# Thread artifacts: aggregate across all runs/executions
+# ---------------------------------------------------------------------------
+
+
+@router.get("/{thread_id}/artifacts", response_model=BaseResponse[List[ArtifactResponse]])
+async def list_thread_artifacts(
+    thread_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[List[ArtifactResponse]]:
+    """List all artifacts produced by runs in this thread."""
+    artifacts = (
+        (
+            await db.execute(
+                select(Artifact)
+                .join(Execution, Artifact.execution_id == Execution.id)
+                .join(AgentRun, Execution.run_id == AgentRun.id)
+                .where(AgentRun.thread_id == thread_id)
+                .order_by(Artifact.created_at.desc())
+            )
+        )
+        .scalars()
+        .all()
+    )
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=[ArtifactResponse.model_validate(a) for a in artifacts],
+    )
+
+
+# ---------------------------------------------------------------------------
+# Thread events: aggregate execution events across all runs
+# ---------------------------------------------------------------------------
+
+
+@router.get("/{thread_id}/events", response_model=BaseResponse[ThreadEventsListResponse])
+async def list_thread_events(
+    thread_id: uuid.UUID,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(...),
+    after: uuid.UUID | None = Query(None, description="Cursor: event ID to paginate after"),
+    limit: int = Query(200, ge=1, le=500),
+    db: AsyncSession = Depends(get_db),
+) -> BaseResponse[ThreadEventsListResponse]:
+    """List aggregated execution events across all runs in this thread."""
+    service = ThreadService(db)
+    events, total = await service.list_thread_events(thread_id, after_id=after, limit=limit)
+    return BaseResponse(
+        success=True,
+        code=200,
+        msg="ok",
+        data=ThreadEventsListResponse(
+            events=[ThreadEventResponse(**e) for e in events],
+            total=total,
+        ),
+    )
diff --git a/backend/app/api/v1/tokens.py b/backend/app/api/v1/tokens.py
index 6a2d2757d..a4509a92d 100644
--- a/backend/app/api/v1/tokens.py
+++ b/backend/app/api/v1/tokens.py
@@ -11,8 +11,8 @@
 from fastapi import APIRouter, Depends, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import BadRequestException
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.schemas.platform_token import (
@@ -68,7 +68,11 @@ async def list_tokens(
     parsed_resource_id = None
     if resource_id is not None:
         if not is_valid_uuid(resource_id):
-            raise BadRequestException("Invalid resource_id: must be a valid UUID")
+            raise InvalidRequestError(
+                "Invalid resource_id: must be a valid UUID",
+                code="TOKEN_RESOURCE_ID_INVALID",
+                data={"resource_id": resource_id},
+            )
         parsed_resource_id = uuid.UUID(resource_id)
 
     service = PlatformTokenService(db)
diff --git a/backend/app/api/v1/tools.py b/backend/app/api/v1/tools.py
index 2c63f0874..64a56cddc 100644
--- a/backend/app/api/v1/tools.py
+++ b/backend/app/api/v1/tools.py
@@ -9,6 +9,7 @@
 from fastapi import APIRouter, Depends, Query
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import NotFoundError
 from app.common.dependencies import get_current_user
 from app.common.response import success_response
 from app.core.database import get_db
@@ -97,7 +98,7 @@ async def get_tool(
     tool = service.get_tool_by_key(tool_id)
 
     if not tool:
-        return success_response(data=None, message="Tool not found")
+        raise NotFoundError("Tool not found", code="TOOL_NOT_FOUND", data={"tool_id": tool_id})
 
     return success_response(
         data=tool.to_response(),
diff --git a/backend/app/api/v1/traces.py b/backend/app/api/v1/traces.py
index e12ad1cb9..ddff7dc49 100644
--- a/backend/app/api/v1/traces.py
+++ b/backend/app/api/v1/traces.py
@@ -1,282 +1,180 @@
 """
 Traces API (path: /api/v1/traces)
 
-Query historical execution trace data. Supports trace listing, single trace detail, and observation listing.
+Query historical execution trace data. Supports trace listing, single trace
+detail, and observation listing.
 """
 
+from __future__ import annotations
+
 import uuid
-from datetime import datetime
 from typing import Any, Optional
 
-from fastapi import APIRouter, Depends, Query, Request
-from loguru import logger
-from pydantic import BaseModel
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.dependencies import CurrentUser
-from app.common.exceptions import ForbiddenException
+from app.common.app_errors import AccessDeniedError, NotFoundError
+from app.common.dependencies import CurrentUser, require_workspace_role
 from app.core.database import get_db
+from app.core.observation.model import Observation, Trace
+from app.models.auth import AuthUser as User
+from app.models.workspace import WorkspaceMemberRole
 from app.schemas import BaseResponse
-from app.services.trace_service import TraceService
+from app.services.workspace_permission import check_workspace_access
 
 router = APIRouter(prefix="/v1/traces", tags=["Traces"])
 
 
-def _bind_log(request: Request, **kwargs):
-    trace_id = getattr(request.state, "trace_id", "-")
-    return logger.bind(trace_id=trace_id, **kwargs)
-
-
 # ==================== Response Schemas ====================
 
 
-class ObservationSchema(BaseModel):
-    """Observation response schema."""
-
-    id: str
-    trace_id: str
-    parent_observation_id: Optional[str] = None
-    type: str
-    name: Optional[str] = None
-    level: str = "DEFAULT"
-    status: str = "RUNNING"
-    status_message: Optional[str] = None
-    start_time: Optional[datetime] = None
-    end_time: Optional[datetime] = None
-    duration_ms: Optional[int] = None
-    input: Optional[Any] = None
-    output: Optional[Any] = None
-    model_name: Optional[str] = None
-    model_provider: Optional[str] = None
-    model_parameters: Optional[Any] = None
-    prompt_tokens: Optional[int] = None
-    completion_tokens: Optional[int] = None
-    total_tokens: Optional[int] = None
-    input_cost: Optional[float] = None
-    output_cost: Optional[float] = None
-    total_cost: Optional[float] = None
-    metadata: Optional[Any] = None
-    version: Optional[str] = None
+class TraceSchema(BaseResponse):
+    """Single trace representation (field-level, not the envelope)."""
 
     class Config:
         from_attributes = True
 
 
-class TraceSchema(BaseModel):
-    """Trace response schema."""
-
-    id: str
-    workspace_id: Optional[str] = None
-    graph_id: Optional[str] = None
-    thread_id: Optional[str] = None
-    user_id: Optional[str] = None
-    name: Optional[str] = None
-    status: str
-    input: Optional[Any] = None
-    output: Optional[Any] = None
-    start_time: Optional[datetime] = None
-    end_time: Optional[datetime] = None
-    duration_ms: Optional[int] = None
-    total_tokens: Optional[int] = None
-    total_cost: Optional[float] = None
-    metadata: Optional[Any] = None
-    tags: Optional[list] = None
-    created_at: Optional[datetime] = None
-
-    class Config:
-        from_attributes = True
-
-
-class TraceDetailSchema(BaseModel):
-    """Trace detail (with observations)."""
-
-    trace: TraceSchema
-    observations: list[ObservationSchema]
-
-
-class TraceListSchema(BaseModel):
-    """Trace list."""
-
-    traces: list[TraceSchema]
-    total: int
-
-
-# ==================== Helper ====================
-
-
-def _trace_to_schema(trace) -> TraceSchema:
-    """Convert a Trace ORM object to a schema."""
-    return TraceSchema(
-        id=str(trace.id),
-        workspace_id=str(trace.workspace_id) if trace.workspace_id else None,
-        graph_id=str(trace.graph_id) if trace.graph_id else None,
-        thread_id=trace.thread_id,
-        user_id=trace.user_id,
-        name=trace.name,
-        status=trace.status.value if hasattr(trace.status, "value") else str(trace.status),
-        input=trace.input,
-        output=trace.output,
-        start_time=trace.start_time,
-        end_time=trace.end_time,
-        duration_ms=trace.duration_ms,
-        total_tokens=trace.total_tokens,
-        total_cost=trace.total_cost,
-        metadata=trace.metadata_,
-        tags=trace.tags,
-        created_at=trace.created_at,
-    )
-
-
-def _obs_to_schema(obs) -> ObservationSchema:
-    """Convert an Observation ORM object to a schema."""
-    return ObservationSchema(
-        id=str(obs.id),
-        trace_id=str(obs.trace_id),
-        parent_observation_id=str(obs.parent_observation_id) if obs.parent_observation_id else None,
-        type=obs.type.value if hasattr(obs.type, "value") else str(obs.type),
-        name=obs.name,
-        level=obs.level.value if hasattr(obs.level, "value") else str(obs.level),
-        status=obs.status.value if hasattr(obs.status, "value") else str(obs.status),
-        status_message=obs.status_message,
-        start_time=obs.start_time,
-        end_time=obs.end_time,
-        duration_ms=obs.duration_ms,
-        input=obs.input,
-        output=obs.output,
-        model_name=obs.model_name,
-        model_provider=obs.model_provider,
-        model_parameters=obs.model_parameters,
-        prompt_tokens=obs.prompt_tokens,
-        completion_tokens=obs.completion_tokens,
-        total_tokens=obs.total_tokens,
-        input_cost=obs.input_cost,
-        output_cost=obs.output_cost,
-        total_cost=obs.total_cost,
-        metadata=obs.metadata_,
-        version=obs.version,
-    )
-
-
 # ==================== Endpoints ====================
 
 
 @router.get("", response_model=BaseResponse)
 async def list_traces(
-    request: Request,
-    current_user: CurrentUser,
+    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
+    workspace_id: uuid.UUID = Query(..., description="Filter by Workspace ID (required)"),
+    agent_version_id: Optional[uuid.UUID] = Query(None, description="Filter by Agent Version ID"),
+    page: int = Query(1, ge=1, description="Page number (1-based)"),
+    page_size: int = Query(20, ge=1, le=100, description="Page size"),
     db: AsyncSession = Depends(get_db),
-    graph_id: Optional[uuid.UUID] = Query(None, description="Filter by Graph ID"),
-    workspace_id: Optional[uuid.UUID] = Query(None, description="Filter by Workspace ID"),
-    thread_id: Optional[str] = Query(None, description="Filter by Thread ID"),
-    limit: int = Query(20, ge=1, le=100, description="Page size"),
-    offset: int = Query(0, ge=0, description="Offset"),
-):
-    """List traces (paginated)."""
-    log = _bind_log(request, user_id=str(current_user.id))
-    service = TraceService(db)
-
-    if workspace_id:
-        from app.models.workspace import WorkspaceMemberRole
-        from app.services.workspace_permission import check_workspace_access
-
-        has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
-        if not has_access:
-            raise ForbiddenException("No access to workspace traces")
-
-    total = await service.count_traces(graph_id=graph_id, workspace_id=workspace_id, thread_id=thread_id)
-    traces = await service.list_traces(
-        graph_id=graph_id,
-        workspace_id=workspace_id,
-        thread_id=thread_id,
-        limit=limit,
-        offset=offset,
-    )
+) -> BaseResponse:
+    """List traces, sorted by created_at DESC."""
+    stmt = select(Trace).where(Trace.workspace_id == workspace_id).order_by(Trace.created_at.desc())
+    if agent_version_id is not None:
+        stmt = stmt.where(Trace.agent_version_id == agent_version_id)
 
-    log.debug(
-        f"Listed {len(traces)} traces (total={total}) | workspace_id={workspace_id} graph_id={graph_id} thread_id={thread_id}"
-    )
+    offset = (page - 1) * page_size
+    stmt = stmt.limit(page_size).offset(offset)
+    result = await db.execute(stmt)
+    traces = list(result.scalars().all())
 
     return BaseResponse(
         success=True,
         code=200,
         msg="ok",
-        data={
-            "traces": [_trace_to_schema(t).model_dump(mode="json") for t in traces],
-            "total": total,
-        },
+        data=[_trace_to_dict(t) for t in traces],
     )
 
 
 @router.get("/{trace_id}", response_model=BaseResponse)
-async def get_trace_detail(
+async def get_trace(
     trace_id: uuid.UUID,
-    request: Request,
     current_user: CurrentUser,
     db: AsyncSession = Depends(get_db),
-):
-    """Get a single trace's detail with all observations."""
-    log = _bind_log(request, user_id=str(current_user.id))
-    service = TraceService(db)
-
-    trace = await service.get_trace(trace_id)
+) -> BaseResponse:
+    """Get a single Trace record by ID."""
+    trace = (await db.execute(select(Trace).where(Trace.id == trace_id))).scalar_one_or_none()
     if trace is None:
-        return BaseResponse(success=False, code=404, msg="Trace not found", data=None)
-
-    if trace.workspace_id:
-        from app.models.workspace import WorkspaceMemberRole
-        from app.services.workspace_permission import check_workspace_access
-
-        has_access = await check_workspace_access(db, trace.workspace_id, current_user, WorkspaceMemberRole.viewer)
-        if not has_access:
-            raise ForbiddenException("No access to workspace traces")
-
-    observations = await service.get_observations_for_trace(trace_id)
+        raise NotFoundError("Trace not found", code="TRACE_NOT_FOUND", data={"trace_id": str(trace_id)})
 
-    log.debug(f"Fetched trace {trace_id} with {len(observations)} observations")
+    if not await check_workspace_access(db, trace.workspace_id, current_user, WorkspaceMemberRole.viewer):
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
 
     return BaseResponse(
         success=True,
         code=200,
         msg="ok",
-        data={
-            "trace": _trace_to_schema(trace).model_dump(mode="json"),
-            "observations": [_obs_to_schema(o).model_dump(mode="json") for o in observations],
-        },
+        data=_trace_to_dict(trace),
     )
 
 
 @router.get("/{trace_id}/observations", response_model=BaseResponse)
 async def get_trace_observations(
     trace_id: uuid.UUID,
-    request: Request,
     current_user: CurrentUser,
+    type: Optional[str] = Query(None, description="Filter by observation type (e.g. GENERATION)"),
     db: AsyncSession = Depends(get_db),
-):
-    """Get a flat list of observations for a trace (sorted by time)."""
-    log = _bind_log(request, user_id=str(current_user.id))
-    service = TraceService(db)
-
-    trace = await service.get_trace(trace_id)
+) -> BaseResponse:
+    """Return a flat list of observations for a trace, optionally filtered by type."""
+    trace = (await db.execute(select(Trace).where(Trace.id == trace_id))).scalar_one_or_none()
     if trace is None:
-        return BaseResponse(success=False, code=404, msg="Trace not found", data=None)
-
-    if trace.workspace_id:
-        from app.models.workspace import WorkspaceMemberRole
-        from app.services.workspace_permission import check_workspace_access
+        raise NotFoundError("Trace not found", code="TRACE_NOT_FOUND", data={"trace_id": str(trace_id)})
 
-        has_access = await check_workspace_access(db, trace.workspace_id, current_user, WorkspaceMemberRole.viewer)
-        if not has_access:
-            raise ForbiddenException("No access to workspace traces")
+    if not await check_workspace_access(db, trace.workspace_id, current_user, WorkspaceMemberRole.viewer):
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
 
-    observations = await service.get_observations_for_trace(trace_id)
+    stmt = select(Observation).where(Observation.trace_id == trace_id).order_by(Observation.start_time.asc())
+    if type is not None:
+        stmt = stmt.where(Observation.type == type)
 
-    log.debug(f"Fetched {len(observations)} observations for trace {trace_id}")
+    result = await db.execute(stmt)
+    observations = list(result.scalars().all())
 
     return BaseResponse(
         success=True,
         code=200,
         msg="ok",
-        data={
-            "observations": [_obs_to_schema(o).model_dump(mode="json") for o in observations],
-        },
+        data=[_observation_to_dict(o) for o in observations],
     )
+
+
+# ==================== Helpers ====================
+
+
+def _trace_to_dict(trace: Trace) -> dict[str, Any]:
+    return {
+        "id": str(trace.id),
+        "name": trace.name,
+        "workspace_id": str(trace.workspace_id),
+        "execution_id": str(trace.execution_id),
+        "agent_version_id": str(trace.agent_version_id),
+        "user_id": str(trace.user_id),
+        "status": trace.status,
+        "input": trace.input,
+        "output": trace.output,
+        "metadata": trace.meta,
+        "start_time": trace.start_time.isoformat() if trace.start_time else None,
+        "end_time": trace.end_time.isoformat() if trace.end_time else None,
+        "duration_ms": trace.duration_ms,
+        "total_observations": trace.total_observations,
+        "total_tokens": trace.total_tokens,
+        "total_cost": float(trace.total_cost) if trace.total_cost is not None else None,
+        "tags": trace.tags,
+        "session_id": trace.session_id,
+        "environment": trace.environment,
+        "release": trace.release,
+        "version": trace.version,
+        "bookmarked": trace.bookmarked,
+        "public": trace.public,
+        "created_at": trace.created_at.isoformat() if trace.created_at else None,
+    }
+
+
+def _observation_to_dict(obs: Observation) -> dict[str, Any]:
+    return {
+        "id": str(obs.id),
+        "trace_id": str(obs.trace_id),
+        "parent_observation_id": str(obs.parent_observation_id) if obs.parent_observation_id else None,
+        "type": obs.type,
+        "name": obs.name,
+        "level": obs.level,
+        "status_message": obs.status_message,
+        "environment": obs.environment,
+        "start_time": obs.start_time.isoformat() if obs.start_time else None,
+        "end_time": obs.end_time.isoformat() if obs.end_time else None,
+        "completion_start_time": obs.completion_start_time.isoformat() if obs.completion_start_time else None,
+        "input": obs.input,
+        "output": obs.output,
+        "metadata": obs.meta,
+        "model": obs.model,
+        "model_parameters": obs.model_parameters,
+        "usage_details": obs.usage_details,
+        "cost_details": obs.cost_details,
+        "prompt_name": obs.prompt_name,
+        "prompt_version": obs.prompt_version,
+        "tool_definitions": obs.tool_definitions,
+        "tool_calls": obs.tool_calls,
+        "execution_id": str(obs.execution_id),
+        "workspace_id": str(obs.workspace_id),
+        "created_at": obs.created_at.isoformat() if obs.created_at else None,
+    }
diff --git a/backend/app/api/v1/users.py b/backend/app/api/v1/users.py
index 0a521dcdd..c738d309e 100644
--- a/backend/app/api/v1/users.py
+++ b/backend/app/api/v1/users.py
@@ -9,14 +9,13 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, NotFoundError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import ForbiddenException, NotFoundException
 from app.common.response import success_response
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.models.settings import Settings
 from app.services.user_service import UserService
-from app.services.workspace_file_service import WorkspaceFileService
 
 router = APIRouter(prefix="/v1/users", tags=["Users"])
 
@@ -192,22 +191,6 @@ async def update_settings(
     }
 
 
-@router.get("/me/usage-limits")
-async def get_usage_limits(
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """Get current user's storage usage (workspace files)."""
-    service = WorkspaceFileService(db)
-    storage = await service.get_user_storage_usage(current_user)
-    usage = {"plan": "standard"}
-    base = success_response(
-        data={"storage": storage, "usage": usage},
-        message="Fetched storage usage",
-    )
-    return {**base, "storage": storage, "usage": usage}
-
-
 @router.get("/{user_id}", response_model=UserResponse)
 async def get_user(
     user_id: str,
@@ -216,12 +199,12 @@ async def get_user(
 ):
     """Get user by ID (requires superuser permission)."""
     if not current_user.is_superuser:
-        raise ForbiddenException("Forbidden")
+        raise AccessDeniedError("Forbidden", code="SUPERUSER_REQUIRED")
 
     service = UserService(db)
     user = await service.get_user_by_id(user_id)
     if not user:
-        raise NotFoundException("User not found")
+        raise NotFoundError("User not found", code="USER_NOT_FOUND", data={"user_id": user_id})
 
     return success_response(
         data=_user_to_response(user),
@@ -238,7 +221,7 @@ async def list_users(
 ):
     """Search/list users (requires superuser permission)."""
     if not current_user.is_superuser:
-        raise ForbiddenException("Forbidden")
+        raise AccessDeniedError("Forbidden", code="SUPERUSER_REQUIRED")
 
     service = UserService(db)
     if keyword:
@@ -260,7 +243,7 @@ async def create_user(
 ):
     """Create a new user (requires superuser permission)."""
     if not current_user.is_superuser:
-        raise ForbiddenException("Forbidden")
+        raise AccessDeniedError("Forbidden", code="SUPERUSER_REQUIRED")
 
     service = UserService(db)
     user = await service.create_user(
@@ -286,12 +269,12 @@ async def update_user(
 ):
     """Update user info (requires superuser permission)."""
     if not current_user.is_superuser:
-        raise ForbiddenException("Forbidden")
+        raise AccessDeniedError("Forbidden", code="SUPERUSER_REQUIRED")
 
     service = UserService(db)
     user = await service.get_user_by_id(user_id)
     if not user:
-        raise NotFoundException("User not found")
+        raise NotFoundError("User not found", code="USER_NOT_FOUND", data={"user_id": user_id})
 
     updated_user = await service.update_user(
         user,
@@ -317,7 +300,7 @@ async def delete_user(
 ):
     """Delete a user (requires superuser permission)."""
     if not current_user.is_superuser:
-        raise ForbiddenException("Forbidden")
+        raise AccessDeniedError("Forbidden", code="SUPERUSER_REQUIRED")
 
     service = UserService(db)
     await service.delete_user(user_id)
diff --git a/backend/app/api/v1/workspace_files.py b/backend/app/api/v1/workspace_files.py
deleted file mode 100644
index 96b652616..000000000
--- a/backend/app/api/v1/workspace_files.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""
-Workspace file management API (versioned path: /api/v1/workspaces)
-"""
-
-import uuid
-from typing import Optional
-
-from fastapi import APIRouter, Depends, File, Query, Request, UploadFile
-from fastapi.responses import FileResponse, JSONResponse
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user_optional, require_workspace_role
-from app.common.exceptions import AppException, ConflictException
-from app.common.response import success_response
-from app.core.database import get_db
-from app.core.settings import settings
-from app.models.auth import AuthUser as User
-from app.models.workspace import WorkspaceMemberRole
-from app.services.workspace_file_service import WorkspaceFileService
-
-router = APIRouter(prefix="/v1/workspaces", tags=["WorkspaceFiles"])
-
-
-@router.get("/{workspace_id}/files")
-async def list_workspace_files(
-    workspace_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
-):
-    service = WorkspaceFileService(db)
-    files = await service.list_files(workspace_id, current_user)
-    # compatible with frontend reading files directly, while preserving unified response format
-    base = success_response(data={"files": files}, message="Fetched workspace files")
-    return {**base, "files": files}
-
-
-@router.post("/{workspace_id}/files")
-async def upload_workspace_file(
-    workspace_id: uuid.UUID,
-    file: UploadFile = File(..., description="File to upload"),
-    db: AsyncSession = Depends(get_db),
-    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
-):
-    # Duplicate file returns 409 + isDuplicate with error field for frontend
-    try:
-        service = WorkspaceFileService(db)
-        record = await service.upload_file(workspace_id, file, current_user)
-        base = success_response(data={"file": record}, message="File uploaded")
-        return {**base, "file": record}
-    except ConflictException as exc:
-        return JSONResponse(
-            status_code=exc.status_code,
-            content={
-                "success": False,
-                "error": str(exc.detail),
-                "isDuplicate": True,
-            },
-        )
-    except AppException as exc:
-        # Return error field alongside unified response (success=false) for frontend compatibility
-        return JSONResponse(
-            status_code=exc.status_code,
-            content={
-                "success": False,
-                "error": str(exc.detail),
-            },
-        )
-
-
-@router.delete("/{workspace_id}/files/{file_id}")
-async def delete_workspace_file(
-    workspace_id: uuid.UUID,
-    file_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = require_workspace_role(WorkspaceMemberRole.member),
-):
-    service = WorkspaceFileService(db)
-    await service.delete_file(workspace_id, file_id, current_user)
-    # Include top-level success field for frontend compatibility
-    base = success_response(message="File deleted", data={"fileId": str(file_id)})
-    return {**base, "success": True}
-
-
-@router.post("/{workspace_id}/files/{file_id}/download")
-async def generate_workspace_file_download_url(
-    workspace_id: uuid.UUID,
-    file_id: uuid.UUID,
-    request: Request,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = require_workspace_role(WorkspaceMemberRole.viewer),
-):
-    service = WorkspaceFileService(db)
-    url = await service.generate_download_url(workspace_id, file_id, current_user)
-    record = await service.get_file_record(workspace_id, file_id)
-
-    # Generate absolute downloadUrl from the request base URL
-    base_url = str(request.base_url).rstrip("/")
-    download_url = f"{base_url}{url}"
-    viewer_url = f"{settings.frontend_url.rstrip('/')}/workspace/{workspace_id}/files/{file_id}/view"
-
-    payload = {
-        "downloadUrl": download_url,
-        "viewerUrl": viewer_url,
-        "fileName": record.original_name,
-        "expiresIn": None,
-    }
-
-    base = success_response(data=payload, message="Download URL generated")
-    return {**base, "success": True, **payload}
-
-
-@router.get("/{workspace_id}/files/{file_id}/serve")
-async def serve_workspace_file(
-    workspace_id: uuid.UUID,
-    file_id: uuid.UUID,
-    token: Optional[str] = Query(default=None, description="Download signature token"),
-    db: AsyncSession = Depends(get_db),
-    current_user: Optional[User] = Depends(get_current_user_optional),
-):
-    service = WorkspaceFileService(db)
-    await service.validate_token_or_user(workspace_id, file_id, token, current_user)
-    record = await service.get_file_record(workspace_id, file_id)
-    file_path = service.get_file_path(record)
-
-    if not file_path.exists():
-        # deferred validation: raise a consistent error if the file is missing
-        await service.read_file_bytes(record)
-
-    # use FileResponse directly to reduce memory usage
-    return FileResponse(
-        path=file_path,
-        media_type=record.content_type or "application/octet-stream",
-        filename=record.original_name,
-    )
diff --git a/backend/app/api/v1/workspace_folders.py b/backend/app/api/v1/workspace_folders.py
deleted file mode 100644
index e9c07aa16..000000000
--- a/backend/app/api/v1/workspace_folders.py
+++ /dev/null
@@ -1,250 +0,0 @@
-"""Folders API (versioned path: /api/v1/folders)"""
-
-import uuid
-from typing import Optional
-
-from fastapi import APIRouter, Depends, Query
-from pydantic import BaseModel, Field
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.common.response import success_response
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.repositories.workspace_folder import WorkflowFolderRepository
-from app.services.workspace_folder_service import FolderService
-
-router = APIRouter(prefix="/v1/folders", tags=["Folders"])
-
-
-class CreateFolderRequest(BaseModel):
-    workspaceId: uuid.UUID
-    name: str = Field(..., min_length=1, max_length=255)
-    parentId: Optional[uuid.UUID] = None
-    color: Optional[str] = Field(default=None, max_length=32)
-
-
-class UpdateFolderRequest(BaseModel):
-    workspaceId: Optional[uuid.UUID] = None
-    name: Optional[str] = Field(None, min_length=1, max_length=255)
-    color: Optional[str] = Field(None, max_length=32)
-    isExpanded: Optional[bool] = None
-    parentId: Optional[uuid.UUID] = None
-
-
-class DuplicateFolderRequest(BaseModel):
-    name: str = Field(..., min_length=1, max_length=255)
-    workspaceId: Optional[uuid.UUID] = None
-    parentId: Optional[uuid.UUID] = None
-    color: Optional[str] = Field(default=None, max_length=32)
-
-
-def _serialize_folder(folder) -> dict:
-    return {
-        "id": str(folder.id),
-        "name": folder.name,
-        "workspaceId": str(folder.workspace_id),
-        "parentId": str(folder.parent_id) if folder.parent_id else None,
-        "color": folder.color,
-        "isExpanded": folder.is_expanded,
-        "sortOrder": folder.sort_order,
-        "createdAt": folder.created_at,
-        "updatedAt": folder.updated_at,
-        "userId": str(folder.user_id),
-    }
-
-
-@router.get("")
-async def list_folders(
-    workspace_id: uuid.UUID = Query(..., alias="workspaceId"),
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    service = FolderService(db)
-    folders = await service.list_folders(workspace_id, current_user=current_user)
-    payload = [_serialize_folder(f) for f in folders]
-    base = success_response(data={"folders": payload}, message="Fetched folders")
-    return {**base, "folders": payload}
-
-
-@router.post("")
-async def create_folder(
-    body: CreateFolderRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    service = FolderService(db)
-    folder = await service.create_folder(
-        workspace_id=body.workspaceId,
-        current_user=current_user,
-        name=body.name,
-        parent_id=body.parentId,
-        color=body.color,
-        is_expanded=False,
-    )
-    payload = _serialize_folder(folder)
-    base = success_response(data={"folder": payload}, message="Folder created")
-    return {**base, "folder": payload}
-
-
-@router.put("/{folder_id}")
-async def update_folder(
-    folder_id: uuid.UUID,
-    body: UpdateFolderRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    repo = WorkflowFolderRepository(db)
-    existing = await repo.get(folder_id)
-    if not existing:
-        from app.common.exceptions import NotFoundException
-
-        raise NotFoundException("Folder not found")
-
-    workspace_id = body.workspaceId or existing.workspace_id
-    service = FolderService(db)
-    folder = await service.update_folder(
-        folder_id,
-        workspace_id=workspace_id,
-        current_user=current_user,
-        name=body.name,
-        color=body.color,
-        is_expanded=body.isExpanded,
-        parent_id=body.parentId,
-    )
-    payload = _serialize_folder(folder)
-    base = success_response(data={"folder": payload}, message="Folder updated")
-    return {**base, "folder": payload}
-
-
-@router.delete("/{folder_id}")
-async def delete_folder(
-    folder_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    repo = WorkflowFolderRepository(db)
-    existing = await repo.get(folder_id)
-    if not existing:
-        from app.common.exceptions import NotFoundException
-
-        raise NotFoundException("Folder not found")
-
-    service = FolderService(db)
-    stats = await service.delete_folder_tree(
-        folder_id,
-        workspace_id=existing.workspace_id,
-        current_user=current_user,
-    )
-    base = success_response(data={"deletedItems": stats}, message="Folder deleted")
-    return {**base, "success": True, "deletedItems": stats}
-
-
-@router.post("/{folder_id}/duplicate")
-async def duplicate_folder(
-    folder_id: uuid.UUID,
-    body: DuplicateFolderRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    repo = WorkflowFolderRepository(db)
-    source = await repo.get(folder_id)
-    if not source:
-        from app.common.exceptions import NotFoundException
-
-        raise NotFoundException("Source folder not found")
-
-    target_workspace_id = body.workspaceId or source.workspace_id
-
-    service = FolderService(db)
-    new_root = await service.duplicate_folder(
-        folder_id,
-        workspace_id=target_workspace_id,
-        current_user=current_user,
-        name=body.name,
-        parent_id=body.parentId,
-        color=body.color,
-    )
-
-    result = {
-        "id": str(new_root.id),
-        "name": new_root.name,
-        "color": new_root.color,
-        "workspaceId": str(new_root.workspace_id),
-        "parentId": str(new_root.parent_id) if new_root.parent_id else None,
-    }
-    base = success_response(data=result, message="Folder duplicated", code=201)
-    return {**base, **result}
-
-
-@router.get("/{folder_id}/graphs")
-async def list_folder_graphs(
-    folder_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """List all graphs in a folder."""
-    from sqlalchemy import func, select
-
-    from app.models.graph import AgentGraph, GraphNode
-    from app.repositories.graph import GraphRepository
-
-    # verify folder exists and get workspace_id
-    repo = WorkflowFolderRepository(db)
-    folder = await repo.get(folder_id)
-    if not folder:
-        from app.common.exceptions import NotFoundException
-
-        raise NotFoundException("Folder not found")
-
-    # verify user permission (read access)
-    service = FolderService(db)
-    await service._ensure_permission(folder.workspace_id, current_user, "read")
-
-    # query all graphs in this folder
-    GraphRepository(db)
-    stmt = (
-        select(AgentGraph)
-        .where(AgentGraph.folder_id == folder_id, AgentGraph.user_id == current_user.id)
-        .order_by(AgentGraph.created_at.desc())
-    )
-
-    result = await db.execute(stmt)
-    graphs = list(result.scalars().all())
-
-    # batch-query node counts
-    graph_ids = [graph.id for graph in graphs]
-    node_counts = {}
-    if graph_ids:
-        count_query = (
-            select(GraphNode.graph_id, func.count(GraphNode.id).label("count"))
-            .where(GraphNode.graph_id.in_(graph_ids))
-            .group_by(GraphNode.graph_id)
-        )
-        count_result = await db.execute(count_query)
-        for row in count_result:
-            node_counts[row.graph_id] = row.count
-
-    # serialize graphs
-    data = []
-    for graph in graphs:
-        data.append(
-            {
-                "id": str(graph.id),
-                "userId": str(graph.user_id),
-                "workspaceId": str(graph.workspace_id) if graph.workspace_id else None,
-                "folderId": str(graph.folder_id) if graph.folder_id else None,
-                "parentId": str(graph.parent_id) if graph.parent_id else None,
-                "name": graph.name,
-                "description": graph.description,
-                "color": graph.color,
-                "isDeployed": graph.is_deployed,
-                "variables": graph.variables or {},
-                "createdAt": graph.created_at.isoformat() if graph.created_at else None,
-                "updatedAt": graph.updated_at.isoformat() if graph.updated_at else None,
-                "nodeCount": node_counts.get(graph.id, 0),
-            }
-        )
-
-    base = success_response(data={"graphs": data}, message="Fetched graphs")
-    return {**base, "graphs": data}
diff --git a/backend/app/api/v1/workspaces.py b/backend/app/api/v1/workspaces.py
index 2ac773a33..394d8c275 100644
--- a/backend/app/api/v1/workspaces.py
+++ b/backend/app/api/v1/workspaces.py
@@ -7,8 +7,8 @@
 from pydantic import BaseModel, EmailStr, Field
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, InvalidRequestError
 from app.common.dependencies import get_current_user, require_workspace_role
-from app.common.exceptions import BadRequestException, ForbiddenException
 from app.common.pagination import PaginationParams
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
@@ -74,7 +74,11 @@ async def create_workspace(
         try:
             workspace_type = WorkspaceType(payload.type)
         except ValueError:
-            raise BadRequestException(f"Invalid workspace type: {payload.type}. Must be 'personal' or 'team'")
+            raise InvalidRequestError(
+                f"Invalid workspace type: {payload.type}. Must be 'personal' or 'team'",
+                code="WORKSPACE_TYPE_INVALID",
+                data={"workspace_type": payload.type},
+            )
 
     service = WorkspaceService(db)
     workspace = await service.create_workspace(
@@ -220,7 +224,7 @@ async def get_my_permission(
     role = await service.get_user_role(workspace_id, current_user)
 
     if not role:
-        raise ForbiddenException("No access to workspace")
+        raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
 
     # reuse the frontend's role-to-permission mapping for consistency
     role_to_permission = {
@@ -293,12 +297,16 @@ async def update_member_role(
         WorkspaceMemberRole.admin,
     )
     if not has_access:
-        raise ForbiddenException("Insufficient workspace permission")
+        raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
 
     try:
         new_role = WorkspaceMemberRole(payload.role)
     except ValueError:
-        raise BadRequestException(f"Invalid role: {payload.role}")
+        raise InvalidRequestError(
+            f"Invalid role: {payload.role}",
+            code="WORKSPACE_MEMBER_ROLE_INVALID",
+            data={"role": payload.role},
+        )
 
     service = WorkspaceService(db)
     member = await service.update_member_role(
@@ -329,7 +337,7 @@ async def remove_member(
             WorkspaceMemberRole.admin,
         )
         if not has_access:
-            raise ForbiddenException("Insufficient workspace permission")
+            raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
 
     service = WorkspaceService(db)
     await service.remove_member(
diff --git a/backend/app/common/app_errors.py b/backend/app/common/app_errors.py
new file mode 100644
index 000000000..143dd6169
--- /dev/null
+++ b/backend/app/common/app_errors.py
@@ -0,0 +1,302 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Mapping
+
+
+def _normalize_data(data: Mapping[str, Any] | None) -> dict[str, Any] | None:
+    if data is None:
+        return None
+    return dict(data)
+
+
+@dataclass(slots=True)
+class AppError(Exception):
+    code: str
+    message: str
+    data: Mapping[str, Any] | None = None
+    source: str = "internal"
+    retryable: bool = False
+    user_action: str | None = None
+    detail: str | None = None
+
+    def __post_init__(self) -> None:
+        Exception.__init__(self, self.message)
+        self.data = _normalize_data(self.data)
+
+    def to_payload(self) -> dict[str, Any]:
+        result: dict[str, Any] = {
+            "code": self.code,
+            "message": self.message,
+            "data": dict(self.data) if self.data is not None else None,
+            "source": self.source,
+            "retryable": self.retryable,
+        }
+        if self.user_action is not None:
+            result["user_action"] = self.user_action
+        if self.detail is not None:
+            result["detail"] = self.detail
+        return result
+
+
+class DomainError(AppError):
+    _default_source: str = "api"
+
+
+class InfraError(AppError):
+    _default_source: str = "runtime"
+
+
+class AuthError(AppError):
+    _default_source: str = "auth"
+
+
+class ValidationError(AppError):
+    _default_source: str = "validation"
+
+
+class PermissionDeniedError(AppError):
+    _default_source: str = "permission"
+
+
+class ConflictError(AppError):
+    _default_source: str = "api"
+
+
+class RateLimitError(AppError):
+    _default_source: str = "api"
+
+
+class InternalError(AppError):
+    _default_source: str = "internal"
+
+
+class NotFoundError(DomainError):
+    def __init__(
+        self,
+        message: str = "资源不存在",
+        *,
+        code: str = "NOT_FOUND",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class InvalidRequestError(DomainError):
+    def __init__(
+        self,
+        message: str = "请求错误",
+        *,
+        code: str = "BAD_REQUEST",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class AuthenticationError(AuthError):
+    def __init__(
+        self,
+        message: str = "未认证",
+        *,
+        code: str = "UNAUTHORIZED",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = "relogin",
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class AccessDeniedError(PermissionDeniedError):
+    def __init__(
+        self,
+        message: str = "无权限",
+        *,
+        code: str = "FORBIDDEN",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class ResourceConflictError(ConflictError):
+    def __init__(
+        self,
+        message: str = "资源冲突",
+        *,
+        code: str = "CONFLICT",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class RateLimitExceededError(RateLimitError):
+    def __init__(
+        self,
+        message: str = "请求过于频繁",
+        *,
+        code: str = "RATE_LIMITED",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = True,
+        user_action: str | None = "retry",
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class InternalServiceError(InternalError):
+    def __init__(
+        self,
+        message: str = "内部错误",
+        *,
+        code: str = "INTERNAL_ERROR",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class ServiceUnavailableError(InfraError):
+    def __init__(
+        self,
+        message: str = "服务暂不可用",
+        *,
+        code: str = "SERVICE_UNAVAILABLE",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = True,
+        user_action: str | None = "retry",
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class ClientClosedError(AppError):
+    _default_source: str = "api"
+
+    def __init__(
+        self,
+        message: str = "客户端已关闭连接",
+        *,
+        code: str = "CLIENT_CLOSED",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = None,
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class RequestValidationAppError(ValidationError):
+    def __init__(
+        self,
+        message: str = "请求参数校验失败",
+        *,
+        code: str = "REQUEST_VALIDATION_ERROR",
+        data: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = "fix_input",
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=data, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+class ModelConfigError(DomainError):
+    MODEL_NOT_FOUND = "MODEL_NOT_FOUND"
+    MODEL_NO_CREDENTIALS = "MODEL_NO_CREDENTIALS"
+    PROVIDER_NOT_FOUND = "PROVIDER_NOT_FOUND"
+    MODEL_NAME_REQUIRED = "MODEL_NAME_REQUIRED"
+    BUILD_COPILOT_MODEL_REQUIRED = "BUILD_COPILOT_MODEL_REQUIRED"
+
+    def __init__(
+        self,
+        code: str,
+        message: str = "模型配置错误",
+        *,
+        params: Mapping[str, Any] | None = None,
+        retryable: bool = False,
+        user_action: str | None = "configure_model",
+        detail: str | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(
+            code=code, message=message, data=params, retryable=retryable, user_action=user_action, detail=detail, **kw
+        )
+
+
+def normalize_app_error(
+    exc: Exception,
+    *,
+    default_code: str = "INTERNAL_ERROR",
+    default_message: str = "内部错误",
+    default_data: Mapping[str, Any] | None = None,
+    source: str = "internal",
+    retryable: bool = False,
+) -> AppError:
+    if isinstance(exc, AppError):
+        return exc
+    return InternalServiceError(
+        default_message,
+        code=default_code,
+        source=source,
+        retryable=retryable,
+        data={
+            **(dict(default_data) if default_data is not None else {}),
+            "detail": str(exc),
+        }
+        if str(exc)
+        else (dict(default_data) if default_data is not None else None),
+    )
diff --git a/backend/app/common/auth_dependency.py b/backend/app/common/auth_dependency.py
index 08b4f56a8..472d72ec6 100644
--- a/backend/app/common/auth_dependency.py
+++ b/backend/app/common/auth_dependency.py
@@ -11,8 +11,8 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AuthenticationError
 from app.common.dependencies import get_current_user
-from app.common.exceptions import UnauthorizedException
 from app.core.database import get_db
 from app.models.auth import AuthUser as User
 from app.models.platform_token import PlatformToken
@@ -67,9 +67,9 @@ async def get_current_user_or_token(
 
     # Fall through to existing session/JWT auth
     if request is None:
-        from app.common.exceptions import UnauthorizedException
+        from app.common.app_errors import AuthenticationError
 
-        raise UnauthorizedException("Authentication required")
+        raise AuthenticationError("Authentication required", code="AUTH_REQUIRED")
     user = await get_current_user(token=token, request=request, db=db)
     return AuthContext(user=user, token_scopes=None)
 
@@ -85,13 +85,13 @@ async def _authenticate_platform_token(
     pt = result.scalar_one_or_none()
 
     if not pt:
-        raise UnauthorizedException("Invalid API token")
+        raise AuthenticationError("Invalid API token", code="API_TOKEN_INVALID")
 
     if not pt.is_active:
-        raise UnauthorizedException("API token has been revoked")
+        raise AuthenticationError("API token has been revoked", code="API_TOKEN_REVOKED")
 
     if pt.expires_at and pt.expires_at < datetime.now(timezone.utc):
-        raise UnauthorizedException("API token has expired")
+        raise AuthenticationError("API token has expired", code="API_TOKEN_EXPIRED")
 
     # Debounce last_used_at update
     now = datetime.now(timezone.utc)
@@ -105,7 +105,7 @@ async def _authenticate_platform_token(
         user_result = await db.execute(select(User).where(User.id == pt.user_id))
         user = user_result.scalar_one_or_none()
     if not user or not user.is_active:
-        raise UnauthorizedException("Token owner account is inactive")
+        raise AuthenticationError("Token owner account is inactive", code="API_TOKEN_OWNER_INACTIVE")
 
     return AuthContext(
         user=user,
diff --git a/backend/app/common/dependencies.py b/backend/app/common/dependencies.py
index 9a5cf9331..760599365 100644
--- a/backend/app/common/dependencies.py
+++ b/backend/app/common/dependencies.py
@@ -11,8 +11,8 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, AuthenticationError, NotFoundError
 from app.common.cookie_auth import extract_token_from_cookies
-from app.common.exceptions import ForbiddenException, NotFoundException, UnauthorizedException
 from app.core.database import get_db
 from app.core.security import decode_token
 from app.models.auth import AuthUser as User
@@ -45,7 +45,7 @@ async def get_current_user(
         logger.debug("Failed to read auth token from cookies", exc_info=True)
     token = token or cookie_token
     if not token:
-        raise UnauthorizedException("Missing credentials")
+        raise AuthenticationError("Missing credentials", code="MISSING_CREDENTIALS")
 
     # try JWT token first (JWT mode)
     payload = decode_token(token)
@@ -54,9 +54,9 @@ async def get_current_user(
         result = await db.execute(select(User).where(User.id == str(user_id)))
         user = result.scalar_one_or_none()
         if user is None:
-            raise UnauthorizedException("User not found")
+            raise AuthenticationError("User not found", code="USER_NOT_FOUND")
         if not user.is_active:
-            raise UnauthorizedException("User is inactive")
+            raise AuthenticationError("User is inactive", code="USER_INACTIVE")
         return user
 
     # if JWT validation fails, try as session token (backward-compatible)
@@ -66,12 +66,12 @@ async def get_current_user(
         result = await db.execute(select(User).where(User.id == session.user_id))
         user = result.scalar_one_or_none()
         if user is None:
-            raise UnauthorizedException("User not found")
+            raise AuthenticationError("User not found", code="USER_NOT_FOUND")
         if not user.is_active:
-            raise UnauthorizedException("User is inactive")
+            raise AuthenticationError("User is inactive", code="USER_INACTIVE")
         return user
 
-    raise UnauthorizedException("Could not validate credentials")
+    raise AuthenticationError("Could not validate credentials", code="CREDENTIALS_INVALID")
 
 
 async def get_current_user_optional(
@@ -148,17 +148,17 @@ async def checker(
 
         workspace = await ws_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError("Workspace not found", code="WORKSPACE_NOT_FOUND")
 
         if workspace.owner_id == current_user.id:
             return current_user
 
         member = await member_repo.get_member(workspace_id, current_user.id)
         if not member:
-            raise ForbiddenException("No access to workspace")
+            raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
 
         if _role_rank(member.role) < _role_rank(min_role):
-            raise ForbiddenException("Insufficient workspace permission")
+            raise AccessDeniedError("Insufficient workspace permission", code="WORKSPACE_PERMISSION_DENIED")
 
         return current_user
 
@@ -195,9 +195,9 @@ async def checker(
         )
         member = result.scalar_one_or_none()
         if not member:
-            raise ForbiddenException("No access to organization")
+            raise AccessDeniedError("No access to organization", code="ORGANIZATION_ACCESS_DENIED")
         if _rank(member.role) < _rank(min_role):
-            raise ForbiddenException("Insufficient organization permission")
+            raise AccessDeniedError("Insufficient organization permission", code="ORGANIZATION_PERMISSION_DENIED")
         return current_user
 
     return Depends(checker)
diff --git a/backend/app/common/exceptions.py b/backend/app/common/exceptions.py
index 5a4dfbc12..7a4026602 100644
--- a/backend/app/common/exceptions.py
+++ b/backend/app/common/exceptions.py
@@ -1,215 +1,101 @@
-"""
-Unified exception system (single entry point).
-
-- Exception classes: all inherit from `AppException(HTTPException)`, supporting separate
-  `status_code` (HTTP) and `code` (business/error code), with `data` for extra error details.
-- Global handlers: provide FastAPI exception handler functions and a one-call registration
-  function `register_exception_handlers`, ensuring the unified response format defined by
-  `app.common.response.error_response`.
-"""
-
 from __future__ import annotations
 
-from typing import Any, Dict, Iterable, List, Mapping, Optional
+from typing import Any, Iterable, Mapping
 
 from fastapi import HTTPException, Request, status
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse, Response
 from pydantic import ValidationError as PydanticValidationError
 
+from app.common.app_errors import (
+    AppError,
+    AuthError,
+    ClientClosedError,
+    ConflictError,
+    DomainError,
+    InfraError,
+    InternalError,
+    InternalServiceError,
+    NotFoundError,
+    PermissionDeniedError,
+    RateLimitError,
+    RequestValidationAppError,
+    ValidationError,
+    normalize_app_error,
+)
 from app.common.response import error_response
 
 
-class AppException(HTTPException):
-    """Base application exception (recommended for all business code)."""
-
-    code: int
-    data: Any
-
-    def __init__(
-        self,
-        status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR,
-        message: str = "Internal Server Error",
-        *,
-        code: int | None = None,
-        data: Any = None,
-        headers: Optional[Dict[str, str]] = None,
-    ):
-        super().__init__(status_code=status_code, detail=message, headers=headers)
-        self.code = status_code if code is None else code
-        self.data = data
-
-
-# Common HTTP exceptions (raise directly from business code)
-
-
-class NotFoundException(AppException):
-    """Resource not found (404)."""
-
-    def __init__(self, message: str = "Resource not found", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_404_NOT_FOUND, message=message, code=code, data=data)
-
-
-class ModelConfigError(AppException):
-    """Model configuration error with structured error_code + params for frontend i18n.
-
-    error_code: Frontend i18n key (e.g. MODEL_NOT_FOUND, MODEL_NO_CREDENTIALS)
-    params:     Interpolation params (e.g. {model: "gpt-4o", provider: "openai"})
-    message:    English fallback (shown when frontend has no i18n key)
-    """
-
-    # Error code constants — shared with frontend i18n keys
-    MODEL_NOT_FOUND = "MODEL_NOT_FOUND"
-    MODEL_NO_CREDENTIALS = "MODEL_NO_CREDENTIALS"
-    PROVIDER_NOT_FOUND = "PROVIDER_NOT_FOUND"
-    MODEL_NAME_REQUIRED = "MODEL_NAME_REQUIRED"
-
-    error_code: str
-    params: Dict[str, Any]
-
-    def __init__(
-        self,
-        error_code: str,
-        message: str = "Model configuration error",
-        *,
-        params: Dict[str, Any] | None = None,
-    ):
-        self.error_code = error_code
-        self.params = params or {}
-        super().__init__(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            message=message,
-            data={"error_code": error_code, "params": self.params},
-        )
-
-
-class BadRequestException(AppException):
-    """Bad request (400)."""
-
-    def __init__(self, message: str = "Bad request", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_400_BAD_REQUEST, message=message, code=code, data=data)
-
-
-class UnauthorizedException(AppException):
-    """Unauthorized (401)."""
-
-    def __init__(self, message: str = "Unauthorized", *, code: int | None = None, data: Any = None):
-        super().__init__(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            message=message,
-            code=code,
-            data=data,
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-
-
-class ForbiddenException(AppException):
-    """Forbidden (403)."""
-
-    def __init__(self, message: str = "Forbidden", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_403_FORBIDDEN, message=message, code=code, data=data)
-
-
-class ValidationException(AppException):
-    """Request validation failed (422)."""
-
-    def __init__(self, message: str = "Validation error", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, message=message, code=code, data=data)
-
-
-class ConflictException(AppException):
-    """Resource conflict (409)."""
-
-    def __init__(self, message: str = "Resource conflict", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_409_CONFLICT, message=message, code=code, data=data)
-
-
-class TooManyRequestsException(AppException):
-    """Too many requests (429)."""
-
-    def __init__(self, message: str = "Too many requests", *, code: int | None = None, data: Any = None):
-        super().__init__(status_code=status.HTTP_429_TOO_MANY_REQUESTS, message=message, code=code, data=data)
-
-
-class InternalServerException(AppException):
-    """Internal server error (500)."""
-
-    def __init__(self, message: str = "Internal Server Error", *, code: int | None = 1007, data: Any = None):
-        super().__init__(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, message=message, code=code, data=data)
-
-
-class ClientClosedException(AppException):
-    """Client disconnected early (499)."""
-
-    def __init__(self, message: str = "Client has closed the connection", *, code: int | None = 1008, data: Any = None):
-        # 499 is a non-standard HTTP status code, but some gateways/logging systems use it
-        super().__init__(status_code=499, message=message, code=code, data=data)
-
-
-class BusinessLogicException(BadRequestException):
-    """Business logic error (default 400, business code default 1006)."""
-
-    def __init__(self, message: str, *, code: int | None = 1006, data: Any = None):
-        super().__init__(message=message, code=code, data=data)
-
-
-class ParameterValidationException(BadRequestException):
-    """Parameter/business validation error (default 400, business code default 1001)."""
-
-    def __init__(self, message: str, *, code: int | None = 1001, data: Any = None):
-        super().__init__(message=message, code=code, data=data)
-
-
-# Aliases
-
-# Authentication -> 401, Authorization -> 403
-AuthenticationException = UnauthorizedException
-AuthorizationException = ForbiddenException
-ResourceNotFoundException = NotFoundException
-ResourceConflictException = ConflictException
-
-
-# Unified error response construction & global exception handlers
-
-
-def create_error_response(*, status_code: int, code: int, message: str, data: Any = None) -> Response:
-    """Build a unified error response (conforming to app.common.response.error_response)."""
+def create_error_response(
+    *,
+    status_code: int,
+    error: AppError,
+    headers: Mapping[str, str] | None = None,
+) -> Response:
     return JSONResponse(
         status_code=status_code,
-        content=error_response(message=message, code=code, data=data),
+        content=error_response(error.to_payload()),
+        headers=dict(headers) if headers else None,
     )
 
 
-async def app_exception_handler(request: Request, exc: AppException) -> Response:
-    """Handle application exceptions (AppException)."""
-    code_value = getattr(exc, "code", exc.status_code)
-    code = code_value if isinstance(code_value, int) else exc.status_code
+def _status_code_for_error(error: AppError) -> int:
+    if isinstance(error, ClientClosedError):
+        return 499
+    if isinstance(error, NotFoundError):
+        return status.HTTP_404_NOT_FOUND
+    if isinstance(error, AuthError):
+        return status.HTTP_401_UNAUTHORIZED
+    if isinstance(error, PermissionDeniedError):
+        return status.HTTP_403_FORBIDDEN
+    if isinstance(error, RequestValidationAppError):
+        return status.HTTP_422_UNPROCESSABLE_CONTENT
+    if isinstance(error, ValidationError):
+        return status.HTTP_400_BAD_REQUEST
+    if isinstance(error, ConflictError):
+        return status.HTTP_409_CONFLICT
+    if isinstance(error, RateLimitError):
+        return status.HTTP_429_TOO_MANY_REQUESTS
+    if isinstance(error, InternalError | InfraError):
+        return status.HTTP_500_INTERNAL_SERVER_ERROR
+    if isinstance(error, DomainError):
+        return status.HTTP_400_BAD_REQUEST
+    return status.HTTP_500_INTERNAL_SERVER_ERROR
+
+
+def _headers_for_error(error: AppError) -> dict[str, str] | None:
+    if isinstance(error, AuthError):
+        return {"WWW-Authenticate": "Bearer"}
+    return None
+
+
+async def app_error_handler(request: Request, exc: AppError) -> Response:
     return create_error_response(
-        status_code=exc.status_code,
-        code=code,
-        message=str(exc.detail),
-        data=getattr(exc, "data", None),
+        status_code=_status_code_for_error(exc),
+        error=exc,
+        headers=_headers_for_error(exc),
     )
 
 
 async def http_exception_handler(request: Request, exc: HTTPException) -> Response:
-    """Handle FastAPI/Starlette HTTPException (non-AppException)."""
+    error = AppError(
+        code=str(exc.status_code),
+        message=str(exc.detail),
+        data=None,
+    )
     return create_error_response(
         status_code=exc.status_code,
-        code=exc.status_code,
-        message=str(exc.detail),
-        data=getattr(exc, "data", None),
+        error=error,
+        headers=exc.headers,
     )
 
 
-def _format_validation_errors(errors: Iterable[Mapping[str, Any]]) -> List[dict[str, Any]]:
-    formatted: List[dict[str, Any]] = []
+def _format_validation_errors(errors: Iterable[Mapping[str, Any]]) -> list[dict[str, Any]]:
+    formatted: list[dict[str, Any]] = []
     for err in errors:
-        loc = err.get("loc", ())
-        field_path = ".".join(str(x) for x in loc)
         formatted.append(
             {
-                "field": field_path,
+                "field": ".".join(str(part) for part in err.get("loc", ())),
                 "message": err.get("msg"),
                 "type": err.get("type"),
             }
@@ -218,88 +104,35 @@ def _format_validation_errors(errors: Iterable[Mapping[str, Any]]) -> List[dict[
 
 
 async def request_validation_exception_handler(request: Request, exc: Exception) -> Response:
-    """Handle request validation exceptions (RequestValidationError / PydanticValidationError)."""
-    errors: List[dict[str, Any]] = []
+    errors: list[dict[str, Any]] = []
     if isinstance(exc, (RequestValidationError, PydanticValidationError)):
         errors = _format_validation_errors(exc.errors())
 
-    return create_error_response(
-        status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-        code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-        message="Request parameter validation failed",
-        data={"validation_errors": errors} if errors else None,
-    )
+    error = RequestValidationAppError(data={"errors": errors})
+    return await app_error_handler(request, error)
 
 
 async def general_exception_handler(request: Request, exc: Exception) -> Response:
-    """Handle uncaught exceptions (500)."""
+    if isinstance(exc, AppError):
+        return await app_error_handler(request, exc)
+
     try:
         from loguru import logger
 
         logger.exception("Unhandled exception: {}", exc)
     except Exception:
-        # fallback when logger is unavailable
         pass
 
-    debug = False
-    try:
-        from app.core.settings import settings
-
-        debug = bool(getattr(settings, "debug", False))
-    except Exception:
-        debug = False
-
-    return create_error_response(
-        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-        code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-        message=str(exc) if debug else "Internal Server Error",
-        data={"error_type": type(exc).__name__} if debug else None,
-    )
+    return await app_error_handler(request, InternalServiceError())
 
 
 def register_exception_handlers(app: Any) -> None:
-    """
-    Register all exception handlers on the FastAPI app in one call.
-
-    Note: keep this function free of hard FastAPI type dependencies to avoid circular imports.
-    """
-    app.add_exception_handler(AppException, app_exception_handler)
+    app.add_exception_handler(AppError, app_error_handler)
     app.add_exception_handler(HTTPException, http_exception_handler)
     app.add_exception_handler(RequestValidationError, request_validation_exception_handler)
     app.add_exception_handler(PydanticValidationError, request_validation_exception_handler)
     app.add_exception_handler(Exception, general_exception_handler)
 
 
-# Convenience raise_* helpers
-
-
-def raise_validation_error(message: str, data: Any = None) -> None:
-    raise ParameterValidationException(message, code=1001, data=data)
-
-
-def raise_auth_error(message: str = "Authentication failed, please sign in again", data: Any = None) -> None:
-    raise UnauthorizedException(message, code=1002, data=data)
-
-
-def raise_permission_error(message: str = "Insufficient permissions", data: Any = None) -> None:
-    raise ForbiddenException(message, code=1003, data=data)
-
-
-def raise_not_found_error(resource: str, data: Any = None) -> None:
-    raise NotFoundException(f"{resource} not found", code=1004, data=data)
-
-
-def raise_conflict_error(message: str, data: Any = None) -> None:
-    raise ConflictException(message, code=1005, data=data)
-
-
-def raise_client_closed_error(message: str = "Client has closed the connection", data: Any = None) -> None:
-    raise ClientClosedException(message, code=1008, data=data)
-
-
-def raise_business_error(message: str, data: Any = None) -> None:
-    raise BusinessLogicException(message, code=1006, data=data)
-
-
-def raise_internal_error(message: str = "Internal server error", data: Any = None) -> None:
-    raise InternalServerException(message, code=1007, data=data)
+def normalize_exception(exc: Exception) -> AppError:
+    return normalize_app_error(exc)
diff --git a/backend/app/common/logging.py b/backend/app/common/logging.py
index c208194c1..433a9a8be 100644
--- a/backend/app/common/logging.py
+++ b/backend/app/common/logging.py
@@ -8,11 +8,9 @@
 import logging
 import os
 import time
-from collections.abc import Callable
 
-from fastapi import Request, Response
 from loguru import logger
-from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
 from app.core.trace_context import get_trace_id, set_trace_id
 
@@ -35,45 +33,65 @@ def emit(self, record):
         logger.opt(depth=depth, exception=record.exc_info).log(level, record.getMessage())
 
 
-class LoggingMiddleware(BaseHTTPMiddleware):
-    """HTTP request logging middleware."""
+class LoggingMiddleware:
+    """Pure ASGI logging middleware (avoids BaseHTTPMiddleware re-raise issues)."""
+
+    def __init__(self, app: ASGIApp) -> None:
+        self.app = app
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
+        if scope["type"] != "http":
+            await self.app(scope, receive, send)
+            return
 
-    async def dispatch(self, request: Request, call_next: Callable) -> Response:
-        """Process the request and log details."""
         start_time = time.time()
-        method = request.method
-        path = request.url.path
-        client_host = request.client.host if request.client else "unknown"
+        method = scope.get("method", "-")
+        path = scope.get("path", "-")
+        client = scope.get("client")
+        client_host = client[0] if client else "unknown"
+
+        request_id = None
+        for key, value in scope.get("headers", []):
+            if key == b"x-request-id":
+                request_id = value.decode()
+                break
+        trace_id = set_trace_id(request_id)
 
-        trace_id = set_trace_id(request.headers.get("X-Request-ID") or None)
-        request.state.trace_id = trace_id
         log = logger.bind(trace_id=trace_id, method=method, path=path, client=client_host)
-
         log.info("request.start")
 
-        try:
-            response = await call_next(request)
-
-            process_time = time.time() - start_time
-            status_code = response.status_code
-            message = f"request.completed status={status_code} duration={process_time:.3f}s"
-
-            if status_code >= 500:
-                log.error(message)
-            elif status_code >= 400:
-                log.warning(message)
-            else:
-                log.info(message)
-
-            response.headers["X-Process-Time"] = str(process_time)
-            response.headers["X-Trace-Id"] = trace_id
-            return response
+        status_code = 500
+        response_process_time = 0.0
+
+        async def send_wrapper(message: Message) -> None:
+            nonlocal status_code, response_process_time
+            if message["type"] == "http.response.start":
+                status_code = message["status"]
+                response_process_time = time.time() - start_time
+                if "headers" not in message:
+                    message["headers"] = []
+                message["headers"] = list(message["headers"]) + [
+                    [b"x-process-time", str(response_process_time).encode()],
+                    [b"x-trace-id", trace_id.encode()],
+                ]
+            await send(message)
 
+        try:
+            await self.app(scope, receive, send_wrapper)
         except Exception as e:
             process_time = time.time() - start_time
             log.opt(exception=True).error(f"request.failed duration={process_time:.3f}s error={type(e).__name__}")
             raise
 
+        process_time = response_process_time or (time.time() - start_time)
+        message = f"request.completed status={status_code} duration={process_time:.3f}s"
+        if status_code >= 500:
+            log.error(message)
+        elif status_code >= 400:
+            log.warning(message)
+        else:
+            log.info(message)
+
 
 def setup_logging():
     """
diff --git a/backend/app/common/response.py b/backend/app/common/response.py
index ba9cd1127..02522daf9 100644
--- a/backend/app/common/response.py
+++ b/backend/app/common/response.py
@@ -1,6 +1,4 @@
-"""
-Unified response format.
-"""
+"""Unified response format."""
 
 from typing import Any, Generic, List, Optional, TypeVar
 
@@ -51,19 +49,9 @@ def success_response(
     }
 
 
-def error_response(
-    message: str = "Error",
-    code: int = 400,
-    data: Any = None,
-) -> dict:
-    """Build an error response."""
-    return {
-        "success": False,
-        "code": code,
-        "message": message,
-        "data": data,
-        "timestamp": utc_now().isoformat() + "Z",
-    }
+def error_response(error: dict[str, Any]) -> dict:
+    """Build a canonical error response."""
+    return dict(error)
 
 
 def paginated_response(
diff --git a/backend/app/common/skill_permissions.py b/backend/app/common/skill_permissions.py
index a9e749924..d12cb39cc 100644
--- a/backend/app/common/skill_permissions.py
+++ b/backend/app/common/skill_permissions.py
@@ -7,7 +7,7 @@
 from sqlalchemy import and_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import ForbiddenException
+from app.common.app_errors import AccessDeniedError
 from app.common.permissions import check_token_permission
 from app.models.skill import Skill
 from app.models.skill_collaborator import CollaboratorRole, SkillCollaborator
@@ -44,7 +44,7 @@ async def check_skill_access(
     """
     Unified permission check.
 
-    Raises ForbiddenException if the user lacks sufficient access.
+    Raises AccessDeniedError if the user lacks sufficient access.
     """
     # 1. Superuser bypass
     if is_superuser:
@@ -67,7 +67,11 @@ async def check_skill_access(
         _check_token_scope(token_scopes, required_scope, str(skill.id), token_resource_type, token_resource_id)
         return
 
-    raise ForbiddenException("You don't have permission to access this skill")
+    raise AccessDeniedError(
+        "You don't have permission to access this skill",
+        code="SKILL_ACCESS_DENIED",
+        data={"skill_id": str(skill.id), "user_id": user_id, "min_role": min_role.value},
+    )
 
 
 def _check_token_scope(
@@ -88,4 +92,8 @@ def _check_token_scope(
             token_resource_id=str(token_resource_id) if token_resource_id else None,
         )
         if not has_permission:
-            raise ForbiddenException(f"Token missing required scope or resource binding: {required_scope}")
+            raise AccessDeniedError(
+                f"Token missing required scope or resource binding: {required_scope}",
+                code="SKILL_TOKEN_SCOPE_FORBIDDEN",
+                data={"skill_id": skill_id, "required_scope": required_scope},
+            )
diff --git a/backend/app/common/stream_errors.py b/backend/app/common/stream_errors.py
new file mode 100644
index 000000000..fe3a229a2
--- /dev/null
+++ b/backend/app/common/stream_errors.py
@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+import json
+from typing import Any, Mapping
+
+
+def stream_error_event(
+    *,
+    code: str,
+    message: str,
+    data: Mapping[str, Any] | None = None,
+    source: str = "internal",
+    retryable: bool = False,
+    user_action: str | None = None,
+) -> str:
+    payload: dict[str, Any] = {
+        "code": code,
+        "message": message,
+        "data": dict(data) if data is not None else None,
+        "source": source,
+        "retryable": retryable,
+    }
+    if user_action is not None:
+        payload["user_action"] = user_action
+    return f"event: error\ndata: {json.dumps(payload)}\n\n"
diff --git a/backend/app/core/agent/artifacts/collector.py b/backend/app/core/agent/artifacts/collector.py
index 2fdee4f6a..94a09d361 100644
--- a/backend/app/core/agent/artifacts/collector.py
+++ b/backend/app/core/agent/artifacts/collector.py
@@ -9,13 +9,13 @@
 
 import json
 import mimetypes
-import os
 from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any
 
 from loguru import logger
 
+from app.core.settings import settings
 from app.utils.path_utils import sanitize_path_component
 
 MANIFEST_FILENAME = "_manifest.json"
@@ -26,7 +26,7 @@ def _default_artifacts_root() -> Path:
 
 
 def resolve_artifacts_root() -> Path:
-    env = os.getenv("AGENT_ARTIFACTS_ROOT", "").strip()
+    env = (settings.agent_artifacts_root or "").strip()
     if env:
         return Path(env).expanduser().resolve()
     return _default_artifacts_root().resolve()
diff --git a/backend/app/core/agent/backends/pydantic_adapter.py b/backend/app/core/agent/backends/pydantic_adapter.py
index ea523b370..1f00269f2 100644
--- a/backend/app/core/agent/backends/pydantic_adapter.py
+++ b/backend/app/core/agent/backends/pydantic_adapter.py
@@ -29,6 +29,7 @@
 from loguru import logger
 from pydantic_ai_backends import DockerSandbox
 
+from app.common.app_errors import ServiceUnavailableError
 from app.core.agent.backends.constants import (
     DEFAULT_AUTO_REMOVE,
     DEFAULT_COMMAND_TIMEOUT,
@@ -44,6 +45,7 @@
     list_builtin_runtimes,
     resolve_runtime,
 )
+from app.core.agent.backends.utils.command_executor import DANGEROUS_RE
 from app.utils.backend_utils import create_execute_response
 
 # Re-export for backward compatibility
@@ -234,7 +236,11 @@ def __init__(
             logger.info(f"DockerSandbox created: id={self._id}, image={self.image}")
         except Exception as e:
             logger.error(f"Failed to create DockerSandbox for adapter {self._id}: {e}", exc_info=True)
-            raise RuntimeError(f"Failed to create DockerSandbox: {e}") from e
+            raise ServiceUnavailableError(
+                "Failed to create Docker sandbox",
+                code="DOCKER_SANDBOX_CREATE_FAILED",
+                data={"sandbox_id": self._id, "image": self.image, "detail": str(e)},
+            ) from e
 
         # Start the sandbox
         logger.debug(f"Starting sandbox {self._id}...")
@@ -366,24 +372,11 @@ def start(self) -> None:
             logger.info(f"Sandbox {self._id} started (image={self.image})")
         except Exception as e:
             logger.error(f"Failed to start sandbox {self._id}: {e}")
-            raise RuntimeError(f"Failed to start sandbox {self._id}: {e}") from e
-
-    # Dangerous command patterns (defense-in-depth, not sole security boundary)
-    _DANGEROUS_PATTERNS = [
-        r"rm\s+-rf\s+/\s*$",  # rm -rf /
-        r"mkfs\.",  # format disk
-        r"dd\s+.*of=/dev/",  # write to device
-        r":\(\)\s*\{",  # fork bomb :(){ :|:& };:
-    ]
-    _DANGEROUS_RE = None  # Lazy-compiled combined regex
-
-    @classmethod
-    def _get_dangerous_re(cls):
-        if cls._DANGEROUS_RE is None:
-            import re
-
-            cls._DANGEROUS_RE = re.compile("|".join(f"(?:{p})" for p in cls._DANGEROUS_PATTERNS))
-        return cls._DANGEROUS_RE
+            raise ServiceUnavailableError(
+                "Failed to start Docker sandbox",
+                code="DOCKER_SANDBOX_START_FAILED",
+                data={"sandbox_id": self._id, "image": self.image, "detail": str(e)},
+            ) from e
 
     def _exec_command(self, command: str) -> tuple[str, int]:
         """Execute command in sandbox with safety checks.
@@ -394,7 +387,7 @@ def _exec_command(self, command: str) -> tuple[str, int]:
         Returns:
             Tuple of (output, exit_code)
         """
-        if self._get_dangerous_re().search(command):
+        if DANGEROUS_RE.search(command):
             logger.warning(f"[{self._id}] Blocked dangerous command: {command[:100]}")
             return "Error: command blocked by security policy", 1
 
diff --git a/backend/app/core/agent/backends/utils/command_executor.py b/backend/app/core/agent/backends/utils/command_executor.py
index 6195772db..7f6c48c4c 100644
--- a/backend/app/core/agent/backends/utils/command_executor.py
+++ b/backend/app/core/agent/backends/utils/command_executor.py
@@ -10,6 +10,7 @@
 - Output truncation support
 """
 
+import re
 import subprocess
 from typing import Optional
 
@@ -21,6 +22,16 @@
 )
 from app.utils.backend_utils import create_execute_response
 
+# Shared denylist for obviously destructive commands.
+# Defense-in-depth — shell=True is kept for LLM agent pipe/redirect support.
+DANGEROUS_PATTERNS = [
+    r"rm\s+-rf\s+/\s*$",  # rm -rf /
+    r"mkfs\.",  # format disk
+    r"dd\s+.*of=/dev/",  # write to device
+    r":\(\)\s*\{",  # fork bomb :(){ :|:& };:
+]
+DANGEROUS_RE = re.compile("|".join(f"(?:{p})" for p in DANGEROUS_PATTERNS))
+
 
 def combine_stdout_stderr(stdout: Optional[str], stderr: Optional[str]) -> str:
     """Combine stdout and stderr into a single output string.
@@ -106,6 +117,9 @@ def execute_local_command(
         total 0
         ...
     """
+    if DANGEROUS_RE.search(command):
+        return create_error_response("Command blocked by security policy")
+
     try:
         result = subprocess.run(
             command,
diff --git a/backend/app/core/agent/checkpointer/checkpointer.py b/backend/app/core/agent/checkpointer/checkpointer.py
index 0ca5adeac..4bdbdb613 100644
--- a/backend/app/core/agent/checkpointer/checkpointer.py
+++ b/backend/app/core/agent/checkpointer/checkpointer.py
@@ -5,12 +5,13 @@
 Centralize all checkpointer logic and provide a unified interface.
 """
 
-import os
 from typing import TYPE_CHECKING, Optional
 
 from loguru import logger
 from psycopg_pool import AsyncConnectionPool
 
+from app.common.app_errors import InternalServiceError, ServiceUnavailableError
+
 if TYPE_CHECKING:
     from langgraph.checkpoint.postgres.aio import AsyncPostgresSaver
 
@@ -63,10 +64,12 @@ async def initialize(cls) -> None:
 
         try:
             db_uri = cls._get_db_uri()
+            from app.core.settings import settings as _settings
+
             cls._pool = AsyncConnectionPool(
                 conninfo=db_uri,
-                min_size=int(os.getenv("DB_POOL_MIN_SIZE", 1)),
-                max_size=int(os.getenv("DB_POOL_MAX_SIZE", 10)),
+                min_size=_settings.checkpointer_pool_min_size,
+                max_size=_settings.checkpointer_pool_max_size,
                 kwargs={"autocommit": True, "prepare_threshold": 0},
                 open=False,  # do not auto-open in constructor
             )
@@ -75,7 +78,7 @@ async def initialize(cls) -> None:
             cls._initialized = True
             logger.info(
                 f"CheckpointerManager initialized | "
-                f"pool_size={os.getenv('DB_POOL_MIN_SIZE', 1)}-{os.getenv('DB_POOL_MAX_SIZE', 10)}"
+                f"pool_size={_settings.checkpointer_pool_min_size}-{_settings.checkpointer_pool_max_size}"
             )
 
             # initialize database table schema
@@ -103,7 +106,11 @@ async def _init_db(cls) -> None:
             Exception: If table creation fails.
         """
         if not cls._pool:
-            raise RuntimeError("Pool not initialized. Call initialize() first.")
+            raise InternalServiceError(
+                "Checkpointer pool is not initialized",
+                code="CHECKPOINTER_POOL_UNINITIALIZED",
+                data={"operation": "setup"},
+            )
 
         from langgraph.checkpoint.postgres.aio import AsyncPostgresSaver
 
@@ -122,8 +129,10 @@ def _get_pool(cls) -> AsyncConnectionPool:
             RuntimeError: If CheckpointerManager is not initialized.
         """
         if not cls._pool:
-            raise RuntimeError(
-                "CheckpointerManager not initialized. Call CheckpointerManager.initialize() at application startup."
+            raise InternalServiceError(
+                "Checkpointer manager is not initialized",
+                code="CHECKPOINTER_MANAGER_UNINITIALIZED",
+                data={"operation": "get_pool"},
             )
         return cls._pool
 
@@ -193,7 +202,11 @@ async def delete_thread_checkpoints(thread_id: str) -> None:
     """
     checkpointer = get_checkpointer()
     if checkpointer is None:
-        raise RuntimeError("Checkpoint is not enabled. Enable checkpoint in settings to use this function.")
+        raise ServiceUnavailableError(
+            "Checkpoint is not enabled",
+            code="CHECKPOINTER_DISABLED",
+            data=None,
+        )
 
     try:
         await checkpointer.adelete_thread(thread_id)
diff --git a/backend/app/core/agent/cli_backends/__init__.py b/backend/app/core/agent/cli_backends/__init__.py
new file mode 100644
index 000000000..e648e1f7e
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/__init__.py
@@ -0,0 +1,13 @@
+from .base import CLIMessage, CLIResult, RuntimeProvider, RuntimeSession
+from .registry import RuntimeProviderRegistry
+from .session_registry import SessionRegistry, session_registry
+
+__all__ = [
+    "CLIMessage",
+    "CLIResult",
+    "RuntimeProvider",
+    "RuntimeSession",
+    "RuntimeProviderRegistry",
+    "SessionRegistry",
+    "session_registry",
+]
diff --git a/backend/app/core/agent/cli_backends/base.py b/backend/app/core/agent/cli_backends/base.py
new file mode 100644
index 000000000..2cdce9409
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/base.py
@@ -0,0 +1,88 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from dataclasses import dataclass
+from typing import Any, AsyncIterator, Awaitable, Callable, Protocol
+
+
+@dataclass
+class CLIMessage:
+    type: str  # "text" | "thinking" | "tool_use" | "tool_result" | "error" | "artifact" | "approval_request"
+    content: str = ""
+    tool: str = ""
+    call_id: str = ""
+    input: dict | None = None
+    output: str = ""
+    error_payload: dict[str, Any] | None = None
+    # Observation/instrumentation fields — used by CLIObservationExtractor
+    tool_name: str | None = None
+    tool_input: dict | None = None
+    usage: dict | None = None
+
+
+def build_control_response(request_id: str, behavior: str) -> str:
+    return json.dumps(
+        {
+            "type": "control_response",
+            "response": {
+                "subtype": "success",
+                "request_id": request_id,
+                "response": {"behavior": behavior},
+            },
+        }
+    )
+
+
+@dataclass
+class CLIResult:
+    status: str  # "completed" | "failed" | "timeout" | "blocked"
+    output: str = ""
+    error: str = ""
+    error_payload: dict[str, Any] | None = None
+    session_id: str = ""
+    branch_name: str = ""
+    usage: dict | None = None
+
+
+@dataclass
+class RuntimeSession:
+    messages: asyncio.Queue[CLIMessage | None]
+    result: asyncio.Future[CLIResult]
+    _inject_fn: Callable[[str], Awaitable[None]] | None = None
+    _cancel_fn: Callable[[], Awaitable[None]] | None = None
+    _drain_task: asyncio.Task | None = None
+
+    async def inject_message(self, message: str) -> None:
+        if self._inject_fn:
+            await self._inject_fn(message)
+
+    async def cancel(self) -> None:
+        if self._cancel_fn:
+            await self._cancel_fn()
+        if self._drain_task:
+            self._drain_task.cancel()
+
+    async def iter_messages(self) -> AsyncIterator[CLIMessage]:
+        while True:
+            msg = await self.messages.get()
+            if msg is None:
+                break
+            yield msg
+
+
+class RuntimeProvider(Protocol):
+    provider_type: str
+
+    async def execute(
+        self,
+        prompt: str,
+        *,
+        container_id: str,
+        cwd: str | None = None,
+        model: str | None = None,
+        timeout: int = 7200,
+        resume_session_id: str | None = None,
+        env: dict[str, str] | None = None,
+        auto_approve: bool = True,
+    ) -> RuntimeSession: ...
diff --git a/backend/app/core/agent/cli_backends/claude_code.py b/backend/app/core/agent/cli_backends/claude_code.py
new file mode 100644
index 000000000..564ecc774
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/claude_code.py
@@ -0,0 +1,294 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from typing import Any
+
+from loguru import logger
+
+from .base import CLIMessage, CLIResult, RuntimeSession
+from .container_bridge import ContainerProcessBridge
+
+
+class ClaudeCodeProvider:
+    provider_type = "claude_code"
+
+    def __init__(self, executable_path: str = "claude"):
+        self.executable_path = executable_path
+        self.bridge = ContainerProcessBridge()
+
+    async def execute(
+        self,
+        prompt: str,
+        *,
+        container_id: str,
+        cwd: str | None = None,
+        model: str | None = None,
+        timeout: int = 7200,
+        resume_session_id: str | None = None,
+        env: dict[str, str] | None = None,
+        auto_approve: bool = True,
+    ) -> RuntimeSession:
+        cmd = [
+            self.executable_path,
+            "-p",
+            "--output-format",
+            "stream-json",
+            "--input-format",
+            "stream-json",
+            "--verbose",
+            "--max-turns",
+            "200",
+            "--permission-mode",
+            "bypassPermissions" if auto_approve else "default",
+        ]
+        if model:
+            cmd.extend(["--model", model])
+        if resume_session_id:
+            cmd.extend(["--resume", resume_session_id])
+
+        process = await self.bridge.exec_streaming(
+            container_id,
+            cmd,
+            env=env,
+            workdir=cwd,
+        )
+        logger.info(f"[claude] docker exec started for container {container_id[:12]}, pid={process.pid}")
+
+        # Send the initial prompt via stdin as stream-json (not --print)
+        if not resume_session_id and process.stdin:
+            user_msg = json.dumps(
+                {
+                    "type": "user",
+                    "message": {
+                        "role": "user",
+                        "content": [{"type": "text", "text": prompt}],
+                    },
+                }
+            )
+            process.stdin.write(f"{user_msg}\n".encode())
+            await process.stdin.drain()
+            logger.info(f"[claude] Sent initial prompt via stdin ({len(prompt)} chars)")
+
+        queue: asyncio.Queue[CLIMessage | None] = asyncio.Queue(maxsize=512)
+        loop = asyncio.get_event_loop()
+        result_future: asyncio.Future[CLIResult] = loop.create_future()
+
+        drain_task = asyncio.create_task(
+            self._drain(process, queue, result_future, timeout),
+            name=f"claude-drain-{container_id[:12]}",
+        )
+
+        async def inject(message: str) -> None:
+            if process.stdin and not process.stdin.is_closing():
+                process.stdin.write(f"{message}\n".encode())
+                await process.stdin.drain()
+
+        async def cancel() -> None:
+            process.terminate()
+
+        return RuntimeSession(
+            messages=queue,
+            result=result_future,
+            _inject_fn=inject,
+            _cancel_fn=cancel,
+            _drain_task=drain_task,
+        )
+
+    async def _drain(
+        self,
+        process: asyncio.subprocess.Process,
+        queue: asyncio.Queue[CLIMessage | None],
+        result_future: asyncio.Future[CLIResult],
+        timeout: int,
+    ) -> None:
+        accumulated_text: list[str] = []
+        session_id = ""
+        usage: dict = {}
+        is_error = False
+
+        try:
+            async with asyncio.timeout(timeout):
+                assert process.stdout is not None
+                logger.info("[claude] Drain loop started, reading stdout...")
+                async for raw_line in process.stdout:
+                    line = raw_line.decode().strip()
+                    if not line:
+                        continue
+                    try:
+                        event = json.loads(line)
+                    except json.JSONDecodeError:
+                        logger.warning(f"[claude] Non-JSON line from stdout: {line[:200]}")
+                        continue
+
+                    if not isinstance(event, dict):
+                        continue
+
+                    event_type = event.get("type", "unknown")
+                    logger.info(f"[claude] Received event: type={event_type}")
+
+                    for msg in self._parse_event(event):
+                        if msg.type == "text":
+                            accumulated_text.append(msg.content)
+                        await queue.put(msg)
+
+                    if event.get("type") == "result":
+                        result_data = event.get("result", {})
+                        if isinstance(result_data, dict):
+                            session_id = result_data.get("session_id", "")
+                        if "usage" in event:
+                            usage = event["usage"]
+                        if event.get("is_error"):
+                            is_error = True
+                        # result received — close stdin so the process exits cleanly
+                        if process.stdin and not process.stdin.is_closing():
+                            process.stdin.close()
+                        break
+
+        except TimeoutError:
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="timeout",
+                        error="Agent timed out",
+                        error_payload={
+                            "code": "CLAUDE_CODE_TIMEOUT",
+                            "message": "Agent timed out",
+                            "data": None,
+                            "source": "runtime",
+                            "retryable": True,
+                        },
+                    )
+                )
+        except Exception as e:
+            logger.error(f"Claude drain error: {e}")
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="failed",
+                        error=str(e),
+                        error_payload={
+                            "code": "CLAUDE_CODE_DRAIN_FAILED",
+                            "message": str(e),
+                            "data": None,
+                            "source": "runtime",
+                            "retryable": False,
+                        },
+                    )
+                )
+        finally:
+            if not result_future.done():
+                exit_code = await process.wait()
+                if is_error:
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            output="\n".join(accumulated_text),
+                            error="\n".join(accumulated_text) or "Claude Code reported an error",
+                            error_payload={
+                                "code": "CLAUDE_CODE_EXECUTION_FAILED",
+                                "message": "\n".join(accumulated_text) or "Claude Code reported an error",
+                                "data": None,
+                                "source": "runtime",
+                                "retryable": False,
+                            },
+                            session_id=session_id,
+                            usage=usage,
+                        )
+                    )
+                elif exit_code == 0 or accumulated_text:
+                    result_future.set_result(
+                        CLIResult(
+                            status="completed",
+                            output="\n".join(accumulated_text),
+                            session_id=session_id,
+                            usage=usage,
+                        )
+                    )
+                else:
+                    stderr_bytes = await process.stderr.read() if process.stderr else b""
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            error=f"Exit code {exit_code}: {stderr_bytes.decode()[:2000]}",
+                            error_payload={
+                                "code": "CLAUDE_CODE_EXIT_FAILED",
+                                "message": f"Exit code {exit_code}: {stderr_bytes.decode()[:2000]}",
+                                "data": {"exit_code": exit_code},
+                                "source": "runtime",
+                                "retryable": False,
+                            },
+                            usage=usage,
+                        )
+                    )
+            await queue.put(None)
+
+    def _parse_event(self, event: dict) -> list[CLIMessage]:
+        messages: list[CLIMessage] = []
+        event_type = event.get("type", "")
+
+        if event_type == "assistant" and "message" in event:
+            msg = event["message"]
+            for block in msg.get("content", []) if isinstance(msg, dict) else []:
+                if isinstance(block, str):
+                    messages.append(CLIMessage(type="text", content=block))
+                    continue
+                if not isinstance(block, dict):
+                    continue
+                block_type = block.get("type", "")
+                if block_type == "text":
+                    messages.append(CLIMessage(type="text", content=block.get("text", "")))
+                elif block_type == "tool_use":
+                    messages.append(
+                        CLIMessage(
+                            type="tool_use",
+                            tool=block.get("name", ""),
+                            call_id=block.get("id", ""),
+                            input=block.get("input"),
+                        )
+                    )
+                elif block_type == "thinking":
+                    messages.append(CLIMessage(type="thinking", content=block.get("thinking", "")))
+
+        elif event_type == "tool_result":
+            messages.append(
+                CLIMessage(
+                    type="tool_result",
+                    tool=event.get("tool", ""),
+                    call_id=event.get("call_id", ""),
+                    output=str(event.get("output", ""))[:8192],
+                )
+            )
+
+        elif event_type == "control_request":
+            request = event.get("request", {})
+            messages.append(
+                CLIMessage(
+                    type="approval_request",
+                    tool=request.get("tool_name", ""),
+                    call_id=event.get("request_id", ""),
+                    input=request.get("input"),
+                    content=request.get("subtype", ""),
+                )
+            )
+        elif event_type == "system" and event.get("subtype") == "error":
+            error_payload = _extract_claude_error_payload(event)
+            messages.append(
+                CLIMessage(
+                    type="error",
+                    content=error_payload["message"],
+                    error_payload=error_payload,
+                )
+            )
+
+        return messages
+
+
+def _extract_claude_error_payload(event: dict[str, Any]) -> dict[str, Any]:
+    return {
+        "code": str(event.get("code") or "CLAUDE_CODE_RUNTIME_ERROR"),
+        "message": str(event.get("message") or "Claude Code runtime error"),
+        "data": event.get("data") if isinstance(event.get("data"), dict) else None,
+        "source": "runtime",
+        "retryable": False,
+    }
diff --git a/backend/app/core/agent/cli_backends/codex.py b/backend/app/core/agent/cli_backends/codex.py
new file mode 100644
index 000000000..bcab5d92c
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/codex.py
@@ -0,0 +1,526 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from typing import Any
+
+from loguru import logger
+
+from app.common.app_errors import InternalServiceError
+from app.utils.safe_task import safe_create_task
+
+from .base import CLIMessage, CLIResult, RuntimeSession
+from .container_bridge import ContainerProcessBridge
+
+
+class CodexProvider:
+    """Runtime provider for OpenAI Codex CLI.
+
+    Codex uses JSON-RPC 2.0 over stdio. We spawn ``codex app-server --listen
+    stdio://``, perform the initialize / thread/start / turn/start handshake,
+    then read NDJSON lines from stdout.  Each line is either:
+
+    * A *response* (has ``id`` + ``result`` or ``error``) — matched to a
+      pending request.
+    * A *server request* (has ``id`` + ``method``) — auto-approved.
+    * A *notification* (has ``method``, no ``id``) — mapped to CLIMessage.
+    """
+
+    provider_type = "codex"
+
+    def __init__(self, executable_path: str = "codex") -> None:
+        self.executable_path = executable_path
+        self.bridge = ContainerProcessBridge()
+
+    # ── public API ──────────────────────────────────────────────────────
+
+    async def execute(
+        self,
+        prompt: str,
+        *,
+        container_id: str,
+        cwd: str | None = None,
+        model: str | None = None,
+        timeout: int = 7200,
+        resume_session_id: str | None = None,
+        env: dict[str, str] | None = None,
+        auto_approve: bool = True,
+    ) -> RuntimeSession:
+        cmd = [self.executable_path, "app-server", "--listen", "stdio://"]
+
+        process = await self.bridge.exec_streaming(
+            container_id,
+            cmd,
+            env=env,
+            workdir=cwd,
+        )
+
+        queue: asyncio.Queue[CLIMessage | None] = asyncio.Queue(maxsize=512)
+        loop = asyncio.get_event_loop()
+        result_future: asyncio.Future[CLIResult] = loop.create_future()
+
+        drain_task = asyncio.create_task(
+            self._drain(process, queue, result_future, prompt, model, timeout),
+            name=f"codex-drain-{container_id[:12]}",
+        )
+
+        async def inject(message: str) -> None:
+            if process.stdin and not process.stdin.is_closing():
+                process.stdin.write(f"{message}\n".encode())
+                await process.stdin.drain()
+
+        async def cancel() -> None:
+            process.terminate()
+
+        return RuntimeSession(
+            messages=queue,
+            result=result_future,
+            _inject_fn=inject,
+            _cancel_fn=cancel,
+            _drain_task=drain_task,
+        )
+
+    # ── JSON-RPC helpers ────────────────────────────────────────────────
+
+    _next_id: int = 0
+
+    async def _rpc_request(
+        self,
+        process: asyncio.subprocess.Process,
+        method: str,
+        params: dict,
+    ) -> dict:
+        """Send a JSON-RPC request and wait for the matching response."""
+        self._next_id += 1
+        req_id = self._next_id
+        msg = {"jsonrpc": "2.0", "id": req_id, "method": method, "params": params}
+        line = json.dumps(msg) + "\n"
+        assert process.stdin is not None
+        process.stdin.write(line.encode())
+        await process.stdin.drain()
+        return {"_pending_id": req_id}
+
+    async def _rpc_notify(
+        self,
+        process: asyncio.subprocess.Process,
+        method: str,
+    ) -> None:
+        msg = {"jsonrpc": "2.0", "method": method}
+        line = json.dumps(msg) + "\n"
+        assert process.stdin is not None
+        process.stdin.write(line.encode())
+        await process.stdin.drain()
+
+    async def _rpc_respond(
+        self,
+        process: asyncio.subprocess.Process,
+        req_id: int,
+        result: dict,
+    ) -> None:
+        msg = {"jsonrpc": "2.0", "id": req_id, "result": result}
+        line = json.dumps(msg) + "\n"
+        assert process.stdin is not None
+        process.stdin.write(line.encode())
+        await process.stdin.drain()
+
+    # ── drain loop ──────────────────────────────────────────────────────
+
+    async def _drain(
+        self,
+        process: asyncio.subprocess.Process,
+        queue: asyncio.Queue[CLIMessage | None],
+        result_future: asyncio.Future[CLIResult],
+        prompt: str,
+        model: str | None,
+        timeout: int,
+    ) -> None:
+        accumulated_text: list[str] = []
+        pending: dict[int, asyncio.Future[dict]] = {}
+        turn_done: asyncio.Future[bool] = asyncio.get_event_loop().create_future()
+
+        async def wait_response(req_id: int) -> dict:
+            """Register a pending request and wait for its response."""
+            fut: asyncio.Future[dict] = asyncio.get_event_loop().create_future()
+            pending[req_id] = fut
+            return await fut
+
+        def handle_line(line: str) -> None:
+            """Route a single JSON-RPC line."""
+            try:
+                raw = json.loads(line)
+            except json.JSONDecodeError:
+                return
+            if not isinstance(raw, dict):
+                return
+
+            has_id = "id" in raw
+
+            # Response to our request
+            if has_id and ("result" in raw or "error" in raw):
+                req_id = raw.get("id")
+                if req_id in pending and not pending[req_id].done():
+                    if "error" in raw:
+                        pending[req_id].set_exception(RuntimeError(f"RPC error: {raw['error']}"))
+                    else:
+                        pending[req_id].set_result(raw.get("result", {}))
+                return
+
+            # Server request (has id + method) — auto-approve
+            if has_id and "method" in raw:
+                method = raw.get("method", "")
+                safe_create_task(
+                    self._rpc_respond(process, raw["id"], {"decision": "accept"}),
+                    name=f"codex-rpc-{raw['id']}",
+                )
+                return
+
+            # Notification (no id, has method)
+            if "method" in raw:
+                for msg in self._parse_notification(raw):
+                    if msg.type == "text":
+                        accumulated_text.append(msg.content)
+                    try:
+                        queue.put_nowait(msg)
+                    except asyncio.QueueFull:
+                        logger.warning(f"Codex event queue full, dropping message: {msg.type}")
+
+                # Detect turn completion
+                method = raw.get("method", "")
+                params = raw.get("params", {})
+                if method == "turn/completed":
+                    status = _nested_str(params, "turn", "status")
+                    aborted = status in ("cancelled", "canceled", "aborted", "interrupted")
+                    if not turn_done.done():
+                        turn_done.set_result(aborted)
+                elif method == "codex/event":
+                    msg_data = (params or {}).get("msg", {})
+                    if isinstance(msg_data, dict):
+                        msg_type = msg_data.get("type", "")
+                        if msg_type == "task_complete":
+                            if not turn_done.done():
+                                turn_done.set_result(False)
+                        elif msg_type == "turn_aborted":
+                            if not turn_done.done():
+                                turn_done.set_result(True)
+
+        try:
+            async with asyncio.timeout(timeout):
+                # 1. Send initialize
+                await self._rpc_request(
+                    process,
+                    "initialize",
+                    {
+                        "clientInfo": {
+                            "name": "joysafeter-agent",
+                            "title": "JoySafeter Agent",
+                            "version": "0.1.0",
+                        },
+                        "capabilities": {"experimentalApi": True},
+                    },
+                )
+                init_id = self._next_id
+
+                # Read lines until we get the initialize response
+                assert process.stdout is not None
+                async for raw_line in process.stdout:
+                    line = raw_line.decode().strip()
+                    if not line:
+                        continue
+                    try:
+                        raw = json.loads(line)
+                    except json.JSONDecodeError:
+                        continue
+                    if isinstance(raw, dict) and raw.get("id") == init_id and "result" in raw:
+                        break
+                    handle_line(line)
+
+                # 2. Send initialized notification
+                await self._rpc_notify(process, "initialized")
+
+                # 3. Start thread
+                await self._rpc_request(
+                    process,
+                    "thread/start",
+                    {
+                        "model": model,
+                        "cwd": None,
+                        "approvalPolicy": None,
+                        "sandbox": None,
+                    },
+                )
+                thread_start_id = self._next_id
+                thread_id = ""
+
+                assert process.stdout is not None
+                async for raw_line in process.stdout:
+                    line = raw_line.decode().strip()
+                    if not line:
+                        continue
+                    try:
+                        raw = json.loads(line)
+                    except json.JSONDecodeError:
+                        continue
+                    if isinstance(raw, dict) and raw.get("id") == thread_start_id and "result" in raw:
+                        result_data = raw.get("result", {})
+                        thread_data = result_data.get("thread", {}) if isinstance(result_data, dict) else {}
+                        thread_id = thread_data.get("id", "") if isinstance(thread_data, dict) else ""
+                        break
+                    handle_line(line)
+
+                if not thread_id:
+                    raise InternalServiceError(
+                        "Codex thread start returned no thread ID",
+                        code="CODEX_THREAD_START_INVALID",
+                        data=None,
+                    )
+
+                logger.info(f"codex thread started: {thread_id}")
+
+                # 4. Start turn
+                await self._rpc_request(
+                    process,
+                    "turn/start",
+                    {
+                        "threadId": thread_id,
+                        "input": [{"type": "text", "text": prompt}],
+                    },
+                )
+
+                # 5. Read events until turn completes
+                assert process.stdout is not None
+                async for raw_line in process.stdout:
+                    line = raw_line.decode().strip()
+                    if not line:
+                        continue
+                    handle_line(line)
+                    if turn_done.done():
+                        break
+
+        except TimeoutError:
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="timeout",
+                        error="Codex agent timed out",
+                        error_payload={
+                            "code": "CODEX_TIMEOUT",
+                            "message": "Codex agent timed out",
+                            "data": None,
+                            "source": "runtime",
+                            "retryable": True,
+                        },
+                    )
+                )
+        except Exception as e:
+            logger.error(f"Codex drain error: {e}")
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="failed",
+                        error=str(e),
+                        error_payload={
+                            "code": "CODEX_DRAIN_FAILED",
+                            "message": str(e),
+                            "data": None,
+                            "source": "runtime",
+                            "retryable": False,
+                        },
+                    )
+                )
+        finally:
+            if not result_future.done():
+                exit_code = await process.wait()
+                aborted = turn_done.done() and turn_done.result()
+                if aborted:
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            output="\n".join(accumulated_text),
+                            error="Turn was aborted",
+                            error_payload={
+                                "code": "CODEX_TURN_ABORTED",
+                                "message": "Turn was aborted",
+                                "data": None,
+                                "source": "runtime",
+                                "retryable": False,
+                            },
+                        )
+                    )
+                elif exit_code == 0 or accumulated_text:
+                    result_future.set_result(
+                        CLIResult(
+                            status="completed",
+                            output="\n".join(accumulated_text),
+                        )
+                    )
+                else:
+                    stderr_bytes = await process.stderr.read() if process.stderr else b""
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            error=f"Exit code {exit_code}: {stderr_bytes.decode()[:2000]}",
+                            error_payload={
+                                "code": "CODEX_EXIT_FAILED",
+                                "message": f"Exit code {exit_code}: {stderr_bytes.decode()[:2000]}",
+                                "data": {"exit_code": exit_code},
+                                "source": "runtime",
+                                "retryable": False,
+                            },
+                        )
+                    )
+            await queue.put(None)
+
+    # ── event parsing (testable without Docker) ─────────────────────────
+
+    def _parse_notification(self, raw: dict) -> list[CLIMessage]:
+        """Parse a JSON-RPC notification into CLIMessage list.
+
+        Handles both legacy ``codex/event`` notifications and raw v2
+        ``item/*`` / ``turn/*`` notifications.
+        """
+        method = raw.get("method", "")
+        params = raw.get("params", {}) or {}
+
+        # Legacy codex/event format
+        if method == "codex/event" or method.startswith("codex/event/"):
+            return self._parse_legacy_event(params)
+
+        # Raw v2 item notifications
+        if method.startswith("item/"):
+            return self._parse_item_notification(method, params)
+
+        if method == "turn/error":
+            payload = _extract_codex_error_payload(params)
+            return [CLIMessage(type="error", content=payload["message"], error_payload=payload)]
+
+        return []
+
+    def _parse_legacy_event(self, params: dict) -> list[CLIMessage]:
+        msg_data = params.get("msg")
+        if not isinstance(msg_data, dict):
+            return []
+
+        msg_type = msg_data.get("type", "")
+        messages: list[CLIMessage] = []
+
+        if msg_type == "agent_message":
+            text = msg_data.get("message", "")
+            if text:
+                messages.append(CLIMessage(type="text", content=text))
+        elif msg_type == "exec_command_begin":
+            messages.append(
+                CLIMessage(
+                    type="tool_use",
+                    tool="exec_command",
+                    call_id=msg_data.get("call_id", ""),
+                    input={"command": msg_data.get("command", "")},
+                )
+            )
+        elif msg_type == "exec_command_end":
+            messages.append(
+                CLIMessage(
+                    type="tool_result",
+                    tool="exec_command",
+                    call_id=msg_data.get("call_id", ""),
+                    output=msg_data.get("output", ""),
+                )
+            )
+        elif msg_type == "patch_apply_begin":
+            messages.append(
+                CLIMessage(
+                    type="tool_use",
+                    tool="patch_apply",
+                    call_id=msg_data.get("call_id", ""),
+                )
+            )
+        elif msg_type == "patch_apply_end":
+            messages.append(
+                CLIMessage(
+                    type="tool_result",
+                    tool="patch_apply",
+                    call_id=msg_data.get("call_id", ""),
+                )
+            )
+
+        return messages
+
+    def _parse_item_notification(self, method: str, params: dict) -> list[CLIMessage]:
+        item = params.get("item", {})
+        if not isinstance(item, dict):
+            return []
+
+        item_type = item.get("type", "")
+        item_id = item.get("id", "")
+
+        if method == "item/started" and item_type == "commandExecution":
+            return [
+                CLIMessage(
+                    type="tool_use",
+                    tool="exec_command",
+                    call_id=item_id,
+                    input={"command": item.get("command", "")},
+                )
+            ]
+
+        if method == "item/completed" and item_type == "commandExecution":
+            return [
+                CLIMessage(
+                    type="tool_result",
+                    tool="exec_command",
+                    call_id=item_id,
+                    output=item.get("aggregatedOutput", ""),
+                )
+            ]
+
+        if method == "item/started" and item_type == "fileChange":
+            return [
+                CLIMessage(
+                    type="tool_use",
+                    tool="patch_apply",
+                    call_id=item_id,
+                )
+            ]
+
+        if method == "item/completed" and item_type == "fileChange":
+            return [
+                CLIMessage(
+                    type="tool_result",
+                    tool="patch_apply",
+                    call_id=item_id,
+                )
+            ]
+
+        if method == "item/completed" and item_type == "agentMessage":
+            text = item.get("text", "")
+            if text:
+                return [CLIMessage(type="text", content=text)]
+
+        return []
+
+
+def _nested_str(m: dict, *keys: str) -> str:
+    current = m
+    for key in keys:
+        if not isinstance(current, dict):
+            return ""
+        current = current.get(key, {})
+    return current if isinstance(current, str) else ""
+
+
+def _extract_codex_error_payload(params: dict[str, Any]) -> dict[str, Any]:
+    error = params.get("error")
+    if isinstance(error, dict):
+        return {
+            "code": str(error.get("code") or "CODEX_RUNTIME_ERROR"),
+            "message": str(error.get("message") or "Codex runtime error"),
+            "data": error.get("data") if isinstance(error.get("data"), dict) else None,
+            "source": "runtime",
+            "retryable": False,
+        }
+    return {
+        "code": "CODEX_RUNTIME_ERROR",
+        "message": str(params.get("message") or "Codex runtime error"),
+        "data": None,
+        "source": "runtime",
+        "retryable": False,
+    }
diff --git a/backend/app/core/agent/cli_backends/container_bridge.py b/backend/app/core/agent/cli_backends/container_bridge.py
new file mode 100644
index 000000000..6b00b0166
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/container_bridge.py
@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import asyncio
+
+from loguru import logger
+
+
+class ContainerProcessBridge:
+    async def exec_streaming(
+        self,
+        container_id: str,
+        cmd: list[str],
+        workdir: str | None = None,
+        env: dict[str, str] | None = None,
+    ) -> asyncio.subprocess.Process:
+        docker_cmd = ["docker", "exec", "-i"]
+        if workdir:
+            docker_cmd.extend(["-w", workdir])
+        if env:
+            for key, value in env.items():
+                docker_cmd.extend(["-e", f"{key}={value}"])
+        docker_cmd.append(container_id)
+        docker_cmd.extend(cmd)
+
+        logger.debug(f"container exec: {' '.join(docker_cmd[:6])}...")
+
+        return await asyncio.create_subprocess_exec(
+            *docker_cmd,
+            stdin=asyncio.subprocess.PIPE,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
diff --git a/backend/app/core/agent/cli_backends/container_pool.py b/backend/app/core/agent/cli_backends/container_pool.py
new file mode 100644
index 000000000..dd6da4c3a
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/container_pool.py
@@ -0,0 +1,193 @@
+"""
+CLI agent container pool with TTL-based eviction and session resume.
+
+Keeps containers alive after execution for reuse by the same agent.
+Idle containers are cleaned up after `idle_timeout` seconds (default 30 min).
+On app shutdown, containers are NOT destroyed — they survive restarts.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import time
+import uuid
+from dataclasses import dataclass
+from typing import Optional
+
+from loguru import logger
+
+from .container_service import CLIContainerService, ContainerInfo
+
+
+@dataclass
+class PoolEntry:
+    container: ContainerInfo
+    agent_profile_id: uuid.UUID
+    last_used: float
+    created_at: float
+    active_count: int = 0
+    last_session_id: Optional[str] = None
+
+
+class ContainerPool:
+    """Pool of CLI agent containers keyed by agent_profile_id."""
+
+    def __init__(
+        self,
+        container_service: Optional[CLIContainerService] = None,
+        idle_timeout: int = 1800,
+        max_size: int = 20,
+    ):
+        self._pool: dict[uuid.UUID, PoolEntry] = {}
+        self._lock = asyncio.Lock()
+        self._idle_timeout = idle_timeout
+        self._max_size = max_size
+        self._shutdown = False
+        self.container_service = container_service or CLIContainerService()
+
+    async def get(self, agent_profile_id: uuid.UUID) -> tuple[Optional[ContainerInfo], Optional[str]]:
+        """Return (container, last_session_id) if a pooled container exists."""
+        async with self._lock:
+            if self._shutdown:
+                return None, None
+            entry = self._pool.get(agent_profile_id)
+            if entry:
+                entry.last_used = time.time()
+                entry.active_count += 1
+                return entry.container, entry.last_session_id
+            return None, None
+
+    async def put(
+        self,
+        agent_profile_id: uuid.UUID,
+        container: ContainerInfo,
+    ) -> None:
+        """Register a newly created container in the pool."""
+        old: Optional[PoolEntry] = None
+        evicted: Optional[PoolEntry] = None
+        shutdown = False
+
+        async with self._lock:
+            if self._shutdown:
+                shutdown = True
+            else:
+                if len(self._pool) >= self._max_size and agent_profile_id not in self._pool:
+                    evicted = self._evict_lru_entry()
+
+                old = self._pool.pop(agent_profile_id, None)
+                self._pool[agent_profile_id] = PoolEntry(
+                    container=container,
+                    agent_profile_id=agent_profile_id,
+                    last_used=time.time(),
+                    created_at=time.time(),
+                    active_count=1,
+                )
+                logger.info(
+                    f"Pooled container {container.container_id[:12]} for agent "
+                    f"{agent_profile_id} (pool_size={len(self._pool)})"
+                )
+
+        if shutdown:
+            await self._safe_remove(container.container_id)
+            return
+        if evicted:
+            await self._safe_remove(evicted.container.container_id)
+        if old:
+            await self._safe_remove(old.container.container_id)
+
+    async def release(self, agent_profile_id: uuid.UUID) -> None:
+        """Decrement active count after execution finishes."""
+        async with self._lock:
+            entry = self._pool.get(agent_profile_id)
+            if entry:
+                entry.active_count = max(0, entry.active_count - 1)
+                entry.last_used = time.time()
+
+    async def release_and_destroy_if_idle(self, agent_profile_id: uuid.UUID) -> bool:
+        """Decrement active count; if no other executions are using it, remove the container.
+
+        Returns True if the container was destroyed."""
+        entry: Optional[PoolEntry] = None
+        async with self._lock:
+            e = self._pool.get(agent_profile_id)
+            if not e:
+                return False
+            e.active_count = max(0, e.active_count - 1)
+            if e.active_count == 0:
+                entry = self._pool.pop(agent_profile_id)
+        if entry:
+            await self._safe_remove(entry.container.container_id)
+            logger.info(
+                f"Destroyed idle container {entry.container.container_id[:12]} "
+                f"for agent {agent_profile_id} after cancel"
+            )
+            return True
+        return False
+
+    async def set_session_id(self, agent_profile_id: uuid.UUID, session_id: str) -> None:
+        """Store Claude session_id for next --resume."""
+        async with self._lock:
+            entry = self._pool.get(agent_profile_id)
+            if entry and session_id:
+                entry.last_session_id = session_id
+
+    async def remove(self, agent_profile_id: uuid.UUID) -> None:
+        """Force-remove a container (e.g., on execution failure)."""
+        entry: Optional[PoolEntry] = None
+        async with self._lock:
+            entry = self._pool.pop(agent_profile_id, None)
+        if entry:
+            await self._safe_remove(entry.container.container_id)
+
+    async def cleanup_idle(self) -> int:
+        """Remove containers idle longer than idle_timeout. Returns count removed."""
+        now = time.time()
+        to_remove: list[tuple[uuid.UUID, str]] = []
+
+        async with self._lock:
+            for agent_id, entry in list(self._pool.items()):
+                idle = entry.active_count == 0 and (now - entry.last_used) > self._idle_timeout
+                if idle:
+                    self._pool.pop(agent_id)
+                    to_remove.append((agent_id, entry.container.container_id))
+
+        for agent_id, container_id in to_remove:
+            await self._safe_remove(container_id)
+            logger.info(f"Evicted idle container {container_id[:12]} for agent {agent_id}")
+
+        return len(to_remove)
+
+    async def shutdown(self) -> None:
+        """Mark pool as shut down. Containers are NOT destroyed."""
+        async with self._lock:
+            self._shutdown = True
+            self._pool.clear()
+        logger.info("Container pool shut down (containers left running for reuse after restart)")
+
+    async def _evict_lru(self) -> None:
+        """Evict the least-recently-used idle container. Called outside lock."""
+        entry = self._evict_lru_entry()
+        if entry:
+            await self._safe_remove(entry.container.container_id)
+
+    def _evict_lru_entry(self) -> Optional[PoolEntry]:
+        """Pop the LRU idle entry from the pool. Must be called inside lock."""
+        lru_id: Optional[uuid.UUID] = None
+        lru_time = float("inf")
+        for agent_id, entry in self._pool.items():
+            if entry.active_count == 0 and entry.last_used < lru_time:
+                lru_time = entry.last_used
+                lru_id = agent_id
+        if lru_id:
+            return self._pool.pop(lru_id)
+        return None
+
+    async def _safe_remove(self, container_id: str) -> None:
+        try:
+            await self.container_service.remove_container(container_id, force=True)
+        except Exception as exc:
+            logger.warning(f"Failed to remove pooled container {container_id[:12]}: {exc}")
+
+
+# Module-level singleton
+container_pool = ContainerPool()
diff --git a/backend/app/core/agent/cli_backends/container_service.py b/backend/app/core/agent/cli_backends/container_service.py
new file mode 100644
index 000000000..f767bffde
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/container_service.py
@@ -0,0 +1,156 @@
+"""
+CLI container lifecycle management via Docker.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import os
+import tempfile
+import uuid
+from dataclasses import dataclass, field
+from typing import Optional
+
+from loguru import logger
+
+from app.common.app_errors import ServiceUnavailableError
+
+
+@dataclass
+class ContainerConfig:
+    image: str = "joysafeter/cli-agent:latest"
+    memory_limit: str = "2g"
+    cpu_quota: int = 200000
+    network_mode: str = "bridge"
+    working_dir: str = "/workspace"
+    labels: dict[str, str] = field(default_factory=dict)
+
+
+@dataclass
+class ContainerInfo:
+    container_id: str
+    name: str
+    status: str
+    working_dir: str
+
+
+class CLIContainerService:
+    """Manages Docker container lifecycle for CLI agent executions."""
+
+    def __init__(self, default_config: Optional[ContainerConfig] = None):
+        self.default_config = default_config or ContainerConfig()
+
+    async def create_container(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        config: Optional[ContainerConfig] = None,
+        env: Optional[dict[str, str]] = None,
+    ) -> ContainerInfo:
+        cfg = config or self.default_config
+        name = f"cli-agent-{execution_id!s:.12}"
+
+        docker_cmd = [
+            "docker",
+            "create",
+            "--name",
+            name,
+            "-w",
+            cfg.working_dir,
+            f"--memory={cfg.memory_limit}",
+            f"--cpu-quota={cfg.cpu_quota}",
+            f"--network={cfg.network_mode}",
+        ]
+        for k, v in cfg.labels.items():
+            docker_cmd.extend(["--label", f"{k}={v}"])
+        docker_cmd.extend(["--label", f"execution_id={execution_id}"])
+
+        env_file_path: Optional[str] = None
+        if env:
+            env_file_path = self._write_env_file(env)
+            docker_cmd.extend(["--env-file", env_file_path])
+
+        docker_cmd.append(cfg.image)
+        docker_cmd.append("sleep")
+        docker_cmd.append("infinity")
+
+        try:
+            container_id = await self._run_docker(docker_cmd)
+            container_id = container_id.strip()
+        finally:
+            if env_file_path:
+                try:
+                    os.unlink(env_file_path)
+                except OSError:
+                    pass
+
+        await self._run_docker(["docker", "start", container_id])
+
+        logger.info(f"Created container {container_id[:12]} for execution {execution_id}")
+        return ContainerInfo(
+            container_id=container_id,
+            name=name,
+            status="running",
+            working_dir=cfg.working_dir,
+        )
+
+    @staticmethod
+    def _write_env_file(env: dict[str, str]) -> str:
+        """Write env vars to a temp file (mode 0600) and return its path."""
+        fd, path = tempfile.mkstemp(prefix="cli_agent_env_", suffix=".env")
+        try:
+            with os.fdopen(fd, "w") as f:
+                for k, v in env.items():
+                    f.write(f"{k}={v}\n")
+            os.chmod(path, 0o600)
+        except Exception:
+            os.unlink(path)
+            raise
+        return path
+
+    async def stop_container(self, container_id: str, timeout: int = 10) -> None:
+        try:
+            await self._run_docker(["docker", "stop", "-t", str(timeout), container_id])
+            logger.info(f"Stopped container {container_id[:12]}")
+        except RuntimeError as exc:
+            logger.warning(f"Failed to stop container {container_id[:12]}: {exc}")
+
+    async def remove_container(self, container_id: str, force: bool = True) -> None:
+        cmd = ["docker", "rm"]
+        if force:
+            cmd.append("-f")
+        cmd.append(container_id)
+        try:
+            await self._run_docker(cmd)
+            logger.info(f"Removed container {container_id[:12]}")
+        except RuntimeError as exc:
+            logger.warning(f"Failed to remove container {container_id[:12]}: {exc}")
+
+    async def copy_to_container(self, container_id: str, src_path: str, dest_path: str) -> None:
+        await self._run_docker(["docker", "cp", src_path, f"{container_id}:{dest_path}"])
+
+    async def exec_in_container(self, container_id: str, cmd: list[str], workdir: Optional[str] = None) -> str:
+        docker_cmd = ["docker", "exec"]
+        if workdir:
+            docker_cmd.extend(["-w", workdir])
+        docker_cmd.append(container_id)
+        docker_cmd.extend(cmd)
+        return await self._run_docker(docker_cmd)
+
+    async def inspect_container(self, container_id: str) -> str:
+        return await self._run_docker(["docker", "inspect", "--format", "{{.State.Status}}", container_id])
+
+    async def _run_docker(self, cmd: list[str]) -> str:
+        proc = await asyncio.create_subprocess_exec(
+            *cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        stdout, stderr = await proc.communicate()
+        if proc.returncode != 0:
+            raise ServiceUnavailableError(
+                "Docker command failed",
+                code="DOCKER_COMMAND_FAILED",
+                data={"command": cmd, "exit_code": proc.returncode, "detail": stderr.decode()[:1000]},
+            )
+        return stdout.decode()
diff --git a/backend/app/core/agent/cli_backends/execution_runner.py b/backend/app/core/agent/cli_backends/execution_runner.py
new file mode 100644
index 000000000..6dfc981a6
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/execution_runner.py
@@ -0,0 +1,483 @@
+"""
+ExecutionRunner — end-to-end orchestrator for CLI agent executions.
+
+Lifecycle:
+  1. Get or create container (from pool)
+  2. Inject credentials, skills, and CLAUDE.md config
+  3. Execute via RuntimeProvider (with session resume if available)
+  4. Drain messages → append as ExecutionEvents
+  5. Mark final status, store session_id back to pool
+  6. Release container back to pool (NOT destroyed)
+"""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from typing import TYPE_CHECKING, Any, Optional
+
+from loguru import logger
+
+from app.common.app_errors import normalize_app_error
+from app.core.agent.cli_backends.base import CLIMessage, CLIResult, RuntimeSession, build_control_response
+from app.core.agent.cli_backends.container_pool import container_pool
+from app.core.agent.cli_backends.container_service import (
+    CLIContainerService,
+    ContainerConfig,
+    ContainerInfo,
+)
+from app.core.agent.cli_backends.injectors import (
+    CLISkillInjector,
+    RuntimeConfigInjector,
+)
+from app.core.agent.cli_backends.registry import runtime_registry
+from app.core.agent.cli_backends.runner_callbacks import RunnerCallbacks
+from app.core.agent.cli_backends.session_registry import session_registry
+from app.core.events.event_types import ExecutionEventType
+from app.core.ports.execution import EventContext, ExecutionEventPort, ExecutionReaderPort
+
+if TYPE_CHECKING:
+    from app.models.agent import AgentRelease
+
+
+class ExecutionRunner:
+    """Orchestrates the full lifecycle of a CLI agent execution."""
+
+    def __init__(
+        self,
+        event_port: ExecutionEventPort,
+        reader_port: ExecutionReaderPort,
+        container_service: Optional[CLIContainerService] = None,
+        callbacks: Optional[RunnerCallbacks] = None,
+    ):
+        self._events = event_port
+        self._reader = reader_port
+        self.container_service = container_service or CLIContainerService()
+        self.callbacks = callbacks
+        self._auto_approve: bool = True
+        self._session: Optional[RuntimeSession] = None
+
+    async def run(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        prompt: str,
+        credentials: Optional[dict[str, str]] = None,
+        skills: Optional[list[dict[str, Any]]] = None,
+        container_config: Optional[ContainerConfig] = None,
+        model: Optional[str] = None,
+        timeout: int = 7200,
+        collector: Any = None,
+    ) -> CLIResult:
+        """Run a full execution lifecycle.
+
+        Returns the final CLIResult after the agent completes or fails.
+        """
+        container: Optional[ContainerInfo] = None
+        execution = await self._reader.get_execution(execution_id)
+        run = await self._reader.get_run_for_execution(execution_id)
+        release = await self._reader.get_release_for_run(run.id)
+        pooled = False  # whether the container came from the pool
+
+        # Inject run metadata so events route through the bus
+        self._events.set_event_context(
+            EventContext(
+                run_id=run.id,
+                workspace_id=run.workspace_id,
+                trigger_medium=run.trigger_medium,
+                run_purpose=run.run_purpose,
+                thread_id=run.thread_id,
+                task_id=run.task_id,
+            )
+        )
+
+        logger.info(
+            f"[exec:{execution_id}] Starting execution "
+            f"(release={release.id if release else 'draft'}, "
+            f"engine={execution.engine_kind})"
+        )
+
+        try:
+            # 1. Mark as dispatched
+            await self._events.mark_status(execution_id=execution_id, status="dispatched")
+
+            # 2. Get or create container
+            prior_session_id: Optional[str] = None
+            if release:
+                container, prior_session_id = await container_pool.get(release.id)
+
+            if container:
+                pooled = True
+                # Verify container is still running
+                try:
+                    status = await self.container_service.inspect_container(container.container_id)
+                    if "running" not in status.strip().lower():
+                        logger.warning(
+                            f"[exec:{execution_id}] Pooled container {container.container_id[:12]} "
+                            f"not running (status={status.strip()}), creating new one"
+                        )
+                        if release:
+                            await container_pool.remove(release.id)
+                        container = None
+                        prior_session_id = None
+                        pooled = False
+                except Exception as inspect_exc:
+                    logger.warning(f"[exec:{execution_id}] Failed to inspect pooled container: {inspect_exc}")
+                    if release:
+                        await container_pool.remove(release.id)
+                    container = None
+                    prior_session_id = None
+                    pooled = False
+
+            if not container:
+                logger.info(f"[exec:{execution_id}] Creating new container")
+                container = await self.container_service.create_container(
+                    execution_id=execution_id,
+                    config=container_config,
+                    env=credentials,
+                )
+                if release:
+                    await container_pool.put(release.id, container)
+                    pooled = True
+
+            if prior_session_id:
+                logger.info(
+                    f"[exec:{execution_id}] Reusing pooled container "
+                    f"{container.container_id[:12]} with session {prior_session_id}"
+                )
+
+            await self._events.mark_status(
+                execution_id=execution_id, status="running", container_id=container.container_id
+            )
+
+            # 3. Inject skills and config (idempotent — safe to re-run on reuse)
+            await self._inject(
+                container_id=container.container_id,
+                skills=skills,
+                release=release,
+                working_dir=container.working_dir,
+            )
+
+            # 4. Record execution_started event
+            await self._events.append_event(
+                execution_id=execution_id,
+                event_type=ExecutionEventType.EXECUTION_STARTED,
+                payload={
+                    "container_id": container.container_id,
+                    "engine_kind": execution.engine_kind,
+                    "reused": prior_session_id is not None,
+                },
+            )
+
+            # 5. Execute via provider (with session resume + credentials)
+            provider = runtime_registry.get(execution.engine_kind)
+
+            # Determine auto_approve from task settings
+            if run.task_id:
+                self._auto_approve = await self._reader.get_task_auto_approve(run.task_id)
+            else:
+                self._auto_approve = True
+
+            session = await provider.execute(
+                prompt,
+                container_id=container.container_id,
+                cwd=container.working_dir,
+                model=model,
+                timeout=timeout,
+                resume_session_id=prior_session_id,
+                env=credentials,
+                auto_approve=self._auto_approve,
+            )
+
+            # 5b. Register session so the API layer can inject messages
+            session_registry.register(execution_id, session)
+            self._session = session
+
+            # 6. Drain messages → events
+            await self._drain_to_events(execution_id, collector=collector, engine_kind=execution.engine_kind)
+
+            # 7. Await final result
+            result = await session.result
+
+            # 8. Mark final status
+            await self._finalize(execution_id, result, release)
+
+            # 9. Store session_id back to pool for next resume
+            if result.session_id and release:
+                await container_pool.set_session_id(release.id, result.session_id)
+                logger.info(f"[exec:{execution_id}] Stored session {result.session_id} for release {release.id}")
+
+            return result
+
+        except Exception as exc:
+            logger.error(f"[exec:{execution_id}] ExecutionRunner error: {exc}")
+            await self._mark_failed(execution_id, str(exc))
+            app_error = normalize_app_error(
+                exc,
+                default_code="CLI_EXECUTION_RUNNER_FAILED",
+                default_message="CLI execution runner failed",
+                default_data={"execution_id": str(execution_id)},
+            )
+            return CLIResult(status="failed", error=app_error.message, error_payload=app_error.to_payload())
+
+        finally:
+            # 10. Unregister session; release container back to pool
+            session_registry.unregister(execution_id)
+            if container and release and pooled:
+                await container_pool.release(release.id)
+                logger.info(f"[exec:{execution_id}] Released container {container.container_id[:12]} back to pool")
+            elif container:
+                await self._cleanup_container(container.container_id)
+                logger.info(f"[exec:{execution_id}] Destroyed container {container.container_id[:12]} (no release)")
+
+    async def _inject(
+        self,
+        *,
+        container_id: str,
+        skills: Optional[list[dict[str, Any]]],
+        release: Optional[AgentRelease],
+        working_dir: str,
+    ) -> None:
+        skill_injector = CLISkillInjector(self.container_service)
+        config_injector = RuntimeConfigInjector(self.container_service)
+
+        if skills:
+            await skill_injector.inject(container_id, skills)
+
+        # Pull instructions from release runtime_binding if present
+        instructions = release.runtime_binding.get("instructions") if release else None
+        skill_names = None
+        if skills:
+            skill_names = [s.get("name", "") for s in skills if s.get("name")]
+
+        await config_injector.inject(
+            container_id,
+            instructions=instructions,
+            skill_names=skill_names,
+            working_dir=working_dir,
+        )
+
+    _DRAIN_BATCH_SIZE = 5
+    _DRAIN_FLUSH_INTERVAL = 0.5  # seconds — flush at least every 500ms
+
+    async def _drain_to_events(
+        self,
+        execution_id: uuid.UUID,
+        *,
+        collector: Any = None,
+        engine_kind: str = "cli",
+    ) -> None:
+        assert self._session is not None, "_drain_to_events called before session was set"
+        pending: list[tuple[CLIMessage, str, dict[str, Any]]] = []
+        logger.info(f"[exec:{execution_id}] _drain_to_events started")
+        queue = self._session.messages
+
+        # Observation: set up root span + extractor if collector is set
+        root_span = None
+        extractor = None
+        if collector:
+            from app.core.observation.instrumentation.cli_extractor import CLIObservationExtractor
+
+            root_span = collector.start_agent(name=f"cli:{engine_kind}")
+            extractor = CLIObservationExtractor(collector, root_span)
+
+        while True:
+            try:
+                msg = await asyncio.wait_for(queue.get(), timeout=self._DRAIN_FLUSH_INTERVAL)
+            except asyncio.TimeoutError:
+                # Timeout — flush whatever we have so far
+                if pending:
+                    await self._flush_pending(execution_id, pending)
+                    pending.clear()
+                continue
+
+            if msg is None:
+                break
+
+            # Observation: process message through extractor
+            if extractor:
+                try:
+                    await extractor.process_message(msg)
+                except Exception as obs_exc:
+                    logger.debug(f"[exec:{execution_id}] Observation extractor error: {obs_exc}")
+
+            event_type = self._msg_to_event_type(msg)
+            payload = self._msg_to_payload(msg)
+            pending.append((msg, event_type, payload))
+
+            needs_flush = len(pending) >= self._DRAIN_BATCH_SIZE or msg.type == "approval_request"
+            if needs_flush:
+                await self._flush_pending(execution_id, pending)
+                pending.clear()
+
+        if pending:
+            await self._flush_pending(execution_id, pending)
+
+        # Observation: flush pending and close root span
+        if extractor:
+            try:
+                await extractor.flush_pending()
+            except Exception as obs_exc:
+                logger.debug(f"[exec:{execution_id}] Observation extractor flush error: {obs_exc}")
+        if root_span:
+            try:
+                await root_span.end(output={"status": "completed"})
+            except Exception:
+                pass
+
+        logger.info(f"[exec:{execution_id}] _drain_to_events finished")
+
+    async def _flush_pending(
+        self,
+        execution_id: uuid.UUID,
+        pending: list[tuple[CLIMessage, str, dict[str, Any]]],
+    ) -> None:
+        try:
+            await self._events.batch_append_events(
+                execution_id=execution_id,
+                events=[{"event_type": event_type, "payload": payload} for _, event_type, payload in pending],
+            )
+            for msg, _, payload in pending:
+                if msg.type == "approval_request":
+                    if self._auto_approve:
+                        request_id = payload.get("request_id", "")
+                        assert self._session is not None
+                        await self._session.inject_message(build_control_response(request_id, "allow"))
+                        await self._events.append_event(
+                            execution_id=execution_id,
+                            event_type=ExecutionEventType.APPROVAL_RESOLVED,
+                            payload={"decision": "auto_approved", "request_id": request_id},
+                        )
+                    else:
+                        await self._events.mark_status(execution_id=execution_id, status="approval_wait")
+                    break
+        except Exception as exc:
+            logger.warning(f"Failed to flush {len(pending)} events for {execution_id}: {exc}")
+
+    async def _finalize(
+        self,
+        execution_id: uuid.UUID,
+        result: CLIResult,
+        release: Optional[AgentRelease],
+    ) -> None:
+        status = "succeeded" if result.status == "completed" else "failed"
+
+        await self._events.complete_execution(
+            execution_id=execution_id,
+            terminal_status=status,
+            result_summary=result.usage,
+            error=result.error_payload or _build_completion_error(result.error),
+            session_id=result.session_id,
+        )
+
+        if self.callbacks:
+            try:
+                await self.callbacks.on_execution_finalized(execution_id, status, result)
+            except Exception as exc:
+                logger.warning(f"Callback on_execution_finalized failed for {execution_id}: {exc}")
+
+    async def _mark_failed(
+        self,
+        execution_id: uuid.UUID,
+        error: str,
+    ) -> None:
+        try:
+            error_payload = _build_completion_error(error[:2000])
+            await self._events.append_event(
+                execution_id=execution_id,
+                event_type=ExecutionEventType.ERROR,
+                payload=error_payload
+                or {
+                    "code": "EXECUTION_FAILED",
+                    "message": error,
+                    "data": None,
+                    "source": "runtime",
+                    "retryable": False,
+                },
+            )
+            await self._events.complete_execution(
+                execution_id=execution_id,
+                terminal_status="failed",
+                error=error_payload,
+            )
+        except Exception as exc:
+            logger.error(f"Failed to mark execution {execution_id} as failed: {exc}")
+
+        if self.callbacks:
+            try:
+                await self.callbacks.on_execution_failed(execution_id, error)
+            except Exception as exc:
+                logger.warning(f"Callback on_execution_failed failed for {execution_id}: {exc}")
+
+    async def _cleanup_container(self, container_id: str) -> None:
+        try:
+            await self.container_service.remove_container(container_id, force=True)
+        except Exception as exc:
+            logger.warning(f"Failed to cleanup container {container_id[:12]}: {exc}")
+
+    @staticmethod
+    def _msg_to_event_type(msg: CLIMessage) -> ExecutionEventType:
+        mapping = {
+            "text": ExecutionEventType.ASSISTANT_TEXT,
+            "thinking": ExecutionEventType.THINKING,
+            "tool_use": ExecutionEventType.TOOL_USE_START,
+            "tool_result": ExecutionEventType.TOOL_USE_END,
+            "error": ExecutionEventType.ERROR,
+            "artifact": ExecutionEventType.ARTIFACT_CREATED,
+            "approval_request": ExecutionEventType.APPROVAL_REQUESTED,
+        }
+        return mapping.get(msg.type) or ExecutionEventType(msg.type)
+
+    @staticmethod
+    def _msg_to_payload(msg: CLIMessage) -> dict[str, Any]:
+        if msg.type == "text":
+            return {"content": msg.content}
+        if msg.type == "thinking":
+            return {"content": msg.content}
+        if msg.type == "tool_use":
+            return {
+                "tool": {
+                    "name": msg.tool,
+                    "call_id": msg.call_id,
+                    "input": msg.input,
+                    "status": "running",
+                },
+            }
+        if msg.type == "tool_result":
+            return {
+                "call_id": msg.call_id,
+                "tool_name": msg.tool,
+                "output": msg.output,
+            }
+        if msg.type == "error":
+            return msg.error_payload or {
+                "code": "EXECUTION_FAILED",
+                "message": msg.content,
+                "data": None,
+                "source": "runtime",
+                "retryable": False,
+            }
+        if msg.type == "artifact":
+            return {"artifact": {"content": msg.content}}
+        if msg.type == "approval_request":
+            return {
+                "request_id": msg.call_id,
+                "subtype": msg.content,
+                "tool_name": msg.tool,
+                "input": msg.input,
+                "message": f"Agent wants to use: {msg.tool or 'unknown tool'}",
+            }
+        return {"content": msg.content}
+
+
+def _build_completion_error(message: str | None) -> dict[str, Any] | None:
+    if not message:
+        return None
+
+    return {
+        "code": "EXECUTION_FAILED",
+        "message": message,
+        "data": None,
+        "source": "runtime",
+        "retryable": False,
+    }
diff --git a/backend/app/core/agent/cli_backends/injectors.py b/backend/app/core/agent/cli_backends/injectors.py
new file mode 100644
index 000000000..6a1ca34f4
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/injectors.py
@@ -0,0 +1,100 @@
+"""
+Skill and runtime config injectors for CLI agent containers.
+"""
+
+from __future__ import annotations
+
+import json
+from typing import Any, Optional
+
+from loguru import logger
+
+from .container_service import CLIContainerService
+
+
+class CLISkillInjector:
+    """Writes skill definitions into the container filesystem."""
+
+    def __init__(self, container_service: CLIContainerService):
+        self.container_service = container_service
+
+    async def inject(
+        self,
+        container_id: str,
+        skills: list[dict[str, Any]],
+        target_dir: str = "/workspace/.skills",
+    ) -> None:
+        if not skills:
+            return
+        await self.container_service.exec_in_container(container_id, ["mkdir", "-p", target_dir])
+        for skill in skills:
+            name = skill.get("name", "unnamed")
+            filename = f"{target_dir}/{name}.json"
+            content = json.dumps(skill, indent=2)
+            await self.container_service.exec_in_container(
+                container_id,
+                ["sh", "-c", f"cat > {filename} << 'SKILLEOF'\n{content}\nSKILLEOF"],
+            )
+        logger.debug(f"Injected {len(skills)} skills into {container_id[:12]}")
+
+
+class RuntimeConfigInjector:
+    """Generates and writes CLAUDE.md configuration into the container."""
+
+    def __init__(self, container_service: CLIContainerService):
+        self.container_service = container_service
+
+    async def inject(
+        self,
+        container_id: str,
+        *,
+        instructions: Optional[str] = None,
+        skill_names: Optional[list[str]] = None,
+        project_context: Optional[str] = None,
+        working_dir: str = "/workspace",
+    ) -> None:
+        claude_md = self._build_claude_md(
+            instructions=instructions,
+            skill_names=skill_names,
+            project_context=project_context,
+        )
+        target = f"{working_dir}/CLAUDE.md"
+        await self.container_service.exec_in_container(
+            container_id,
+            ["sh", "-c", f"cat > {target} << 'CLAUDEEOF'\n{claude_md}\nCLAUDEEOF"],
+        )
+        logger.debug(f"Injected CLAUDE.md into {container_id[:12]}")
+
+    def _build_claude_md(
+        self,
+        *,
+        instructions: Optional[str] = None,
+        skill_names: Optional[list[str]] = None,
+        project_context: Optional[str] = None,
+    ) -> str:
+        sections: list[str] = []
+        sections.append("# Agent Configuration")
+        sections.append("")
+        sections.append("You are an autonomous coding agent executing a task.")
+        sections.append("Complete the task thoroughly and commit your work when done.")
+
+        if instructions:
+            sections.append("")
+            sections.append("## Instructions")
+            sections.append("")
+            sections.append(instructions)
+
+        if skill_names:
+            sections.append("")
+            sections.append("## Available Skills")
+            sections.append("")
+            for name in skill_names:
+                sections.append(f"- {name}")
+
+        if project_context:
+            sections.append("")
+            sections.append("## Project Context")
+            sections.append("")
+            sections.append(project_context)
+
+        return "\n".join(sections)
diff --git a/backend/app/core/agent/cli_backends/openclaw.py b/backend/app/core/agent/cli_backends/openclaw.py
new file mode 100644
index 000000000..a75a43550
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/openclaw.py
@@ -0,0 +1,327 @@
+from __future__ import annotations
+
+import asyncio
+import json
+import time
+from typing import Any
+
+from loguru import logger
+
+from .base import CLIMessage, CLIResult, RuntimeSession
+from .container_bridge import ContainerProcessBridge
+
+
+class OpenClawProvider:
+    """Runtime provider for OpenClaw CLI.
+
+    OpenClaw outputs NDJSON events on *stderr* (not stdout).  We spawn
+    ``openclaw agent --local --json --session-id <id> --message <prompt>``
+    and read stderr line-by-line.
+
+    Event types (from the wire protocol):
+      text, tool_use, tool_result, error, lifecycle, step_start, step_finish
+    """
+
+    provider_type = "openclaw"
+
+    def __init__(self, executable_path: str = "openclaw") -> None:
+        self.executable_path = executable_path
+        self.bridge = ContainerProcessBridge()
+
+    # ── public API ──────────────────────────────────────────────────────
+
+    async def execute(
+        self,
+        prompt: str,
+        *,
+        container_id: str,
+        cwd: str | None = None,
+        model: str | None = None,
+        timeout: int = 7200,
+        resume_session_id: str | None = None,
+        env: dict[str, str] | None = None,
+        auto_approve: bool = True,
+    ) -> RuntimeSession:
+        session_id = resume_session_id or f"joysafeter-{int(time.time() * 1e9)}"
+
+        cmd = [
+            self.executable_path,
+            "agent",
+            "--local",
+            "--json",
+            "--session-id",
+            session_id,
+        ]
+        if model:
+            cmd.extend(["--model", model])
+        cmd.extend(["--message", prompt])
+
+        process = await self.bridge.exec_streaming(
+            container_id,
+            cmd,
+            env=env,
+            workdir=cwd,
+        )
+
+        queue: asyncio.Queue[CLIMessage | None] = asyncio.Queue(maxsize=512)
+        loop = asyncio.get_event_loop()
+        result_future: asyncio.Future[CLIResult] = loop.create_future()
+
+        drain_task = asyncio.create_task(
+            self._drain(process, queue, result_future, session_id, timeout),
+            name=f"openclaw-drain-{container_id[:12]}",
+        )
+
+        async def inject(message: str) -> None:
+            if process.stdin and not process.stdin.is_closing():
+                process.stdin.write(f"{message}\n".encode())
+                await process.stdin.drain()
+
+        async def cancel() -> None:
+            process.terminate()
+
+        return RuntimeSession(
+            messages=queue,
+            result=result_future,
+            _inject_fn=inject,
+            _cancel_fn=cancel,
+            _drain_task=drain_task,
+        )
+
+    # ── drain loop ──────────────────────────────────────────────────────
+
+    async def _drain(
+        self,
+        process: asyncio.subprocess.Process,
+        queue: asyncio.Queue[CLIMessage | None],
+        result_future: asyncio.Future[CLIResult],
+        session_id: str,
+        timeout: int,
+    ) -> None:
+        accumulated_text: list[str] = []
+        final_status = "completed"
+        final_error = ""
+        final_error_payload: dict[str, Any] | None = None
+
+        try:
+            async with asyncio.timeout(timeout):
+                # OpenClaw writes JSON events to stderr
+                assert process.stderr is not None
+                async for raw_line in process.stderr:
+                    line = raw_line.decode().strip()
+                    if not line:
+                        continue
+
+                    for msg in self._parse_line(line):
+                        if msg.type == "text":
+                            accumulated_text.append(msg.content)
+                        if msg.type == "error":
+                            final_status = "failed"
+                            final_error = msg.content
+                            final_error_payload = msg.error_payload
+                        await queue.put(msg)
+
+        except TimeoutError:
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="timeout",
+                        error="OpenClaw agent timed out",
+                        error_payload={
+                            "code": "OPENCLAW_AGENT_TIMEOUT",
+                            "message": "OpenClaw agent timed out",
+                            "data": {"session_id": session_id},
+                            "source": "runtime",
+                            "retryable": True,
+                        },
+                        session_id=session_id,
+                    )
+                )
+        except Exception as e:
+            logger.error(f"OpenClaw drain error: {e}")
+            if not result_future.done():
+                result_future.set_result(
+                    CLIResult(
+                        status="failed",
+                        error=str(e),
+                        error_payload={
+                            "code": "OPENCLAW_AGENT_DRAIN_FAILED",
+                            "message": str(e),
+                            "data": {"session_id": session_id},
+                            "source": "runtime",
+                            "retryable": False,
+                        },
+                        session_id=session_id,
+                    )
+                )
+        finally:
+            if not result_future.done():
+                exit_code = await process.wait()
+                if final_status == "failed":
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            output="\n".join(accumulated_text),
+                            error=final_error,
+                            error_payload=final_error_payload,
+                            session_id=session_id,
+                        )
+                    )
+                elif exit_code == 0 or accumulated_text:
+                    result_future.set_result(
+                        CLIResult(
+                            status="completed",
+                            output="\n".join(accumulated_text),
+                            session_id=session_id,
+                        )
+                    )
+                else:
+                    stdout_bytes = await process.stdout.read() if process.stdout else b""
+                    result_future.set_result(
+                        CLIResult(
+                            status="failed",
+                            error=f"Exit code {exit_code}: {stdout_bytes.decode()[:2000]}",
+                            error_payload={
+                                "code": "OPENCLAW_AGENT_EXIT_FAILED",
+                                "message": f"Exit code {exit_code}: {stdout_bytes.decode()[:2000]}",
+                                "data": {"session_id": session_id, "exit_code": exit_code},
+                                "source": "runtime",
+                                "retryable": False,
+                            },
+                            session_id=session_id,
+                        )
+                    )
+            await queue.put(None)
+
+    # ── event parsing (testable without Docker) ─────────────────────────
+
+    def _parse_line(self, line: str) -> list[CLIMessage]:
+        """Parse a single stderr line into CLIMessage list.
+
+        Non-JSON lines (plain log output) are silently skipped.
+        """
+        if not line or line[0] != "{":
+            return []
+
+        try:
+            event = json.loads(line)
+        except json.JSONDecodeError:
+            return []
+
+        if not isinstance(event, dict) or "type" not in event:
+            return []
+
+        return self._parse_event(event)
+
+    def _parse_event(self, event: dict) -> list[CLIMessage]:
+        """Map an OpenClaw NDJSON event to CLIMessage(s)."""
+        event_type = event.get("type", "")
+
+        if event_type == "text":
+            text = event.get("text", "")
+            if text:
+                return [CLIMessage(type="text", content=text)]
+            return []
+
+        if event_type == "tool_use":
+            input_data = event.get("input")
+            if isinstance(input_data, str):
+                try:
+                    input_data = json.loads(input_data)
+                except json.JSONDecodeError:
+                    input_data = None
+            return [
+                CLIMessage(
+                    type="tool_use",
+                    tool=event.get("tool", ""),
+                    call_id=event.get("callId", ""),
+                    input=input_data if isinstance(input_data, dict) else None,
+                )
+            ]
+
+        if event_type == "tool_result":
+            return [
+                CLIMessage(
+                    type="tool_result",
+                    tool=event.get("tool", ""),
+                    call_id=event.get("callId", ""),
+                    output=event.get("text", ""),
+                )
+            ]
+
+        if event_type == "error":
+            error_payload = _extract_error_payload(event)
+            return [CLIMessage(type="error", content=error_payload["message"], error_payload=error_payload)]
+
+        if event_type == "lifecycle":
+            phase = event.get("phase", "")
+            if phase in ("error", "failed", "cancelled"):
+                error_payload = _extract_error_payload(event)
+                return [CLIMessage(type="error", content=error_payload["message"], error_payload=error_payload)]
+            return []
+
+        if event_type == "step_start":
+            return [CLIMessage(type="text", content="[step started]")]
+
+        if event_type == "step_finish":
+            return [CLIMessage(type="text", content="[step finished]")]
+
+        # Unknown event type — skip
+        return []
+
+
+def _extract_error_payload(event: dict) -> dict[str, Any]:
+    """Extract canonical error payload from an OpenClaw event."""
+    err_obj = event.get("error")
+    if isinstance(err_obj, dict):
+        code = err_obj.get("code") or event.get("code") or "OPENCLAW_AGENT_ERROR"
+        data = err_obj.get("data") if isinstance(err_obj.get("data"), dict) else None
+        if err_obj.get("message"):
+            return {
+                "code": str(code),
+                "message": str(err_obj["message"]),
+                "data": data,
+                "source": "runtime",
+                "retryable": False,
+            }
+        if isinstance(data, dict) and data.get("message"):
+            return {
+                "code": str(code),
+                "message": str(data["message"]),
+                "data": data,
+                "source": "runtime",
+                "retryable": False,
+            }
+        if err_obj.get("name"):
+            return {
+                "code": str(code),
+                "message": str(err_obj["name"]),
+                "data": data,
+                "source": "runtime",
+                "retryable": False,
+            }
+
+    if event.get("text"):
+        return {
+            "code": str(event.get("code") or "OPENCLAW_AGENT_ERROR"),
+            "message": str(event["text"]),
+            "data": None,
+            "source": "runtime",
+            "retryable": False,
+        }
+    if event.get("message"):
+        return {
+            "code": str(event.get("code") or "OPENCLAW_AGENT_ERROR"),
+            "message": str(event["message"]),
+            "data": None,
+            "source": "runtime",
+            "retryable": False,
+        }
+
+    return {
+        "code": str(event.get("code") or "OPENCLAW_AGENT_ERROR"),
+        "message": "unknown openclaw error",
+        "data": None,
+        "source": "runtime",
+        "retryable": False,
+    }
diff --git a/backend/app/core/agent/cli_backends/registry.py b/backend/app/core/agent/cli_backends/registry.py
new file mode 100644
index 000000000..8363304ee
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/registry.py
@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from loguru import logger
+
+from app.common.app_errors import NotFoundError
+
+from .base import RuntimeProvider
+
+
+class RuntimeProviderRegistry:
+    def __init__(self) -> None:
+        self._providers: dict[str, RuntimeProvider] = {}
+
+    def register(self, provider: RuntimeProvider) -> None:
+        self._providers[provider.provider_type] = provider
+        logger.info(f"Registered runtime provider: {provider.provider_type}")
+
+    def get(self, provider_type: str) -> RuntimeProvider:
+        if provider_type not in self._providers:
+            raise NotFoundError(
+                "Runtime provider not found",
+                code="RUNTIME_PROVIDER_NOT_FOUND",
+                data={"provider_type": provider_type, "available_providers": list(self._providers.keys())},
+            )
+        return self._providers[provider_type]
+
+    def list_providers(self) -> list[str]:
+        return list(self._providers.keys())
+
+
+runtime_registry = RuntimeProviderRegistry()
+
+
+def init_providers() -> None:
+    from .claude_code import ClaudeCodeProvider
+    from .codex import CodexProvider
+    from .openclaw import OpenClawProvider
+
+    runtime_registry.register(ClaudeCodeProvider())
+    runtime_registry.register(CodexProvider())
+    runtime_registry.register(OpenClawProvider())
diff --git a/backend/app/core/agent/cli_backends/runner_callbacks.py b/backend/app/core/agent/cli_backends/runner_callbacks.py
new file mode 100644
index 000000000..d81c9a98a
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/runner_callbacks.py
@@ -0,0 +1,35 @@
+"""
+Callback protocol for ExecutionRunner — breaks circular dependency.
+
+ExecutionRunner calls these hooks after finalize/failure.
+The concrete implementation lives in ExecutionLifecycleService.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Protocol, runtime_checkable
+
+from app.core.agent.cli_backends.base import CLIResult
+
+
+@runtime_checkable
+class RunnerCallbacks(Protocol):
+    """Interface that ExecutionRunner uses to notify lifecycle events."""
+
+    async def on_execution_finalized(
+        self,
+        execution_id: uuid.UUID,
+        status: str,
+        result: CLIResult,
+    ) -> None:
+        """Called after execution reaches terminal state (completed/failed)."""
+        ...
+
+    async def on_execution_failed(
+        self,
+        execution_id: uuid.UUID,
+        error: str,
+    ) -> None:
+        """Called when runner catches an unhandled exception."""
+        ...
diff --git a/backend/app/core/agent/cli_backends/session_registry.py b/backend/app/core/agent/cli_backends/session_registry.py
new file mode 100644
index 000000000..b3b92cd1a
--- /dev/null
+++ b/backend/app/core/agent/cli_backends/session_registry.py
@@ -0,0 +1,28 @@
+"""In-memory registry of active RuntimeSessions, keyed by execution_id."""
+
+from __future__ import annotations
+
+import uuid
+from typing import Optional
+
+from .base import RuntimeSession
+
+
+class SessionRegistry:
+    """Thread-safe registry of active execution sessions."""
+
+    def __init__(self) -> None:
+        self._sessions: dict[uuid.UUID, RuntimeSession] = {}
+
+    def register(self, execution_id: uuid.UUID, session: RuntimeSession) -> None:
+        self._sessions[execution_id] = session
+
+    def get(self, execution_id: uuid.UUID) -> Optional[RuntimeSession]:
+        return self._sessions.get(execution_id)
+
+    def unregister(self, execution_id: uuid.UUID) -> None:
+        self._sessions.pop(execution_id, None)
+
+
+# Module-level singleton
+session_registry = SessionRegistry()
diff --git a/backend/app/core/agent/code_agent/executor/docker_executor.py b/backend/app/core/agent/code_agent/executor/docker_executor.py
index 29b5525cd..bb267c0bf 100644
--- a/backend/app/core/agent/code_agent/executor/docker_executor.py
+++ b/backend/app/core/agent/code_agent/executor/docker_executor.py
@@ -13,6 +13,8 @@
 
 from loguru import logger
 
+from app.common.app_errors import ServiceUnavailableError
+
 from .base import CodeOutput, PythonExecutor
 
 
@@ -103,13 +105,18 @@ def _get_backend(self):
 
             except ImportError as e:
                 logger.error(f"Failed to import PydanticSandboxAdapter: {e}")
-                raise RuntimeError(
-                    "PydanticSandboxAdapter is required for DockerPythonExecutor. "
-                    "Please ensure pydantic-ai-backend[docker] is installed."
+                raise ServiceUnavailableError(
+                    "PydanticSandboxAdapter is required for DockerPythonExecutor",
+                    code="DOCKER_EXECUTOR_DEPENDENCY_MISSING",
+                    data={"dependency": "pydantic-ai-backend[docker]"},
                 ) from e
             except Exception as e:
                 logger.error(f"Failed to create PydanticSandboxAdapter: {e}")
-                raise RuntimeError(f"Failed to initialize Docker backend: {e}") from e
+                raise ServiceUnavailableError(
+                    "Failed to initialize Docker backend",
+                    code="DOCKER_EXECUTOR_INIT_FAILED",
+                    data={"detail": str(e)},
+                ) from e
 
         return self._backend
 
diff --git a/backend/app/core/agent/code_agent/interpreter/ast_evaluator.py b/backend/app/core/agent/code_agent/interpreter/ast_evaluator.py
index 93b63ca66..d68063416 100644
--- a/backend/app/core/agent/code_agent/interpreter/ast_evaluator.py
+++ b/backend/app/core/agent/code_agent/interpreter/ast_evaluator.py
@@ -1335,13 +1335,6 @@ def evaluate_ast(
     elif isinstance(expression, ast.Delete):
         return evaluate_delete(expression, *common_params)
 
-    # Python 3.8 Index node (backward compatibility)
-    elif hasattr(ast, "Index") and isinstance(expression, ast.Index):
-        value = getattr(expression, "value", None)
-        if value is not None:
-            return evaluate_ast(value, *common_params)
-        raise InterpreterError("Index node has no value attribute")
-
     else:
         raise InterpreterError(f"{expression.__class__.__name__} is not supported.")
 
diff --git a/backend/app/core/agent/code_agent/utils.py b/backend/app/core/agent/code_agent/utils.py
index e60b3d800..b4e96a51d 100644
--- a/backend/app/core/agent/code_agent/utils.py
+++ b/backend/app/core/agent/code_agent/utils.py
@@ -18,6 +18,8 @@
 
 from loguru import logger
 
+from app.common.app_errors import InternalServiceError
+
 __all__ = [
     "RateLimiter",
     "Retrying",
@@ -328,7 +330,11 @@ async def __call__(
         # Should not reach here, but just in case
         if last_exception:
             raise last_exception
-        raise RuntimeError("Unexpected state in retry logic")
+        raise InternalServiceError(
+            "Unexpected state in async retry logic",
+            code="RETRY_STATE_INVALID",
+            data={"mode": "async"},
+        )
 
     def call_sync(
         self,
@@ -376,7 +382,11 @@ def call_sync(
 
         if last_exception:
             raise last_exception
-        raise RuntimeError("Unexpected state in retry logic")
+        raise InternalServiceError(
+            "Unexpected state in sync retry logic",
+            code="RETRY_STATE_INVALID",
+            data={"mode": "sync"},
+        )
 
     def wrap(self, func: Callable[..., T]) -> Callable[..., T]:
         """
diff --git a/backend/app/core/agent/coordinator_tools.py b/backend/app/core/agent/coordinator_tools.py
new file mode 100644
index 000000000..ca3917dbe
--- /dev/null
+++ b/backend/app/core/agent/coordinator_tools.py
@@ -0,0 +1,217 @@
+"""LangGraph tools for Coordinator agents to spawn and manage CLI agents."""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+
+from loguru import logger
+from sqlalchemy import select
+
+from app.core.agent.cli_backends.base import CLIResult
+from app.core.database import async_session_factory
+from app.models.execution import Execution
+from app.services.execution_orchestrator import ExecutionOrchestrator
+from app.utils.safe_task import safe_create_task
+
+# Execution status string literals
+EXECUTION_STATUS_COMPLETED = "succeeded"
+EXECUTION_STATUS_FAILED = "failed"
+
+
+async def spawn_agent(
+    agent_name: str,
+    prompt: str,
+    *,
+    workspace_id: str,
+    user_id: str,
+    parent_execution_id: str,
+    runtime_type: str = "claude_code",
+    model: str | None = None,
+    wait: bool = True,
+    timeout: int = 3600,
+) -> dict:
+    """
+    Spawn a CLI agent to execute a sub-task.
+
+    Args:
+        agent_name: Display name for the spawned agent
+        prompt: Task description for the agent
+        workspace_id: Workspace context
+        user_id: User who initiated the parent execution
+        parent_execution_id: The coordinator's execution ID
+        runtime_type: CLI type ("claude_code", "codex", "openclaw")
+        model: Optional model override
+        wait: If True, wait for completion and return result
+        timeout: Max wait time in seconds
+
+    Returns:
+        dict with execution_id, status, and output (if wait=True)
+    """
+    ws_id = uuid.UUID(workspace_id)
+    parent_id = uuid.UUID(parent_execution_id)
+
+    async with async_session_factory() as db:
+        from app.models.agent_run import AgentRun
+
+        parent_identity = (
+            await db.execute(
+                select(AgentRun.release_id, AgentRun.agent_version_id)
+                .join(Execution, AgentRun.id == Execution.run_id)
+                .where(Execution.id == parent_id)
+            )
+        ).one_or_none()
+        if not parent_identity:
+            raise ValueError(f"Parent execution {parent_id} not found")
+
+        parent_release = parent_identity[0]
+        parent_version = None if parent_release else parent_identity[1]
+
+        run = AgentRun(
+            release_id=parent_release,
+            agent_version_id=parent_version,
+            workspace_id=ws_id,
+            trigger_medium="system",
+            run_purpose="production",
+            goal=f"[Sub] {agent_name}: {prompt[:80]}",
+            status="pending",
+            created_by=user_id,
+        )
+        db.add(run)
+        await db.flush()
+
+        from app.services.execution_service import ExecutionService
+
+        svc = ExecutionService(db)
+        execution = await svc.create_execution(
+            run_id=run.id,
+            runtime_type=runtime_type,
+            parent_execution_id=parent_id,
+        )
+        run.current_execution_id = execution.id
+        await db.commit()
+        exec_id = execution.id
+
+        await ExecutionOrchestrator.publish_run_status_change(
+            db,
+            run,
+            execution_id=execution.id,
+            target_status="running",
+        )
+
+    logger.info(f"Coordinator spawned {agent_name} ({runtime_type}) -> execution {exec_id}")
+
+    if wait:
+        return await _run_and_wait(exec_id, prompt, ws_id, user_id, runtime_type, model, timeout, agent_name)
+    else:
+        _fire_and_forget(exec_id, prompt, ws_id, user_id, runtime_type, model)
+        return {
+            "execution_id": str(exec_id),
+            "status": "dispatched",
+            "output": "",
+        }
+
+
+async def _run_and_wait(
+    exec_id: uuid.UUID,
+    prompt: str,
+    ws_id: uuid.UUID,
+    user_id: str,
+    runtime_type: str,
+    model: str | None,
+    timeout: int,
+    agent_name: str,
+) -> dict:
+    """Run the execution synchronously and return the result."""
+    try:
+        async with async_session_factory() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            result: CLIResult = await asyncio.wait_for(
+                runner.run(
+                    execution_id=exec_id,
+                    prompt=prompt,
+                    model=model,
+                    timeout=timeout,
+                ),
+                timeout=timeout,
+            )
+        return {
+            "execution_id": str(exec_id),
+            "status": result.status,
+            "output": result.output[:5000],
+            "session_id": result.session_id,
+        }
+    except asyncio.TimeoutError:
+        return {
+            "execution_id": str(exec_id),
+            "status": "timeout",
+            "output": f"Agent '{agent_name}' timed out after {timeout}s",
+        }
+    except Exception as e:
+        logger.error(f"spawn_agent error for {exec_id}: {e}")
+        return {
+            "execution_id": str(exec_id),
+            "status": "failed",
+            "output": str(e)[:2000],
+        }
+
+
+def _fire_and_forget(
+    exec_id: uuid.UUID,
+    prompt: str,
+    ws_id: uuid.UUID,
+    user_id: str,
+    runtime_type: str,
+    model: str | None,
+) -> None:
+    """Dispatch execution as a background task."""
+
+    async def _background():
+        async with async_session_factory() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            await runner.run(execution_id=exec_id, prompt=prompt, model=model)
+
+    safe_create_task(
+        _background(),
+        name=f"coordinator-child-{exec_id}",
+    )
+
+
+async def get_agent_result(execution_id: str, *, user_id: str) -> dict:
+    """
+    Get the result of a previously spawned agent.
+
+    Args:
+        execution_id: The execution ID returned by spawn_agent
+        user_id: The user who owns the execution
+
+    Returns:
+        dict with status and output
+    """
+    exec_id = uuid.UUID(execution_id)
+
+    async with async_session_factory() as db:
+        from app.services.execution_service import ExecutionService
+
+        svc = ExecutionService(db)
+        execution = await svc.get_execution(exec_id, user_id)
+
+        if not execution:
+            return {"status": "not_found", "output": ""}
+
+        status = execution.status.value if hasattr(execution.status, "value") else str(execution.status)
+
+        if status == EXECUTION_STATUS_COMPLETED:
+            output = ""
+            if execution.metrics:
+                output = execution.metrics.get("output", "")
+            return {"status": "succeeded", "output": output}
+        elif status == EXECUTION_STATUS_FAILED:
+            error = execution.error or {}
+            return {"status": "failed", "output": error.get("message") or "Unknown error"}
+        else:
+            return {"status": status, "output": f"Agent is still {status}"}
diff --git a/backend/app/core/agent/langfuse_callback.py b/backend/app/core/agent/langfuse_callback.py
deleted file mode 100644
index 08a5c14ee..000000000
--- a/backend/app/core/agent/langfuse_callback.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Langfuse callback handler for LLM observability.
-
-Integrates Langfuse tracing with LangChain/LangGraph agents to track:
-- LLM calls (prompts, responses, tokens, costs)
-- Tool calls and results
-- Agent execution traces
-- User interactions
-"""
-
-import os
-from typing import Any
-
-from loguru import logger
-
-try:
-    from langfuse.langchain import CallbackHandler as LangfuseCallbackHandler
-
-    LANGFUSE_AVAILABLE = True
-except ImportError:
-    LANGFUSE_AVAILABLE = False
-    logger.warning("langfuse not installed. Langfuse tracing will be disabled.")
-
-
-def get_langfuse_callbacks(enabled: bool = True, **kwargs: Any) -> list[Any]:
-    """
-    Get list of Langfuse callbacks for use with LangChain/LangGraph.
-
-    Environment variables are automatically read from .env:
-    - LANGFUSE_PUBLIC_KEY
-    - LANGFUSE_SECRET_KEY
-    - LANGFUSE_HOST (optional, defaults to https://cloud.langfuse.com)
-
-    Returns a list that can be used in two ways:
-    1. Via with_config: runnable.with_config({"callbacks": [...]})
-    2. Via invoke: agent.invoke(..., config={"callbacks": [...]})
-
-    Example:
-        # Simple usage - environment variables from .env
-        langfuse_handler = CallbackHandler()
-        config = {
-            "callbacks": [langfuse_handler],
-            "configurable": {...}
-        }
-        result = graph.astream(input=initial_state, config=config)
-
-    Args:
-        enabled: Whether to enable Langfuse tracing
-        **kwargs: Additional arguments (for backward compatibility, but not used)
-
-    Returns:
-        List of callback handlers (empty list if disabled or unavailable)
-    """
-    if not enabled:
-        logger.debug("[langfuse] Langfuse tracing is disabled")
-        return []
-
-    if not LANGFUSE_AVAILABLE:
-        logger.warning("[langfuse] Langfuse package not installed, skipping callback creation")
-        return []
-
-    # Check if environment variables are set
-    public_key = os.getenv("LANGFUSE_PUBLIC_KEY")
-    secret_key = os.getenv("LANGFUSE_SECRET_KEY")
-    host = os.getenv("LANGFUSE_HOST", "https://cloud.langfuse.com")
-
-    # Print configuration (mask sensitive keys)
-    def _mask_key(k):
-        return f"{k[:8]}...{k[-4:]}" if k and len(k) > 12 else "***" if k else None
-
-    logger.info(
-        f"[langfuse] Configuration: enabled={enabled}, "
-        f"public_key={_mask_key(public_key)}, "
-        f"secret_key={'***' if secret_key else None}, "
-        f"host={host}"
-    )
-
-    if not public_key or not secret_key:
-        logger.warning(
-            "[langfuse] Langfuse keys not found in environment variables. "
-            "Please set LANGFUSE_PUBLIC_KEY and LANGFUSE_SECRET_KEY in .env file"
-        )
-        return []
-
-    try:
-        # Create handler with trace_id from context for cross-system correlation
-        from app.core.trace_context import get_trace_id
-
-        trace_id = get_trace_id()
-        handler = LangfuseCallbackHandler(
-            trace_context={"trace_id": trace_id} if trace_id else None,
-        )
-        logger.info(f"[langfuse] Langfuse callback handler created successfully (host: {host})")
-        return [handler]
-    except Exception as e:
-        logger.error(f"[langfuse] Failed to create Langfuse callback handler: {e}")
-        return []
diff --git a/backend/app/core/agent/memory/manager.py b/backend/app/core/agent/memory/manager.py
index b76872031..4c5f0496d 100644
--- a/backend/app/core/agent/memory/manager.py
+++ b/backend/app/core/agent/memory/manager.py
@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from textwrap import dedent
-from typing import Any, Callable, Dict, List, Literal, Optional, Type, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Literal, Optional, Type, Union
 
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages.chat import ChatMessage as Message
@@ -17,11 +19,19 @@
 from app.core.constants import DEFAULT_USER_ID
 from app.core.tools.tool import EnhancedTool
 from app.schemas.memory import UserMemory
-from app.services.memory_service import MemoryService
 from app.utils.datetime import utc_now
 from app.utils.prompts import get_json_output_prompt
 from app.utils.string import parse_response_model_str
 
+if TYPE_CHECKING:
+    from app.services.memory_service import MemoryService
+
+
+def _is_memory_service(obj: Any) -> bool:
+    from app.services.memory_service import MemoryService as _MS  # cached by Python's import system
+
+    return isinstance(obj, _MS)
+
 
 class MemorySearchResponse(BaseModel):
     """Model for Memory Search Response."""
@@ -140,7 +150,7 @@ def read_from_db(self, user_id: Optional[str] = None):
 
     async def aread_from_db(self, user_id: Optional[str] = None):
         if self.db:
-            if isinstance(self.db, MemoryService):
+            if _is_memory_service(self.db):
                 # If no user_id is provided, read all memories
                 if user_id is None:
                     all_memories: List[UserMemory] = await self.db.get_user_memories()  # type: ignore
@@ -394,9 +404,9 @@ def clear(self) -> None:
         if self.db:
             result = self.db.clear_memories()
             if hasattr(result, "__await__"):
-                import asyncio
+                from app.utils.safe_task import safe_create_task
 
-                asyncio.create_task(result)  # type: ignore[unused-coroutine]
+                safe_create_task(result, name="memory-clear")  # type: ignore[arg-type]
 
     def delete_user_memory(
         self,
@@ -431,7 +441,7 @@ def clear_user_memories(self, user_id: Optional[str] = None) -> None:
             logger.warning("Memory DB not provided.")
             return
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             raise ValueError(
                 "clear_user_memories() is not supported with an async DB. Please use aclear_user_memories() instead."
             )
@@ -447,7 +457,7 @@ def clear_user_memories(self, user_id: Optional[str] = None) -> None:
 
         if memory_ids:
             # Delete all memories in a single batch operation
-            self.db.delete_user_memories(memory_ids=memory_ids, user_id=user_id)
+            self.db.delete_user_memories(memory_ids=memory_ids, user_id=user_id)  # type: ignore[unused-coroutine]
             logger.debug(f"Cleared {len(memory_ids)} memories for user {user_id}")
 
     async def aclear_user_memories(self, user_id: Optional[str] = None) -> None:
@@ -463,7 +473,7 @@ async def aclear_user_memories(self, user_id: Optional[str] = None) -> None:
             logger.warning("Memory DB not provided.")
             return
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             memories = await self.aget_user_memories(user_id=user_id)
         else:
             memories = self.get_user_memories(user_id=user_id)
@@ -477,10 +487,10 @@ async def aclear_user_memories(self, user_id: Optional[str] = None) -> None:
 
         if memory_ids:
             # Delete all memories in a single batch operation
-            if isinstance(self.db, MemoryService):
+            if _is_memory_service(self.db):
                 await self.db.delete_user_memories(memory_ids=memory_ids, user_id=user_id)
             else:
-                self.db.delete_user_memories(memory_ids=memory_ids, user_id=user_id)
+                self.db.delete_user_memories(memory_ids=memory_ids, user_id=user_id)  # type: ignore[unused-coroutine]
             logger.debug(f"Cleared {len(memory_ids)} memories for user {user_id}")
 
     # -*- Agent Functions
@@ -499,7 +509,7 @@ def create_user_memories(
             logger.warning("MemoryDb not provided.")
             return "Please provide a db to store memories"
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             raise ValueError(
                 "create_user_memories() is not supported with an async DB. Please use acreate_user_memories() instead."
             )
@@ -567,7 +577,7 @@ async def acreate_user_memories(
         if user_id is None:
             user_id = "default"
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             memories = await self.aread_from_db(user_id=user_id)
         else:
             memories = self.read_from_db(user_id=user_id)
@@ -589,7 +599,7 @@ async def acreate_user_memories(
         )
 
         # We refresh from the DB
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             memories = await self.aread_from_db(user_id=user_id)
         else:
             memories = self.read_from_db(user_id=user_id)
@@ -603,7 +613,7 @@ def update_memory_task(self, task: str, user_id: Optional[str] = None) -> str:
             logger.warning("MemoryDb not provided.")
             return "Please provide a db to store memories"
 
-        if not isinstance(self.db, MemoryService):
+        if not _is_memory_service(self.db):
             raise ValueError(
                 "update_memory_task() is not supported with an async DB. Please use aupdate_memory_task() instead."
             )
@@ -645,7 +655,7 @@ async def aupdate_memory_task(self, task: str, user_id: Optional[str] = None) ->
         if user_id is None:
             user_id = "default"
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             memories = await self.aread_from_db(user_id=user_id)
         else:
             memories = self.read_from_db(user_id=user_id)
@@ -668,7 +678,7 @@ async def aupdate_memory_task(self, task: str, user_id: Optional[str] = None) ->
         )
 
         # We refresh from the DB
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             await self.aread_from_db(user_id=user_id)
         else:
             self.read_from_db(user_id=user_id)
@@ -683,13 +693,13 @@ def _upsert_db_memory(self, memory: UserMemory) -> str:
                 raise ValueError("Memory db not initialized")
             result = self.db.upsert_user_memory(memory=memory)
             if hasattr(result, "__await__"):
-                import asyncio
+                from app.utils.safe_task import safe_create_task
 
-                asyncio.create_task(result)  # type: ignore[unused-coroutine]
-            return "Memory added successfully"
+                safe_create_task(result, name="memory-upsert")  # type: ignore[arg-type]
         except Exception as e:
             logger.warning(f"Error storing memory in db: {e}")
             return f"Error adding memory: {e}"
+        return ""
 
     def _delete_db_memory(self, memory_id: str, user_id: Optional[str] = None) -> str:
         """Use this function to delete a memory from the database."""
@@ -702,13 +712,13 @@ def _delete_db_memory(self, memory_id: str, user_id: Optional[str] = None) -> st
 
             result = self.db.delete_user_memory(memory_id=memory_id, user_id=user_id)
             if hasattr(result, "__await__"):
-                import asyncio
+                from app.utils.safe_task import safe_create_task
 
-                asyncio.create_task(result)  # type: ignore[unused-coroutine]
-            return "Memory deleted successfully"
+                safe_create_task(result, name="memory-delete")  # type: ignore[arg-type]
         except Exception as e:
             logger.warning(f"Error deleting memory in db: {e}")
             return f"Error deleting memory: {e}"
+        return ""
 
     # -*- Utility Functions
     def search_user_memories(
@@ -1104,7 +1114,7 @@ def optimize_memories(
         if user_id is None:
             user_id = "default"
 
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             raise ValueError(
                 "optimize_memories() is not supported with an async DB. Please use aoptimize_memories() instead."
             )
@@ -1145,7 +1155,7 @@ def optimize_memories(
 
                     opt_mem.memory_id = str(uuid4())
 
-                self.db.upsert_user_memory(memory=opt_mem)
+                self.db.upsert_user_memory(memory=opt_mem)  # type: ignore[unused-coroutine]
 
         optimized_tokens = strategy_instance.count_tokens(optimized_memories)
         logger.debug(f"Optimization complete. New token count: {optimized_tokens}")
@@ -1176,7 +1186,7 @@ async def aoptimize_memories(
             user_id = "default"
 
         # Get user memories - handle both sync and async DBs
-        if isinstance(self.db, MemoryService):
+        if _is_memory_service(self.db):
             memories = await self.aget_user_memories(user_id=user_id)
         else:
             memories = self.get_user_memories(user_id=user_id)
@@ -1215,10 +1225,10 @@ async def aoptimize_memories(
 
                     opt_mem.memory_id = str(uuid4())
 
-                if isinstance(self.db, MemoryService):
+                if _is_memory_service(self.db):
                     await self.db.upsert_user_memory(memory=opt_mem)
-                elif isinstance(self.db, MemoryService):
-                    self.db.upsert_user_memory(memory=opt_mem)
+                else:
+                    self.db.upsert_user_memory(memory=opt_mem)  # type: ignore[unused-coroutine]
 
         optimized_tokens = strategy_instance.count_tokens(optimized_memories)
         logger.debug(f"Memory optimization complete. New token count: {optimized_tokens}")
@@ -1458,7 +1468,7 @@ async def acreate_or_update_memories(
         # and LangChain models are thread-safe
         model_copy = self.model
         # Update the Model (set defaults, add logit etc.)
-        if isinstance(db, MemoryService):
+        if _is_memory_service(db):
             _tools = self.determine_tools_for_model(
                 await self._aget_db_tools(
                     user_id,
@@ -1668,7 +1678,7 @@ async def arun_memory_task(
         # and LangChain models are thread-safe
         model_copy = self.model
         # Update the Model (set defaults, add logit etc.)
-        if isinstance(db, MemoryService):
+        if _is_memory_service(db):
             _tools = self.determine_tools_for_model(
                 await self._aget_db_tools(
                     user_id,
@@ -1952,7 +1962,7 @@ async def add_memory(memory: str, topics: Optional[List[str]] = None) -> str:
 
             try:
                 memory_id = str(uuid4())
-                if isinstance(db, MemoryService):
+                if _is_memory_service(db):
                     await db.upsert_user_memory(
                         UserMemory(
                             memory_id=memory_id,
@@ -1965,7 +1975,7 @@ async def add_memory(memory: str, topics: Optional[List[str]] = None) -> str:
                         )
                     )
                 else:
-                    db.upsert_user_memory(
+                    db.upsert_user_memory(  # type: ignore[unused-coroutine]
                         UserMemory(
                             memory_id=memory_id,
                             user_id=user_id,
@@ -1997,7 +2007,7 @@ async def update_memory(memory_id: str, memory: str, topics: Optional[List[str]]
                 return "Can't update memory with empty string. Use the delete memory function if available."
 
             try:
-                if isinstance(db, MemoryService):
+                if _is_memory_service(db):
                     await db.upsert_user_memory(
                         UserMemory(
                             memory_id=memory_id,
@@ -2007,7 +2017,7 @@ async def update_memory(memory_id: str, memory: str, topics: Optional[List[str]]
                         )
                     )
                 else:
-                    db.upsert_user_memory(
+                    db.upsert_user_memory(  # type: ignore[unused-coroutine]
                         UserMemory(
                             memory_id=memory_id,
                             memory=memory,
@@ -2029,10 +2039,10 @@ async def delete_memory(memory_id: str) -> str:
                 str: A message indicating if the memory was deleted successfully or not.
             """
             try:
-                if isinstance(db, MemoryService):
+                if _is_memory_service(db):
                     await db.delete_user_memory(memory_id=memory_id, user_id=user_id)
                 else:
-                    db.delete_user_memory(memory_id=memory_id, user_id=user_id)
+                    db.delete_user_memory(memory_id=memory_id, user_id=user_id)  # type: ignore[unused-coroutine]
                 logger.debug("Memory deleted")
                 return "Memory deleted successfully"
             except Exception as e:
@@ -2045,10 +2055,10 @@ async def clear_memory() -> str:
             Returns:
                 str: A message indicating if the memory was cleared successfully or not.
             """
-            if isinstance(db, MemoryService):
+            if _is_memory_service(db):
                 await db.clear_memories()
             else:
-                db.clear_memories()
+                db.clear_memories()  # type: ignore[unused-coroutine]
             logger.debug("Memory cleared")
             return "Memory cleared successfully"
 
diff --git a/backend/app/core/agent/middleware/logging.py b/backend/app/core/agent/middleware/logging.py
index 753d7cb1e..9180ad4f5 100644
--- a/backend/app/core/agent/middleware/logging.py
+++ b/backend/app/core/agent/middleware/logging.py
@@ -6,10 +6,7 @@
 import traceback
 from collections.abc import Awaitable, Callable
 from datetime import datetime
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
-
-if TYPE_CHECKING:
-    pass
+from typing import Any, Dict, List, Optional
 
 from deepagents.backends.protocol import BackendProtocol
 from langchain.agents.middleware.types import AgentMiddleware, AgentState, ModelRequest, ModelResponse
@@ -632,16 +629,5 @@ def get_error_summary(self) -> Dict[str, Any]:
         except Exception:
             return {"error": "Failed to generate error summary"}
 
-    def cleanup_old_logs(self, days_to_keep: int = 30) -> None:
-        """Clean up old log files."""
-        time.time() - (days_to_keep * 24 * 60 * 60)
-
-        try:
-            # concrete cleanup logic needs to be implemented here;
-            # limited by BackendProtocol, this is a placeholder
-            pass
-        except Exception as e:
-            logger.warning(f"Failed to cleanup old logs: {e}")
-
 
 # (no additional imports needed)
diff --git a/backend/app/core/agent/middleware/memory_iteration_with_db.py b/backend/app/core/agent/middleware/memory_iteration_with_db.py
index b245c76c1..8379e47af 100644
--- a/backend/app/core/agent/middleware/memory_iteration_with_db.py
+++ b/backend/app/core/agent/middleware/memory_iteration_with_db.py
@@ -10,7 +10,7 @@
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from typing import TYPE_CHECKING, Any, List, Literal, Optional
+from typing import Any, List, Literal, Optional
 
 from langchain.agents.middleware.types import AgentMiddleware, AgentState, ModelRequest, ModelResponse
 from langchain_core.messages import AIMessage, HumanMessage
@@ -20,9 +20,6 @@
 from app.core.agent.memory.manager import MemoryManager
 from app.schemas.memory import UserMemory
 
-if TYPE_CHECKING:
-    pass
-
 
 class AgenticMemoryState(AgentState):
     """Extended state for the Agentic Memory middleware."""
diff --git a/backend/app/core/agent/node_tools.py b/backend/app/core/agent/node_tools.py
index 563988904..3410e81c6 100644
--- a/backend/app/core/agent/node_tools.py
+++ b/backend/app/core/agent/node_tools.py
@@ -1,13 +1,15 @@
 """
 Node tools resolution.
 
-Parses `GraphNode` tool configuration (persisted in DB) and resolves it into a
-LangChain-compatible tools list for `create_agent(..., tools=[...])`.
+Parses node tool configuration and resolves it into a LangChain-compatible
+tools list for ``create_agent(..., tools=[...])``.
 
 Frontend stores tools under:
 - node.data.config.tools = { builtin: string[], mcp: string[] }
-  where mcp entries are in format `${server_name}::${toolName}`.
-Backend also has a dedicated `GraphNode.tools` JSONB field; we support both.
+  where mcp entries are in format ``${server_name}::${toolName}``.
+
+Node objects are duck-typed: any object with ``id``, ``data``, and optional
+``tools`` attributes is accepted.
 """
 
 from __future__ import annotations
@@ -23,7 +25,6 @@
 # Import default user ID constant
 from app.core.constants import DEFAULT_USER_ID
 from app.core.tools.tool import EnhancedTool, ToolMetadata, ToolSourceType
-from app.models.graph import GraphNode
 from app.utils.sandbox_paths import get_user_sandbox_host_dir
 
 
@@ -34,9 +35,9 @@ def _first_dict(*candidates: Any) -> Optional[dict]:
     return None
 
 
-def extract_tools_config(node: GraphNode) -> Optional[dict]:
+def extract_tools_config(node: Any) -> Optional[dict]:
     """
-    Extract tools config dict from a GraphNode.
+    Extract tools config dict from a node data object.
 
     Preference order:
     1) node.data.config.tools (canonical)
@@ -381,22 +382,20 @@ def _normalize_user_id(user_id: Any | None) -> str:
     return str(user_id)
 
 
-async def resolve_tools_for_node(
-    node: GraphNode, *, user_id: str | None = None, backend: Any = None
-) -> Optional[List[Any]]:
+async def resolve_tools_for_node(node: Any, *, user_id: str | None = None, backend: Any = None) -> Optional[List[Any]]:
     """
     Resolve tools list for a node.
 
     Process flow:
     1. Extract tools config from node
-    2. Parse builtin tools → resolve to tool objects
-    3. Parse MCP tools → resolve server names → get tools
+    2. Parse builtin tools -> resolve to tool objects
+    3. Parse MCP tools -> resolve server names -> get tools
     4. Return combined tool list
 
     MCP server identification: server name (unique per user)
 
     Args:
-        node: GraphNode to resolve tools for
+        node: Node data object with id/data attributes
         user_id: User ID (normalized to string UUID format)
 
     Returns:
diff --git a/backend/app/core/agent/sample_agent.py b/backend/app/core/agent/sample_agent.py
index 31412ff3e..c4f5b006b 100644
--- a/backend/app/core/agent/sample_agent.py
+++ b/backend/app/core/agent/sample_agent.py
@@ -16,10 +16,9 @@
 from langchain_openai import ChatOpenAI
 from pydantic import SecretStr
 
-from app.common.exceptions import ModelConfigError
+from app.common.app_errors import ModelConfigError
 from app.core.agent.backends.filesystem_sandbox import FilesystemSandboxBackend
 from app.core.agent.middleware import LoggingMiddleware
-from app.services.model_service import MODEL_NAME_REQUIRED, MODEL_NO_CREDENTIALS
 
 load_dotenv()
 
@@ -52,7 +51,7 @@ def get_default_model(
 
     if not llm_model:
         raise ModelConfigError(
-            MODEL_NAME_REQUIRED,
+            ModelConfigError.MODEL_NAME_REQUIRED,
             "Model name is required but was not specified.",
         )
 
@@ -60,7 +59,7 @@ def get_default_model(
 
     if not api_key_value:
         raise ModelConfigError(
-            MODEL_NO_CREDENTIALS,
+            ModelConfigError.MODEL_NO_CREDENTIALS,
             f'No valid API key provided for model "{model_name}".',
             params={"model": model_name},
         )
diff --git a/backend/app/core/ai_adapter.py b/backend/app/core/ai_adapter.py
index fc997a160..7468e66f5 100644
--- a/backend/app/core/ai_adapter.py
+++ b/backend/app/core/ai_adapter.py
@@ -64,7 +64,7 @@ def __init__(
         self.engine = engine
 
         # Create per-session directories using configured workspace root
-        workspace_root = Path(settings.WORKSPACE_ROOT)
+        workspace_root = Path(settings.workspace_root)
         self.session_dir = workspace_root / "sessions" / session_id
         self.session_dir.mkdir(parents=True, exist_ok=True)
 
diff --git a/backend/app/core/contracts/__init__.py b/backend/app/core/contracts/__init__.py
new file mode 100644
index 000000000..39ed65f12
--- /dev/null
+++ b/backend/app/core/contracts/__init__.py
@@ -0,0 +1,83 @@
+"""Canonical backend contract values."""
+
+from app.core.contracts.agent import (
+    ALL_ENGINE_KINDS,
+    CLI_ENGINE_KINDS,
+    ENGINE_KINDS,
+    ENGINE_RUNTIME_MAP,
+    INTERNAL_ENGINE_KINDS,
+    RUNTIME_KINDS,
+    AllEngineKind,
+    EngineKind,
+    InternalEngineKind,
+    RuntimeKind,
+    infer_runtime_kind,
+    is_cli_engine_kind,
+    normalize_engine_kind,
+    normalize_runtime_kind,
+)
+from app.core.contracts.error import (
+    ERROR_CODES,
+    ERROR_SOURCES,
+    USER_ACTIONS,
+    ErrorCode,
+    ErrorSource,
+    ErrorSourceLiteral,
+    UserAction,
+    UserActionLiteral,
+)
+from app.core.contracts.execution import (
+    ACTIVE_EXECUTION_STATUSES,
+    ACTIVE_RUN_STATUSES,
+    EXECUTION_STATUSES,
+    RELEASE_STATUSES,
+    RUN_PURPOSES,
+    RUN_STATUSES,
+    TERMINAL_EXECUTION_STATUSES,
+    TERMINAL_RUN_STATUSES,
+    TRIGGER_MEDIUMS,
+    ExecutionStatusLiteral,
+    ReleaseStatusLiteral,
+    RunPurposeLiteral,
+    RunStatusLiteral,
+    TriggerMediumLiteral,
+)
+
+__all__ = [
+    "ACTIVE_EXECUTION_STATUSES",
+    "ACTIVE_RUN_STATUSES",
+    "ALL_ENGINE_KINDS",
+    "CLI_ENGINE_KINDS",
+    "ENGINE_KINDS",
+    "ENGINE_RUNTIME_MAP",
+    "ERROR_CODES",
+    "ERROR_SOURCES",
+    "EXECUTION_STATUSES",
+    "AllEngineKind",
+    "EngineKind",
+    "ErrorCode",
+    "ErrorSource",
+    "ErrorSourceLiteral",
+    "ExecutionStatusLiteral",
+    "INTERNAL_ENGINE_KINDS",
+    "InternalEngineKind",
+    "RELEASE_STATUSES",
+    "RUN_STATUSES",
+    "RUNTIME_KINDS",
+    "ReleaseStatusLiteral",
+    "RunStatusLiteral",
+    "RuntimeKind",
+    "TERMINAL_EXECUTION_STATUSES",
+    "TERMINAL_RUN_STATUSES",
+    "TRIGGER_MEDIUMS",
+    "RUN_PURPOSES",
+    "TriggerMediumLiteral",
+    "RunPurposeLiteral",
+    "USER_ACTIONS",
+    "UserAction",
+    "UserActionLiteral",
+    "infer_runtime_kind",
+    "is_cli_engine_kind",
+    "normalize_engine_kind",
+    "normalize_runtime_kind",
+]
diff --git a/backend/app/core/contracts/agent.py b/backend/app/core/contracts/agent.py
new file mode 100644
index 000000000..cdcb96c4d
--- /dev/null
+++ b/backend/app/core/contracts/agent.py
@@ -0,0 +1,58 @@
+"""Canonical Agent engine/runtime kind contract values."""
+
+from __future__ import annotations
+
+from typing import Literal, Union, get_args
+
+from app.common.app_errors import InvalidRequestError
+
+EngineKind = Literal[
+    "langgraph_visual",
+    "langgraph_code",
+    "claude_code",
+    "codex",
+    "openclaw",
+]
+ENGINE_KINDS: set[str] = set(get_args(EngineKind))
+
+InternalEngineKind = Literal["build_copilot"]
+INTERNAL_ENGINE_KINDS: set[str] = set(get_args(InternalEngineKind))
+
+AllEngineKind = Union[EngineKind, InternalEngineKind]
+ALL_ENGINE_KINDS: set[str] = ENGINE_KINDS | INTERNAL_ENGINE_KINDS
+
+RuntimeKind = Literal["sandbox", "server"]
+RUNTIME_KINDS: set[str] = set(get_args(RuntimeKind))
+
+ENGINE_RUNTIME_MAP: dict[str, str] = {
+    "langgraph_visual": "server",
+    "langgraph_code": "server",
+    "claude_code": "sandbox",
+    "codex": "sandbox",
+    "openclaw": "sandbox",
+}
+
+CLI_ENGINE_KINDS: set[str] = {k for k, v in ENGINE_RUNTIME_MAP.items() if v == "sandbox"}
+
+
+def infer_runtime_kind(engine_kind: str) -> str:
+    runtime_kind = ENGINE_RUNTIME_MAP.get(engine_kind)
+    if not runtime_kind:
+        raise InvalidRequestError(
+            f"Unsupported engine_kind={engine_kind}",
+            code="AGENT_ENGINE_KIND_UNSUPPORTED",
+            data={"engine_kind": engine_kind},
+        )
+    return runtime_kind
+
+
+def is_cli_engine_kind(engine_kind: str) -> bool:
+    return engine_kind in CLI_ENGINE_KINDS
+
+
+def normalize_engine_kind(engine_kind: str | None) -> str | None:
+    return engine_kind if engine_kind in ENGINE_KINDS else None
+
+
+def normalize_runtime_kind(runtime_kind: str | None) -> str | None:
+    return runtime_kind if runtime_kind in RUNTIME_KINDS else None
diff --git a/backend/app/core/contracts/error.py b/backend/app/core/contracts/error.py
new file mode 100644
index 000000000..bc9d01de2
--- /dev/null
+++ b/backend/app/core/contracts/error.py
@@ -0,0 +1,416 @@
+"""Canonical error contract values — source of truth for error metadata.
+
+Mirrors the pattern of agent.py and execution.py: StrEnum for type-safe
+values, Literal types for function signatures, plain sets for runtime checks.
+"""
+
+from __future__ import annotations
+
+from enum import StrEnum
+from typing import Literal
+
+
+# ---------------------------------------------------------------------------
+# Error source — classifies where the failure originated
+# ---------------------------------------------------------------------------
+class ErrorSource(StrEnum):
+    API = "api"
+    ENGINE = "engine"
+    RUNTIME = "runtime"
+    NODE = "node"
+    TOOL = "tool"
+    WEBSOCKET = "websocket"
+    AUTH = "auth"
+    VALIDATION = "validation"
+    PERMISSION = "permission"
+    INTERNAL = "internal"
+
+
+ErrorSourceLiteral = Literal[
+    "api",
+    "engine",
+    "runtime",
+    "node",
+    "tool",
+    "websocket",
+    "auth",
+    "validation",
+    "permission",
+    "internal",
+]
+
+ERROR_SOURCES: set[str] = {s.value for s in ErrorSource}
+
+
+# ---------------------------------------------------------------------------
+# User action — what the user should do to resolve the failure
+# ---------------------------------------------------------------------------
+class UserAction(StrEnum):
+    RETRY = "retry"
+    CONFIGURE_MODEL = "configure_model"
+    RELOGIN = "relogin"
+    FIX_INPUT = "fix_input"
+    CONTACT_SUPPORT = "contact_support"
+
+
+UserActionLiteral = Literal[
+    "retry",
+    "configure_model",
+    "relogin",
+    "fix_input",
+    "contact_support",
+]
+
+USER_ACTIONS: set[str] = {a.value for a in UserAction}
+
+
+# ---------------------------------------------------------------------------
+# Error codes — the canonical registry of all product error codes.
+#
+# Every error code used anywhere in backend must have an entry here.
+# StrEnum values compare equal to their string values, so existing call
+# sites using raw strings remain compatible during gradual migration.
+# ---------------------------------------------------------------------------
+class ErrorCode(StrEnum):
+    # -- Generic --
+    NOT_FOUND = "NOT_FOUND"
+    BAD_REQUEST = "BAD_REQUEST"
+    UNAUTHORIZED = "UNAUTHORIZED"
+    FORBIDDEN = "FORBIDDEN"
+    CONFLICT = "CONFLICT"
+    RATE_LIMITED = "RATE_LIMITED"
+    INTERNAL_ERROR = "INTERNAL_ERROR"
+    SERVICE_UNAVAILABLE = "SERVICE_UNAVAILABLE"
+    CLIENT_CLOSED = "CLIENT_CLOSED"
+    REQUEST_VALIDATION_ERROR = "REQUEST_VALIDATION_ERROR"
+    SUPERUSER_REQUIRED = "SUPERUSER_REQUIRED"
+
+    # -- Auth --
+    AUTH_REQUIRED = "AUTH_REQUIRED"
+    BEARER_TOKEN_MISSING = "BEARER_TOKEN_MISSING"
+    TOKEN_INVALID = "TOKEN_INVALID"
+    TOKEN_REFRESH_FAILED = "TOKEN_REFRESH_FAILED"
+    TOKEN_REFRESH_UNAVAILABLE = "TOKEN_REFRESH_UNAVAILABLE"
+    TOKEN_RESOURCE_ID_INVALID = "TOKEN_RESOURCE_ID_INVALID"
+    REFRESH_TOKEN_INVALID = "REFRESH_TOKEN_INVALID"
+    RESET_TOKEN_INVALID = "RESET_TOKEN_INVALID"
+    RESET_TOKEN_EXPIRED = "RESET_TOKEN_EXPIRED"
+    VERIFICATION_TOKEN_INVALID = "VERIFICATION_TOKEN_INVALID"
+    VERIFICATION_TOKEN_EXPIRED = "VERIFICATION_TOKEN_EXPIRED"
+    CREDENTIALS_INVALID = "CREDENTIALS_INVALID"
+    INVALID_CREDENTIALS = "INVALID_CREDENTIALS"
+    MISSING_CREDENTIALS = "MISSING_CREDENTIALS"
+    EMAIL_NOT_VERIFIED = "EMAIL_NOT_VERIFIED"
+    EMAIL_ALREADY_VERIFIED = "EMAIL_ALREADY_VERIFIED"
+
+    # -- User --
+    USER_NOT_FOUND = "USER_NOT_FOUND"
+    USER_ALREADY_EXISTS = "USER_ALREADY_EXISTS"
+    USER_INACTIVE = "USER_INACTIVE"
+    USER_INVALID = "USER_INVALID"
+
+    # -- Agent --
+    AGENT_NOT_FOUND = "AGENT_NOT_FOUND"
+    AGENT_NOT_PUBLISHED = "AGENT_NOT_PUBLISHED"
+    AGENT_ACTIVE_RELEASE_MISSING = "AGENT_ACTIVE_RELEASE_MISSING"
+    AGENT_DRAFT_VERSION_MISSING = "AGENT_DRAFT_VERSION_MISSING"
+    AGENT_DRAFT_VERSION_NOT_FOUND = "AGENT_DRAFT_VERSION_NOT_FOUND"
+    AGENT_WORKSPACE_MISMATCH = "AGENT_WORKSPACE_MISMATCH"
+    AGENT_DEFINITION_KIND_UNSUPPORTED = "AGENT_DEFINITION_KIND_UNSUPPORTED"
+    AGENT_DELETE_TASK_REFERENCE_CONFLICT = "AGENT_DELETE_TASK_REFERENCE_CONFLICT"
+    AGENT_VERSION_NOT_FOUND = "AGENT_VERSION_NOT_FOUND"
+    AGENT_VERSION_AGENT_MISMATCH = "AGENT_VERSION_AGENT_MISMATCH"
+    AGENT_VERSION_NOT_FROZEN = "AGENT_VERSION_NOT_FROZEN"
+    AGENT_RELEASE_NOT_FOUND = "AGENT_RELEASE_NOT_FOUND"
+    AGENT_RELEASE_NOT_ACTIVATABLE = "AGENT_RELEASE_NOT_ACTIVATABLE"
+    AGENT_RELEASE_ACTIVE_CANNOT_RETIRE = "AGENT_RELEASE_ACTIVE_CANNOT_RETIRE"
+    AGENT_RELEASE_AGENT_MISMATCH = "AGENT_RELEASE_AGENT_MISMATCH"
+    AGENT_RUN_NOT_FOUND = "AGENT_RUN_NOT_FOUND"
+    AGENT_RUN_FILTER_REQUIRED = "AGENT_RUN_FILTER_REQUIRED"
+    AGENT_RUN_WORKSPACE_REQUIRED = "AGENT_RUN_WORKSPACE_REQUIRED"
+
+    # -- Run --
+    RUN_NOT_FOUND = "RUN_NOT_FOUND"
+    RUN_BINDING_INVALID = "RUN_BINDING_INVALID"
+    RUN_CANCEL_STATUS_INVALID = "RUN_CANCEL_STATUS_INVALID"
+    RUN_RETRY_STATUS_INVALID = "RUN_RETRY_STATUS_INVALID"
+    RUN_RETRY_DRAFT_FORBIDDEN = "RUN_RETRY_DRAFT_FORBIDDEN"
+    RETRY_STATE_INVALID = "RETRY_STATE_INVALID"
+
+    # -- Execution --
+    EXECUTION_NOT_FOUND = "EXECUTION_NOT_FOUND"
+    EXECUTION_SNAPSHOT_NOT_FOUND = "EXECUTION_SNAPSHOT_NOT_FOUND"
+    EXECUTION_ENGINE_FAILED = "EXECUTION_ENGINE_FAILED"
+    EXECUTION_ENGINE_NOT_REGISTERED = "EXECUTION_ENGINE_NOT_REGISTERED"
+    EXECUTION_EVENT_CONTEXT_MISSING = "EXECUTION_EVENT_CONTEXT_MISSING"
+    EXECUTION_FAILED = "EXECUTION_FAILED"
+    EXECUTION_MESSAGE_UNSUPPORTED = "EXECUTION_MESSAGE_UNSUPPORTED"
+    EXECUTION_MESSAGE_REJECTED = "EXECUTION_MESSAGE_REJECTED"
+    EXECUTION_OPERATION_UNSUPPORTED = "EXECUTION_OPERATION_UNSUPPORTED"
+    EXECUTION_RUNTIME_KIND_MISSING = "EXECUTION_RUNTIME_KIND_MISSING"
+    STALE_REAPED = "STALE_REAPED"
+    DRAFT_OVERRIDE_PARAMETERS_INVALID = "DRAFT_OVERRIDE_PARAMETERS_INVALID"
+
+    # -- Graph engine --
+    GRAPH_DEFINITION_KIND_UNSUPPORTED = "GRAPH_DEFINITION_KIND_UNSUPPORTED"
+    GRAPH_DEFINITION_NODES_EMPTY = "GRAPH_DEFINITION_NODES_EMPTY"
+    GRAPH_EXECUTION_FAILED = "GRAPH_EXECUTION_FAILED"
+    GRAPH_EXECUTION_NOT_RUNNING = "GRAPH_EXECUTION_NOT_RUNNING"
+    GRAPH_EXECUTION_MESSAGE_UNSUPPORTED = "GRAPH_EXECUTION_MESSAGE_UNSUPPORTED"
+
+    # -- Code engine --
+    CODE_DEFINITION_EMPTY = "CODE_DEFINITION_EMPTY"
+    CODE_DEFINITION_KIND_UNSUPPORTED = "CODE_DEFINITION_KIND_UNSUPPORTED"
+    CODE_EXECUTION_FAILED = "CODE_EXECUTION_FAILED"
+    CODE_EXECUTION_INVALID = "CODE_EXECUTION_INVALID"
+    CODE_EXECUTION_NOT_RUNNING = "CODE_EXECUTION_NOT_RUNNING"
+    CODE_EXECUTION_MESSAGE_UNSUPPORTED = "CODE_EXECUTION_MESSAGE_UNSUPPORTED"
+    CODEX_THREAD_START_INVALID = "CODEX_THREAD_START_INVALID"
+
+    # -- CLI engine --
+    CLI_EXECUTION_RUNNER_FAILED = "CLI_EXECUTION_RUNNER_FAILED"
+    CLAUDE_CODE_RUNTIME_ERROR = "CLAUDE_CODE_RUNTIME_ERROR"
+    CODEX_RUNTIME_ERROR = "CODEX_RUNTIME_ERROR"
+    RUNTIME_PROVIDER_NOT_FOUND = "RUNTIME_PROVIDER_NOT_FOUND"
+
+    # -- Copilot --
+    AGENT_ERROR = "AGENT_ERROR"
+    CREDENTIAL_ERROR = "CREDENTIAL_ERROR"
+    CANCELLED = "CANCELLED"
+    COPILOT_EXECUTION_FAILED = "COPILOT_EXECUTION_FAILED"
+    COPILOT_EXECUTION_MESSAGE_UNSUPPORTED = "COPILOT_EXECUTION_MESSAGE_UNSUPPORTED"
+    UNKNOWN_ERROR = "UNKNOWN_ERROR"
+
+    # -- Event bus --
+    EVENT_ERROR_PAYLOAD_MISSING = "EVENT_ERROR_PAYLOAD_MISSING"
+    EVENT_SUBSCRIBER_DB_SESSION_MISSING = "EVENT_SUBSCRIBER_DB_SESSION_MISSING"
+    EVENT_TARGET_STATUS_MISSING = "EVENT_TARGET_STATUS_MISSING"
+    EVENT_TERMINAL_STATUS_MISSING = "EVENT_TERMINAL_STATUS_MISSING"
+    EVENT_TERMINAL_STATUS_INVALID = "EVENT_TERMINAL_STATUS_INVALID"
+
+    # -- State machine --
+    STATE_TRANSITION_INVALID = "STATE_TRANSITION_INVALID"
+
+    # -- Model --
+    MODEL_NOT_FOUND = "MODEL_NOT_FOUND"
+    MODEL_NO_CREDENTIALS = "MODEL_NO_CREDENTIALS"
+    MODEL_NAME_REQUIRED = "MODEL_NAME_REQUIRED"
+    MODEL_TYPE_UNSUPPORTED = "MODEL_TYPE_UNSUPPORTED"
+    MODEL_STREAM_ERROR = "MODEL_STREAM_ERROR"
+    MODEL_INSTANCE_NOT_FOUND = "MODEL_INSTANCE_NOT_FOUND"
+    MODEL_INSTANCE_CREATE_FAILED = "MODEL_INSTANCE_CREATE_FAILED"
+    MODEL_PROVIDER_NOT_FOUND = "MODEL_PROVIDER_NOT_FOUND"
+    MODEL_PROVIDER_OR_NAME_REQUIRED = "MODEL_PROVIDER_OR_NAME_REQUIRED"
+    MODEL_PROVIDER_DELETE_FORBIDDEN = "MODEL_PROVIDER_DELETE_FORBIDDEN"
+    MODEL_PROVIDER_BUILTIN_DELETE_FORBIDDEN = "MODEL_PROVIDER_BUILTIN_DELETE_FORBIDDEN"
+    MODEL_CREDENTIAL_NOT_FOUND = "MODEL_CREDENTIAL_NOT_FOUND"
+    MODEL_CREDENTIAL_CUSTOM_DELETE_FORBIDDEN = "MODEL_CREDENTIAL_CUSTOM_DELETE_FORBIDDEN"
+    BUILD_COPILOT_MODEL_REQUIRED = "BUILD_COPILOT_MODEL_REQUIRED"
+
+    # -- Sandbox --
+    SANDBOX_NOT_FOUND = "SANDBOX_NOT_FOUND"
+    SANDBOX_NOT_RUNNING = "SANDBOX_NOT_RUNNING"
+    SANDBOX_ACCESS_DENIED = "SANDBOX_ACCESS_DENIED"
+    SANDBOX_SETUP_FAILED = "SANDBOX_SETUP_FAILED"
+    SANDBOX_STOP_TARGET_NOT_FOUND = "SANDBOX_STOP_TARGET_NOT_FOUND"
+    SANDBOX_IMAGE_EMPTY = "SANDBOX_IMAGE_EMPTY"
+    SANDBOX_IMAGE_TOO_LONG = "SANDBOX_IMAGE_TOO_LONG"
+    SANDBOX_PROVIDER_UNKNOWN = "SANDBOX_PROVIDER_UNKNOWN"
+    DOCKER_DAEMON_UNAVAILABLE = "DOCKER_DAEMON_UNAVAILABLE"
+    DOCKER_COMMAND_FAILED = "DOCKER_COMMAND_FAILED"
+    DOCKER_EXECUTOR_DEPENDENCY_MISSING = "DOCKER_EXECUTOR_DEPENDENCY_MISSING"
+    DOCKER_EXECUTOR_INIT_FAILED = "DOCKER_EXECUTOR_INIT_FAILED"
+    DOCKER_SANDBOX_CREATE_FAILED = "DOCKER_SANDBOX_CREATE_FAILED"
+    DOCKER_SANDBOX_START_FAILED = "DOCKER_SANDBOX_START_FAILED"
+    MODAL_SANDBOX_STARTUP_FAILED = "MODAL_SANDBOX_STARTUP_FAILED"
+    MODAL_SANDBOX_STARTUP_TIMEOUT = "MODAL_SANDBOX_STARTUP_TIMEOUT"
+    RUNLOOP_API_KEY_MISSING = "RUNLOOP_API_KEY_MISSING"
+    RUNLOOP_DEVBOX_STARTUP_TIMEOUT = "RUNLOOP_DEVBOX_STARTUP_TIMEOUT"
+    CHECKPOINTER_DISABLED = "CHECKPOINTER_DISABLED"
+    CHECKPOINTER_POOL_UNINITIALIZED = "CHECKPOINTER_POOL_UNINITIALIZED"
+    CHECKPOINTER_MANAGER_UNINITIALIZED = "CHECKPOINTER_MANAGER_UNINITIALIZED"
+    DEEPAGENTS_UNAVAILABLE = "DEEPAGENTS_UNAVAILABLE"
+
+    # -- Skill --
+    SKILL_NOT_FOUND = "SKILL_NOT_FOUND"
+    SKILL_ACCESS_DENIED = "SKILL_ACCESS_DENIED"
+    SKILL_DELETE_FORBIDDEN = "SKILL_DELETE_FORBIDDEN"
+    SKILL_NAME_ALREADY_EXISTS = "SKILL_NAME_ALREADY_EXISTS"
+    SKILL_NAME_INVALID = "SKILL_NAME_INVALID"
+    SKILL_OWNER_COLLABORATOR_FORBIDDEN = "SKILL_OWNER_COLLABORATOR_FORBIDDEN"
+    SKILL_OWNER_TRANSFER_FORBIDDEN = "SKILL_OWNER_TRANSFER_FORBIDDEN"
+    SKILL_TOKEN_SCOPE_FORBIDDEN = "SKILL_TOKEN_SCOPE_FORBIDDEN"
+    SKILL_COLLABORATOR_NOT_FOUND = "SKILL_COLLABORATOR_NOT_FOUND"
+    SKILL_COLLABORATOR_ALREADY_EXISTS = "SKILL_COLLABORATOR_ALREADY_EXISTS"
+    SKILL_VERSION_NOT_FOUND = "SKILL_VERSION_NOT_FOUND"
+    SKILL_VERSION_FORMAT_INVALID = "SKILL_VERSION_FORMAT_INVALID"
+    SKILL_VERSION_NOT_GREATER_THAN_LATEST = "SKILL_VERSION_NOT_GREATER_THAN_LATEST"
+    SKILL_VERSION_PRERELEASE_UNSUPPORTED = "SKILL_VERSION_PRERELEASE_UNSUPPORTED"
+    SKILL_IMPORT_FILES_INVALID = "SKILL_IMPORT_FILES_INVALID"
+    SKILL_FILE_NOT_FOUND = "SKILL_FILE_NOT_FOUND"
+    SKILL_FILE_CONTENT_INVALID = "SKILL_FILE_CONTENT_INVALID"
+    SKILL_SYSTEM_FILE_IMPORT_FORBIDDEN = "SKILL_SYSTEM_FILE_IMPORT_FORBIDDEN"
+    SKILL_LOAD_FAILED = "SKILL_LOAD_FAILED"
+    SKILL_FILE_WRITE_FAILED = "SKILL_FILE_WRITE_FAILED"
+
+    # -- Tool / MCP --
+    TOOL_NOT_FOUND = "TOOL_NOT_FOUND"
+    TOOL_EXECUTION_FAILED = "TOOL_EXECUTION_FAILED"
+    CUSTOM_TOOL_NOT_FOUND = "CUSTOM_TOOL_NOT_FOUND"
+    CUSTOM_TOOL_NAME_ALREADY_EXISTS = "CUSTOM_TOOL_NAME_ALREADY_EXISTS"
+    CUSTOM_TOOL_QUOTA_EXCEEDED = "CUSTOM_TOOL_QUOTA_EXCEEDED"
+    CUSTOM_TOOL_VIEW_FORBIDDEN = "CUSTOM_TOOL_VIEW_FORBIDDEN"
+    CUSTOM_TOOL_UPDATE_FORBIDDEN = "CUSTOM_TOOL_UPDATE_FORBIDDEN"
+    CUSTOM_TOOL_DELETE_FORBIDDEN = "CUSTOM_TOOL_DELETE_FORBIDDEN"
+    MCP_SERVER_NOT_FOUND = "MCP_SERVER_NOT_FOUND"
+    MCP_SERVER_NAME_ALREADY_EXISTS = "MCP_SERVER_NAME_ALREADY_EXISTS"
+    MCP_SERVER_URL_REQUIRED = "MCP_SERVER_URL_REQUIRED"
+    MCP_SERVER_IDENTIFIER_INVALID = "MCP_SERVER_IDENTIFIER_INVALID"
+    MCP_SERVER_ACCESS_DENIED = "MCP_SERVER_ACCESS_DENIED"
+    MCP_SERVER_CONNECTION_FAILED = "MCP_SERVER_CONNECTION_FAILED"
+    MCP_SERVER_DISABLED = "MCP_SERVER_DISABLED"
+    MCP_SERVER_REFRESH_DISABLED = "MCP_SERVER_REFRESH_DISABLED"
+    MCP_SERVER_RESOLVE_FAILED = "MCP_SERVER_RESOLVE_FAILED"
+    MCP_SERVER_TOGGLE_TARGET_MISSING = "MCP_SERVER_TOGGLE_TARGET_MISSING"
+    MCP_SERVER_UPDATE_TARGET_MISSING = "MCP_SERVER_UPDATE_TARGET_MISSING"
+    MCP_TOOL_NOT_FOUND = "MCP_TOOL_NOT_FOUND"
+    MCP_TOOL_EXECUTION_FAILED = "MCP_TOOL_EXECUTION_FAILED"
+    MCP_TOOLKIT_SESSION_MISSING = "MCP_TOOLKIT_SESSION_MISSING"
+    MCP_STARTUP_SYNC_FAILED = "MCP_STARTUP_SYNC_FAILED"
+
+    # -- Task --
+    TASK_NOT_FOUND = "TASK_NOT_FOUND"
+    TASK_AGENT_MISSING = "TASK_AGENT_MISSING"
+    TASK_PRIORITY_INVALID = "TASK_PRIORITY_INVALID"
+    TASK_STATUS_INVALID = "TASK_STATUS_INVALID"
+    TASK_STATUS_NOT_DISPATCHABLE = "TASK_STATUS_NOT_DISPATCHABLE"
+    TASK_STATUS_TRANSITION_INVALID = "TASK_STATUS_TRANSITION_INVALID"
+    TASK_RUN_ALREADY_ACTIVE = "TASK_RUN_ALREADY_ACTIVE"
+    TASK_ACTIVITY_NOT_FOUND = "TASK_ACTIVITY_NOT_FOUND"
+
+    # -- Thread --
+    THREAD_NOT_FOUND = "THREAD_NOT_FOUND"
+    THREAD_ACTIVE_RUN_EXISTS = "THREAD_ACTIVE_RUN_EXISTS"
+
+    # -- File --
+    FILE_NOT_FOUND = "FILE_NOT_FOUND"
+    FILE_EMPTY = "FILE_EMPTY"
+    FILE_TOO_LARGE = "FILE_TOO_LARGE"
+    FILE_TYPE_UNSUPPORTED = "FILE_TYPE_UNSUPPORTED"
+    FILE_CONTENT_TYPE_MISMATCH = "FILE_CONTENT_TYPE_MISMATCH"
+    FILE_UPLOAD_FAILED = "FILE_UPLOAD_FAILED"
+    FILE_WRITE_FAILED = "FILE_WRITE_FAILED"
+    FILE_READ_FAILED = "FILE_READ_FAILED"
+    FILE_DELETE_FAILED = "FILE_DELETE_FAILED"
+    FILE_LIST_FAILED = "FILE_LIST_FAILED"
+    FILE_CLEAR_FAILED = "FILE_CLEAR_FAILED"
+
+    # -- Artifact --
+    ARTIFACT_FILE_NOT_FOUND = "ARTIFACT_FILE_NOT_FOUND"
+    ARTIFACT_FILE_READ_FAILED = "ARTIFACT_FILE_READ_FAILED"
+    ARTIFACT_RUN_DELETE_FAILED = "ARTIFACT_RUN_DELETE_FAILED"
+
+    # -- Memory --
+    MEMORY_NOT_FOUND = "MEMORY_NOT_FOUND"
+    MEMORY_CREATE_FAILED = "MEMORY_CREATE_FAILED"
+    MEMORY_UPDATE_FAILED = "MEMORY_UPDATE_FAILED"
+    MEMORY_IDS_EMPTY = "MEMORY_IDS_EMPTY"
+    MEMORY_TABLE_TYPE_UNSUPPORTED = "MEMORY_TABLE_TYPE_UNSUPPORTED"
+    MEMORY_OPTIMIZATION_FAILED = "MEMORY_OPTIMIZATION_FAILED"
+    MEMORY_OPTIMIZATION_MODEL_REQUIRED = "MEMORY_OPTIMIZATION_MODEL_REQUIRED"
+    MEMORY_OPTIMIZATION_MODEL_INVALID = "MEMORY_OPTIMIZATION_MODEL_INVALID"
+
+    # -- Trace --
+    TRACE_NOT_FOUND = "TRACE_NOT_FOUND"
+
+    # -- Workspace --
+    WORKSPACE_NOT_FOUND = "WORKSPACE_NOT_FOUND"
+    WORKSPACE_ACCESS_DENIED = "WORKSPACE_ACCESS_DENIED"
+    WORKSPACE_PERMISSION_DENIED = "WORKSPACE_PERMISSION_DENIED"
+    WORKSPACE_TYPE_INVALID = "WORKSPACE_TYPE_INVALID"
+    WORKSPACE_MEMBER_NOT_FOUND = "WORKSPACE_MEMBER_NOT_FOUND"
+    WORKSPACE_MEMBER_ALREADY_EXISTS = "WORKSPACE_MEMBER_ALREADY_EXISTS"
+    WORKSPACE_MEMBER_ROLE_INVALID = "WORKSPACE_MEMBER_ROLE_INVALID"
+    WORKSPACE_MEMBER_ROLE_TOO_HIGH = "WORKSPACE_MEMBER_ROLE_TOO_HIGH"
+    WORKSPACE_OWNER_REMOVE_FORBIDDEN = "WORKSPACE_OWNER_REMOVE_FORBIDDEN"
+    WORKSPACE_OWNER_ROLE_CHANGE_FORBIDDEN = "WORKSPACE_OWNER_ROLE_CHANGE_FORBIDDEN"
+    WORKSPACE_OWNER_ROLE_ASSIGNMENT_FORBIDDEN = "WORKSPACE_OWNER_ROLE_ASSIGNMENT_FORBIDDEN"
+    WORKSPACE_LAST_ADMIN_REMOVE_FORBIDDEN = "WORKSPACE_LAST_ADMIN_REMOVE_FORBIDDEN"
+    PERSONAL_WORKSPACE_DELETE_FORBIDDEN = "PERSONAL_WORKSPACE_DELETE_FORBIDDEN"
+    PERSONAL_WORKSPACE_DUPLICATE_FORBIDDEN = "PERSONAL_WORKSPACE_DUPLICATE_FORBIDDEN"
+
+    # -- Organization --
+    ORGANIZATION_NOT_FOUND = "ORGANIZATION_NOT_FOUND"
+    ORGANIZATION_ACCESS_DENIED = "ORGANIZATION_ACCESS_DENIED"
+    ORGANIZATION_PERMISSION_DENIED = "ORGANIZATION_PERMISSION_DENIED"
+    ORGANIZATION_SLUG_ALREADY_EXISTS = "ORGANIZATION_SLUG_ALREADY_EXISTS"
+    ORGANIZATION_PLAN_UNSUPPORTED = "ORGANIZATION_PLAN_UNSUPPORTED"
+    ORGANIZATION_SEATS_INVALID = "ORGANIZATION_SEATS_INVALID"
+    ORGANIZATION_SEATS_BELOW_MEMBER_COUNT = "ORGANIZATION_SEATS_BELOW_MEMBER_COUNT"
+    ORGANIZATION_SEATS_UNAVAILABLE = "ORGANIZATION_SEATS_UNAVAILABLE"
+    ORGANIZATION_MEMBER_NOT_FOUND = "ORGANIZATION_MEMBER_NOT_FOUND"
+    ORGANIZATION_MEMBER_ALREADY_EXISTS = "ORGANIZATION_MEMBER_ALREADY_EXISTS"
+    ORGANIZATION_MEMBER_ROLE_INVALID = "ORGANIZATION_MEMBER_ROLE_INVALID"
+    ORGANIZATION_MEMBER_VIEW_FORBIDDEN = "ORGANIZATION_MEMBER_VIEW_FORBIDDEN"
+    ORGANIZATION_MEMBER_ROLE_UPDATE_FORBIDDEN = "ORGANIZATION_MEMBER_ROLE_UPDATE_FORBIDDEN"
+    ORGANIZATION_MEMBER_REMOVE_FORBIDDEN = "ORGANIZATION_MEMBER_REMOVE_FORBIDDEN"
+    ORGANIZATION_OWNER_INVITE_FORBIDDEN = "ORGANIZATION_OWNER_INVITE_FORBIDDEN"
+    ORGANIZATION_OWNER_REMOVE_FORBIDDEN = "ORGANIZATION_OWNER_REMOVE_FORBIDDEN"
+    ORGANIZATION_OWNER_ROLE_MODIFY_FORBIDDEN = "ORGANIZATION_OWNER_ROLE_MODIFY_FORBIDDEN"
+    ORGANIZATION_OWNER_ROLE_REASSIGN_FORBIDDEN = "ORGANIZATION_OWNER_ROLE_REASSIGN_FORBIDDEN"
+    ORGANIZATION_ADMIN_PROMOTE_FORBIDDEN = "ORGANIZATION_ADMIN_PROMOTE_FORBIDDEN"
+    ORGANIZATION_ADMIN_ROLE_TARGET_FORBIDDEN = "ORGANIZATION_ADMIN_ROLE_TARGET_FORBIDDEN"
+    ORGANIZATION_ADMIN_REMOVE_TARGET_FORBIDDEN = "ORGANIZATION_ADMIN_REMOVE_TARGET_FORBIDDEN"
+
+    # -- OAuth --
+    OAUTH_PROVIDER_NOT_FOUND = "OAUTH_PROVIDER_NOT_FOUND"
+    OAUTH_EMAIL_REQUIRED = "OAUTH_EMAIL_REQUIRED"
+    OAUTH_REGISTRATION_DISABLED = "OAUTH_REGISTRATION_DISABLED"
+    OAUTH_TOKEN_EXCHANGE_FAILED = "OAUTH_TOKEN_EXCHANGE_FAILED"
+    OAUTH_USERINFO_FETCH_FAILED = "OAUTH_USERINFO_FETCH_FAILED"
+    OAUTH_LAST_ACCOUNT_UNLINK_FORBIDDEN = "OAUTH_LAST_ACCOUNT_UNLINK_FORBIDDEN"
+
+    # -- API token --
+    API_TOKEN_INVALID = "API_TOKEN_INVALID"
+    API_TOKEN_REVOKED = "API_TOKEN_REVOKED"
+    API_TOKEN_EXPIRED = "API_TOKEN_EXPIRED"
+    API_TOKEN_OWNER_INACTIVE = "API_TOKEN_OWNER_INACTIVE"
+
+    # -- Platform token --
+    PLATFORM_TOKEN_NOT_FOUND = "PLATFORM_TOKEN_NOT_FOUND"
+    PLATFORM_TOKEN_LIMIT_EXCEEDED = "PLATFORM_TOKEN_LIMIT_EXCEEDED"
+    PLATFORM_TOKEN_SCOPES_INVALID = "PLATFORM_TOKEN_SCOPES_INVALID"
+    PLATFORM_TOKEN_REVOKE_FORBIDDEN = "PLATFORM_TOKEN_REVOKE_FORBIDDEN"
+    PLATFORM_TOKEN_RESOURCE_TYPE_INVALID = "PLATFORM_TOKEN_RESOURCE_TYPE_INVALID"
+    PLATFORM_TOKEN_RESOURCE_BINDING_INVALID = "PLATFORM_TOKEN_RESOURCE_BINDING_INVALID"
+    PLATFORM_TOKEN_WORKSPACE_ACCESS_DENIED = "PLATFORM_TOKEN_WORKSPACE_ACCESS_DENIED"
+    PLATFORM_TOKEN_TOOL_ACCESS_DENIED = "PLATFORM_TOKEN_TOOL_ACCESS_DENIED"
+    PLATFORM_TOKEN_SKILL_ACCESS_DENIED = "PLATFORM_TOKEN_SKILL_ACCESS_DENIED"
+
+    # -- WebSocket --
+    WEBSOCKET_INVALID_JSON = "WEBSOCKET_INVALID_JSON"
+    WEBSOCKET_UNKNOWN_FRAME_TYPE = "WEBSOCKET_UNKNOWN_FRAME_TYPE"
+    WEBSOCKET_EXECUTION_ID_REQUIRED = "WEBSOCKET_EXECUTION_ID_REQUIRED"
+    WEBSOCKET_INVALID_EXECUTION_ID = "WEBSOCKET_INVALID_EXECUTION_ID"
+    WEBSOCKET_INVALID_AFTER_SEQ = "WEBSOCKET_INVALID_AFTER_SEQ"
+
+    # -- OpenClaw --
+    OPENCLAW_INSTANCE_NOT_FOUND = "OPENCLAW_INSTANCE_NOT_FOUND"
+    OPENCLAW_INSTANCE_NOT_RUNNING = "OPENCLAW_INSTANCE_NOT_RUNNING"
+    OPENCLAW_INSTANCE_START_FAILED = "OPENCLAW_INSTANCE_START_FAILED"
+    OPENCLAW_INSTANCE_RESTART_FAILED = "OPENCLAW_INSTANCE_RESTART_FAILED"
+    OPENCLAW_CONTAINER_NOT_FOUND = "OPENCLAW_CONTAINER_NOT_FOUND"
+    OPENCLAW_CONTAINER_CREATE_FAILED = "OPENCLAW_CONTAINER_CREATE_FAILED"
+    OPENCLAW_CONTAINER_STARTUP_FAILED = "OPENCLAW_CONTAINER_STARTUP_FAILED"
+    OPENCLAW_GATEWAY_ENV_MISSING = "OPENCLAW_GATEWAY_ENV_MISSING"
+    OPENCLAW_GATEWAY_TIMEOUT = "OPENCLAW_GATEWAY_TIMEOUT"
+    OPENCLAW_PORT_POOL_EXHAUSTED = "OPENCLAW_PORT_POOL_EXHAUSTED"
+    OPENCLAW_SKILL_SYNC_FAILED = "OPENCLAW_SKILL_SYNC_FAILED"
+    OPENCLAW_STREAM_ERROR = "OPENCLAW_STREAM_ERROR"
+    OPENCLAW_DEVICE_LIST_FAILED = "OPENCLAW_DEVICE_LIST_FAILED"
+    OPENCLAW_DEVICE_COMMAND_FAILED = "OPENCLAW_DEVICE_COMMAND_FAILED"
+    OPENCLAW_DEVICE_APPROVE_FAILED = "OPENCLAW_DEVICE_APPROVE_FAILED"
+    OPENCLAW_DEVICE_APPROVE_ALL_FAILED = "OPENCLAW_DEVICE_APPROVE_ALL_FAILED"
+
+
+ERROR_CODES: set[str] = {c.value for c in ErrorCode}
diff --git a/backend/app/core/contracts/execution.py b/backend/app/core/contracts/execution.py
new file mode 100644
index 000000000..fa611229f
--- /dev/null
+++ b/backend/app/core/contracts/execution.py
@@ -0,0 +1,59 @@
+"""Canonical execution contract values."""
+
+from __future__ import annotations
+
+from typing import Literal
+
+RunStatusLiteral = Literal["pending", "running", "succeeded", "failed", "cancelled"]
+ExecutionStatusLiteral = Literal[
+    "pending",
+    "dispatched",
+    "running",
+    "approval_wait",
+    "succeeded",
+    "failed",
+    "cancelled",
+]
+ReleaseStatusLiteral = Literal["ready", "active", "superseded", "failed", "retired"]
+TriggerMediumLiteral = Literal[
+    "api",
+    "scheduler",
+    "system",
+    "ui",
+]
+RunPurposeLiteral = Literal[
+    "production",
+    "draft_test",
+    "debug",
+    "internal_builder",
+]
+
+RUN_STATUSES: set[str] = {"pending", "running", "succeeded", "failed", "cancelled"}
+ACTIVE_RUN_STATUSES: set[str] = {"pending", "running"}
+TERMINAL_RUN_STATUSES: set[str] = {"succeeded", "failed", "cancelled"}
+
+EXECUTION_STATUSES: set[str] = {
+    "pending",
+    "dispatched",
+    "running",
+    "approval_wait",
+    "succeeded",
+    "failed",
+    "cancelled",
+}
+ACTIVE_EXECUTION_STATUSES: set[str] = {"pending", "dispatched", "running", "approval_wait"}
+TERMINAL_EXECUTION_STATUSES: set[str] = {"succeeded", "failed", "cancelled"}
+
+RELEASE_STATUSES: set[str] = {"ready", "active", "superseded", "failed", "retired"}
+TRIGGER_MEDIUMS: set[str] = {
+    "api",
+    "scheduler",
+    "system",
+    "ui",
+}
+RUN_PURPOSES: set[str] = {
+    "production",
+    "draft_test",
+    "debug",
+    "internal_builder",
+}
diff --git a/backend/app/core/copilot/action_applier.py b/backend/app/core/copilot/action_applier.py
index a2d46718b..68da82f1c 100644
--- a/backend/app/core/copilot/action_applier.py
+++ b/backend/app/core/copilot/action_applier.py
@@ -107,7 +107,7 @@ def apply_actions_to_graph_state(
         actions: List of actions to apply (CREATE_NODE, CONNECT_NODES, etc.)
 
     Returns:
-        Tuple of (updated_nodes, updated_edges) in format ready for GraphService.save_graph_state
+        Tuple of (updated_nodes, updated_edges) ready for visual AgentVersion definition payloads
     """
     # Clone current state to apply diffs
     processed_nodes: List[Dict[str, Any]] = [node.copy() for node in current_nodes]
@@ -163,7 +163,7 @@ def apply_actions_to_graph_state(
                     edge_exists = any(e.get("source") == source and e.get("target") == target for e in processed_edges)
 
                     if not edge_exists:
-                        # Create edge in format expected by GraphService.save_graph_state
+                        # Create edge in the visual definition payload format.
                         # Format matches frontend: { id, source, target, data: {} }
                         new_edge: Dict[str, Any] = {
                             "id": f"e-{source}-{target}",
diff --git a/backend/app/core/copilot/exceptions.py b/backend/app/core/copilot/exceptions.py
index 31025ed24..ee406dfe3 100644
--- a/backend/app/core/copilot/exceptions.py
+++ b/backend/app/core/copilot/exceptions.py
@@ -1,122 +1,70 @@
-"""
-Copilot-specific exceptions for better error handling.
+from typing import Any, Mapping
 
-Provides specialized exception classes for Copilot operations,
-enabling better error categorization and user-friendly error messages.
-"""
+from app.common.app_errors import AuthenticationError, InfraError, InternalServiceError, InvalidRequestError
 
-from typing import Any
 
-from fastapi import status
+def _with_original_error(data: Mapping[str, Any] | None, original_error: Exception | None) -> dict[str, Any] | None:
+    payload = dict(data) if data else None
+    if original_error is None:
+        return payload
+    merged = payload or {}
+    merged["error_type"] = type(original_error).__name__
+    merged["error_message"] = str(original_error)
+    return merged
 
-from app.common.exceptions import AppException, BadRequestException
-
-
-class CopilotException(AppException):
-    """Base exception for Copilot operations."""
-
-    def __init__(
-        self,
-        message: str = "Copilot operation failed",
-        *,
-        code: int | None = 5001,
-        data: Any = None,
-        status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR,
-    ):
-        super().__init__(status_code=status_code, message=message, code=code, data=data)
-
-
-class CopilotLLMError(CopilotException):
-    """LLM-related errors (API failures, rate limits, etc.)."""
 
+class CopilotLLMError(InfraError):
     def __init__(
         self,
         message: str = "LLM service error",
         *,
-        code: int | None = 5101,
-        data: Any = None,
+        code: str = "COPILOT_LLM_ERROR",
+        data: Mapping[str, Any] | None = None,
         original_error: Exception | None = None,
-    ):
-        if original_error:
-            message = f"{message}: {str(original_error)}"
-            if data is None:
-                data = {"error_type": type(original_error).__name__}
-        super().__init__(
-            status_code=status.HTTP_502_BAD_GATEWAY,
-            message=message,
-            code=code,
-            data=data,
-        )
-
+    ) -> None:
+        super().__init__(code=code, message=message, data=_with_original_error(data, original_error))
 
-class CopilotValidationError(BadRequestException):
-    """Action validation errors."""
 
+class CopilotValidationError(InvalidRequestError):
     def __init__(
         self,
         message: str = "Action validation failed",
         *,
-        code: int | None = 5102,
-        data: Any = None,
-    ):
+        code: str = "COPILOT_VALIDATION_ERROR",
+        data: Mapping[str, Any] | None = None,
+    ) -> None:
         super().__init__(message=message, code=code, data=data)
 
 
-class CopilotSessionError(CopilotException):
-    """Session management errors (Redis unavailable, session not found, etc.)."""
-
+class CopilotSessionError(InfraError):
     def __init__(
         self,
         message: str = "Session management error",
         *,
-        code: int | None = 5103,
-        data: Any = None,
-        status_code: int = status.HTTP_503_SERVICE_UNAVAILABLE,
-    ):
-        super().__init__(
-            status_code=status_code,
-            message=message,
-            code=code,
-            data=data,
-        )
+        code: str = "COPILOT_SESSION_ERROR",
+        data: Mapping[str, Any] | None = None,
+    ) -> None:
+        super().__init__(code=code, message=message, data=dict(data) if data else None)
 
 
-class CopilotCredentialError(CopilotException):
-    """Credential-related errors (missing API key, invalid credentials, etc.)."""
-
+class CopilotCredentialError(AuthenticationError):
     def __init__(
         self,
         message: str = "Credential error",
         *,
-        code: int | None = 5105,
-        data: Any = None,
-    ):
-        super().__init__(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            message=message,
-            code=code,
-            data=data,
-        )
-
+        code: str = "COPILOT_CREDENTIAL_ERROR",
+        data: Mapping[str, Any] | None = None,
+    ) -> None:
+        super().__init__(message=message, code=code, data=data)
 
-class CopilotAgentError(CopilotException):
-    """Agent execution errors (tool failures, recursion limits, etc.)."""
 
+class CopilotAgentError(InternalServiceError):
     def __init__(
         self,
         message: str = "Agent execution error",
         *,
-        code: int | None = 5106,
-        data: Any = None,
+        code: str = "COPILOT_AGENT_ERROR",
+        data: Mapping[str, Any] | None = None,
         original_error: Exception | None = None,
-    ):
-        if original_error:
-            message = f"{message}: {str(original_error)}"
-            if data is None:
-                data = {"error_type": type(original_error).__name__}
-        super().__init__(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            message=message,
-            code=code,
-            data=data,
-        )
+    ) -> None:
+        super().__init__(message=message, code=code, data=_with_original_error(data, original_error))
diff --git a/backend/app/core/copilot_deepagents/artifacts.py b/backend/app/core/copilot_deepagents/artifacts.py
index c839a585f..9fb74320f 100644
--- a/backend/app/core/copilot_deepagents/artifacts.py
+++ b/backend/app/core/copilot_deepagents/artifacts.py
@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 import json
-import os
 import re
 import uuid
 from dataclasses import dataclass, field
@@ -24,6 +23,7 @@
 
 from loguru import logger
 
+from app.core.settings import settings
 from app.utils.datetime import utc_now
 
 
@@ -32,7 +32,7 @@ def _default_artifacts_root() -> Path:
 
 
 def resolve_artifacts_root() -> Path:
-    env = os.getenv("DEEPAGENTS_ARTIFACTS_DIR", "").strip()
+    env = (settings.deepagents_artifacts_dir or "").strip()
     if env:
         return Path(env).expanduser()
     return _default_artifacts_root()
diff --git a/backend/app/core/copilot_deepagents/manager.py b/backend/app/core/copilot_deepagents/manager.py
index ab28e2450..e352b578e 100644
--- a/backend/app/core/copilot_deepagents/manager.py
+++ b/backend/app/core/copilot_deepagents/manager.py
@@ -9,7 +9,6 @@
 
 from __future__ import annotations
 
-import os
 import uuid
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, List, Optional, Type
@@ -21,7 +20,9 @@
 from langchain_core.runnables import Runnable
 from loguru import logger
 
+from app.common.app_errors import ServiceUnavailableError
 from app.core.copilot.tools import connect_nodes, create_node, delete_node, update_config
+from app.core.settings import settings
 
 from .artifacts import ArtifactStore
 from .prompts import (
@@ -64,7 +65,7 @@
 
 def get_artifacts_root() -> Path:
     """Return the artifacts root directory."""
-    root = os.environ.get("DEEPAGENTS_ARTIFACTS_DIR", "")
+    root = settings.deepagents_artifacts_dir or ""
     if not root:
         root = str(Path.home() / ".agent-platform" / "deepagents")
     return Path(root)
@@ -145,7 +146,11 @@ def create_copilot_manager(
         (manager_agent, artifact_store)
     """
     if not DEEPAGENTS_AVAILABLE or create_deep_agent is None or FilesystemBackend is None:
-        raise RuntimeError("deepagents library not available. Install with: pip install deepagents")
+        raise ServiceUnavailableError(
+            "deepagents library is not available",
+            code="DEEPAGENTS_UNAVAILABLE",
+            data={"install_hint": "pip install deepagents"},
+        )
     assert create_deep_agent is not None and FilesystemBackend is not None  # narrow types for mypy
 
     # generate run_id
@@ -193,10 +198,3 @@ def create_copilot_manager(
     logger.info(f"[DeepAgentsCopilot] Created manager run_id={run_id} run_dir={run_dir}")
 
     return manager, store
-
-
-# ==================== Schema Validation Helpers (Moved to .utils) ====================
-
-# Re-exporting from .utils if needed, but better to import directly from .utils
-
-# ==================== Helpers (Moved to .utils) ====================
diff --git a/backend/app/core/copilot_deepagents/runner.py b/backend/app/core/copilot_deepagents/runner.py
index ab98b09fb..f11d9e197 100644
--- a/backend/app/core/copilot_deepagents/runner.py
+++ b/backend/app/core/copilot_deepagents/runner.py
@@ -250,8 +250,11 @@ async def stream_copilot_manager(
 
         # Determine error code and potentially simplify message
         error_code = "AGENT_ERROR"
+        source = "runtime"
+        retryable = False
         if "api_key" in error_msg.lower() or "credential" in error_msg.lower():
             error_code = "CREDENTIAL_ERROR"
+            source = "api"
         elif "RateLimitReached" in error_msg:
             # Try to extract a more readable message for rate limits
             import re
@@ -262,9 +265,12 @@ async def stream_copilot_manager(
                 error_msg = f"Rate limit reached. Please retry after {seconds} seconds."
             else:
                 error_msg = "Rate limit reached. Please try again later."
+            retryable = True
 
         yield {
             "type": "error",
             "message": error_msg,
             "code": error_code,
+            "source": source,
+            "retryable": retryable,
         }
diff --git a/backend/app/core/engine/__init__.py b/backend/app/core/engine/__init__.py
new file mode 100644
index 000000000..c8817c3db
--- /dev/null
+++ b/backend/app/core/engine/__init__.py
@@ -0,0 +1,30 @@
+"""
+Engine package — unified execution engine abstraction.
+
+Registers all built-in engines at import time.
+"""
+
+from app.core.engine.cli_engine import CLIEngine
+from app.core.engine.code_engine import LangGraphCodeEngine
+from app.core.engine.copilot_engine import CopilotEngine
+from app.core.engine.graph_engine import LangGraphVisualEngine
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext, ExecutionEngine
+from app.core.engine.registry import engine_registry
+
+engine_registry.register("langgraph_visual", LangGraphVisualEngine())
+engine_registry.register("langgraph_code", LangGraphCodeEngine())
+engine_registry.register("claude_code", CLIEngine("claude_code"))
+engine_registry.register("codex", CLIEngine("codex"))
+engine_registry.register("openclaw", CLIEngine("openclaw"))
+engine_registry.register("build_copilot", CopilotEngine())
+
+__all__ = [
+    "CLIEngine",
+    "CopilotEngine",
+    "EngineCapabilities",
+    "ExecutionContext",
+    "ExecutionEngine",
+    "LangGraphCodeEngine",
+    "LangGraphVisualEngine",
+    "engine_registry",
+]
diff --git a/backend/app/core/engine/cli_engine.py b/backend/app/core/engine/cli_engine.py
new file mode 100644
index 000000000..9c0997bd9
--- /dev/null
+++ b/backend/app/core/engine/cli_engine.py
@@ -0,0 +1,75 @@
+"""CLI Execution Engine — parameterized base for all CLI-based agent runtimes.
+
+Covers: claude_code, codex, openclaw.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from loguru import logger
+
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class CLIEngine:
+    """CLI execution engine, parameterized by engine_kind."""
+
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=True,
+        supports_debug_observation=False,
+        supports_artifacts=True,
+        supports_approval=True,
+    )
+
+    def __init__(self, engine_kind: str) -> None:
+        self.engine_kind = engine_kind
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        from app.core.database import AsyncSessionLocal
+
+        execution_id = context.execution_id
+        logger.info(f"[CLIEngine:{self.engine_kind}] Starting execution {execution_id}")
+
+        await context.update_status("running")
+        await context.emit(
+            ExecutionEventType.EXECUTION_STARTED,
+            {"engine": self.engine_kind},
+        )
+
+        async with AsyncSessionLocal() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            await runner.run(
+                execution_id=execution_id,
+                prompt=prompt,
+                credentials=context.credentials or None,
+                collector=context.collector,
+            )
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.cancel()
+            logger.info(f"[CLIEngine:{self.engine_kind}] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.inject_message(message)
diff --git a/backend/app/core/engine/code_engine.py b/backend/app/core/engine/code_engine.py
new file mode 100644
index 000000000..ce6d466fe
--- /dev/null
+++ b/backend/app/core/engine/code_engine.py
@@ -0,0 +1,188 @@
+"""
+LangGraph Code Execution Engine — sandboxed user-code executor.
+
+engine_kind: "langgraph_code"
+Extracts a StateGraph from user Python code via execute_code(),
+compiles it, and executes it with streaming events.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from typing import Any
+
+from loguru import logger
+from sqlalchemy import select
+
+from app.common.app_errors import InternalServiceError, InvalidRequestError, normalize_app_error
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class LangGraphCodeEngine:
+    """Sandboxed code executor engine."""
+
+    engine_kind = "langgraph_code"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=False,
+        supports_debug_observation=True,
+        supports_artifacts=False,
+        supports_approval=False,
+    )
+
+    def __init__(self) -> None:
+        self._running: dict[uuid.UUID, Any] = {}
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        """Extract StateGraph from user code, compile, and execute."""
+
+        execution_id = context.execution_id
+
+        if engine_kind != "langgraph_code":
+            error = InvalidRequestError(
+                f"LangGraphCodeEngine cannot handle engine_kind={engine_kind}",
+                code="LANGGRAPH_CODE_ENGINE_KIND_MISMATCH",
+                data={"engine_kind": engine_kind},
+            )
+            await context.complete("failed", error.message, error)
+            return
+
+        code = definition_payload.get("code", "")
+        if not code or not code.strip():
+            error = InvalidRequestError(
+                "No code provided in definition_payload",
+                code="CODE_DEFINITION_EMPTY",
+            )
+            await context.complete("failed", error.message, error)
+            return
+
+        logger.info(f"[LangGraphCodeEngine] Starting execution {execution_id} ({len(code)} chars of code)")
+
+        cancel_event = asyncio.Event()
+        self._running[execution_id] = cancel_event
+
+        # ------------------------------------------------------------------
+        # Observation: create root span + callback handler if collector set
+        # ------------------------------------------------------------------
+        root_span = None
+        obs_handler = None
+        if context.collector:
+            root_span = context.collector.start_agent(name="code_executor")
+            obs_handler = context.collector.create_langchain_handler()
+
+        try:
+            await context.update_status("running")
+            await context.emit(
+                ExecutionEventType.EXECUTION_STARTED,
+                {
+                    "engine": "langgraph_code",
+                    "code_length": len(code),
+                },
+            )
+
+            thread_id: str | None = None
+            try:
+                from app.models.agent_run import AgentRun
+
+                run = (
+                    await context.db.execute(select(AgentRun).where(AgentRun.id == context.run_id))
+                ).scalar_one_or_none()
+                if run:
+                    thread_id = str(run.thread_id) if run.thread_id else None
+            except Exception as lookup_exc:
+                logger.warning(f"[LangGraphCodeEngine] Could not resolve user_id/thread_id: {lookup_exc}")
+
+            from app.core.code_executor import execute_code
+
+            await context.emit(ExecutionEventType.ASSISTANT_TEXT, {"content": "Compiling user code..."})
+            state_graph = execute_code(code)
+
+            await context.emit(ExecutionEventType.ASSISTANT_TEXT, {"content": "Graph extracted, compiling..."})
+            compiled = state_graph.compile()
+
+            stream_config: dict[str, Any] = {
+                "configurable": {"thread_id": thread_id or str(execution_id)},
+            }
+            if obs_handler:
+                stream_config["callbacks"] = [obs_handler]
+
+            result_text: str = ""
+            async for chunk in compiled.astream(
+                {"messages": [{"role": "user", "content": prompt}]},  # type: ignore[arg-type]
+                stream_config,  # type: ignore[arg-type]
+            ):
+                if cancel_event.is_set():
+                    await context.complete("cancelled", "Execution cancelled by user")
+                    return
+
+                for node_output in chunk.values():
+                    messages = node_output.get("messages", []) if isinstance(node_output, dict) else []
+                    for msg in messages:
+                        content = getattr(msg, "content", None) or (
+                            msg.get("content") if isinstance(msg, dict) else None
+                        )
+                        if content:
+                            result_text = str(content)
+                            await context.emit(ExecutionEventType.ASSISTANT_TEXT, {"content": result_text})
+
+            await context.complete("succeeded", result_text[:2000] if result_text else None)
+
+        except (ValueError, ImportError, TimeoutError) as exc:
+            logger.warning(f"[LangGraphCodeEngine] Code execution error {execution_id}: {exc}")
+            app_error = normalize_app_error(
+                exc,
+                default_code="CODE_EXECUTION_INVALID",
+                default_message="Code execution failed",
+                default_data={"execution_id": str(execution_id)},
+                source="engine",
+            )
+            await context.emit(ExecutionEventType.ERROR, app_error.to_payload())
+            await context.complete("failed", app_error.message[:2000], app_error)
+        except Exception as exc:
+            logger.error(f"[LangGraphCodeEngine] Execution {execution_id} failed: {exc}")
+            app_error = normalize_app_error(
+                exc,
+                default_code="CODE_EXECUTION_FAILED",
+                default_message="Code execution failed",
+                default_data={"execution_id": str(execution_id)},
+                source="engine",
+            )
+            await context.emit(ExecutionEventType.ERROR, app_error.to_payload())
+            await context.complete("failed", app_error.message[:2000], app_error)
+        finally:
+            self._running.pop(execution_id, None)
+            if root_span:
+                try:
+                    root_span.set_output({"status": "completed"})
+                    root_span.end()
+                except Exception:
+                    pass
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        event = self._running.get(execution_id)
+        if event:
+            event.set()
+            logger.info(f"[LangGraphCodeEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        if execution_id not in self._running:
+            raise InternalServiceError(
+                "No running code execution",
+                code="CODE_EXECUTION_NOT_RUNNING",
+                data={"execution_id": str(execution_id)},
+            )
+        raise InvalidRequestError(
+            code="CODE_EXECUTION_MESSAGE_UNSUPPORTED",
+            message="Message injection is not supported for code executions",
+            data={"execution_id": str(execution_id)},
+        )
diff --git a/backend/app/core/engine/copilot_engine.py b/backend/app/core/engine/copilot_engine.py
new file mode 100644
index 000000000..bebad0b98
--- /dev/null
+++ b/backend/app/core/engine/copilot_engine.py
@@ -0,0 +1,242 @@
+"""
+Graph Builder Copilot Engine — internal platform engine.
+
+engine_kind: "build_copilot"
+
+This is NOT a user-facing agent runtime.  It is the AI assistant that helps
+users design agent graphs on the visual canvas.  It reuses the execution
+pipeline (Run → Execution → EventBus → WebSocket) for streaming and
+persistence, but no user-created Agent ever has runtime_kind="build_copilot".
+
+Wraps CopilotService streaming and maps copilot events to ExecutionEvents.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import time
+import uuid
+from typing import Any
+
+from loguru import logger
+
+from app.common.app_errors import InternalServiceError, InvalidRequestError, normalize_app_error
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class CopilotEngine:
+    """Graph Builder Copilot engine (internal) — persists copilot events as ExecutionEvents."""
+
+    engine_kind = "build_copilot"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=False,
+        supports_debug_observation=False,
+        supports_artifacts=False,
+        supports_approval=False,
+    )
+
+    def __init__(self) -> None:
+        self._running: dict[uuid.UUID, asyncio.Event] = {}
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        """Stream copilot events, mapping each to an ExecutionEvent."""
+
+        execution_id = context.execution_id
+
+        graph_context = definition_payload.get("graph_context", {})
+        conversation_history = definition_payload.get("conversation_history")
+        mode = definition_payload.get("mode", "deepagents")
+        provider_name = definition_payload.get("provider_name")
+        model_name = definition_payload.get("model_name")
+        user_id = definition_payload.get("user_id")
+
+        logger.info(f"[CopilotEngine] Starting execution {execution_id} mode={mode}")
+
+        cancel_event = asyncio.Event()
+        self._running[execution_id] = cancel_event
+
+        try:
+            await context.update_status("running")
+            await context.emit(ExecutionEventType.EXECUTION_STARTED, {"engine": "build_copilot", "mode": mode})
+
+            # ------------------------------------------------------------------
+            # Observation: create copilot extractor if collector set
+            # ------------------------------------------------------------------
+            copilot_extractor = None
+            obs_start: float = 0.0
+            if context.collector and model_name:
+                from app.core.observation.instrumentation.copilot_extractor import CopilotObservationExtractor
+
+                copilot_extractor = CopilotObservationExtractor(context.collector, model_name)
+                obs_start = time.monotonic()
+
+            from app.services.copilot_service import CopilotService
+
+            service = CopilotService(
+                user_id=user_id,
+                provider_name=provider_name,
+                model_name=model_name,
+                db=context.db,
+            )
+
+            result_message = ""
+            result_actions: list[dict] = []
+
+            async for event in service.get_copilot_stream(
+                prompt=prompt,
+                graph_context=graph_context,
+                conversation_history=conversation_history,
+                mode=mode,
+                graph_id=definition_payload.get("graph_id"),
+            ):
+                if cancel_event.is_set():
+                    await context.complete("cancelled", "Cancelled by user")
+                    return
+
+                event_type = event.get("type", "")
+
+                if event_type == "status":
+                    await context.emit(
+                        ExecutionEventType.COPILOT_STATUS,
+                        {
+                            "stage": event.get("stage"),
+                            "message": event.get("message"),
+                        },
+                    )
+
+                elif event_type == "content":
+                    content_text = event.get("content", "")
+                    await context.emit(
+                        ExecutionEventType.COPILOT_CONTENT,
+                        {
+                            "content": content_text,
+                        },
+                    )
+                    if copilot_extractor and content_text:
+                        copilot_extractor.accumulate(content_text)
+
+                elif event_type == "thought_step":
+                    await context.emit(
+                        ExecutionEventType.COPILOT_THOUGHT_STEP,
+                        {
+                            "step": event.get("step", {}),
+                        },
+                    )
+
+                elif event_type == "tool_call":
+                    await context.emit(
+                        ExecutionEventType.COPILOT_TOOL_CALL,
+                        {
+                            "tool": event.get("tool"),
+                            "input": event.get("input", {}),
+                        },
+                    )
+
+                elif event_type == "tool_result":
+                    action = event.get("action", {})
+                    result_actions.append(action)
+                    await context.emit(
+                        ExecutionEventType.COPILOT_TOOL_RESULT,
+                        {
+                            "action": action,
+                        },
+                    )
+
+                elif event_type == "result":
+                    result_message = event.get("message", "")
+                    actions = event.get("actions", [])
+                    result_actions = actions if actions else result_actions
+                    await context.emit(
+                        ExecutionEventType.COPILOT_RESULT,
+                        {
+                            "message": result_message,
+                            "actions": result_actions,
+                        },
+                    )
+
+                elif event_type == "error":
+                    code = event.get("code") or "COPILOT_EXECUTION_FAILED"
+                    message = event.get("message", "Unknown error")
+                    data = event.get("data")
+                    source = event.get("source", "runtime")
+                    retryable = event.get("retryable", False)
+                    user_action = event.get("user_action")
+                    await context.emit(
+                        ExecutionEventType.ERROR,
+                        {
+                            "message": message,
+                            "code": code,
+                            "data": data,
+                            "source": source,
+                            "retryable": retryable,
+                            **({"user_action": user_action} if user_action else {}),
+                        },
+                    )
+                    app_error = InternalServiceError(
+                        message=message,
+                        code=code,
+                        data=data if isinstance(data, dict) else None,
+                        source=source,
+                        retryable=bool(retryable),
+                    )
+                    await context.complete("failed", message[:2000], app_error)
+                    return
+
+                elif event_type == "done":
+                    pass  # handled by complete() below
+
+            # Observation: flush accumulated content
+            if copilot_extractor:
+                try:
+                    elapsed_ms = (time.monotonic() - obs_start) * 1000
+                    await copilot_extractor.flush(
+                        prompt=prompt,
+                        mode=mode,
+                        elapsed_ms=elapsed_ms,
+                    )
+                except Exception as obs_exc:
+                    logger.debug(f"[CopilotEngine] Observation flush error: {obs_exc}")
+
+            await context.complete(
+                "succeeded",
+                result_message[:2000] if result_message else None,
+            )
+
+        except Exception as exc:
+            logger.error(f"[CopilotEngine] Execution {execution_id} failed: {exc}")
+            app_error = normalize_app_error(  # type: ignore[assignment]
+                exc,
+                default_code="COPILOT_EXECUTION_FAILED",
+                default_message="Copilot execution failed",
+                default_data={"execution_id": str(execution_id)},
+                source="engine",
+            )
+            await context.emit(ExecutionEventType.ERROR, app_error.to_payload())
+            await context.complete("failed", app_error.message[:2000], app_error)
+        finally:
+            self._running.pop(execution_id, None)
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        """Cancel a running copilot execution."""
+        event = self._running.get(execution_id)
+        if event:
+            event.set()
+            logger.info(f"[CopilotEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        """Copilot executions don't support message injection."""
+        raise InvalidRequestError(
+            "Message injection is not supported for copilot executions",
+            code="COPILOT_EXECUTION_MESSAGE_UNSUPPORTED",
+            data={"execution_id": str(execution_id)},
+        )
diff --git a/backend/app/core/engine/graph_engine.py b/backend/app/core/engine/graph_engine.py
new file mode 100644
index 000000000..3169faacd
--- /dev/null
+++ b/backend/app/core/engine/graph_engine.py
@@ -0,0 +1,312 @@
+"""
+LangGraph Visual Execution Engine — DeepAgents-based executor.
+
+engine_kind: "langgraph_visual"
+Compiles AgentVersion.definition_payload (nodes/edges) into a DeepAgents graph and executes it.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from typing import Any
+
+from loguru import logger
+from sqlalchemy import select
+
+from app.common.app_errors import InternalServiceError, InvalidRequestError, normalize_app_error
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+# ---------------------------------------------------------------------------
+# Duck-typed shims — wrap plain dicts from definition_payload into objects
+# that builder.py / config.py can consume without touching ORM models.
+# ---------------------------------------------------------------------------
+
+
+class _GraphShim:
+    """Minimal graph-like object derived from execution context + payload."""
+
+    def __init__(
+        self,
+        agent_id: Any,
+        workspace_id: Any,
+        variables: dict,
+        name: str = "",
+    ) -> None:
+        self.id = agent_id
+        self.workspace_id = workspace_id
+        self.variables = variables
+        self.name = name
+        self.title = name
+
+
+class _NodeShim:
+    """Wraps a node dict from definition_payload['nodes'] into a duck-typed object."""
+
+    def __init__(self, d: dict) -> None:
+        self.id = d.get("id")
+        self.type = d.get("type", "")
+        self.data = d.get("data", {})
+
+
+class _EdgeShim:
+    """Wraps an edge dict from definition_payload['edges'] into a duck-typed object."""
+
+    def __init__(self, d: dict) -> None:
+        # Support both snake_case (internal) and camelCase / React-Flow key names
+        self.source_node_id = d.get("source_node_id") or d.get("source")
+        self.target_node_id = d.get("target_node_id") or d.get("target")
+
+
+def _extract_message_contents_from_stream_chunk(chunk: Any) -> list[str]:
+    """Extract assistant text from LangGraph update chunks.
+
+    DeepAgents middleware can emit ``messages=Overwrite([...])`` to replace state.
+    That is a state update, not a new assistant message, and it is not iterable.
+    """
+    if not isinstance(chunk, dict):
+        return []
+
+    contents: list[str] = []
+    for node_output in chunk.values():
+        if not isinstance(node_output, dict):
+            continue
+
+        messages = node_output.get("messages", [])
+        for msg in _iter_stream_messages(messages):
+            if not _is_assistant_message(msg):
+                continue
+
+            content = getattr(msg, "content", None) or (msg.get("content") if isinstance(msg, dict) else None)
+            if content:
+                contents.append(str(content))
+
+    return contents
+
+
+def _iter_stream_messages(messages: Any) -> list[Any]:
+    if _is_overwrite_update(messages):
+        return []
+    if isinstance(messages, list | tuple):
+        return list(messages)
+    if isinstance(messages, dict):
+        return [messages] if "content" in messages else []
+    if hasattr(messages, "content"):
+        return [messages]
+    return []
+
+
+def _is_overwrite_update(value: Any) -> bool:
+    if value.__class__.__name__ == "Overwrite" and hasattr(value, "value"):
+        return True
+    return isinstance(value, dict) and set(value.keys()) == {"__overwrite__"}
+
+
+def _is_assistant_message(message: Any) -> bool:
+    if isinstance(message, dict):
+        role = message.get("role") or message.get("type")
+        return role in {"assistant", "ai"}
+    return getattr(message, "type", None) == "ai" or getattr(message, "role", None) == "assistant"
+
+
+# ---------------------------------------------------------------------------
+# Engine
+# ---------------------------------------------------------------------------
+
+
+class LangGraphVisualEngine:
+    """DeepAgents compiler + executor engine."""
+
+    engine_kind = "langgraph_visual"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=False,
+        supports_debug_observation=True,
+        supports_artifacts=True,
+        supports_approval=True,
+    )
+
+    def __init__(self) -> None:
+        self._running: dict[uuid.UUID, Any] = {}
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        """Compile graph definition and execute via DeepAgents."""
+
+        execution_id = context.execution_id
+
+        if engine_kind != "langgraph_visual":
+            error = InvalidRequestError(
+                f"LangGraphVisualEngine cannot handle engine_kind={engine_kind}",
+                code="LANGGRAPH_VISUAL_ENGINE_KIND_MISMATCH",
+                data={"engine_kind": engine_kind},
+            )
+            await context.complete("failed", error.message, error)
+            return
+
+        raw_nodes = definition_payload.get("nodes", [])
+        raw_edges = definition_payload.get("edges", [])
+        variables = definition_payload.get("variables", {}) or {}
+
+        if not raw_nodes:
+            error = InvalidRequestError(
+                "Graph definition has no nodes",
+                code="GRAPH_DEFINITION_NODES_EMPTY",
+            )
+            await context.complete("failed", error.message, error)
+            return
+
+        logger.info(f"[LangGraphVisualEngine] Starting execution {execution_id} with {len(raw_nodes)} nodes")
+
+        cancel_event = asyncio.Event()
+        self._running[execution_id] = cancel_event
+
+        await context.update_status("running")
+        await context.emit(
+            ExecutionEventType.EXECUTION_STARTED,
+            {
+                "engine": "langgraph_visual",
+                "node_count": len(raw_nodes),
+                "edge_count": len(raw_edges),
+            },
+        )
+
+        # ------------------------------------------------------------------
+        # Resolve user_id and thread_id from the AgentRun linked to this
+        # execution, so builder.py can initialise memory / sandbox correctly.
+        # ------------------------------------------------------------------
+        user_id: str | None = None
+        thread_id: str | None = None
+        try:
+            from app.models.agent_run import AgentRun
+
+            run = (await context.db.execute(select(AgentRun).where(AgentRun.id == context.run_id))).scalar_one_or_none()
+            if run:
+                user_id = run.created_by
+                thread_id = str(run.thread_id) if run.thread_id else None
+        except Exception as lookup_exc:  # pragma: no cover
+            logger.warning(f"[LangGraphVisualEngine] Could not resolve user_id/thread_id: {lookup_exc}")
+
+        # ------------------------------------------------------------------
+        # Wrap plain dicts into duck-typed shim objects
+        # ------------------------------------------------------------------
+        nodes = [_NodeShim(n) for n in raw_nodes]
+        edges = [_EdgeShim(e) for e in raw_edges]
+        graph = _GraphShim(
+            agent_id=context.run_id,  # stable surrogate — run_id is graph-level unique here
+            workspace_id=context.workspace_id,
+            variables=variables,
+            name=definition_payload.get("name", ""),
+        )
+
+        # ------------------------------------------------------------------
+        # Observation: create root span + callback handler if collector set
+        # ------------------------------------------------------------------
+        root_span = None
+        obs_handler = None
+        if context.collector:
+            graph_name = definition_payload.get("name", "graph")
+            root_span = context.collector.start_agent(name=f"root:{graph_name}")
+            obs_handler = context.collector.create_langchain_handler()
+
+        try:
+            # ------------------------------------------------------------------
+            # Build deep-agents graph
+            # ------------------------------------------------------------------
+            from app.core.graph.deep_agents.builder import build_deep_agents_graph
+            from app.services.model_service import ModelService
+
+            model_service = ModelService(context.db)
+
+            compiled = await build_deep_agents_graph(
+                graph,
+                nodes,
+                edges,
+                user_id=user_id,
+                model_service=model_service,
+                thread_id=thread_id,
+            )
+
+            # ------------------------------------------------------------------
+            # Run the compiled agent and stream events back through context
+            # ------------------------------------------------------------------
+            stream_config: dict[str, Any] = {
+                "configurable": {"thread_id": thread_id or str(execution_id)},
+            }
+            if obs_handler:
+                stream_config["callbacks"] = [obs_handler]
+
+            result_text: str = ""
+            async for chunk in compiled.astream(
+                {"messages": [{"role": "user", "content": prompt}]},
+                stream_config,
+            ):
+                if cancel_event.is_set():
+                    await context.complete("cancelled", "Execution cancelled by user")
+                    return
+
+                # deepagents yields dicts keyed by node name; extract text chunks
+                for content in _extract_message_contents_from_stream_chunk(chunk):
+                    result_text = content
+                    await context.emit(ExecutionEventType.ASSISTANT_TEXT, {"content": result_text})
+
+            # ------------------------------------------------------------------
+            # Cleanup sandbox if the compiled agent holds one
+            # ------------------------------------------------------------------
+            sandbox_handle = getattr(compiled, "_sandbox_handle", None)
+            if sandbox_handle:
+                try:
+                    await sandbox_handle.release()
+                except Exception as cleanup_exc:  # pragma: no cover
+                    logger.warning(f"[LangGraphVisualEngine] Sandbox cleanup failed: {cleanup_exc}")
+
+            await context.complete("succeeded", result_text[:2000] if result_text else None)
+
+        except Exception as exc:
+            logger.error(f"[LangGraphVisualEngine] Execution {execution_id} failed: {exc}")
+            app_error = normalize_app_error(
+                exc,
+                default_code="GRAPH_EXECUTION_FAILED",
+                default_message="Graph execution failed",
+                default_data={"execution_id": str(execution_id)},
+                source="engine",
+            )
+            await context.emit(ExecutionEventType.ERROR, app_error.to_payload())
+            await context.complete("failed", app_error.message[:2000], app_error)
+        finally:
+            self._running.pop(execution_id, None)
+            if root_span:
+                try:
+                    root_span.set_output({"status": "completed"})
+                    root_span.end()
+                except Exception:
+                    pass
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        """Cancel a running graph execution."""
+        event = self._running.get(execution_id)
+        if event:
+            event.set()
+            logger.info(f"[LangGraphVisualEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        """Graph executions don't support message injection (yet)."""
+        if execution_id not in self._running:
+            raise InternalServiceError(
+                "No running graph execution",
+                code="GRAPH_EXECUTION_NOT_RUNNING",
+                data={"execution_id": str(execution_id)},
+            )
+        raise InvalidRequestError(
+            "Message injection is not yet supported for graph executions",
+            code="GRAPH_EXECUTION_MESSAGE_UNSUPPORTED",
+            data={"execution_id": str(execution_id)},
+        )
diff --git a/backend/app/core/engine/protocol.py b/backend/app/core/engine/protocol.py
new file mode 100644
index 000000000..280267a88
--- /dev/null
+++ b/backend/app/core/engine/protocol.py
@@ -0,0 +1,121 @@
+"""
+Execution engine protocol — the stable abstraction layer.
+
+All execution engines implement this protocol.
+The orchestrator dispatches to engines via the registry; engines emit events via context.
+"""
+
+from __future__ import annotations
+
+import uuid
+from dataclasses import dataclass, field
+from typing import Any, Protocol, runtime_checkable
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AppError
+from app.core.events.event_types import ExecutionEventType
+
+
+@dataclass
+class ExecutionContext:
+    """
+    Provided to every engine at start time.
+
+    Engines use this to emit events, update status, and signal completion.
+    The context handles persistence (ExecutionEvent rows) and real-time push
+    (WebSocket broadcast) — engines never touch those layers directly.
+    """
+
+    db: AsyncSession
+    execution_id: uuid.UUID
+    run_id: uuid.UUID
+    workspace_id: uuid.UUID
+    credentials: dict[str, str] = field(default_factory=dict)
+    auto_approve: bool = True
+    metadata: dict[str, Any] = field(default_factory=dict)
+    debug: bool = False
+    collector: Any = None  # ObservationCollector | None — import avoided for no circular deps
+
+    # ---- set by orchestrator after construction ----
+    _emit_fn: Any = None  # async (event_type, payload) -> None
+    _status_fn: Any = None  # async (status) -> None
+    _complete_fn: Any = None  # async (status, result_summary, error) -> None
+
+    async def emit(self, event_type: ExecutionEventType, payload: dict | None = None) -> None:
+        """Emit an execution event → persisted + broadcast."""
+        if self._emit_fn:
+            await self._emit_fn(event_type, payload or {})
+
+    async def update_status(self, status: str) -> None:
+        """Update Execution.status without completing."""
+        if self._status_fn:
+            await self._status_fn(status)
+
+    async def complete(
+        self,
+        status: str,
+        result_summary: str | None = None,
+        error: AppError | None = None,
+    ) -> None:
+        """Mark execution as terminal → updates Run + Task status."""
+        if self._complete_fn:
+            await self._complete_fn(status, result_summary, error)
+
+
+@dataclass(frozen=True)
+class EngineCapabilities:
+    supports_cancel: bool = False
+    supports_message_injection: bool = False
+    supports_debug_observation: bool = False
+    supports_artifacts: bool = False
+    supports_approval: bool = False
+
+
+@runtime_checkable
+class ExecutionEngine(Protocol):
+    """
+    Stable interface for all execution engines.
+
+    User-facing engines:
+      - LangGraphVisualEngine  (engine_kind: langgraph_visual)
+      - LangGraphCodeEngine    (engine_kind: langgraph_code)
+      - ClaudeCodeEngine       (engine_kind: claude_code)
+      - CodexEngine            (engine_kind: codex)
+      - OpenClawEngine         (engine_kind: openclaw)
+
+    Internal platform engines:
+      - CopilotEngine          (engine_kind: build_copilot)
+    """
+
+    engine_kind: str
+    capabilities: EngineCapabilities
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        """
+        Start execution. Events flow through context.emit().
+
+        Args:
+            context: execution context with emit/status/complete callbacks
+            release_runtime_binding: from AgentRelease.runtime_binding
+            engine_kind: "langgraph_visual" | "langgraph_code" | "claude_code" | "codex" | "openclaw"
+            definition_payload: from AgentVersion.definition_payload
+            prompt: the user prompt or task goal
+        """
+        ...
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        """Cancel a running execution."""
+        ...
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        """Inject a human message into a running execution."""
+        ...
diff --git a/backend/app/core/engine/registry.py b/backend/app/core/engine/registry.py
new file mode 100644
index 000000000..d66637292
--- /dev/null
+++ b/backend/app/core/engine/registry.py
@@ -0,0 +1,38 @@
+"""
+Engine registry — maps engine_kind to ExecutionEngine instances.
+"""
+
+from __future__ import annotations
+
+from app.common.app_errors import NotFoundError
+from app.core.engine.protocol import ExecutionEngine
+
+
+class EngineRegistry:
+    """Singleton registry: engine_kind → ExecutionEngine."""
+
+    def __init__(self) -> None:
+        self._engines: dict[str, ExecutionEngine] = {}
+
+    def register(self, engine_kind: str, engine: ExecutionEngine) -> None:
+        self._engines[engine_kind] = engine
+
+    def has(self, engine_kind: str) -> bool:
+        return engine_kind in self._engines
+
+    def get(self, engine_kind: str) -> ExecutionEngine:
+        engine = self._engines.get(engine_kind)
+        if not engine:
+            available = ", ".join(self._engines.keys()) or "(none)"
+            raise NotFoundError(
+                "Execution engine is not registered",
+                code="EXECUTION_ENGINE_NOT_REGISTERED",
+                data={"engine_kind": engine_kind, "available_engine_kinds": available},
+            )
+        return engine
+
+    def list_kinds(self) -> list[str]:
+        return list(self._engines.keys())
+
+
+engine_registry = EngineRegistry()
diff --git a/backend/app/core/events/__init__.py b/backend/app/core/events/__init__.py
new file mode 100644
index 000000000..f23b5c934
--- /dev/null
+++ b/backend/app/core/events/__init__.py
@@ -0,0 +1,15 @@
+"""Events infrastructure — unified execution event bus."""
+
+from app.core.events.bus import ExecutionEventBus, execution_event_bus
+from app.core.events.envelope import ExecutionEventEnvelope
+from app.core.events.event_types import ExecutionEventType
+from app.core.events.subscriber import EventSubscriber, SubscriberPhase
+
+__all__ = [
+    "ExecutionEventBus",
+    "ExecutionEventEnvelope",
+    "ExecutionEventType",
+    "EventSubscriber",
+    "SubscriberPhase",
+    "execution_event_bus",
+]
diff --git a/backend/app/core/events/bus.py b/backend/app/core/events/bus.py
new file mode 100644
index 000000000..9585637d2
--- /dev/null
+++ b/backend/app/core/events/bus.py
@@ -0,0 +1,78 @@
+"""
+ExecutionEventBus — unified event pipeline.
+
+Phase 1 subscribers share the caller's DB session and run sequentially.
+The bus commits once after all Phase 1 subscribers complete.
+
+Phase 2 subscribers run in parallel with independent sessions.
+A failure in one does not affect the others.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from typing import TYPE_CHECKING
+
+from loguru import logger
+
+from app.core.events.subscriber import EventSubscriber, SubscriberPhase
+
+if TYPE_CHECKING:
+    from sqlalchemy.ext.asyncio import AsyncSession
+
+    from app.core.events.envelope import ExecutionEventEnvelope
+
+
+class ExecutionEventBus:
+    def __init__(self) -> None:
+        self._persist_subs: list[EventSubscriber] = []
+        self._broadcast_subs: list[EventSubscriber] = []
+
+    def register(self, sub: EventSubscriber) -> None:
+        if sub.phase == SubscriberPhase.PERSIST:
+            self._persist_subs.append(sub)
+        else:
+            self._broadcast_subs.append(sub)
+        logger.info(f"[EventBus] Registered subscriber: {sub.name} (phase={sub.phase.name})")
+
+    async def publish(self, envelope: ExecutionEventEnvelope, db: AsyncSession) -> None:
+        # Phase 1: shared transaction, sequential
+        for sub in self._persist_subs:
+            await sub.handle(envelope, db=db)
+        await db.commit()
+
+        # Phase 2: independent sessions, parallel fan-out
+        await self._fan_out([envelope])
+
+    async def publish_batch(
+        self,
+        envelopes: list[ExecutionEventEnvelope],
+        db: AsyncSession,
+    ) -> None:
+        """Publish multiple envelopes in a single transaction.
+
+        Phase 1 processes all envelopes sequentially, then commits once.
+        Phase 2 fans out all envelopes in parallel.
+        """
+        for envelope in envelopes:
+            for sub in self._persist_subs:
+                await sub.handle(envelope, db=db)
+        await db.commit()
+
+        await self._fan_out(envelopes)
+
+    async def _fan_out(self, envelopes: list[ExecutionEventEnvelope]) -> None:
+        if not self._broadcast_subs:
+            return
+        tasks = [sub.handle(envelope) for envelope in envelopes for sub in self._broadcast_subs]
+        results = await asyncio.gather(*tasks, return_exceptions=True)
+        for i, result in enumerate(results):
+            if isinstance(result, Exception):
+                sub_idx = i % len(self._broadcast_subs)
+                logger.warning(
+                    f"[EventBus] {self._broadcast_subs[sub_idx].name} failed: {result}",
+                    exc_info=result,
+                )
+
+
+execution_event_bus = ExecutionEventBus()
diff --git a/backend/app/core/events/envelope.py b/backend/app/core/events/envelope.py
new file mode 100644
index 000000000..5f3a44a2f
--- /dev/null
+++ b/backend/app/core/events/envelope.py
@@ -0,0 +1,42 @@
+"""
+Canonical event envelope — the single shape all subscribers receive.
+"""
+
+from __future__ import annotations
+
+import uuid
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Any, Optional
+
+from app.core.events.event_types import ExecutionEventType
+from app.utils.datetime import utc_now
+
+
+@dataclass
+class ExecutionEventEnvelope:
+    """Canonical event envelope flowing through the event bus."""
+
+    execution_id: uuid.UUID
+    run_id: uuid.UUID
+    workspace_id: uuid.UUID
+    event_type: ExecutionEventType | str
+    payload: dict[str, Any] = field(default_factory=dict)
+    created_at: datetime = field(default_factory=utc_now)
+    seq: int = 0  # filled by PersistenceSubscriber in Phase 1
+
+    # Run metadata — subscribers use these for routing decisions
+    trigger_medium: Optional[str] = None
+    run_purpose: Optional[str] = None
+    thread_id: Optional[uuid.UUID] = None
+    task_id: Optional[uuid.UUID] = None
+
+    # Completion-only fields
+    terminal_status: Optional[str] = None
+    result_summary: Optional[str] = None
+    error: Optional[dict[str, Any]] = None  # ErrorDescriptor via AppError.to_payload()
+
+    # Status-change fields (used by execution_status_change events)
+    target_status: Optional[str] = None
+    container_id: Optional[str] = None
+    metrics: Optional[dict[str, Any]] = None
diff --git a/backend/app/core/events/event_types.py b/backend/app/core/events/event_types.py
new file mode 100644
index 000000000..941b39811
--- /dev/null
+++ b/backend/app/core/events/event_types.py
@@ -0,0 +1,36 @@
+"""
+Canonical execution event types — the single source of truth for event naming.
+
+Backend emitters MUST use these constants.  The frontend type union mirrors them.
+"""
+
+from __future__ import annotations
+
+from enum import StrEnum
+
+
+class ExecutionEventType(StrEnum):
+    # Content events (mapped from CLI message types by ExecutionRunner)
+    ASSISTANT_TEXT = "assistant_text"
+    THINKING = "thinking"
+    TOOL_USE_START = "tool_use_start"
+    TOOL_USE_END = "tool_use_end"
+    ERROR = "error"
+    ARTIFACT_CREATED = "artifact_created"
+    APPROVAL_REQUESTED = "approval_requested"
+    APPROVAL_RESOLVED = "approval_resolved"
+    USER_MESSAGE = "user_message"
+
+    # Lifecycle events
+    EXECUTION_STARTED = "execution_started"
+    EXECUTION_COMPLETED = "execution_completed"
+    EXECUTION_STATUS_CHANGE = "execution_status_change"
+    RUN_STATUS_CHANGE = "run_status_change"
+
+    # Copilot events (mapped from CopilotService stream events by CopilotEngine)
+    COPILOT_STATUS = "copilot_status"
+    COPILOT_CONTENT = "copilot_content"
+    COPILOT_THOUGHT_STEP = "copilot_thought_step"
+    COPILOT_TOOL_CALL = "copilot_tool_call"
+    COPILOT_TOOL_RESULT = "copilot_tool_result"
+    COPILOT_RESULT = "copilot_result"
diff --git a/backend/app/core/events/subscriber.py b/backend/app/core/events/subscriber.py
new file mode 100644
index 000000000..6a4727a3c
--- /dev/null
+++ b/backend/app/core/events/subscriber.py
@@ -0,0 +1,30 @@
+"""
+Subscriber protocol and phase enum.
+"""
+
+from __future__ import annotations
+
+from enum import Enum
+from typing import TYPE_CHECKING, Optional, Protocol, runtime_checkable
+
+if TYPE_CHECKING:
+    from sqlalchemy.ext.asyncio import AsyncSession
+
+    from app.core.events.envelope import ExecutionEventEnvelope
+
+
+class SubscriberPhase(Enum):
+    PERSIST = 1
+    BROADCAST = 2
+
+
+@runtime_checkable
+class EventSubscriber(Protocol):
+    name: str
+    phase: SubscriberPhase
+
+    async def handle(
+        self,
+        envelope: ExecutionEventEnvelope,
+        db: Optional[AsyncSession] = None,
+    ) -> None: ...
diff --git a/backend/app/core/events/subscribers/__init__.py b/backend/app/core/events/subscribers/__init__.py
new file mode 100644
index 000000000..4aa51e593
--- /dev/null
+++ b/backend/app/core/events/subscribers/__init__.py
@@ -0,0 +1 @@
+"""Event subscribers."""
diff --git a/backend/app/core/events/subscribers/persistence.py b/backend/app/core/events/subscribers/persistence.py
new file mode 100644
index 000000000..24c295c4e
--- /dev/null
+++ b/backend/app/core/events/subscribers/persistence.py
@@ -0,0 +1,79 @@
+"""
+PersistenceSubscriber — Phase 1.
+
+Writes ExecutionEvent rows to the database and fills envelope.seq.
+Flushes but does NOT commit — the bus commits after all Phase 1 subscribers.
+"""
+
+from __future__ import annotations
+
+from collections import defaultdict
+from typing import Optional
+
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InternalServiceError
+from app.core.events.envelope import ExecutionEventEnvelope
+from app.core.events.event_types import ExecutionEventType
+from app.core.events.subscriber import SubscriberPhase
+from app.models.execution import ExecutionEvent
+
+
+class PersistenceSubscriber:
+    name = "persistence"
+    phase = SubscriberPhase.PERSIST
+
+    def __init__(self) -> None:
+        # single-process sequence cache:
+        # This in-memory counter avoids a MAX() query on every event and is safe
+        # only when one backend process owns event writes for an execution and
+        # those writes are serialized/single-writer per execution. Multi-worker
+        # or multi-instance deployments need distributed event sequencing before
+        # this cache can be treated as globally safe.
+        self._seq_cache: dict[str, int] = defaultdict(int)
+
+    async def handle(
+        self,
+        envelope: ExecutionEventEnvelope,
+        db: Optional[AsyncSession] = None,
+    ) -> None:
+        if db is None:
+            raise InternalServiceError(
+                "Persistence subscriber requires a database session",
+                code="EVENT_SUBSCRIBER_DB_SESSION_MISSING",
+                data={"subscriber": self.name},
+            )
+
+        eid = str(envelope.execution_id)
+
+        # Seed cache on first event for this execution
+        if eid not in self._seq_cache:
+            max_seq = (
+                await db.execute(
+                    select(func.coalesce(func.max(ExecutionEvent.sequence_no), 0)).where(
+                        ExecutionEvent.execution_id == envelope.execution_id
+                    )
+                )
+            ).scalar()
+            self._seq_cache[eid] = max_seq or 0
+
+        self._seq_cache[eid] += 1
+        seq = self._seq_cache[eid]
+
+        event = ExecutionEvent(
+            execution_id=envelope.execution_id,
+            sequence_no=seq,
+            event_type=envelope.event_type,
+            payload=envelope.payload,
+        )
+        db.add(event)
+        await db.flush()
+
+        # Fill seq so Phase 2 subscribers can use it.
+        # Safe: Phase 2 runs only after Phase 1 completes and bus commits.
+        envelope.seq = seq
+
+        # Clean up cache on terminal events
+        if envelope.event_type == ExecutionEventType.EXECUTION_COMPLETED:
+            self._seq_cache.pop(eid, None)
diff --git a/backend/app/core/events/subscribers/state_transition.py b/backend/app/core/events/subscribers/state_transition.py
new file mode 100644
index 000000000..69a89ab6c
--- /dev/null
+++ b/backend/app/core/events/subscribers/state_transition.py
@@ -0,0 +1,141 @@
+"""
+StateTransitionSubscriber — Phase 1.
+
+Handles execution and run state transitions driven by events:
+- execution_status_change → non-terminal transitions (dispatched, running, approval_wait)
+- execution_completed → terminal transitions (succeeded, failed, cancelled) for both Execution and Run
+- run_status_change → direct Run transitions (e.g. running, cancelled, reaper-failed)
+
+Flushes but does NOT commit — the bus commits once after all Phase 1 subscribers.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from loguru import logger
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InternalServiceError
+from app.core.events.envelope import ExecutionEventEnvelope
+from app.core.events.event_types import ExecutionEventType
+from app.core.events.subscriber import SubscriberPhase
+from app.core.state_machines.definitions import EXECUTION_TERMINAL
+from app.core.state_machines.engine import InvalidTransition
+from app.core.state_machines.transitions import transition_execution, transition_run
+from app.models.agent_run import AgentRun
+from app.models.execution import Execution
+
+_HANDLED = {
+    ExecutionEventType.EXECUTION_STATUS_CHANGE,
+    ExecutionEventType.EXECUTION_COMPLETED,
+    ExecutionEventType.RUN_STATUS_CHANGE,
+}
+
+
+class StateTransitionSubscriber:
+    name = "state_transition"
+    phase = SubscriberPhase.PERSIST
+
+    async def handle(
+        self,
+        envelope: ExecutionEventEnvelope,
+        db: Optional[AsyncSession] = None,
+    ) -> None:
+        if envelope.event_type not in _HANDLED:
+            return
+
+        if db is None:
+            raise InternalServiceError(
+                "State transition subscriber requires a database session",
+                code="EVENT_SUBSCRIBER_DB_SESSION_MISSING",
+                data={"subscriber": self.name},
+            )
+
+        if envelope.event_type == ExecutionEventType.EXECUTION_STATUS_CHANGE:
+            await self._handle_status_change(envelope, db)
+        elif envelope.event_type == ExecutionEventType.EXECUTION_COMPLETED:
+            await self._handle_completed(envelope, db)
+        elif envelope.event_type == ExecutionEventType.RUN_STATUS_CHANGE:
+            await self._handle_run_status_change(envelope, db)
+
+    async def _handle_status_change(self, envelope: ExecutionEventEnvelope, db: AsyncSession) -> None:
+        if not envelope.target_status:
+            raise InternalServiceError(
+                "Execution status change event is missing target status",
+                code="EVENT_TARGET_STATUS_MISSING",
+                data={"event_type": str(envelope.event_type), "execution_id": str(envelope.execution_id)},
+            )
+
+        if envelope.target_status in EXECUTION_TERMINAL:
+            raise InternalServiceError(
+                "Terminal execution status must use execution completed events",
+                code="EVENT_TERMINAL_STATUS_INVALID",
+                data={
+                    "event_type": str(envelope.event_type),
+                    "execution_id": str(envelope.execution_id),
+                    "target_status": envelope.target_status,
+                },
+            )
+
+        execution = (await db.execute(select(Execution).where(Execution.id == envelope.execution_id))).scalar_one()
+
+        try:
+            await transition_execution(execution, envelope.target_status, db)
+        except InvalidTransition:
+            logger.warning(f"[StateTransition] Skipping execution {execution.id}: already {execution.status}")
+            return
+
+        self._apply_metadata(execution, envelope)
+        await db.flush()
+
+    async def _handle_completed(self, envelope: ExecutionEventEnvelope, db: AsyncSession) -> None:
+        if not envelope.terminal_status:
+            raise InternalServiceError(
+                "Execution completed event is missing terminal status",
+                code="EVENT_TERMINAL_STATUS_MISSING",
+                data={"event_type": str(envelope.event_type), "execution_id": str(envelope.execution_id)},
+            )
+
+        execution = (await db.execute(select(Execution).where(Execution.id == envelope.execution_id))).scalar_one()
+        try:
+            await transition_execution(execution, envelope.terminal_status, db)
+        except InvalidTransition:
+            logger.warning(f"[StateTransition] Skipping execution {execution.id}: already {execution.status}")
+            return
+
+        self._apply_metadata(execution, envelope)
+
+        run = (await db.execute(select(AgentRun).where(AgentRun.id == envelope.run_id))).scalar_one()
+        try:
+            await transition_run(run, envelope.terminal_status, db, envelope.result_summary)
+        except InvalidTransition:
+            logger.warning(f"[StateTransition] Skipping run {run.id}: already {run.status}")
+
+        await db.flush()
+
+    async def _handle_run_status_change(self, envelope: ExecutionEventEnvelope, db: AsyncSession) -> None:
+        if not envelope.target_status:
+            raise InternalServiceError(
+                "Run status change event is missing target status",
+                code="EVENT_TARGET_STATUS_MISSING",
+                data={"event_type": str(envelope.event_type), "run_id": str(envelope.run_id)},
+            )
+
+        run = (await db.execute(select(AgentRun).where(AgentRun.id == envelope.run_id))).scalar_one()
+
+        try:
+            await transition_run(run, envelope.target_status, db, envelope.result_summary)
+        except InvalidTransition:
+            logger.warning(f"[StateTransition] Skipping run {run.id}: already {run.status}")
+
+    @staticmethod
+    def _apply_metadata(execution: Execution, envelope: ExecutionEventEnvelope) -> None:
+        """Write optional metadata fields from the envelope onto the execution row."""
+        if envelope.error is not None:
+            execution.error = envelope.error
+        if envelope.container_id is not None:
+            execution.runtime_session_ref = envelope.container_id
+        if envelope.metrics is not None:
+            execution.metrics = envelope.metrics
diff --git a/backend/app/core/events/subscribers/task_sync.py b/backend/app/core/events/subscribers/task_sync.py
new file mode 100644
index 000000000..b2b0a4c90
--- /dev/null
+++ b/backend/app/core/events/subscribers/task_sync.py
@@ -0,0 +1,56 @@
+"""
+TaskSyncSubscriber — Phase 2.
+
+On execution_completed or run terminal status change, syncs the task status
+from the run. Uses an independent DB session.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from loguru import logger
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.events.envelope import ExecutionEventEnvelope
+from app.core.events.event_types import ExecutionEventType
+from app.core.events.subscriber import SubscriberPhase
+from app.core.state_machines.definitions import RUN_TERMINAL
+
+_HANDLED = {
+    ExecutionEventType.EXECUTION_COMPLETED,
+    ExecutionEventType.RUN_STATUS_CHANGE,
+}
+
+
+class TaskSyncSubscriber:
+    name = "task_sync"
+    phase = SubscriberPhase.BROADCAST
+
+    async def handle(
+        self,
+        envelope: ExecutionEventEnvelope,
+        db: Optional[AsyncSession] = None,
+    ) -> None:
+        if envelope.event_type not in _HANDLED:
+            return
+
+        if envelope.event_type == ExecutionEventType.RUN_STATUS_CHANGE:
+            if envelope.target_status not in RUN_TERMINAL:
+                return
+
+        from app.core.database import AsyncSessionLocal
+        from app.core.state_machines.transitions import sync_task_from_run
+        from app.models.agent_run import AgentRun
+
+        async with AsyncSessionLocal() as session:
+            run = (await session.execute(select(AgentRun).where(AgentRun.id == envelope.run_id))).scalar_one_or_none()
+            if not run:
+                logger.warning(f"[TaskSync] Run {envelope.run_id} not found")
+                return
+            if not run.task_id:
+                return
+            await sync_task_from_run(run, session)
+            await session.commit()
+            logger.info(f"[TaskSync] Synced task {run.task_id} from run {envelope.run_id}")
diff --git a/backend/app/core/events/subscribers/websocket.py b/backend/app/core/events/subscribers/websocket.py
new file mode 100644
index 000000000..7a03db8c3
--- /dev/null
+++ b/backend/app/core/events/subscribers/websocket.py
@@ -0,0 +1,59 @@
+"""
+WebSocketSubscriber — Phase 2.
+
+Broadcasts events to frontend clients via the existing subscription manager.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InternalServiceError
+from app.core.events.envelope import ExecutionEventEnvelope
+from app.core.events.event_types import ExecutionEventType
+from app.core.events.subscriber import SubscriberPhase
+from app.websocket.execution_subscription_manager import execution_subscription_manager
+
+
+class WebSocketSubscriber:
+    name = "websocket"
+    phase = SubscriberPhase.BROADCAST
+
+    async def handle(
+        self,
+        envelope: ExecutionEventEnvelope,
+        db: Optional[AsyncSession] = None,
+    ) -> None:
+        eid = str(envelope.execution_id)
+
+        if envelope.event_type == ExecutionEventType.EXECUTION_COMPLETED:
+            payload: dict[str, object] = {
+                "type": "execution_completed",
+                "execution_id": eid,
+                "run_id": str(envelope.run_id),
+                "status": envelope.terminal_status,
+            }
+            if envelope.terminal_status == "failed":
+                if envelope.error is None:
+                    raise InternalServiceError(
+                        "Failed execution completed event is missing error payload",
+                        code="EVENT_ERROR_PAYLOAD_MISSING",
+                        data={"event_type": str(envelope.event_type), "execution_id": eid},
+                    )
+                payload["error"] = envelope.error
+            await execution_subscription_manager.broadcast_event(eid, payload)
+            execution_subscription_manager.remove_execution(eid)
+        else:
+            await execution_subscription_manager.broadcast_event(
+                eid,
+                {
+                    "type": "event",
+                    "execution_id": eid,
+                    "seq": envelope.seq,
+                    "event_type": envelope.event_type,
+                    "payload": envelope.payload,
+                    "created_at": envelope.created_at.isoformat() if envelope.created_at else None,
+                },
+            )
diff --git a/backend/app/core/graph/deep_agents/builder.py b/backend/app/core/graph/deep_agents/builder.py
index a39f716a8..3727ccb0c 100644
--- a/backend/app/core/graph/deep_agents/builder.py
+++ b/backend/app/core/graph/deep_agents/builder.py
@@ -7,11 +7,14 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, List, Optional
+
+# app.models.graph was removed; use Protocol stubs for type-checking only.
+# At runtime, duck-typed shim objects (from graph_engine.py) satisfy these contracts.
+from typing import TYPE_CHECKING, Any, List, Optional
 
 from loguru import logger
 
-from app.common.exceptions import AppException
+from app.common.app_errors import ServiceUnavailableError
 from app.core.agent.backends.constants import DOCKER_UNAVAILABLE_MSG
 from app.core.agent.backends.docker_check import is_docker_available
 from app.core.graph.deep_agents.agent_factory import (
@@ -29,15 +32,35 @@
 )
 from app.core.graph.deep_agents.tool_resolver import resolve_tools
 from app.core.graph.runtime_prompt_template import build_runtime_prompt_context, render_runtime_template
-from app.models.graph import AgentGraph, GraphEdge, GraphNode
+
+if TYPE_CHECKING:
+    from typing import Protocol
+
+    class GraphLike(Protocol):
+        id: Any
+        workspace_id: Any
+        variables: Any
+
+    class NodeLike(Protocol):
+        id: Any
+        type: str
+        data: dict
+
+    class EdgeLike(Protocol):
+        source_node_id: Any
+        target_node_id: Any
+
+    AgentGraph = GraphLike  # type: ignore[assignment]
+    GraphNode = NodeLike  # type: ignore[assignment]
+    GraphEdge = EdgeLike  # type: ignore[assignment]
 
 LOG_PREFIX = "[DeepAgentsBuilder]"
 
 
 async def build_deep_agents_graph(
-    graph: AgentGraph,
-    nodes: List[GraphNode],
-    edges: List[GraphEdge],
+    graph: Any,
+    nodes: List[Any],
+    edges: List[Any],
     user_id: Optional[Any] = None,
     model_service: Optional[Any] = None,
     thread_id: Optional[str] = None,
@@ -89,8 +112,7 @@ async def build_deep_agents_graph(
                 for cfg in all_configs
                 if cfg.node_type == "code_agent" and cfg.executor_type == "docker"
             ]
-            raise AppException(
-                status_code=503,
+            raise ServiceUnavailableError(
                 message=(
                     f"{DOCKER_UNAVAILABLE_MSG} "
                     f'Agent "{graph_name}" requires Docker for node(s): {", ".join(docker_nodes)}.'
diff --git a/backend/app/core/graph/deep_agents/config.py b/backend/app/core/graph/deep_agents/config.py
index 606da364e..613c69765 100644
--- a/backend/app/core/graph/deep_agents/config.py
+++ b/backend/app/core/graph/deep_agents/config.py
@@ -1,8 +1,12 @@
 """Node configuration resolution — pure data extraction, no side effects.
 
-Reads raw GraphNode data and produces typed config dataclasses.
+Reads raw node data objects and produces typed config dataclasses.
 Does NOT resolve models, tools, skills, or middleware — those are
 handled by dedicated resolvers during the build phase.
+
+Node data objects are duck-typed: any object with ``id``, ``type``, and
+``data`` attributes is accepted (previously GraphNode ORM instances,
+now plain data holders from AgentVersion.definition_payload).
 """
 
 from __future__ import annotations
@@ -10,8 +14,6 @@
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional
 
-from app.models.graph import GraphNode
-
 
 @dataclass
 class NodeConfig:
@@ -64,8 +66,8 @@ def display_name(self) -> str:
         return self.label or self.name
 
 
-def resolve_node_config(node: GraphNode, node_name: str) -> NodeConfig:
-    """Extract typed config from a GraphNode. Pure function, no side effects."""
+def resolve_node_config(node: Any, node_name: str) -> NodeConfig:
+    """Extract typed config from a node data object. Pure function, no side effects."""
     data = node.data or {}
     config = data.get("config", {}) or {}
     node_type = data.get("type") or node.type or "agent"
@@ -108,7 +110,7 @@ def resolve_node_config(node: GraphNode, node_name: str) -> NodeConfig:
 
 
 def resolve_all_configs(
-    nodes: list[GraphNode],
+    nodes: list[Any],
     edges: list,
 ) -> tuple[Optional[NodeConfig], list[NodeConfig]]:
     """Resolve configs for all nodes. Returns (root_config, child_configs).
diff --git a/backend/app/core/graph/deep_agents/model_resolver.py b/backend/app/core/graph/deep_agents/model_resolver.py
index 8b8916d9d..d5d3b715e 100644
--- a/backend/app/core/graph/deep_agents/model_resolver.py
+++ b/backend/app/core/graph/deep_agents/model_resolver.py
@@ -10,9 +10,8 @@
 
 from loguru import logger
 
-from app.common.exceptions import ModelConfigError
+from app.common.app_errors import ModelConfigError
 from app.core.graph.deep_agents import format_node_ctx
-from app.services.model_service import MODEL_NOT_FOUND
 
 
 class ModelResolver:
@@ -78,7 +77,7 @@ async def _resolve_uncached(
         available = await self._list_available_model_names()
         ctx = format_node_ctx(node_label, graph_name)
         raise ModelConfigError(
-            MODEL_NOT_FOUND,
+            ModelConfigError.MODEL_NOT_FOUND,
             f'Model "{model_name}" is not available ({ctx}).',
             params={
                 "model": model_name or "",
diff --git a/backend/app/core/graph/node_secrets.py b/backend/app/core/graph/node_secrets.py
index 8981c0e67..327f4642a 100644
--- a/backend/app/core/graph/node_secrets.py
+++ b/backend/app/core/graph/node_secrets.py
@@ -1,10 +1,13 @@
 """
-Graph node secrets: encrypt a2a_auth_headers and store by reference.
+Graph node secrets: encrypt a2a_auth_headers and store inline.
 
-- On save: if node has plain a2a_auth_headers, encrypt and store in graph_node_secrets,
-  replace in node.data.config with {"__secretRef": "<secret_id>"}.
-- On load for execution: resolve __secretRef to decrypted headers (in-memory only).
-- GET /state never returns decrypted headers; frontend sees __secretRef or redacted.
+The GraphNode / GraphNodeSecret ORM models have been removed.
+Node secrets are now stored inline in AgentVersion.definition_payload
+under definition_payload["node_secrets"][str(node_id)] as an encrypted
+string.  No database table or UUID secret reference is involved.
+
+The helper functions below operate on plain dicts (node data payloads)
+and are used by the graph builder at compile time.
 """
 
 import copy
@@ -12,11 +15,8 @@
 from typing import Any, Dict, List, Optional
 
 from loguru import logger
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.core.model.utils import decrypt_credentials, encrypt_credentials
-from app.models.graph import GraphNode, GraphNodeSecret
 
 SECRET_KEY_SLUG = "a2a_auth_headers"
 REF_KEY = "__secretRef"
@@ -38,45 +38,57 @@ def _normalize_headers(raw: Any) -> Optional[Dict[str, str]]:
     return None
 
 
-async def store_a2a_auth_headers(
-    db: AsyncSession,
-    graph_id: uuid.UUID,
-    node_id: uuid.UUID,
+def store_a2a_auth_headers(
+    payload_secrets: Dict[str, Any],
+    node_id: str | uuid.UUID,
     headers: Dict[str, str],
-) -> uuid.UUID:
-    """Encrypt and store headers; return the secret row id (for __secretRef)."""
+) -> None:
+    """Encrypt *headers* and store them inline in *payload_secrets*.
+
+    ``payload_secrets`` is ``definition_payload["node_secrets"]`` — a plain
+    dict that lives inside AgentVersion.definition_payload.  The encrypted
+    string is keyed by ``str(node_id)``.
+
+    Example::
+
+        payload_secrets = definition_payload.setdefault("node_secrets", {})
+        store_a2a_auth_headers(payload_secrets, node_id, headers)
+    """
     if not headers:
-        raise ValueError("headers must be non-empty")
+        return
     encrypted = encrypt_credentials(headers)
-    row = GraphNodeSecret(
-        graph_id=graph_id,
-        node_id=node_id,
-        key_slug=SECRET_KEY_SLUG,
-        encrypted_value=encrypted,
-    )
-    db.add(row)
-    await db.flush()
-    return row.id
-
-
-async def resolve_a2a_auth_headers(db: AsyncSession, secret_id: uuid.UUID) -> Optional[Dict[str, str]]:
-    """Load and decrypt headers by secret id. Returns None if not found or invalid."""
-    result = await db.execute(select(GraphNodeSecret).where(GraphNodeSecret.id == secret_id))
-    row = result.scalar_one_or_none()
-    if not row or not row.encrypted_value:
+    payload_secrets[str(node_id)] = encrypted
+    logger.debug(f"[NodeSecrets] Stored encrypted a2a_auth_headers for node_id={node_id}")
+
+
+def resolve_a2a_auth_headers(
+    payload_secrets: Dict[str, Any],
+    node_id: str | uuid.UUID,
+) -> Optional[Dict[str, str]]:
+    """Decrypt and return a2a_auth_headers for *node_id* from *payload_secrets*.
+
+    ``payload_secrets`` is ``definition_payload.get("node_secrets", {})``.
+    Returns ``None`` when no secret is stored for the given node.
+    """
+    encrypted = payload_secrets.get(str(node_id))
+    if not encrypted:
         return None
     try:
-        decrypted = decrypt_credentials(row.encrypted_value)
-        return {str(k): str(v) for k, v in decrypted.items()} if isinstance(decrypted, dict) else None
-    except Exception as e:
-        logger.warning(f"[NodeSecrets] Failed to decrypt secret {secret_id}: {e}")
+        result = decrypt_credentials(encrypted)
+        return {str(k): str(v) for k, v in result.items()} if isinstance(result, dict) else None
+    except Exception as exc:
+        logger.warning(f"[NodeSecrets] Failed to decrypt a2a_auth_headers for node_id={node_id}: {exc}")
         return None
 
 
 def prepare_node_data_for_save(node_data: Dict[str, Any]) -> tuple[Dict[str, Any], Optional[Dict[str, str]]]:
     """
     If node has plain a2a_auth_headers, return (data_copy_without_plain_headers, headers_to_store).
-    Caller must: store the secret, then set data_copy["config"]["a2a_auth_headers"] = {"__secretRef": str(secret_id)}.
+
+    Caller must call ``store_a2a_auth_headers(payload_secrets, node_id, headers_to_store)``
+    after receiving the returned headers dict, then set::
+
+        data_copy["config"]["a2a_auth_headers"] = {"__secretRef": str(node_id)}
     """
     data_copy = copy.deepcopy(node_data)
     config = (data_copy.get("config") or {}) if isinstance(data_copy.get("config"), dict) else {}
@@ -90,27 +102,35 @@ def prepare_node_data_for_save(node_data: Dict[str, Any]) -> tuple[Dict[str, Any
     return data_copy, headers
 
 
-async def hydrate_nodes_a2a_secrets(db: AsyncSession, nodes: List[GraphNode]) -> None:
-    """Resolve __secretRef in each node's data.config.a2a_auth_headers in-place (for execution only)."""
+def hydrate_nodes_a2a_secrets(payload_secrets: Dict[str, Any], nodes: List[Any]) -> None:
+    """Resolve ``__secretRef`` in each node's a2a_auth_headers in-place (for execution only).
+
+    Accepts either plain dicts (from definition_payload["nodes"]) or any
+    object with a ``data`` dict attribute.
+
+    ``payload_secrets`` is ``definition_payload.get("node_secrets", {})``.
+    """
     for node in nodes:
-        data = node.data or {}
+        # Support both plain dicts and data-holder objects.
+        if isinstance(node, dict):
+            node_id = node.get("id", "")
+            data = node.get("data") or {}
+        else:
+            node_id = getattr(node, "id", "")
+            data = getattr(node, "data", None) or {}
+
         config = data.get("config") or {}
         raw = config.get("a2a_auth_headers")
         if not isinstance(raw, dict) or REF_KEY not in raw:
             continue
-        ref = raw.get(REF_KEY)
-        if not ref:
-            continue
-        try:
-            secret_uuid = uuid.UUID(str(ref))
-        except (ValueError, TypeError):
-            continue
-        resolved = await resolve_a2a_auth_headers(db, secret_uuid)
-        if resolved is not None:
-            config["a2a_auth_headers"] = resolved
-            if "config" not in data:
-                data["config"] = config
-            node.data = data
+
+        resolved = resolve_a2a_auth_headers(payload_secrets, node_id)
+        config["a2a_auth_headers"] = resolved if resolved is not None else {}
+
+        # Write back — handle both dict nodes and object nodes.
+        if "config" not in data:
+            data["config"] = config
+        if isinstance(node, dict):
+            node["data"] = data
         else:
-            config["a2a_auth_headers"] = {}
             node.data = data
diff --git a/backend/app/core/graph/runtime_prompt_template.py b/backend/app/core/graph/runtime_prompt_template.py
index b7733a99d..ce1971565 100644
--- a/backend/app/core/graph/runtime_prompt_template.py
+++ b/backend/app/core/graph/runtime_prompt_template.py
@@ -4,8 +4,6 @@
 from collections.abc import Mapping
 from typing import Any
 
-from app.models.graph import AgentGraph
-
 _PLACEHOLDER_PATTERN = re.compile(r"\{([A-Za-z_][A-Za-z0-9_]*)\}")
 _PROMPT_CONFIG_KEYS = ("systemPrompt", "system_prompt", "prompt")
 
@@ -35,7 +33,7 @@ def extract_runtime_template_variables(text: str | None) -> set[str]:
 
 
 def build_runtime_prompt_context(
-    graph: AgentGraph,
+    graph: Any,
     *,
     user_id: Any | None,
     thread_id: str | None,
diff --git a/backend/app/core/observation/__init__.py b/backend/app/core/observation/__init__.py
new file mode 100644
index 000000000..ed366f766
--- /dev/null
+++ b/backend/app/core/observation/__init__.py
@@ -0,0 +1,15 @@
+"""Observation tracing — Langfuse-aligned trace tree for in-product agent debugging."""
+
+from app.core.observation.collector import ObservationCollector
+from app.core.observation.model import Observation, Trace
+from app.core.observation.otel.span_wrapper import ObservationSpan
+from app.core.observation.types import ObservationLevel, ObservationType
+
+__all__ = [
+    "Observation",
+    "ObservationCollector",
+    "ObservationLevel",
+    "ObservationSpan",
+    "ObservationType",
+    "Trace",
+]
diff --git a/backend/app/core/observation/collector.py b/backend/app/core/observation/collector.py
new file mode 100644
index 000000000..21414423e
--- /dev/null
+++ b/backend/app/core/observation/collector.py
@@ -0,0 +1,195 @@
+"""ObservationCollector — OTel-backed central API for observation tracing."""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from typing import Any, Callable, Coroutine
+
+import sqlalchemy as sa
+from loguru import logger
+
+from app.core.observation.instrumentation.langchain_handler import (
+    ObservationCallbackHandler,
+)
+from app.core.observation.model import Trace
+from app.core.observation.otel.provider import ObservationTracerProvider
+from app.core.observation.otel.span_wrapper import ObservationSpan
+from app.core.observation.types import ObservationLevel, ObservationType
+from app.utils.datetime import utc_now
+
+
+class ObservationCollector:
+    def __init__(
+        self,
+        trace_id: uuid.UUID,
+        execution_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        db_session_factory: Callable[..., Coroutine[Any, Any, Any]],
+        broadcast_fn: Callable[..., Coroutine[Any, Any, None]] | None = None,
+    ) -> None:
+        loop = asyncio.get_running_loop()
+        self._provider = ObservationTracerProvider(
+            execution_id=execution_id,
+            trace_id=trace_id,
+            workspace_id=workspace_id,
+            db_session_factory=db_session_factory,
+            broadcast_fn=broadcast_fn,
+            event_loop=loop,
+        )
+        self._tracer = self._provider.get_tracer()
+        self._trace_id = trace_id
+        self._db_session_factory = db_session_factory
+
+    def start_span(
+        self,
+        obs_type: ObservationType,
+        name: str,
+        *,
+        parent: ObservationSpan | None = None,
+        input: Any = None,
+        metadata: dict | None = None,
+        level: ObservationLevel = ObservationLevel.DEFAULT,
+    ) -> ObservationSpan:
+        obs_id = uuid.uuid4()
+
+        parent_ctx = None
+        if parent:
+            parent_ctx = parent.get_context()
+
+        otel_span = self._tracer.start_span(
+            name,
+            context=parent_ctx,
+            attributes={
+                "observation.id": str(obs_id),
+                "observation.type": obs_type.value,
+                "observation.level": level.value,
+            },
+        )
+
+        obs = ObservationSpan(otel_span, obs_id, self._provider)
+
+        if input is not None:
+            obs.set_input(input)
+        if metadata:
+            obs.set_metadata(metadata)
+
+        return obs
+
+    def start_agent(self, name: str, **kw: Any) -> ObservationSpan:
+        return self.start_span(ObservationType.AGENT, name, **kw)
+
+    def child_span(
+        self,
+        parent: ObservationSpan,
+        obs_type: ObservationType,
+        name: str,
+        *,
+        input: Any = None,
+        **kw: Any,
+    ) -> ObservationSpan:
+        return self.start_span(obs_type, name, parent=parent, input=input, **kw)
+
+    def record_generation(
+        self,
+        name: str,
+        *,
+        parent: ObservationSpan | None = None,
+        input: Any = None,
+        output: Any = None,
+        model: str | None = None,
+        usage_details: dict | None = None,
+        cost_details: dict | None = None,
+        metadata: dict | None = None,
+        level: ObservationLevel = ObservationLevel.DEFAULT,
+    ) -> ObservationSpan:
+        span = self.start_span(
+            ObservationType.GENERATION,
+            name,
+            parent=parent,
+            input=input,
+            metadata=metadata,
+            level=level,
+        )
+        if output is not None:
+            span.set_output(output)
+        if model:
+            span.set_model(model)
+        if usage_details:
+            span.set_usage(usage_details)
+        if cost_details:
+            span.set_cost(cost_details)
+        span.end()
+        return span
+
+    def record_tool(
+        self,
+        name: str,
+        *,
+        parent: ObservationSpan | None = None,
+        input: Any = None,
+        output: Any = None,
+        metadata: dict | None = None,
+        level: ObservationLevel = ObservationLevel.DEFAULT,
+    ) -> ObservationSpan:
+        span = self.start_span(
+            ObservationType.TOOL,
+            name,
+            parent=parent,
+            input=input,
+            metadata=metadata,
+            level=level,
+        )
+        if output is not None:
+            span.set_output(output)
+        span.end()
+        return span
+
+    def record_event(
+        self,
+        name: str,
+        *,
+        parent: ObservationSpan | None = None,
+        input: Any = None,
+        metadata: dict | None = None,
+        level: ObservationLevel = ObservationLevel.DEFAULT,
+    ) -> ObservationSpan:
+        span = self.start_span(
+            ObservationType.EVENT,
+            name,
+            parent=parent,
+            input=input,
+            metadata=metadata,
+            level=level,
+        )
+        span.end()
+        return span
+
+    def create_langchain_handler(self) -> ObservationCallbackHandler:
+        return ObservationCallbackHandler(self._tracer, self._provider)
+
+    async def finalize(self, status: str = "complete") -> None:
+        agg = self._provider.get_persistence_aggregates()
+        final_status = "error" if agg["has_error"] else status
+        self._provider.broadcast_trace_complete(final_status, agg)
+        await self._provider.shutdown()
+        await self._update_trace_row(final_status, agg)
+
+    async def _update_trace_row(self, status: str, agg: dict) -> None:
+        try:
+            session = await self._db_session_factory()
+            now = utc_now()
+            await session.execute(
+                sa.update(Trace)
+                .where(Trace.id == self._trace_id)
+                .values(
+                    status=status,
+                    end_time=now,
+                    total_observations=agg["total_observations"],
+                    total_tokens=agg["total_tokens"],
+                    total_cost=agg["total_cost"],
+                )
+            )
+            await session.commit()
+        except Exception:
+            logger.opt(exception=True).warning("Failed to update Trace row")
diff --git a/backend/app/core/observation/instrumentation/__init__.py b/backend/app/core/observation/instrumentation/__init__.py
new file mode 100644
index 000000000..17ab3bc17
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/__init__.py
@@ -0,0 +1,2 @@
+# backend/app/core/observation/instrumentation/__init__.py
+"""Instrumentation helpers that bridge engine-specific data into ObservationCollector."""
diff --git a/backend/app/core/observation/instrumentation/cli_extractor.py b/backend/app/core/observation/instrumentation/cli_extractor.py
new file mode 100644
index 000000000..61cde75fc
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/cli_extractor.py
@@ -0,0 +1,85 @@
+"""CLI message stream → observation extractor for CLI engines."""
+
+from __future__ import annotations
+
+from app.core.agent.cli_backends.base import CLIMessage
+from app.core.observation.collector import ObservationCollector
+from app.core.observation.otel.span_wrapper import ObservationSpan
+from app.core.observation.types import ObservationType
+
+FILE_TOOLS = frozenset(
+    {
+        "read_file",
+        "write_file",
+        "create_file",
+        "edit_file",
+        "Read",
+        "Write",
+        "Edit",
+        "Glob",
+        "Grep",
+    }
+)
+
+
+class CLIObservationExtractor:
+    def __init__(self, collector: ObservationCollector, root_span: ObservationSpan):
+        self._collector = collector
+        self._root = root_span
+        self._text_buffer: list[str] = []
+        self._current_tool_span: ObservationSpan | None = None
+        self._current_usage: dict | None = None
+
+    async def process_message(self, msg: CLIMessage) -> None:
+        match msg.type:
+            case "text":
+                self._text_buffer.append(msg.content or "")
+
+            case "tool_use":
+                await self._flush_generation()
+                tool_name = msg.tool_name or msg.tool or msg.content or "tool"
+                tool_input = msg.tool_input or msg.input or {}
+                self._current_tool_span = self._collector.child_span(
+                    self._root,
+                    ObservationType.TOOL,
+                    name=tool_name,
+                    input={"arguments": tool_input},
+                )
+                if tool_name in FILE_TOOLS:
+                    path = tool_input.get("path", tool_input.get("file_path", ""))
+                    op = "read" if "read" in tool_name.lower() or tool_name in ("Read", "Glob", "Grep") else "write"
+                    self._collector.record_event(
+                        f"file:{op} {path}",
+                        parent=self._current_tool_span,
+                        metadata={"file.path": path, "file.operation": op},
+                    )
+
+            case "tool_result":
+                if self._current_tool_span:
+                    self._current_tool_span.set_output({"result": msg.content})
+                    self._current_tool_span.end()
+                    self._current_tool_span = None
+
+            case "usage":
+                self._current_usage = msg.usage
+
+    async def flush_pending(self) -> None:
+        await self._flush_generation()
+
+    async def _flush_generation(self) -> None:
+        if not self._text_buffer:
+            return
+        text = "".join(self._text_buffer)
+        self._text_buffer.clear()
+        usage = self._current_usage or {}
+        self._current_usage = None
+
+        self._collector.record_generation(
+            "cli-generation",
+            parent=self._root,
+            input=None,
+            output={"completion": text},
+            model=None,
+            usage_details=usage if usage else None,
+            cost_details=None,
+        )
diff --git a/backend/app/core/observation/instrumentation/copilot_extractor.py b/backend/app/core/observation/instrumentation/copilot_extractor.py
new file mode 100644
index 000000000..d6fba0a41
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/copilot_extractor.py
@@ -0,0 +1,40 @@
+"""Copilot stream → observation extractor."""
+
+from __future__ import annotations
+
+from app.core.observation.collector import ObservationCollector
+from app.core.observation.otel.span_wrapper import ObservationSpan
+
+
+class CopilotObservationExtractor:
+    def __init__(
+        self,
+        collector: ObservationCollector,
+        model_name: str,
+        parent_span: ObservationSpan | None = None,
+    ):
+        self._collector = collector
+        self._model_name = model_name
+        self._parent_span = parent_span
+        self._chunks: list[str] = []
+
+    def accumulate(self, content: str) -> None:
+        self._chunks.append(content)
+
+    async def flush(
+        self,
+        *,
+        prompt: str,
+        mode: str,
+        elapsed_ms: float,
+        usage_details: dict | None = None,
+    ) -> None:
+        self._collector.record_generation(
+            f"copilot:{self._model_name}",
+            parent=self._parent_span,
+            input={"prompt": prompt, "mode": mode},
+            output={"completion": "".join(self._chunks)},
+            model=self._model_name,
+            usage_details=usage_details,
+            cost_details=None,
+        )
diff --git a/backend/app/core/observation/instrumentation/file_tracker.py b/backend/app/core/observation/instrumentation/file_tracker.py
new file mode 100644
index 000000000..8d524c654
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/file_tracker.py
@@ -0,0 +1,40 @@
+"""File operation → EVENT observation tracker."""
+
+from __future__ import annotations
+
+from app.core.observation.collector import ObservationCollector
+from app.core.observation.otel.span_wrapper import ObservationSpan
+
+
+class FileOperationTracker:
+    def __init__(
+        self,
+        collector: ObservationCollector,
+        parent_span: ObservationSpan | None = None,
+    ):
+        self._collector = collector
+        self._parent_span = parent_span
+
+    async def track_write(self, path: str, content: bytes | str) -> None:
+        size, preview = self._byte_len(content), None
+        if isinstance(content, str):
+            preview = content[:200]
+        else:
+            preview = content[:200].decode(errors="replace")
+        await self._track(path, "write", size, content_preview=preview)
+
+    async def track_read(self, path: str, content: bytes | str) -> None:
+        await self._track(path, "read", self._byte_len(content))
+
+    async def _track(self, path: str, operation: str, size: int, **extra: str | None) -> None:
+        meta: dict = {"file.path": path, "file.operation": operation, "file.size_bytes": size}
+        meta.update({k: v for k, v in extra.items() if v is not None})
+        self._collector.record_event(
+            f"file:{operation} {path}",
+            parent=self._parent_span,
+            metadata=meta,
+        )
+
+    @staticmethod
+    def _byte_len(content: bytes | str) -> int:
+        return len(content.encode() if isinstance(content, str) else content)
diff --git a/backend/app/core/observation/instrumentation/langchain_handler.py b/backend/app/core/observation/instrumentation/langchain_handler.py
new file mode 100644
index 000000000..5665c7903
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/langchain_handler.py
@@ -0,0 +1,614 @@
+"""LangChain async callback handler — maps all 18 hooks to OTel observation spans."""
+
+from __future__ import annotations
+
+import json
+import time
+import uuid
+from dataclasses import dataclass, field
+from datetime import datetime, timezone
+from typing import Any, Sequence
+
+from langchain_core.callbacks import AsyncCallbackHandler
+from langchain_core.messages import BaseMessage
+from loguru import logger
+from opentelemetry.trace import Tracer
+
+from app.core.observation.instrumentation.langchain_utils import (
+    _classify_chain,
+    extract_model_name,
+)
+from app.core.observation.otel.provider import ObservationTracerProvider
+from app.core.observation.otel.span_wrapper import ObservationSpan
+from app.core.observation.types import ObservationLevel, ObservationType
+from app.utils.message_serializer import serialize_message
+from app.utils.token_usage import extract_usage_from_llm_result
+
+
+def _safe_json(obj: Any) -> Any:
+    if obj is None or isinstance(obj, (str, int, float, bool)):
+        return obj
+    if isinstance(obj, dict):
+        return {k: _safe_json(v) for k, v in obj.items()}
+    if isinstance(obj, (list, tuple)):
+        return [_safe_json(v) for v in obj]
+    if hasattr(obj, "model_dump"):
+        return _safe_json(obj.model_dump())
+    if hasattr(obj, "dict"):
+        return _safe_json(obj.dict())
+    try:
+        json.dumps(obj)
+        return obj
+    except (TypeError, ValueError):
+        return str(obj)
+
+
+@dataclass
+class RunState:
+    parent_run_id: uuid.UUID | None
+    root_run_id: uuid.UUID
+
+
+@dataclass
+class RootRunState:
+    run_ids: set[uuid.UUID] = field(default_factory=set)
+
+
+_FLUSH_INTERVAL_S = 0.1
+
+_MODEL_PARAMETER_KEYS = (
+    "temperature",
+    "max_tokens",
+    "max_completion_tokens",
+    "top_p",
+    "frequency_penalty",
+    "presence_penalty",
+    "request_timeout",
+    "stop",
+    "stop_sequences",
+)
+
+
+def _parse_model_parameters(kwargs: dict[str, Any]) -> dict[str, Any] | None:
+    inv = kwargs.get("invocation_params")
+    if not inv or not isinstance(inv, dict):
+        return None
+    params = {k: inv[k] for k in _MODEL_PARAMETER_KEYS if inv.get(k) is not None}
+    return params or None
+
+
+class _TokenBuffer:
+    __slots__ = ("_parts", "_accumulated", "_last_flush", "_dirty")
+
+    def __init__(self) -> None:
+        self._parts: list[str] = []
+        self._accumulated = ""
+        self._last_flush = time.monotonic()
+        self._dirty = False
+
+    def append(self, token: str) -> str | None:
+        self._parts.append(token)
+        self._dirty = True
+        now = time.monotonic()
+        if now - self._last_flush >= _FLUSH_INTERVAL_S:
+            self._last_flush = now
+            self._accumulated = self._accumulated + "".join(self._parts)
+            self._parts.clear()
+            return self._accumulated
+        return None
+
+    def drain(self) -> str | None:
+        if not self._dirty:
+            return None
+        if self._parts:
+            self._accumulated = self._accumulated + "".join(self._parts)
+            self._parts.clear()
+        return self._accumulated
+
+
+class ObservationCallbackHandler(AsyncCallbackHandler):
+    def __init__(self, tracer: Tracer, provider: ObservationTracerProvider) -> None:
+        self._tracer = tracer
+        self._provider = provider
+        self._runs: dict[uuid.UUID, ObservationSpan] = {}
+        self._run_states: dict[uuid.UUID, RunState] = {}
+        self._root_run_states: dict[uuid.UUID, RootRunState] = {}
+        self._completion_start_memo: set[uuid.UUID] = set()
+        self._token_buffers: dict[uuid.UUID, _TokenBuffer] = {}
+        self._prompt_to_parent: dict[uuid.UUID, Any] = {}
+
+    # --- run tree ---
+
+    def _track_run(self, run_id: uuid.UUID, parent_run_id: uuid.UUID | None) -> None:
+        if run_id in self._run_states:
+            return
+        if parent_run_id is None or parent_run_id not in self._run_states:
+            root = run_id
+            self._root_run_states[root] = RootRunState()
+        else:
+            root = self._run_states[parent_run_id].root_run_id
+        self._run_states[run_id] = RunState(parent_run_id, root)
+        self._root_run_states[root].run_ids.add(run_id)
+
+    def _is_root(self, run_id: uuid.UUID) -> bool:
+        state = self._run_states.get(run_id)
+        return state is not None and state.root_run_id == run_id
+
+    # --- OTel context ---
+
+    def _start_obs_span(
+        self,
+        run_id: uuid.UUID,
+        name: str,
+        obs_type: ObservationType,
+        parent_run_id: uuid.UUID | None = None,
+    ) -> ObservationSpan:
+        obs_id = uuid.uuid4()
+
+        parent_ctx = None
+        if parent_run_id and parent_run_id in self._runs:
+            parent_span = self._runs[parent_run_id]
+            parent_ctx = parent_span.get_context()
+
+        otel_span = self._tracer.start_span(
+            name,
+            context=parent_ctx,
+            attributes={
+                "observation.id": str(obs_id),
+                "observation.type": obs_type.value,
+                "observation.level": ObservationLevel.DEFAULT.value,
+            },
+        )
+        obs = ObservationSpan(otel_span, obs_id, self._provider)
+        self._runs[run_id] = obs
+        return obs
+
+    def _detach_span(self, run_id: uuid.UUID) -> ObservationSpan | None:
+        return self._runs.pop(run_id, None)
+
+    def _reset(self, root_run_id: uuid.UUID) -> None:
+        state = self._root_run_states.pop(root_run_id, None)
+        if state:
+            for rid in state.run_ids:
+                self._run_states.pop(rid, None)
+
+    # --- chain hooks ---
+
+    async def on_chain_start(
+        self,
+        serialized: dict[str, Any] | None,
+        inputs: dict[str, Any],
+        *,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None = None,
+        tags: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._track_run(run_id, parent_run_id)
+            name = (serialized or {}).get("name", "") or kwargs.get("name", "chain")
+            obs_type = _classify_chain(name, serialized or {})
+            obs = self._start_obs_span(run_id, name, obs_type, parent_run_id)
+            obs.set_input(_safe_json(inputs))
+            if metadata:
+                obs.set_metadata(metadata)
+                prompt = metadata.get("langfuse_prompt")
+                if prompt:
+                    self._prompt_to_parent[run_id] = prompt
+        except Exception:
+            logger.opt(exception=True).debug("on_chain_start failed")
+
+    async def on_chain_end(
+        self,
+        outputs: dict[str, Any],
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_output(_safe_json(outputs))
+                obs.end()
+            if self._is_root(run_id):
+                self._reset(run_id)
+        except Exception:
+            logger.opt(exception=True).debug("on_chain_end failed")
+
+    async def on_chain_error(
+        self,
+        error: BaseException,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_level(ObservationLevel.ERROR)
+                obs.set_status_message(str(error))
+                obs.end()
+            if self._is_root(run_id):
+                self._reset(run_id)
+        except Exception:
+            logger.opt(exception=True).debug("on_chain_error failed")
+
+    # --- LLM hooks ---
+
+    def _apply_llm_attributes(
+        self,
+        obs: ObservationSpan,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None,
+        *,
+        serialized: dict[str, Any] | None,
+        metadata: dict[str, Any] | None,
+        kwargs: dict[str, Any],
+    ) -> None:
+        model = extract_model_name(
+            metadata=metadata,
+            serialized=serialized,
+            kwargs=kwargs,
+            response=None,
+        )
+        if model:
+            obs.set_model(model)
+
+        model_params = _parse_model_parameters(kwargs)
+        if model_params:
+            obs.set_model_parameters(model_params)
+
+        inv_params = kwargs.get("invocation_params")
+        if inv_params and isinstance(inv_params, dict):
+            tools = inv_params.get("tools")
+            if tools and isinstance(tools, list):
+                obs.set_tool_definitions(_safe_json(tools))
+
+        if metadata:
+            obs.set_metadata(metadata)
+
+        self._maybe_link_prompt(run_id, parent_run_id, obs)
+
+    async def on_chat_model_start(
+        self,
+        serialized: dict[str, Any] | None,
+        messages: list[list[BaseMessage]],
+        *,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None = None,
+        tags: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._track_run(run_id, parent_run_id)
+            name = (serialized or {}).get("name", "") or kwargs.get("name", "chat_model")
+
+            input_msgs: list[dict[str, Any]] = []
+            for msg_list in messages:
+                input_msgs.extend(serialize_message(m) for m in msg_list)
+
+            obs = self._start_obs_span(run_id, name, ObservationType.GENERATION, parent_run_id)
+            obs.set_input(input_msgs)
+
+            self._apply_llm_attributes(
+                obs,
+                run_id,
+                parent_run_id,
+                serialized=serialized,
+                metadata=metadata,
+                kwargs=kwargs,
+            )
+        except Exception:
+            logger.opt(exception=True).debug("on_chat_model_start failed")
+
+    async def on_llm_start(
+        self,
+        serialized: dict[str, Any] | None,
+        prompts: list[str],
+        *,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None = None,
+        tags: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._track_run(run_id, parent_run_id)
+            name = (serialized or {}).get("name", "") or kwargs.get("name", "llm")
+            obs = self._start_obs_span(run_id, name, ObservationType.GENERATION, parent_run_id)
+            obs.set_input(prompts[0] if len(prompts) == 1 else prompts)
+
+            self._apply_llm_attributes(
+                obs,
+                run_id,
+                parent_run_id,
+                serialized=serialized or {},
+                metadata=metadata,
+                kwargs=kwargs,
+            )
+        except Exception:
+            logger.opt(exception=True).debug("on_llm_start failed")
+
+    async def on_llm_end(
+        self,
+        response: Any,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            buf = self._token_buffers.pop(run_id, None)
+            obs = self._detach_span(run_id)
+            if not obs:
+                return
+
+            if buf:
+                final_text = buf.drain()
+                if final_text is not None:
+                    obs.flush_streaming_text(final_text)
+
+            output: dict[str, Any] = {}
+            if hasattr(response, "generations") and response.generations:
+                gen_list = response.generations[0]
+                if gen_list:
+                    gen = gen_list[0]
+                    if hasattr(gen, "message"):
+                        output = serialize_message(gen.message)
+                        msg = gen.message
+                        tool_calls = getattr(msg, "tool_calls", None)
+                        if tool_calls:
+                            obs.set_tool_calls(_safe_json(tool_calls))
+                    elif hasattr(gen, "text"):
+                        output = {"completion": gen.text}
+
+            usage = extract_usage_from_llm_result(response)
+            if usage:
+                obs.set_usage(usage)
+
+            if hasattr(response, "llm_output") and response.llm_output:
+                model_from_response = response.llm_output.get("model_name")
+                if model_from_response:
+                    obs.set_model(model_from_response)
+
+            obs.set_output(output)
+            obs.end()
+            self._completion_start_memo.discard(run_id)
+        except Exception:
+            logger.opt(exception=True).debug("on_llm_end failed")
+
+    async def on_llm_error(
+        self,
+        error: BaseException,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._token_buffers.pop(run_id, None)
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_level(ObservationLevel.ERROR)
+                obs.set_status_message(str(error))
+                obs.end()
+            self._completion_start_memo.discard(run_id)
+        except Exception:
+            logger.opt(exception=True).debug("on_llm_error failed")
+
+    async def on_llm_new_token(
+        self,
+        token: str,
+        *,
+        run_id: uuid.UUID,
+        chunk: Any | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._runs.get(run_id)
+            if not obs:
+                return
+            if run_id not in self._completion_start_memo:
+                self._completion_start_memo.add(run_id)
+                obs.set_completion_start_time(datetime.now(tz=timezone.utc))
+            buf = self._token_buffers.get(run_id)
+            if buf is None:
+                buf = _TokenBuffer()
+                self._token_buffers[run_id] = buf
+            text = buf.append(token)
+            if text is not None:
+                obs.flush_streaming_text(text)
+        except Exception:
+            logger.opt(exception=True).debug("on_llm_new_token failed")
+
+    # --- tool hooks ---
+
+    async def on_tool_start(
+        self,
+        serialized: dict[str, Any] | None,
+        input_str: str,
+        *,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None = None,
+        tags: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._track_run(run_id, parent_run_id)
+            name = (serialized or {}).get("name", "") or kwargs.get("name", "tool")
+            obs = self._start_obs_span(run_id, name, ObservationType.TOOL, parent_run_id)
+            obs.set_input({"arguments": input_str})
+            if metadata:
+                obs.set_metadata(metadata)
+        except Exception:
+            logger.opt(exception=True).debug("on_tool_start failed")
+
+    async def on_tool_end(
+        self,
+        output: str,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_output({"result": output})
+                obs.end()
+        except Exception:
+            logger.opt(exception=True).debug("on_tool_end failed")
+
+    async def on_tool_error(
+        self,
+        error: BaseException,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_level(ObservationLevel.ERROR)
+                obs.set_status_message(str(error))
+                obs.end()
+        except Exception:
+            logger.opt(exception=True).debug("on_tool_error failed")
+
+    # --- retriever hooks ---
+
+    async def on_retriever_start(
+        self,
+        serialized: dict[str, Any] | None,
+        query: str,
+        *,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None = None,
+        tags: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            self._track_run(run_id, parent_run_id)
+            name = (serialized or {}).get("name", "") or kwargs.get("name", "retriever")
+            obs = self._start_obs_span(run_id, name, ObservationType.RETRIEVER, parent_run_id)
+            obs.set_input({"query": query})
+            if metadata:
+                obs.set_metadata(metadata)
+        except Exception:
+            logger.opt(exception=True).debug("on_retriever_start failed")
+
+    async def on_retriever_end(
+        self,
+        documents: Sequence[Any],
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                docs_out = [_safe_json(d) for d in documents]
+                obs.set_output({"documents": docs_out})
+                obs.end()
+        except Exception:
+            logger.opt(exception=True).debug("on_retriever_end failed")
+
+    async def on_retriever_error(
+        self,
+        error: BaseException,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._detach_span(run_id)
+            if obs:
+                obs.set_level(ObservationLevel.ERROR)
+                obs.set_status_message(str(error))
+                obs.end()
+        except Exception:
+            logger.opt(exception=True).debug("on_retriever_error failed")
+
+    # --- agent hooks ---
+
+    async def on_agent_action(
+        self,
+        action: Any,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._runs.get(run_id)
+            if obs:
+                obs.set_observation_type(ObservationType.AGENT)
+                log = _safe_json(getattr(action, "log", str(action)))
+                obs.add_intermediate_update({"type": ObservationType.AGENT.value, "action_log": log})
+        except Exception:
+            logger.opt(exception=True).debug("on_agent_action failed")
+
+    async def on_agent_finish(
+        self,
+        finish: Any,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._runs.get(run_id)
+            if obs:
+                return_values = _safe_json(getattr(finish, "return_values", str(finish)))
+                obs.set_output(return_values)
+        except Exception:
+            logger.opt(exception=True).debug("on_agent_finish failed")
+
+    # --- misc hooks ---
+
+    async def on_retry(
+        self,
+        retry_state: Any,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        try:
+            obs = self._runs.get(run_id)
+            if obs:
+                obs.add_event(
+                    "retry",
+                    {
+                        "attempt": str(getattr(retry_state, "attempt_number", "?")),
+                        "error": str(getattr(retry_state, "outcome", "")),
+                    },
+                )
+        except Exception:
+            logger.opt(exception=True).debug("on_retry failed")
+
+    async def on_text(
+        self,
+        text: str,
+        *,
+        run_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> None:
+        pass  # Ignored — info covered by other hooks
+
+    # --- prompt linkage helper ---
+
+    def _maybe_link_prompt(
+        self,
+        run_id: uuid.UUID,
+        parent_run_id: uuid.UUID | None,
+        obs: ObservationSpan,
+    ) -> None:
+        current = parent_run_id
+        while current:
+            prompt = self._prompt_to_parent.pop(current, None)
+            if prompt:
+                name = getattr(prompt, "name", str(prompt))
+                version = str(getattr(prompt, "version", ""))
+                obs.set_prompt(name, version or None)
+                return
+            state = self._run_states.get(current)
+            current = state.parent_run_id if state else None
diff --git a/backend/app/core/observation/instrumentation/langchain_utils.py b/backend/app/core/observation/instrumentation/langchain_utils.py
new file mode 100644
index 000000000..108ab7b8d
--- /dev/null
+++ b/backend/app/core/observation/instrumentation/langchain_utils.py
@@ -0,0 +1,94 @@
+"""LangChain callback helper utilities — message conversion, usage normalization, model extraction."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from langchain_core.messages import BaseMessage
+
+from app.core.observation.types import ObservationType
+
+MESSAGE_ROLE_MAP: dict[str, str | None] = {
+    "HumanMessage": "user",
+    "AIMessage": "assistant",
+    "SystemMessage": "system",
+    "ToolMessage": "tool",
+    "FunctionMessage": "function",
+    "ChatMessage": None,
+}
+
+USAGE_KEY_MAP: list[tuple[str, str, str | None]] = [
+    ("prompt_tokens", "completion_tokens", "total_tokens"),
+    ("input_tokens", "output_tokens", None),
+    ("promptTokenCount", "candidatesTokenCount", "totalTokenCount"),
+    ("inputTokens", "outputTokens", "totalTokens"),
+]
+
+
+def convert_message_to_dict(message: BaseMessage) -> dict:
+    """Convert a LangChain BaseMessage to a plain dict with role/content/tool_calls."""
+    role = MESSAGE_ROLE_MAP.get(type(message).__name__, "unknown")
+    if role is None:
+        role = getattr(message, "role", "unknown")
+    result: dict[str, Any] = {"role": role, "content": message.content}
+    if hasattr(message, "tool_calls") and message.tool_calls:
+        result["tool_calls"] = message.tool_calls
+    if hasattr(message, "tool_call_id") and message.tool_call_id:
+        result["tool_call_id"] = message.tool_call_id
+    if message.additional_kwargs:
+        result.update(message.additional_kwargs)
+    return result
+
+
+def normalize_usage(raw: dict | None) -> dict[str, int]:
+    """Normalize token usage across provider formats to {input, output, total}."""
+    if not raw:
+        return {}
+    for input_key, output_key, total_key in USAGE_KEY_MAP:
+        if input_key in raw:
+            inp = int(raw[input_key])
+            out = int(raw.get(output_key, 0))
+            total = int(raw[total_key]) if total_key and total_key in raw else inp + out
+            return {"input": inp, "output": out, "total": total}
+    return {}
+
+
+def extract_model_name(
+    *,
+    metadata: dict | None,
+    serialized: dict | None,
+    kwargs: dict,
+    response: Any | None,
+) -> str | None:
+    """Multi-source model name extraction: metadata -> serialized -> invocation_params -> response."""
+    if metadata and metadata.get("ls_model_name"):
+        return str(metadata["ls_model_name"])
+
+    ser_kwargs = (serialized or {}).get("kwargs", {})
+    if ser_kwargs.get("model_name"):
+        return str(ser_kwargs["model_name"])
+    if ser_kwargs.get("model"):
+        return str(ser_kwargs["model"])
+
+    inv_params = kwargs.get("invocation_params", {})
+    if inv_params.get("model_name"):
+        return str(inv_params["model_name"])
+    if inv_params.get("model"):
+        return str(inv_params["model"])
+
+    if response and hasattr(response, "llm_output") and response.llm_output:
+        if response.llm_output.get("model_name"):
+            return str(response.llm_output["model_name"])
+
+    return None
+
+
+def _classify_chain(name: str, serialized: dict) -> ObservationType:
+    """Determine if a chain is actually an AGENT based on name patterns and serialized id path."""
+    if name and (name.startswith("worker:") or "SubAgent" in name or "CompiledSubAgent" in name):
+        return ObservationType.AGENT
+    if serialized:
+        path = serialized.get("id", [])
+        if any("agent" in seg.lower() for seg in path if isinstance(seg, str)):
+            return ObservationType.AGENT
+    return ObservationType.CHAIN
diff --git a/backend/app/core/observation/model.py b/backend/app/core/observation/model.py
new file mode 100644
index 000000000..5ec04cbb5
--- /dev/null
+++ b/backend/app/core/observation/model.py
@@ -0,0 +1,100 @@
+# backend/app/core/observation/model.py
+"""Trace and Observation persistence models — Langfuse-aligned schema."""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from decimal import Decimal
+
+from sqlalchemy import (
+    ARRAY,
+    Boolean,
+    DateTime,
+    ForeignKey,
+    Integer,
+    Numeric,
+    String,
+    Text,
+    func,
+)
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import Mapped, mapped_column
+
+from app.core.database import Base
+
+
+class Trace(Base):
+    __tablename__ = "traces"
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    workspace_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+
+    start_time: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
+    end_time: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+    status: Mapped[str] = mapped_column(String(20), nullable=False, server_default="running")
+
+    input: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    output: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    meta: Mapped[dict | None] = mapped_column("metadata", JSONB, nullable=True)
+
+    environment: Mapped[str] = mapped_column(String(50), server_default="debug")
+    tags: Mapped[list[str] | None] = mapped_column(ARRAY(String), server_default="{}")
+    release: Mapped[str | None] = mapped_column(String(255), nullable=True)
+    version: Mapped[str | None] = mapped_column(String(100), nullable=True)
+    session_id: Mapped[str | None] = mapped_column(String(255), nullable=True)
+    bookmarked: Mapped[bool] = mapped_column(Boolean, server_default="false")
+    public: Mapped[bool] = mapped_column(Boolean, server_default="false")
+
+    total_observations: Mapped[int] = mapped_column(Integer, server_default="0")
+    total_tokens: Mapped[int] = mapped_column(Integer, server_default="0")
+    total_cost: Mapped[Decimal | None] = mapped_column(Numeric(12, 6), nullable=True)
+    duration_ms: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    execution_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+    agent_version_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+    user_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False)
+
+
+class Observation(Base):
+    __tablename__ = "observations"
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True)
+    trace_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("traces.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    parent_observation_id: Mapped[uuid.UUID | None] = mapped_column(UUID(as_uuid=True), nullable=True)
+
+    type: Mapped[str] = mapped_column(String(20), nullable=False)
+    name: Mapped[str] = mapped_column(String(500), nullable=False)
+    level: Mapped[str] = mapped_column(String(10), nullable=False, server_default="DEFAULT")
+    status_message: Mapped[str | None] = mapped_column(Text, nullable=True)
+    environment: Mapped[str] = mapped_column(String(50), server_default="debug")
+
+    start_time: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
+    end_time: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+    completion_start_time: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
+
+    input: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    output: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    meta: Mapped[dict | None] = mapped_column("metadata", JSONB, nullable=True)
+
+    model: Mapped[str | None] = mapped_column(String(100), nullable=True)
+    model_parameters: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    usage_details: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    cost_details: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    prompt_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
+    prompt_version: Mapped[int | None] = mapped_column(Integer, nullable=True)
+
+    tool_definitions: Mapped[dict | None] = mapped_column(JSONB, nullable=True)
+    tool_calls: Mapped[list | None] = mapped_column(JSONB, nullable=True)
+
+    execution_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+    workspace_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), nullable=False)
+
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False)
diff --git a/backend/app/core/observation/otel/__init__.py b/backend/app/core/observation/otel/__init__.py
new file mode 100644
index 000000000..d4a5695fb
--- /dev/null
+++ b/backend/app/core/observation/otel/__init__.py
@@ -0,0 +1 @@
+"""OpenTelemetry-backed observation pipeline."""
diff --git a/backend/app/core/observation/otel/broadcast_processor.py b/backend/app/core/observation/otel/broadcast_processor.py
new file mode 100644
index 000000000..8e6922634
--- /dev/null
+++ b/backend/app/core/observation/otel/broadcast_processor.py
@@ -0,0 +1,134 @@
+"""BroadcastProcessor — instant WebSocket relay via LiveSpanProcessor."""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from datetime import datetime, timezone
+from typing import Any, Callable, Coroutine
+
+from loguru import logger
+
+from app.core.observation.otel.processor_base import (
+    LiveSpanProcessor,
+    build_cost,
+    build_usage,
+    ns_to_iso,
+    parse_json_attr,
+)
+from app.core.observation.otel.span_wrapper import ObservationSpan
+from app.core.observation.types import ObservationLevel, ObservationType
+
+
+class BroadcastProcessor(LiveSpanProcessor):
+    def __init__(
+        self,
+        execution_id: uuid.UUID,
+        trace_id: uuid.UUID,
+        broadcast_fn: Callable[..., Coroutine[Any, Any, None]] | None,
+        event_loop: asyncio.AbstractEventLoop,
+    ) -> None:
+        self._execution_id = execution_id
+        self._trace_id = trace_id
+        self._broadcast_fn = broadcast_fn
+        self._loop = event_loop
+        self._otel_span_id_to_observation_id: dict[int, str] = {}
+
+    def _resolve_parent_obs_id(self, span: Any) -> str | None:
+        if span.parent:
+            return self._otel_span_id_to_observation_id.get(span.parent.span_id)
+        return None
+
+    def _build_observation(self, span: Any, *, include_end: bool = False) -> dict:
+        attrs = span.attributes or {}
+        obs: dict = {
+            "id": str(attrs.get("observation.id", "")),
+            "trace_id": str(self._trace_id),
+            "parent_observation_id": self._resolve_parent_obs_id(span),
+            "type": attrs.get("observation.type", ObservationType.SPAN.value),
+            "name": span.name,
+            "level": attrs.get("observation.level", ObservationLevel.DEFAULT.value),
+            "status_message": attrs.get("observation.status_message"),
+            "start_time": ns_to_iso(span.start_time),
+            "end_time": ns_to_iso(span.end_time) if include_end else None,
+            "input": parse_json_attr(attrs.get("observation.input")),
+            "output": parse_json_attr(attrs.get("observation.output")) if include_end else None,
+            "metadata": parse_json_attr(attrs.get("observation.metadata")),
+            "model": attrs.get("llm.model"),
+            "model_parameters": parse_json_attr(attrs.get("llm.parameters")),
+            "completion_start_time": attrs.get("llm.completion_start_time"),
+            "prompt_name": attrs.get("llm.prompt.name"),
+            "prompt_version": attrs.get("llm.prompt.version"),
+            "usage_details": build_usage(attrs) if include_end else None,
+            "cost_details": build_cost(attrs) if include_end else None,
+        }
+        return obs
+
+    def on_start(self, span: Any, parent_context: Any = None) -> None:
+        attrs = span.attributes or {}
+        obs_id = str(attrs.get("observation.id", ""))
+        if obs_id and hasattr(span, "context"):
+            self._otel_span_id_to_observation_id[span.context.span_id] = obs_id
+        self._emit("span_open", self._build_observation(span))
+
+    def on_end(self, span: Any) -> None:
+        self._emit("span_close", self._build_observation(span, include_end=True))
+
+        if hasattr(span, "context") and span.context:
+            self._otel_span_id_to_observation_id.pop(span.context.span_id, None)
+
+    def on_event(self, span: ObservationSpan, event_name: str, attributes: dict) -> None:
+        parent_obs_id: str | None = None
+        parent_span_id = span.get_parent_span_id()
+        if parent_span_id is not None:
+            parent_obs_id = self._otel_span_id_to_observation_id.get(parent_span_id)
+        self._emit(
+            event_name,
+            {
+                "id": str(span.observation_id),
+                "trace_id": str(self._trace_id),
+                "parent_observation_id": parent_obs_id,
+            },
+            data=dict(attributes),
+        )
+
+    def emit_trace_complete(self, status: str, trace_id: str, aggregates: dict) -> None:
+        self._emit(
+            "trace_complete",
+            observation=None,
+            data={"status": status, "trace_id": trace_id, **aggregates},
+        )
+
+    def _emit(
+        self,
+        event: str,
+        observation: dict | None,
+        data: dict | None = None,
+    ) -> None:
+        if not self._broadcast_fn:
+            return
+        message = {
+            "type": "observation",
+            "execution_id": str(self._execution_id),
+            "event": event,
+            "observation": observation,
+            "data": data or {},
+            "timestamp": datetime.now(tz=timezone.utc).isoformat(),
+        }
+        try:
+            future = asyncio.run_coroutine_threadsafe(self._broadcast_fn(self._execution_id, message), self._loop)
+            future.add_done_callback(self._log_if_failed)
+        except Exception:
+            logger.opt(exception=True).debug("broadcast schedule failed")
+
+    @staticmethod
+    def _log_if_failed(future: Any) -> None:
+        exc = future.exception()
+        if exc:
+            logger.warning("broadcast failed: %s", exc)
+
+    def shutdown(self) -> None:
+        pass
+
+    def force_flush(self, timeout_millis: int = 30000) -> bool:
+        return True
diff --git a/backend/app/core/observation/otel/persistence_processor.py b/backend/app/core/observation/otel/persistence_processor.py
new file mode 100644
index 000000000..575adcc9e
--- /dev/null
+++ b/backend/app/core/observation/otel/persistence_processor.py
@@ -0,0 +1,245 @@
+"""PersistenceProcessor -- deferred-INSERT SpanProcessor writing Observation rows to PG."""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from collections.abc import Mapping
+from datetime import datetime
+from typing import Any, Callable, Coroutine
+
+from loguru import logger
+from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor
+
+from app.core.observation.model import Observation
+from app.core.observation.otel.processor_base import (
+    build_cost,
+    build_usage,
+    ns_to_datetime,
+    parse_json_attr,
+)
+from app.core.observation.types import ObservationLevel, ObservationType
+
+_SENTINEL = object()
+
+
+class PersistenceProcessor(SpanProcessor):
+    """Batched async writer that converts finished OTel spans into Observation rows.
+
+    Designed to bridge OTel's synchronous SpanProcessor callbacks to async
+    SQLAlchemy persistence via an asyncio.Queue + drain loop running on the
+    caller's event loop.
+    """
+
+    def __init__(
+        self,
+        execution_id: uuid.UUID,
+        trace_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        db_session_factory: Callable[..., Coroutine[Any, Any, Any]],
+        event_loop: asyncio.AbstractEventLoop,
+        *,
+        max_batch: int = 10,
+        max_wait_ms: int = 300,
+        max_buffer_size: int = 1000,
+    ) -> None:
+        self._execution_id = execution_id
+        self._trace_id = trace_id
+        self._workspace_id = workspace_id
+        self._db_session_factory = db_session_factory
+        self._loop = event_loop
+        self._max_batch = max_batch
+        self._max_wait_ms = max_wait_ms
+        self._max_buffer_size = max_buffer_size
+
+        self._queue: asyncio.Queue[Any] = asyncio.Queue(maxsize=max_buffer_size)
+        self._otel_span_id_to_observation_id: dict[int, uuid.UUID] = {}
+
+        # Aggregation state
+        self._total_tokens = 0
+        self._total_cost = 0.0
+        self._observation_count = 0
+        self._has_error = False
+
+        # Start drain loop on the event loop
+        self._drain_future = asyncio.run_coroutine_threadsafe(self._drain_loop(), self._loop)
+
+    # ---- SpanProcessor interface ----
+
+    def on_start(self, span: ReadableSpan, parent_context: Any = None) -> None:  # type: ignore[override]
+        """Stash the OTel span_id -> observation_id mapping for parent resolution."""
+        obs_id_str = span.attributes.get("observation.id")  # type: ignore[union-attr]
+        if obs_id_str:
+            self._otel_span_id_to_observation_id[span.context.span_id] = uuid.UUID(  # type: ignore[union-attr]
+                str(obs_id_str)
+            )
+
+    def on_end(self, span: ReadableSpan) -> None:
+        """Convert a finished span to an Observation and enqueue for persistence."""
+        attrs = span.attributes or {}
+        obs_id_str = attrs.get("observation.id")
+        if not obs_id_str:
+            return
+
+        obs_id = uuid.UUID(str(obs_id_str))
+
+        parent_obs_id: uuid.UUID | None = None
+        if span.parent:
+            parent_obs_id = self._otel_span_id_to_observation_id.get(span.parent.span_id)
+
+        obs = Observation(
+            id=obs_id,
+            trace_id=self._trace_id,
+            execution_id=self._execution_id,
+            workspace_id=self._workspace_id,
+            parent_observation_id=parent_obs_id,
+            type=str(attrs.get("observation.type", ObservationType.SPAN.value)),
+            name=span.name,
+            level=str(attrs.get("observation.level", ObservationLevel.DEFAULT.value)),
+            status_message=attrs.get("observation.status_message"),  # type: ignore[arg-type]
+            start_time=ns_to_datetime(span.start_time),
+            end_time=ns_to_datetime(span.end_time),
+            input=parse_json_attr(attrs.get("observation.input")),
+            output=parse_json_attr(attrs.get("observation.output")),
+            meta=parse_json_attr(attrs.get("observation.metadata")),
+            model=attrs.get("llm.model"),  # type: ignore[arg-type]
+            model_parameters=parse_json_attr(attrs.get("llm.parameters")),
+            usage_details=build_usage(attrs),
+            cost_details=build_cost(attrs),
+            completion_start_time=self._parse_iso_attr(attrs, "llm.completion_start_time"),
+            prompt_name=attrs.get("llm.prompt.name"),  # type: ignore[arg-type]
+            prompt_version=self._safe_int(attrs.get("llm.prompt.version")),
+            tool_calls=parse_json_attr(attrs.get("tool.calls")),
+            tool_definitions=parse_json_attr(attrs.get("tool.definitions")),
+        )
+
+        self._loop.call_soon_threadsafe(self._queue.put_nowait, obs)
+
+        usage_total = attrs.get("llm.usage.total", 0)
+        if usage_total:
+            self._total_tokens += int(usage_total)  # type: ignore[arg-type]
+        cost_total = attrs.get("llm.cost.total", 0.0)
+        if cost_total:
+            self._total_cost += float(cost_total)  # type: ignore[arg-type]
+        self._observation_count += 1
+        if str(attrs.get("observation.level")) == ObservationLevel.ERROR.value:
+            self._has_error = True
+
+        for event in span.events:
+            if event.name.startswith("stream."):
+                continue
+            event_obs = Observation(
+                id=uuid.uuid4(),
+                trace_id=self._trace_id,
+                execution_id=self._execution_id,
+                workspace_id=self._workspace_id,
+                parent_observation_id=obs_id,
+                type=ObservationType.EVENT.value,
+                name=event.name,
+                level=ObservationLevel.DEFAULT.value,
+                start_time=ns_to_datetime(event.timestamp),
+                meta=dict(event.attributes) if event.attributes else None,
+            )
+            self._loop.call_soon_threadsafe(self._queue.put_nowait, event_obs)
+
+        # Prune span-id map entry — no longer needed after on_end
+        if hasattr(span, "context") and span.context:
+            self._otel_span_id_to_observation_id.pop(span.context.span_id, None)
+
+    def force_flush(self, timeout_millis: int = 30000) -> bool:
+        """No-op; drain loop handles flushing on its own schedule."""
+        return True
+
+    # ---- Public API ----
+
+    def get_aggregates(self) -> dict:
+        """Return accumulated token/cost/observation counts."""
+        return {
+            "total_tokens": self._total_tokens,
+            "total_cost": self._total_cost,
+            "total_observations": self._observation_count,
+            "has_error": self._has_error,
+        }
+
+    def shutdown(self, timeout_millis: int = 10000) -> None:
+        """Signal the drain loop to exit and wait for completion.
+
+        Sync to satisfy the SpanProcessor contract (OTel calls this from GC).
+        Our own ObservationTracerProvider.shutdown() calls async_shutdown()
+        for proper async waiting.
+        """
+        try:
+            self._loop.call_soon_threadsafe(self._queue.put_nowait, _SENTINEL)
+        except RuntimeError:
+            return
+        try:
+            self._drain_future.result(timeout=timeout_millis / 1000)
+        except Exception:
+            pass
+
+    async def async_shutdown(self) -> None:
+        """Async variant used by ObservationTracerProvider.shutdown()."""
+        self._queue.put_nowait(_SENTINEL)
+        try:
+            await asyncio.wait_for(asyncio.wrap_future(self._drain_future), timeout=10)
+        except Exception:
+            logger.opt(exception=True).warning("PersistenceProcessor drain loop did not exit cleanly")
+
+    # ---- Internal: drain loop & flush ----
+
+    async def _drain_loop(self) -> None:
+        """Continuously drain the queue and flush batches to PG."""
+        buffer: list[Observation] = []
+        while True:
+            try:
+                item = await asyncio.wait_for(self._queue.get(), timeout=self._max_wait_ms / 1000)
+            except asyncio.TimeoutError:
+                if buffer:
+                    await self._flush(buffer)
+                    buffer.clear()
+                continue
+
+            if item is _SENTINEL:
+                if buffer:
+                    await self._flush(buffer)
+                break
+
+            buffer.append(item)
+            if len(buffer) >= self._max_batch:
+                await self._flush(buffer)
+                buffer.clear()
+
+    async def _flush(self, buffer: list[Observation]) -> None:
+        """Write a batch of Observation rows to PG."""
+        if not buffer:
+            return
+        session = await self._db_session_factory()
+        try:
+            session.add_all(buffer)
+            await session.commit()
+        except Exception:
+            logger.opt(exception=True).warning("PersistenceProcessor flush failed")
+            await session.rollback()
+        finally:
+            await session.close()
+
+    # ---- Helpers ----
+
+    @staticmethod
+    def _parse_iso_attr(attrs: Mapping[str, Any], key: str) -> datetime | None:
+        val = attrs.get(key)
+        if not val or not isinstance(val, str):
+            return None
+        try:
+            return datetime.fromisoformat(val)
+        except ValueError:
+            return None
+
+    @staticmethod
+    def _safe_int(val: Any) -> int | None:
+        if val is None:
+            return None
+        try:
+            return int(val)
+        except (TypeError, ValueError):
+            return None
diff --git a/backend/app/core/observation/otel/processor_base.py b/backend/app/core/observation/otel/processor_base.py
new file mode 100644
index 000000000..f1ffc9cc8
--- /dev/null
+++ b/backend/app/core/observation/otel/processor_base.py
@@ -0,0 +1,71 @@
+"""Base SpanProcessor extension that adds an on_event hook for live streaming."""
+
+from __future__ import annotations
+
+import json
+from collections.abc import Mapping
+from datetime import datetime, timezone
+from typing import Any
+
+from opentelemetry.sdk.trace import SpanProcessor
+
+
+class LiveSpanProcessor(SpanProcessor):
+    """SpanProcessor variant that also receives live (mid-span) events.
+
+    OTel's stock SpanProcessor only fires on_start/on_end. LiveSpanProcessor
+    adds on_event so streaming token / intermediate-update events can be
+    pushed out the moment they happen — bypassing on_end batching.
+    """
+
+    def on_event(self, span: Any, event_name: str, attributes: dict) -> None:
+        """Called by ObservationSpan when a live event is emitted. Default: no-op."""
+        return None
+
+
+def parse_json_attr(val: Any) -> Any:
+    if val is None:
+        return None
+    if isinstance(val, str):
+        try:
+            return json.loads(val)
+        except (json.JSONDecodeError, ValueError):
+            return val
+    return val
+
+
+def ns_to_datetime(ns: int | None) -> datetime | None:
+    if ns is None:
+        return None
+    return datetime.fromtimestamp(ns / 1e9, tz=timezone.utc)
+
+
+def ns_to_iso(ns: int | None) -> str | None:
+    dt = ns_to_datetime(ns)
+    return dt.isoformat() if dt else None
+
+
+def build_usage(attrs: Mapping[str, Any]) -> dict | None:
+    inp = attrs.get("llm.usage.input")
+    out = attrs.get("llm.usage.output")
+    total = attrs.get("llm.usage.total")
+    if inp is None and out is None and total is None:
+        return None
+    return {
+        "input": int(inp) if inp is not None else 0,
+        "output": int(out) if out is not None else 0,
+        "total": int(total) if total is not None else 0,
+    }
+
+
+def build_cost(attrs: Mapping[str, Any]) -> dict | None:
+    inp = attrs.get("llm.cost.input")
+    out = attrs.get("llm.cost.output")
+    total = attrs.get("llm.cost.total")
+    if inp is None and out is None and total is None:
+        return None
+    return {
+        "input": float(inp) if inp is not None else 0.0,
+        "output": float(out) if out is not None else 0.0,
+        "total": float(total) if total is not None else 0.0,
+    }
diff --git a/backend/app/core/observation/otel/provider.py b/backend/app/core/observation/otel/provider.py
new file mode 100644
index 000000000..fb0d64797
--- /dev/null
+++ b/backend/app/core/observation/otel/provider.py
@@ -0,0 +1,62 @@
+"""ObservationTracerProvider — per-execution OTel TracerProvider lifecycle."""
+
+from __future__ import annotations
+
+import asyncio
+import uuid
+from typing import Any, Callable, Coroutine
+
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.trace import Tracer
+
+from app.core.observation.otel.broadcast_processor import BroadcastProcessor
+from app.core.observation.otel.persistence_processor import PersistenceProcessor
+from app.core.observation.otel.processor_base import LiveSpanProcessor
+from app.core.observation.otel.span_wrapper import ObservationSpan
+
+
+class ObservationTracerProvider:
+    def __init__(
+        self,
+        execution_id: uuid.UUID,
+        trace_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        db_session_factory: Callable[..., Coroutine[Any, Any, Any]],
+        broadcast_fn: Callable[..., Coroutine[Any, Any, None]] | None,
+        event_loop: asyncio.AbstractEventLoop,
+    ) -> None:
+        self._provider = TracerProvider(
+            resource=Resource.create(
+                {
+                    "service.name": "joysafeter",
+                    "execution.id": str(execution_id),
+                    "trace.id": str(trace_id),
+                    "workspace.id": str(workspace_id),
+                }
+            )
+        )
+        self._persistence = PersistenceProcessor(execution_id, trace_id, workspace_id, db_session_factory, event_loop)
+        self._trace_id = trace_id
+        self._broadcast = BroadcastProcessor(execution_id, trace_id, broadcast_fn, event_loop)
+        self._provider.add_span_processor(self._persistence)
+        self._provider.add_span_processor(self._broadcast)
+        self._tracer = self._provider.get_tracer("joysafeter.observation")
+        self._live_processors: list[LiveSpanProcessor] = [self._broadcast]
+
+    def get_tracer(self) -> Tracer:
+        return self._tracer
+
+    def dispatch_live_event(self, span: ObservationSpan, event_name: str, attributes: dict) -> None:
+        for proc in self._live_processors:
+            proc.on_event(span, event_name, attributes)
+
+    def get_persistence_aggregates(self) -> dict:
+        return self._persistence.get_aggregates()
+
+    def broadcast_trace_complete(self, status: str, aggregates: dict) -> None:
+        self._broadcast.emit_trace_complete(status, str(self._trace_id), aggregates)
+
+    async def shutdown(self) -> None:
+        await self._persistence.async_shutdown()
+        self._broadcast.shutdown()
diff --git a/backend/app/core/observation/otel/span_wrapper.py b/backend/app/core/observation/otel/span_wrapper.py
new file mode 100644
index 000000000..9ba3d0fd6
--- /dev/null
+++ b/backend/app/core/observation/otel/span_wrapper.py
@@ -0,0 +1,119 @@
+"""ObservationSpan — typed wrapper over an OTel Span with observation-schema setters."""
+
+from __future__ import annotations
+
+import json
+import uuid
+from datetime import datetime
+from typing import TYPE_CHECKING, Any
+
+from opentelemetry.trace import Span
+
+from app.core.observation.types import ObservationLevel, ObservationType
+
+if TYPE_CHECKING:
+    from app.core.observation.otel.provider import ObservationTracerProvider
+
+
+def _safe_json(value: Any) -> str:
+    return json.dumps(value, default=str)
+
+
+class ObservationSpan:
+    __slots__ = ("_span", "observation_id", "_provider")
+
+    def __init__(
+        self,
+        otel_span: Span,
+        observation_id: uuid.UUID,
+        provider: "ObservationTracerProvider",
+    ) -> None:
+        self._span = otel_span
+        self.observation_id = observation_id
+        self._provider = provider
+
+    # --- typed attribute setters ---
+
+    def set_input(self, value: Any) -> None:
+        self._span.set_attribute("observation.input", _safe_json(value))
+
+    def set_output(self, value: Any) -> None:
+        self._span.set_attribute("observation.output", _safe_json(value))
+
+    def set_metadata(self, value: dict) -> None:
+        self._span.set_attribute("observation.metadata", _safe_json(value))
+
+    def set_model(self, name: str) -> None:
+        self._span.set_attribute("llm.model", name)
+
+    def set_model_parameters(self, params: dict) -> None:
+        self._span.set_attribute("llm.parameters", _safe_json(params))
+
+    def set_usage(self, usage: dict) -> None:
+        for key in ("input", "output", "total"):
+            if key in usage:
+                self._span.set_attribute(f"llm.usage.{key}", usage[key])
+
+    def set_cost(self, cost: dict) -> None:
+        for key in ("input", "output", "total"):
+            if key in cost:
+                self._span.set_attribute(f"llm.cost.{key}", cost[key])
+
+    def set_level(self, level: ObservationLevel) -> None:
+        self._span.set_attribute("observation.level", level.value)
+
+    def set_status_message(self, msg: str) -> None:
+        self._span.set_attribute("observation.status_message", msg)
+
+    def set_observation_type(self, t: ObservationType) -> None:
+        self._span.set_attribute("observation.type", t.value)
+
+    def set_prompt(self, name: str, version: str | None) -> None:
+        self._span.set_attribute("llm.prompt.name", name)
+        if version is not None:
+            self._span.set_attribute("llm.prompt.version", version)
+
+    def set_tool_calls(self, calls: list) -> None:
+        self._span.set_attribute("tool.calls", _safe_json(calls))
+
+    def set_tool_definitions(self, defs: list) -> None:
+        self._span.set_attribute("tool.definitions", _safe_json(defs))
+
+    def set_completion_start_time(self, ts: datetime) -> None:
+        self._span.set_attribute("llm.completion_start_time", ts.isoformat())
+
+    def get_parent_span_id(self) -> int | None:
+        parent = getattr(self._span, "parent", None)
+        return parent.span_id if parent else None
+
+    # --- streaming events ---
+
+    def flush_streaming_text(self, text: str) -> None:
+        self._provider.dispatch_live_event(self, "streaming_text", {"text": text})
+
+    def add_intermediate_update(self, payload: dict) -> None:
+        self._span.add_event(
+            "stream.intermediate_update",
+            {
+                "payload_json": json.dumps(payload, default=str),
+            },
+        )
+        self._provider.dispatch_live_event(self, "span_update", payload)
+
+    def add_event(self, name: str, attributes: dict[str, str] | None = None) -> None:
+        self._span.add_event(name, attributes or {})
+
+    # --- lifecycle ---
+
+    def record_error(self, exc: Exception, level: ObservationLevel) -> None:
+        self._span.set_attribute("observation.level", level.value)
+        self._span.set_attribute("observation.status_message", str(exc))
+
+    def get_context(self) -> Any:
+        """Return an OTel Context with this span set as current."""
+        from opentelemetry import trace as _trace
+
+        return _trace.set_span_in_context(self._span)
+
+    def end(self) -> None:
+        self._span.end()
diff --git a/backend/app/core/observation/types.py b/backend/app/core/observation/types.py
new file mode 100644
index 000000000..c5b811f2f
--- /dev/null
+++ b/backend/app/core/observation/types.py
@@ -0,0 +1,30 @@
+"""
+Canonical observation types — the single source of truth for Langfuse-aligned tracing.
+
+Values MUST match Langfuse SDK enums exactly (uppercase). Used by ObservationCollector
+to emit observation events to the trace tree.
+"""
+
+from __future__ import annotations
+
+from enum import StrEnum
+
+
+class ObservationType(StrEnum):
+    SPAN = "SPAN"
+    EVENT = "EVENT"
+    GENERATION = "GENERATION"
+    AGENT = "AGENT"
+    TOOL = "TOOL"
+    CHAIN = "CHAIN"
+    RETRIEVER = "RETRIEVER"
+    EMBEDDING = "EMBEDDING"
+    EVALUATOR = "EVALUATOR"
+    GUARDRAIL = "GUARDRAIL"
+
+
+class ObservationLevel(StrEnum):
+    DEBUG = "DEBUG"
+    DEFAULT = "DEFAULT"
+    WARNING = "WARNING"
+    ERROR = "ERROR"
diff --git a/backend/app/core/ports/__init__.py b/backend/app/core/ports/__init__.py
new file mode 100644
index 000000000..b5220352f
--- /dev/null
+++ b/backend/app/core/ports/__init__.py
@@ -0,0 +1,14 @@
+"""
+Ports — Protocol interfaces defining the boundary between core/ and services/.
+
+core/ modules depend on these Protocols (dependency inversion).
+services/ modules provide concrete implementations.
+"""
+
+from app.core.ports.execution import EventContext, ExecutionEventPort, ExecutionReaderPort
+
+__all__ = [
+    "EventContext",
+    "ExecutionEventPort",
+    "ExecutionReaderPort",
+]
diff --git a/backend/app/core/ports/execution.py b/backend/app/core/ports/execution.py
new file mode 100644
index 000000000..eb8282ac6
--- /dev/null
+++ b/backend/app/core/ports/execution.py
@@ -0,0 +1,94 @@
+"""
+Execution ports — Protocol interfaces for core/ ↔ services/ decoupling.
+
+core/ modules depend on these Protocols (not concrete service classes).
+services/ modules provide the implementations.
+"""
+
+from __future__ import annotations
+
+import uuid
+from dataclasses import dataclass
+from typing import Any, Mapping, Optional, Protocol, runtime_checkable
+
+from app.core.events.event_types import ExecutionEventType
+
+
+@dataclass
+class EventContext:
+    """Run-level metadata injected by the caller (e.g. ExecutionRunner).
+
+    Allows event publishing to construct complete envelopes
+    without querying the DB for run metadata on every event.
+    """
+
+    run_id: uuid.UUID
+    workspace_id: uuid.UUID
+    trigger_medium: Optional[str] = None
+    run_purpose: Optional[str] = None
+    thread_id: Optional[uuid.UUID] = None
+    task_id: Optional[uuid.UUID] = None
+
+
+@runtime_checkable
+class ExecutionEventPort(Protocol):
+    """Port for publishing execution events through the event bus.
+
+    Implemented by: services/execution_event_adapter.py
+    Used by: core/agent/cli_backends/execution_runner.py
+    """
+
+    def set_event_context(self, ctx: EventContext) -> None: ...
+
+    async def mark_status(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        status: str,
+        container_id: Optional[str] = None,
+        session_id: Optional[str] = None,
+        error: Mapping[str, Any] | None = None,
+        result_summary: Optional[dict[str, Any]] = None,
+    ) -> Any: ...
+
+    async def append_event(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        event_type: ExecutionEventType,
+        payload: dict[str, Any],
+    ) -> Any: ...
+
+    async def batch_append_events(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        events: list[dict[str, Any]],
+    ) -> list: ...
+
+    async def complete_execution(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        terminal_status: str,
+        result_summary: Optional[dict] = None,
+        error: Mapping[str, Any] | None = None,
+        session_id: Optional[str] = None,
+    ) -> None: ...
+
+
+@runtime_checkable
+class ExecutionReaderPort(Protocol):
+    """Port for reading execution data without direct ORM queries in core/.
+
+    Implemented by: services/execution_reader_adapter.py (Phase 2)
+    Used by: core/agent/cli_backends/execution_runner.py
+    """
+
+    async def get_execution(self, execution_id: uuid.UUID) -> Any: ...
+
+    async def get_run_for_execution(self, execution_id: uuid.UUID) -> Any: ...
+
+    async def get_release_for_run(self, run_id: uuid.UUID) -> Any: ...
+
+    async def get_task_auto_approve(self, task_id: uuid.UUID) -> bool: ...
diff --git a/backend/app/core/rate_limit.py b/backend/app/core/rate_limit.py
index 58828f704..cc39e98df 100644
--- a/backend/app/core/rate_limit.py
+++ b/backend/app/core/rate_limit.py
@@ -9,7 +9,7 @@
 
 from fastapi import Request
 
-from app.common.exceptions import AppException
+from app.common.app_errors import RateLimitExceededError
 
 
 class RateLimiter:
@@ -135,13 +135,14 @@ async def wrapper(*args, **kwargs):
             # check rate limit
             if not _rate_limiter.is_allowed(rate_limit_key, max_requests, window_seconds):
                 remaining = _rate_limiter.get_remaining(rate_limit_key, max_requests, window_seconds)
-                raise AppException(
-                    status_code=429,
+                raise RateLimitExceededError(
                     message=f"Rate limit exceeded. Try again in {window_seconds} seconds.",
-                    headers={
-                        "X-RateLimit-Limit": str(max_requests),
-                        "X-RateLimit-Remaining": str(remaining),
-                        "X-RateLimit-Reset": str(int(time.time() + window_seconds)),
+                    data={
+                        "headers": {
+                            "X-RateLimit-Limit": str(max_requests),
+                            "X-RateLimit-Remaining": str(remaining),
+                            "X-RateLimit-Reset": str(int(time.time() + window_seconds)),
+                        }
                     },
                 )
 
diff --git a/backend/app/core/redis.py b/backend/app/core/redis.py
index 819f4324f..4dc7d4328 100644
--- a/backend/app/core/redis.py
+++ b/backend/app/core/redis.py
@@ -4,7 +4,7 @@
 
 import json
 from contextlib import asynccontextmanager
-from typing import Any, Awaitable, Dict, Optional, cast
+from typing import Any, Awaitable, Optional, cast
 
 import redis.asyncio as redis_async
 from loguru import logger
@@ -173,41 +173,6 @@ async def lock(cls, name: str, timeout: int = 60, blocking_timeout: int = 60):
                 except Exception as e:
                     logger.warning(f"Error releasing lock {name}: {e}")
 
-    # ==================== Generic Run Methods ====================
-
-    @classmethod
-    async def publish_run_event(cls, run_id: str, event: Dict[str, Any]) -> bool:
-        """Publish a durable run event to subscribers."""
-        if not cls._client:
-            return False
-        channel = f"runs:{run_id}:events"
-        event_str = json.dumps(event, ensure_ascii=False)
-        await cls._client.publish(channel, event_str)
-        return True
-
-    @classmethod
-    async def set_run_snapshot(cls, run_id: str, snapshot: Dict[str, Any], ttl: int = 86400) -> bool:
-        """Cache the latest run snapshot."""
-        if not cls._client:
-            return False
-        key = f"runs:{run_id}:snapshot"
-        await cls._client.set(key, json.dumps(snapshot, ensure_ascii=False), ex=ttl)
-        return True
-
-    @classmethod
-    async def get_run_snapshot(cls, run_id: str) -> Optional[Dict[str, Any]]:
-        """Get the latest cached run snapshot."""
-        if not cls._client:
-            return None
-        key = f"runs:{run_id}:snapshot"
-        data = await cls._client.get(key)
-        if data is None:
-            return None
-        try:
-            return cast(Dict[str, Any], json.loads(data))
-        except (TypeError, ValueError):
-            return None
-
 
 # Helper function
 async def get_redis() -> Optional[redis_async.Redis]:
diff --git a/backend/app/core/scheduler.py b/backend/app/core/scheduler.py
new file mode 100644
index 000000000..49185edf0
--- /dev/null
+++ b/backend/app/core/scheduler.py
@@ -0,0 +1,111 @@
+"""
+Background scheduler loops for task auto-dispatch and stale execution reaping.
+
+Registered in app lifespan (main.py). Each function is an infinite async loop
+following the same pattern as _container_reaper.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from datetime import timedelta
+
+from loguru import logger
+
+from app.core.database import AsyncSessionLocal
+
+_DISPATCH_INTERVAL = 30
+_REAPER_INTERVAL = 30
+
+_STALE_THRESHOLDS: list[tuple[tuple[str, ...], timedelta]] = [
+    (
+        ("pending", "dispatched"),
+        timedelta(minutes=5),
+    ),
+    (
+        ("running",),
+        timedelta(minutes=10),
+    ),
+    (
+        ("approval_wait",),
+        timedelta(minutes=60),
+    ),
+]
+
+
+async def task_dispatcher_loop() -> None:
+    """Every 30s, find BACKLOG tasks with agent assignees and dispatch them."""
+    while True:
+        await asyncio.sleep(_DISPATCH_INTERVAL)
+        try:
+            async with AsyncSessionLocal() as db:
+                from sqlalchemy import select
+
+                from app.models.task import Task
+
+                # Find backlog tasks with assigned agents
+                tasks = (
+                    (
+                        await db.execute(
+                            select(Task).where(
+                                Task.status == "backlog",
+                                Task.agent_id.isnot(None),
+                            )
+                        )
+                    )
+                    .scalars()
+                    .all()
+                )
+
+                count = 0
+                for task in tasks:
+                    try:
+                        from app.services.dispatch_service import DispatchService
+
+                        dispatch = DispatchService(db)
+                        await dispatch.dispatch_task(task.id, task.creator_id)
+                        count += 1
+                    except Exception as task_exc:
+                        logger.warning(f"Auto-dispatch failed for task {task.id}: {task_exc}")
+
+                if count:
+                    logger.info(f"Scheduler: auto-dispatched {count} tasks")
+        except Exception as exc:
+            logger.warning(f"Task dispatcher error: {exc}")
+
+
+async def execution_reaper_loop() -> None:
+    """Every 30s, find stale executions and mark them failed."""
+    while True:
+        await asyncio.sleep(_REAPER_INTERVAL)
+        try:
+            reaped = await _reap_stale_executions()
+            if reaped:
+                logger.info(f"Scheduler: reaped {reaped} stale executions")
+        except Exception as exc:
+            logger.warning(f"Execution reaper error: {exc}")
+
+
+async def recover_stale_on_startup() -> None:
+    """One-shot: catch executions that went stale during downtime."""
+    try:
+        reaped = await _reap_stale_executions()
+        if reaped:
+            logger.info(f"Startup recovery: reaped {reaped} stale executions")
+        else:
+            logger.info("Startup recovery: no stale executions found")
+    except Exception as exc:
+        logger.warning(f"Startup stale execution recovery failed: {exc}")
+
+
+async def _reap_stale_executions() -> int:
+    """Shared logic for reaper loop and startup recovery.
+
+    Delegates all business logic to ExecutionService.reap_stale_executions
+    so the scheduler only decides *when* to run and *what thresholds* to use.
+    """
+    async with AsyncSessionLocal() as db:
+        from app.services.execution_service import ExecutionService
+
+        svc = ExecutionService(db)
+        return await svc.reap_stale_executions(_STALE_THRESHOLDS)
diff --git a/backend/app/core/settings.py b/backend/app/core/settings.py
index f1180e122..cdcff6c91 100644
--- a/backend/app/core/settings.py
+++ b/backend/app/core/settings.py
@@ -106,6 +106,20 @@ def _force_code_version(cls, v: str) -> str:  # noqa: ARG003
         validation_alias=AliasChoices("DATABASE_MAX_OVERFLOW", "DB_MAX_OVERFLOW"),
         description="Database connection pool max overflow",
     )
+    checkpointer_pool_min_size: int = Field(
+        default=1,
+        validation_alias=AliasChoices(
+            "DB_POOL_MIN_SIZE",
+        ),
+        description="Min connections for the LangGraph checkpointer psycopg pool",
+    )
+    checkpointer_pool_max_size: int = Field(
+        default=10,
+        validation_alias=AliasChoices(
+            "DB_POOL_MAX_SIZE",
+        ),
+        description="Max connections for the LangGraph checkpointer psycopg pool",
+    )
 
     @property
     def database_url(self) -> str:
@@ -347,6 +361,26 @@ def parse_cors_origins(cls, v: Union[str, List[str]]) -> List[str]:
         default=False, description="Enable Langfuse tracing (requires langfuse_public_key and langfuse_secret_key)"
     )
 
+    # Artifact Storage
+    agent_artifacts_root: Optional[str] = Field(
+        default=None,
+        description="Root directory for agent artifacts (default: ~/.agent-platform/agent-artifacts)",
+    )
+    deepagents_artifacts_dir: Optional[str] = Field(
+        default=None,
+        description="Root directory for DeepAgents artifacts",
+    )
+
+    # OpenClaw
+    openclaw_image: str = Field(
+        default="jdopensource/joysafeter-openclaw:latest",
+        description="Docker image for OpenClaw instances",
+    )
+    openclaw_network: str = Field(
+        default="joysafeter-network",
+        description="Docker network for OpenClaw instances",
+    )
+
     # UV Package Manager Configuration
     uv_index_url: str = Field(
         default="https://pypi.org/simple",
@@ -368,11 +402,6 @@ def parse_cors_origins(cls, v: Union[str, List[str]]) -> List[str]:
         description="Workspace root directory for storing session files and workspace data",
     )
 
-    @property
-    def WORKSPACE_ROOT(self) -> str:
-        """Alias for workspace_root for backward compatibility"""
-        return self.workspace_root
-
     # OAuth Configuration
     oauth_config_path: Optional[str] = Field(
         default=None,
diff --git a/backend/app/core/skill/exceptions.py b/backend/app/core/skill/exceptions.py
index 30f35d726..77ee26c44 100644
--- a/backend/app/core/skill/exceptions.py
+++ b/backend/app/core/skill/exceptions.py
@@ -1,50 +1,70 @@
-"""Custom exceptions for skill loading operations.
+"""Custom exceptions for skill operations.
 
-This module defines exception classes for skill loading operations,
-providing better error classification and handling.
+All skill exceptions inherit from AppError subclasses, integrating with
+the unified error system while remaining catchable by specific type.
 """
 
-
-class SkillLoadError(Exception):
-    """Base exception for skill loading operations.
-
-    All skill-related exceptions inherit from this class,
-    allowing callers to catch all skill loading errors with a single except clause.
-    """
-
-    pass
-
-
-class SkillNotFoundError(SkillLoadError):
-    """Raised when a skill is not found or access is denied.
-
-    This exception is raised when:
-    - The skill ID does not exist in the database
-    - The user does not have permission to access the skill
-    - The skill service returns None for a skill query
-    """
-
-    pass
-
-
-class SkillPermissionDeniedError(SkillLoadError):
-    """Raised when user lacks permission to access a skill.
-
-    This exception is raised when:
-    - User tries to access a private skill owned by another user
-    - Permission check fails during skill retrieval
-    """
-
-    pass
-
-
-class SkillFileWriteError(SkillLoadError):
-    """Raised when writing skill files to sandbox fails.
-
-    This exception is raised when:
-    - File write operation fails
-    - Backend write() method returns an error
-    - File system errors occur during write
-    """
-
-    pass
+from __future__ import annotations
+
+from typing import Any, Mapping
+
+from app.common.app_errors import (
+    AccessDeniedError,
+    DomainError,
+    InternalServiceError,
+    NotFoundError,
+)
+
+
+class SkillLoadError(DomainError):
+    _default_source: str = "runtime"
+
+    def __init__(
+        self,
+        message: str = "技能加载失败",
+        *,
+        code: str = "SKILL_LOAD_FAILED",
+        data: Mapping[str, Any] | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(code=code, message=message, data=data, **kw)
+
+
+class SkillNotFoundError(NotFoundError):
+    def __init__(
+        self,
+        message: str = "技能未找到",
+        *,
+        code: str = "SKILL_NOT_FOUND",
+        data: Mapping[str, Any] | None = None,
+        **kw: Any,
+    ):
+        super().__init__(code=code, message=message, data=data, **kw)
+
+
+class SkillPermissionDeniedError(AccessDeniedError):
+    def __init__(
+        self,
+        message: str = "技能访问被拒绝",
+        *,
+        code: str = "SKILL_ACCESS_DENIED",
+        data: Mapping[str, Any] | None = None,
+        **kw: Any,
+    ):
+        super().__init__(code=code, message=message, data=data, **kw)
+
+
+class SkillFileWriteError(InternalServiceError):
+    _default_source: str = "runtime"
+
+    def __init__(
+        self,
+        message: str = "技能文件写入失败",
+        *,
+        code: str = "SKILL_FILE_WRITE_FAILED",
+        data: Mapping[str, Any] | None = None,
+        **kw: Any,
+    ):
+        kw.setdefault("source", self._default_source)
+        super().__init__(code=code, message=message, data=data, **kw)
diff --git a/backend/app/core/state_machines/__init__.py b/backend/app/core/state_machines/__init__.py
new file mode 100644
index 000000000..f5d86ff28
--- /dev/null
+++ b/backend/app/core/state_machines/__init__.py
@@ -0,0 +1,44 @@
+"""Centralized state machine definitions and transition functions."""
+
+from app.core.state_machines.definitions import (
+    AGENT_STATES,
+    AGENT_TERMINAL,
+    EXECUTION_STATES,
+    EXECUTION_TERMINAL,
+    RELEASE_STATES,
+    RELEASE_TERMINAL,
+    RUN_STATES,
+    RUN_TERMINAL,
+    RUN_TO_TASK_SYNC,
+    TASK_STATES,
+    TASK_TERMINAL,
+    VERSION_STATES,
+    VERSION_TERMINAL,
+)
+from app.core.state_machines.engine import InvalidTransition, StateMachine
+
+# Pre-built state machine instances
+AGENT_SM = StateMachine("Agent", AGENT_STATES, AGENT_TERMINAL)
+VERSION_SM = StateMachine("AgentVersion", VERSION_STATES, VERSION_TERMINAL)
+RELEASE_SM = StateMachine("AgentRelease", RELEASE_STATES, RELEASE_TERMINAL)
+RUN_SM = StateMachine("AgentRun", RUN_STATES, RUN_TERMINAL)
+EXECUTION_SM = StateMachine("Execution", EXECUTION_STATES, EXECUTION_TERMINAL)
+TASK_SM = StateMachine("Task", TASK_STATES, TASK_TERMINAL)
+
+__all__ = [
+    "AGENT_SM",
+    "VERSION_SM",
+    "RELEASE_SM",
+    "RUN_SM",
+    "EXECUTION_SM",
+    "TASK_SM",
+    "InvalidTransition",
+    "StateMachine",
+    "RUN_TO_TASK_SYNC",
+    "AGENT_STATES",
+    "VERSION_STATES",
+    "RELEASE_STATES",
+    "RUN_STATES",
+    "EXECUTION_STATES",
+    "TASK_STATES",
+]
diff --git a/backend/app/core/state_machines/definitions.py b/backend/app/core/state_machines/definitions.py
new file mode 100644
index 000000000..636e06654
--- /dev/null
+++ b/backend/app/core/state_machines/definitions.py
@@ -0,0 +1,92 @@
+"""
+Centralized state transition definitions for all domain entities.
+
+This is the single source of truth for:
+- What statuses each entity can have
+- What transitions are allowed between statuses
+- Which statuses are terminal (no outbound transitions)
+- How Run completion maps to Task status
+"""
+
+from __future__ import annotations
+
+# ---------------------------------------------------------------------------
+# Agent
+# ---------------------------------------------------------------------------
+AGENT_STATES: dict[str, set[str]] = {
+    "draft": {"active", "archived"},
+    "active": {"draft", "archived"},
+    "archived": {"draft"},
+}
+AGENT_TERMINAL: set[str] = set()  # archived can be reverted
+
+# ---------------------------------------------------------------------------
+# AgentVersion
+# ---------------------------------------------------------------------------
+VERSION_STATES: dict[str, set[str]] = {
+    "draft": {"frozen"},
+    "frozen": {"draft"},  # unfreeze
+}
+VERSION_TERMINAL: set[str] = set()
+
+# ---------------------------------------------------------------------------
+# AgentRelease
+# ---------------------------------------------------------------------------
+RELEASE_STATES: dict[str, set[str]] = {
+    "ready": {"active", "retired"},
+    "active": {"superseded"},
+    "superseded": {"active", "retired"},
+    "failed": {"retired"},
+    "retired": set(),
+}
+RELEASE_TERMINAL: set[str] = {"retired"}
+
+# ---------------------------------------------------------------------------
+# AgentRun
+# ---------------------------------------------------------------------------
+RUN_STATES: dict[str, set[str]] = {
+    "pending": {"running", "cancelled"},
+    "running": {"succeeded", "failed", "cancelled"},
+    "succeeded": set(),
+    "failed": set(),
+    "cancelled": set(),
+}
+RUN_TERMINAL: set[str] = {"succeeded", "failed", "cancelled"}
+
+# ---------------------------------------------------------------------------
+# Execution
+# ---------------------------------------------------------------------------
+EXECUTION_STATES: dict[str, set[str]] = {
+    "pending": {"dispatched", "running", "cancelled", "failed"},
+    "dispatched": {"running", "failed", "cancelled"},
+    "running": {"approval_wait", "succeeded", "failed", "cancelled"},
+    "approval_wait": {"running", "cancelled"},
+    "succeeded": set(),
+    "failed": set(),
+    "cancelled": set(),
+}
+EXECUTION_TERMINAL: set[str] = {"succeeded", "failed", "cancelled"}
+
+# ---------------------------------------------------------------------------
+# Task
+# ---------------------------------------------------------------------------
+TASK_STATES: dict[str, set[str]] = {
+    "backlog": {"todo", "in_progress", "cancelled"},
+    "todo": {"in_progress", "backlog", "cancelled"},
+    "in_progress": {"done", "in_review", "cancelled", "backlog"},
+    "in_review": {"in_progress", "done", "backlog", "cancelled"},
+    "done": {"backlog"},
+    "cancelled": {"backlog"},
+}
+TASK_TERMINAL: set[str] = set()  # done/cancelled can be reopened via backlog
+
+# ---------------------------------------------------------------------------
+# Cross-entity sync: Run terminal status -> Task target status
+# ---------------------------------------------------------------------------
+RUN_TO_TASK_SYNC: dict[str, str] = {
+    "pending": "in_progress",
+    "running": "in_progress",
+    "succeeded": "done",
+    "failed": "in_review",
+    "cancelled": "backlog",
+}
diff --git a/backend/app/core/state_machines/engine.py b/backend/app/core/state_machines/engine.py
new file mode 100644
index 000000000..18f79ce1e
--- /dev/null
+++ b/backend/app/core/state_machines/engine.py
@@ -0,0 +1,63 @@
+"""Generic state machine engine."""
+
+from __future__ import annotations
+
+from app.common.app_errors import DomainError
+
+
+class InvalidTransition(DomainError):
+    """Raised when a status transition violates the state machine rules."""
+
+    def __init__(self, entity: str, from_status: str, to_status: str):
+        self.entity = entity
+        self.from_status = from_status
+        self.to_status = to_status
+        super().__init__(
+            code="STATE_TRANSITION_INVALID",
+            message=f"{entity}: cannot transition from '{from_status}' to '{to_status}'",
+            source="engine",
+            data={"entity": entity, "from_status": from_status, "to_status": to_status},
+        )
+
+
+class StateMachine:
+    """
+    Validates status transitions against a declared transition table.
+
+    Usage:
+        sm = StateMachine("AgentRun", RUN_STATES, RUN_TERMINAL)
+        sm.validate("pending", "running")   # OK
+        sm.validate("succeeded", "running") # raises InvalidTransition
+    """
+
+    def __init__(
+        self,
+        name: str,
+        transitions: dict[str, set[str]],
+        terminal: set[str],
+    ):
+        self.name = name
+        self._transitions = transitions
+        self._terminal = terminal
+
+    def validate(self, from_status: str, to_status: str) -> None:
+        allowed = self._transitions.get(from_status)
+        if allowed is None:
+            raise InvalidTransition(self.name, from_status, to_status)
+        if to_status not in allowed:
+            raise InvalidTransition(self.name, from_status, to_status)
+
+    def is_terminal(self, status: str) -> bool:
+        return status in self._terminal
+
+    @property
+    def all_statuses(self) -> set[str]:
+        return set(self._transitions.keys())
+
+    @property
+    def initial_statuses(self) -> set[str]:
+        """Statuses that are not a target of any transition (entry points)."""
+        all_targets: set[str] = set()
+        for targets in self._transitions.values():
+            all_targets |= targets
+        return self.all_statuses - all_targets
diff --git a/backend/app/core/state_machines/transitions.py b/backend/app/core/state_machines/transitions.py
new file mode 100644
index 000000000..74d01262d
--- /dev/null
+++ b/backend/app/core/state_machines/transitions.py
@@ -0,0 +1,97 @@
+"""
+Centralized status transition functions.
+
+These are the ONLY functions that should modify .status on domain entities.
+All status changes in the codebase should route through here.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Optional
+
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.state_machines import (
+    EXECUTION_SM,
+    RUN_SM,
+    RUN_TO_TASK_SYNC,
+    TASK_SM,
+)
+from app.core.state_machines.engine import InvalidTransition
+from app.utils.datetime import utc_now
+
+
+async def transition_run(
+    run,  # AgentRun — avoid circular import
+    to_status: str,
+    db: AsyncSession,
+    result_summary: str | None = None,
+) -> None:
+    """Transition an AgentRun to a new status with validation."""
+    RUN_SM.validate(run.status, to_status)
+    run.status = to_status
+    if to_status == "running":
+        run.ended_at = None
+        if not run.started_at:
+            run.started_at = utc_now()
+    if RUN_SM.is_terminal(to_status):
+        run.ended_at = run.ended_at or utc_now()
+        if result_summary is not None:
+            run.result_summary = result_summary
+    await db.flush()
+
+
+async def transition_execution(
+    execution,  # Execution
+    to_status: str,
+    db: AsyncSession,
+) -> None:
+    """Transition an Execution to a new status with validation."""
+    EXECUTION_SM.validate(execution.status, to_status)
+    execution.status = to_status
+    if to_status == "running" and not execution.started_at:
+        execution.started_at = utc_now()
+    if EXECUTION_SM.is_terminal(to_status):
+        execution.ended_at = execution.ended_at or utc_now()
+    await db.flush()
+
+
+async def transition_task(
+    task,  # Task
+    to_status: str,
+    db: AsyncSession,
+    *,
+    latest_run_id: Optional[uuid.UUID] = None,
+) -> None:
+    """Transition a Task to a new status with validation."""
+    TASK_SM.validate(task.status, to_status)
+    task.status = to_status
+    if latest_run_id is not None:
+        task.latest_run_id = latest_run_id
+    await db.flush()
+
+
+async def sync_task_from_run(
+    run,  # AgentRun
+    db: AsyncSession,
+) -> None:
+    """Auto-sync Task status based on Run terminal status."""
+    if not run.task_id:
+        return
+    from app.models.task import Task
+
+    task = (await db.execute(select(Task).where(Task.id == run.task_id))).scalar_one_or_none()
+    if not task:
+        return
+    target = RUN_TO_TASK_SYNC.get(run.status)
+    if target and task.status != target:
+        task.latest_run_id = run.id
+        try:
+            await transition_task(task, target, db)
+        except InvalidTransition:
+            # Edge case: task was manually moved to a state where auto-sync
+            # is not valid (e.g., user set it to "done" before run finished).
+            # Don't override the manual decision.
+            return
diff --git a/backend/app/core/tools/mcp_tool_utils.py b/backend/app/core/tools/mcp_tool_utils.py
index f4ebde670..50f75a774 100644
--- a/backend/app/core/tools/mcp_tool_utils.py
+++ b/backend/app/core/tools/mcp_tool_utils.py
@@ -13,16 +13,16 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError, ServiceUnavailableError
 from app.core.tools.tool import EnhancedTool
 from app.core.tools.tool_registry import MCP_TOOL_KEY_SEPARATOR, get_global_registry
 from app.models.mcp import McpServer
-from app.services.mcp_server_service import McpServerService
 
 
 def _assert_not_uuid(server_identifier: str, context: str = "") -> None:
     """Assert that server_identifier is not a UUID.
 
-    Raise AssertionError if server_identifier is a valid UUID,
+    Raise InvalidRequestError if server_identifier is a valid UUID,
     ensuring we always use server names rather than UUIDs.
 
     Args:
@@ -30,18 +30,17 @@ def _assert_not_uuid(server_identifier: str, context: str = "") -> None:
         context: Context info for the error message.
 
     Raises:
-        AssertionError: If server_identifier is a UUID.
+        InvalidRequestError: If server_identifier is a UUID.
     """
     if not server_identifier:
         return
 
     try:
         uuid.UUID(server_identifier)
-        # valid UUID — raise assertion error
-        context_msg = f" in {context}" if context else ""
-        raise AssertionError(
-            f"Server identifier must be a server name, not UUID{context_msg}: {server_identifier}. "
-            f"Please use the server name (e.g., 'my_server') instead of UUID."
+        raise InvalidRequestError(
+            "Server identifier must use the MCP server name instead of UUID",
+            code="MCP_SERVER_IDENTIFIER_INVALID",
+            data={"server_identifier": server_identifier, "context": context or None},
         )
     except (ValueError, AttributeError, TypeError):
         # not a UUID — passes the check
@@ -93,7 +92,7 @@ async def resolve_mcp_server_instance(server_name: str, user_id: str, db: AsyncS
         McpServer instance, or None if not found or deleted.
 
     Raises:
-        AssertionError: If server_name is a UUID.
+        InvalidRequestError: If server_name is a UUID.
     """
     if not server_name or not user_id:
         logger.warning(
@@ -104,18 +103,28 @@ async def resolve_mcp_server_instance(server_name: str, user_id: str, db: AsyncS
     _assert_not_uuid(server_name, f"resolve_mcp_server_instance(user_id={user_id})")
 
     try:
+        from app.services.mcp_server_service import McpServerService
+
         service = McpServerService(db)
         server = await service.repo.get_by_name(user_id, server_name)
 
         if not server:
             error_msg = f"MCP server not found by name: server_name={server_name}, user_id={user_id}"
             logger.error(f"[resolve_mcp_server_instance] {error_msg}")
-            raise RuntimeError(f"MCP server '{server_name}' not found.")
+            raise NotFoundError(
+                "MCP server not found",
+                code="MCP_SERVER_NOT_FOUND",
+                data={"server_name": server_name, "user_id": user_id},
+            )
 
         if server.deleted_at:
             error_msg = f"MCP server is deleted: server_name={server_name}, user_id={user_id}"
             logger.error(f"[resolve_mcp_server_instance] {error_msg}")
-            raise RuntimeError(f"MCP server '{server_name}' has been deleted.")
+            raise NotFoundError(
+                "MCP server has been deleted",
+                code="MCP_SERVER_NOT_FOUND",
+                data={"server_name": server_name, "user_id": user_id},
+            )
 
         logger.debug(
             f"[resolve_mcp_server_instance] Found server: "
@@ -123,11 +132,15 @@ async def resolve_mcp_server_instance(server_name: str, user_id: str, db: AsyncS
         )
         return server
 
-    except RuntimeError:
+    except (NotFoundError, InvalidRequestError, AccessDeniedError, ServiceUnavailableError):
         raise
     except Exception as e:
         logger.error(f"[resolve_mcp_server_instance] Error resolving MCP server instance: {e}", exc_info=True)
-        raise RuntimeError(f"Error resolving MCP server '{server_name}': {str(e)}")
+        raise ServiceUnavailableError(
+            "Failed to resolve MCP server instance",
+            code="MCP_SERVER_RESOLVE_FAILED",
+            data={"server_name": server_name, "user_id": user_id, "detail": str(e)},
+        )
 
 
 async def validate_mcp_server_for_tool(server: McpServer, user_id: str) -> bool:
@@ -141,22 +154,30 @@ async def validate_mcp_server_for_tool(server: McpServer, user_id: str) -> bool:
         True if the server is usable.
 
     Raises:
-        RuntimeError: If validation fails.
+        AccessDeniedError | InvalidRequestError: If validation fails.
     """
     if not server:
-        raise RuntimeError("MCP server instance is None.")
+        raise NotFoundError("MCP server instance not found", code="MCP_SERVER_NOT_FOUND", data=None)
 
     # verify user ownership
     if server.user_id != user_id:
         error_msg = f"User {user_id} does not own server {server.name}"
         logger.error(f"[validate_mcp_server_for_tool] {error_msg}")
-        raise RuntimeError(f"Permission denied: You do not own MCP server '{server.name}'.")
+        raise AccessDeniedError(
+            "You do not own this MCP server",
+            code="MCP_SERVER_ACCESS_DENIED",
+            data={"server_name": server.name, "user_id": user_id},
+        )
 
     # verify server is enabled
     if not server.enabled:
         error_msg = f"Server {server.name} is disabled"
         logger.warning(f"[validate_mcp_server_for_tool] {error_msg}")
-        raise RuntimeError(f"MCP server '{server.name}' is disabled.")
+        raise InvalidRequestError(
+            "MCP server is disabled",
+            code="MCP_SERVER_DISABLED",
+            data={"server_name": server.name},
+        )
 
     return True
 
@@ -181,14 +202,16 @@ async def get_mcp_tool_with_instance(
         EnhancedTool instance.
 
     Raises:
-        RuntimeError: If any validation step fails.
+        AppError: If any validation step fails.
     """
     # 1. resolve MCP server instance
     server = await resolve_mcp_server_instance(server_name, user_id, db)
     if not server:
-        # resolve_mcp_server_instance now raises RuntimeError, so this branch might be unreachable
-        # but kept for robustness if resolve_mcp_server_instance returns None
-        raise RuntimeError(f"MCP server '{server_name}' not found.")
+        raise NotFoundError(
+            "MCP server not found",
+            code="MCP_SERVER_NOT_FOUND",
+            data={"server_name": server_name, "user_id": user_id},
+        )
 
     # 2. validate server instance
     await validate_mcp_server_for_tool(server, user_id)
@@ -200,7 +223,11 @@ async def get_mcp_tool_with_instance(
     if not tool:
         error_msg = f"Tool not found in registry: server_name={server_name}, tool_name={tool_name}"
         logger.error(f"[get_mcp_tool_with_instance] {error_msg}")
-        raise RuntimeError(f"MCP tool '{tool_name}' not found on server '{server_name}'.")
+        raise NotFoundError(
+            "MCP tool not found",
+            code="MCP_TOOL_NOT_FOUND",
+            data={"server_name": server_name, "tool_name": tool_name},
+        )
 
     logger.debug(
         f"[get_mcp_tool_with_instance] Successfully retrieved tool: server_name={server_name}, tool_name={tool_name}"
diff --git a/backend/app/core/tools/sandbox/sandbox_factory.py b/backend/app/core/tools/sandbox/sandbox_factory.py
index 616a07330..daf35d793 100644
--- a/backend/app/core/tools/sandbox/sandbox_factory.py
+++ b/backend/app/core/tools/sandbox/sandbox_factory.py
@@ -12,6 +12,8 @@
 from deepagents.backends.protocol import SandboxBackendProtocol
 from loguru import logger
 
+from app.common.app_errors import InvalidRequestError, ServiceUnavailableError
+
 if TYPE_CHECKING:
     from app.core.agent.backends.pydantic_adapter import RuntimeConfig
 
@@ -43,8 +45,11 @@ def _run_sandbox_setup(backend: SandboxBackendProtocol, setup_script_path: str)
     if result.exit_code != 0:
         logger.info(f"[red]❌ Setup script failed (exit {result.exit_code}):[/red]")
         logger.info(f"[dim]{result.output}[/dim]")
-        msg = "Setup failed - aborting"
-        raise RuntimeError(msg)
+        raise ServiceUnavailableError(
+            "Sandbox setup script failed",
+            code="SANDBOX_SETUP_FAILED",
+            data={"setup_script_path": setup_script_path, "exit_code": result.exit_code, "output": result.output},
+        )
 
     logger.info("[green]✓ Setup complete[/green]")
 
@@ -88,8 +93,11 @@ def create_modal_sandbox(
             # Poll until running (Modal requires this)
             for _ in range(90):  # 180s timeout (90 * 2s)
                 if sandbox.poll() is not None:  # Sandbox terminated unexpectedly
-                    msg = "Modal sandbox terminated unexpectedly during startup"
-                    raise RuntimeError(msg)
+                    raise ServiceUnavailableError(
+                        "Modal sandbox terminated unexpectedly during startup",
+                        code="MODAL_SANDBOX_STARTUP_FAILED",
+                        data={"sandbox_id": sandbox_id},
+                    )
                 # Check if sandbox is ready by attempting a simple command
                 try:
                     process = sandbox.exec("echo", "ready", timeout=5)
@@ -102,8 +110,11 @@ def create_modal_sandbox(
             else:
                 # Timeout - cleanup and fail
                 sandbox.terminate()
-                msg = "Modal sandbox failed to start within 180 seconds"
-                raise RuntimeError(msg)
+                raise ServiceUnavailableError(
+                    "Modal sandbox failed to start within timeout",
+                    code="MODAL_SANDBOX_STARTUP_TIMEOUT",
+                    data={"sandbox_id": sandbox_id, "timeout_seconds": 180},
+                )
 
         backend = ModalBackend(sandbox)
         logger.info(f"[green]✓ Modal sandbox ready: {backend.id}[/green]")
@@ -149,8 +160,11 @@ def create_runloop_sandbox(
 
     bearer_token = os.environ.get("RUNLOOP_API_KEY")
     if not bearer_token:
-        msg = "RUNLOOP_API_KEY environment variable not set"
-        raise ValueError(msg)
+        raise InvalidRequestError(
+            "RUNLOOP_API_KEY environment variable is required",
+            code="RUNLOOP_API_KEY_MISSING",
+            data=None,
+        )
 
     client = Runloop(bearer_token=bearer_token)
 
@@ -173,8 +187,11 @@ def create_runloop_sandbox(
         else:
             # Timeout - cleanup and fail
             client.devboxes.shutdown(id=devbox.id)
-            msg = "Devbox failed to start within 180 seconds"
-            raise RuntimeError(msg)
+            raise ServiceUnavailableError(
+                "Runloop devbox failed to start within timeout",
+                code="RUNLOOP_DEVBOX_STARTUP_TIMEOUT",
+                data={"sandbox_id": sandbox_id, "timeout_seconds": 180},
+            )
 
     logger.info(f"[green]✓ Runloop devbox ready: {sandbox_id}[/green]")
 
@@ -350,8 +367,11 @@ def create_sandbox(
         SandboxBackend instance
     """
     if provider not in _SANDBOX_PROVIDERS:
-        msg = f"Unknown sandbox provider: {provider}. Available providers: {', '.join(get_available_sandbox_types())}"
-        raise ValueError(msg)
+        raise InvalidRequestError(
+            "Unknown sandbox provider",
+            code="SANDBOX_PROVIDER_UNKNOWN",
+            data={"provider": provider, "available_providers": get_available_sandbox_types()},
+        )
 
     sandbox_provider = _SANDBOX_PROVIDERS[provider]
 
@@ -382,8 +402,11 @@ def get_default_working_dir(provider: str) -> str:
     """
     if provider in _PROVIDER_TO_WORKING_DIR:
         return _PROVIDER_TO_WORKING_DIR[provider]
-    msg = f"Unknown sandbox provider: {provider}"
-    raise ValueError(msg)
+    raise InvalidRequestError(
+        "Unknown sandbox provider",
+        code="SANDBOX_PROVIDER_UNKNOWN",
+        data={"provider": provider, "available_providers": list(_PROVIDER_TO_WORKING_DIR.keys())},
+    )
 
 
 __all__ = [
diff --git a/backend/app/core/trace_context.py b/backend/app/core/trace_context.py
index 3f7d0aa58..69b41338b 100644
--- a/backend/app/core/trace_context.py
+++ b/backend/app/core/trace_context.py
@@ -1,5 +1,8 @@
 """Trace context propagation via contextvars.
 
+DEPRECATED: Use ObservationCollector.trace_id instead for new code.
+Retained because logging.py and a2a/client.py still import it.
+
 Provides a single trace_id that flows through the entire async call chain:
 HTTP middleware / WS handler → StreamState → LangGraph → tools → persistence.
 """
diff --git a/backend/app/main.py b/backend/app/main.py
index 7ef2b5f0f..de28cad1a 100644
--- a/backend/app/main.py
+++ b/backend/app/main.py
@@ -2,29 +2,33 @@
 FastAPI Main Application
 """
 
-import asyncio
-from contextlib import asynccontextmanager
-from datetime import datetime, timedelta, timezone
-from typing import AsyncGenerator
-
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect
-from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import JSONResponse
-from loguru import logger
-from sqlalchemy import text
-
-from app.api import api_router
-from app.api.v1.sessions import router as sessions_router
-from app.common.exceptions import register_exception_handlers
-from app.common.logging import LoggingMiddleware, setup_logging
-from app.core.database import AsyncSessionLocal, close_db, engine
-from app.core.redis import RedisClient
-from app.core.settings import settings
-from app.websocket.auth import WebSocketCloseCode, authenticate_websocket, reject_websocket
-from app.websocket.chat_ws_handler import ChatWsHandler
-from app.websocket.notification_manager import NotificationType, notification_manager
-from app.websocket.openclaw_handler import openclaw_bridge_handler
-from app.websocket.run_subscription_handler import run_subscription_handler
+from __future__ import annotations
+
+import asyncio  # noqa: E402
+from contextlib import asynccontextmanager  # noqa: E402
+from typing import AsyncGenerator, Optional  # noqa: E402
+
+from dotenv import load_dotenv  # noqa: E402
+
+from app.core.settings import ENV_FILE  # noqa: E402
+
+load_dotenv(ENV_FILE, override=False)
+
+from fastapi import FastAPI, WebSocket, WebSocketDisconnect  # noqa: E402
+from fastapi.middleware.cors import CORSMiddleware  # noqa: E402
+from loguru import logger  # noqa: E402
+from sqlalchemy import text  # noqa: E402
+
+from app.api import api_router  # noqa: E402
+from app.common.exceptions import register_exception_handlers  # noqa: E402
+from app.common.logging import LoggingMiddleware, setup_logging  # noqa: E402
+from app.core.database import AsyncSessionLocal, close_db, engine  # noqa: E402
+from app.core.redis import RedisClient  # noqa: E402
+from app.core.settings import settings  # noqa: E402
+from app.websocket.auth import WebSocketCloseCode, authenticate_websocket, reject_websocket  # noqa: E402
+from app.websocket.execution_subscription_handler import execution_subscription_handler  # noqa: E402
+from app.websocket.notification_manager import NotificationType, notification_manager  # noqa: E402
+from app.websocket.openclaw_handler import openclaw_bridge_handler  # noqa: E402
 
 setup_logging()
 
@@ -107,29 +111,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
     # Check Docker availability (non-blocking, just warn)
     await _check_docker_availability()
 
-    # Recover stale in-process durable runs that lost their executing runtime.
-    try:
-        from app.services.run_service import RunService
-
-        stale_before = datetime.now(timezone.utc) - timedelta(seconds=settings.run_heartbeat_timeout_seconds)
-        async with RedisClient.lock("init:durable_run_recovery", timeout=60, blocking_timeout=60):
-            async with AsyncSessionLocal() as db:
-                run_service = RunService(db)
-                recovered_runs = await run_service.recover_stale_incomplete_runs(
-                    runtime_owner_id=settings.run_runtime_instance_id,
-                    stale_before=stale_before,
-                )
-        if recovered_runs:
-            logger.warning(
-                f"   ⚠️  Recovered {len(recovered_runs)} stale durable runs for runtime owner "
-                f"{settings.run_runtime_instance_id}"
-            )
-        else:
-            logger.info(
-                f"   ✓ Durable run recovery sweep completed for runtime owner {settings.run_runtime_instance_id}"
-            )
-    except Exception as e:
-        logger.warning(f"   ⚠️  Durable run recovery sweep failed: {e}")
+    # Durable run recovery is no longer needed. AgentRun lifecycle is now managed
+    # by AgentRunService which does not require startup recovery.
 
     # Automatically sync providers and models to database on startup (if not present)
     try:
@@ -191,8 +174,86 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
         logger.warning(f"   ⚠️  Checkpointer initialization failed: {e}")
         logger.warning("   App will continue starting, checkpoint features may be unavailable")
 
+    # Initialize CLI runtime providers
+    try:
+        from app.core.agent.cli_backends.registry import init_providers
+
+        init_providers()
+        logger.info("   ✓ CLI runtime providers initialized")
+    except Exception as e:
+        logger.warning(f"   ⚠️  CLI runtime provider initialization failed: {e}")
+
+    # Register execution event bus subscribers
+    try:
+        from app.core.events.bus import execution_event_bus
+        from app.core.events.subscribers.persistence import PersistenceSubscriber
+        from app.core.events.subscribers.state_transition import StateTransitionSubscriber
+        from app.core.events.subscribers.task_sync import TaskSyncSubscriber
+        from app.core.events.subscribers.websocket import WebSocketSubscriber
+
+        execution_event_bus.register(PersistenceSubscriber())
+        execution_event_bus.register(StateTransitionSubscriber())
+        execution_event_bus.register(WebSocketSubscriber())
+        execution_event_bus.register(TaskSyncSubscriber())
+        logger.info("   ✓ Execution event bus subscribers registered")
+    except Exception as e:
+        logger.error(f"   ⚠️  Event bus subscriber registration failed: {e}")
+
+    # Start container pool reaper (idle containers cleaned up every 5 min)
+    _reaper_task: Optional[asyncio.Task] = None
+    try:
+        from app.core.agent.cli_backends.container_pool import container_pool
+
+        async def _container_reaper() -> None:
+            while True:
+                await asyncio.sleep(300)
+                try:
+                    removed = await container_pool.cleanup_idle()
+                    if removed:
+                        logger.info(f"Container reaper: removed {removed} idle containers")
+                except Exception as e:
+                    logger.warning(f"Container reaper error: {e}")
+
+        _reaper_task = asyncio.create_task(_container_reaper(), name="container-reaper")
+        logger.info("   ✓ Container pool reaper started (idle_timeout=30m)")
+    except Exception as e:
+        logger.warning(f"   ⚠️  Container pool reaper failed to start: {e}")
+
+    # Scheduler: stale execution recovery (one-shot) + periodic loops
+    _dispatcher_task: Optional[asyncio.Task] = None
+    _exec_reaper_task: Optional[asyncio.Task] = None
+    try:
+        from app.core.scheduler import (
+            execution_reaper_loop,
+            recover_stale_on_startup,
+            task_dispatcher_loop,
+        )
+
+        await recover_stale_on_startup()
+        _dispatcher_task = asyncio.create_task(task_dispatcher_loop(), name="task-dispatcher")
+        _exec_reaper_task = asyncio.create_task(execution_reaper_loop(), name="execution-reaper")
+        logger.info("   ✓ Task dispatcher and execution reaper started (interval=30s)")
+    except Exception as e:
+        logger.warning(f"   ⚠️  Scheduler startup failed: {e}")
+
     yield
 
+    # Shutdown: Cancel scheduler loops
+    for task in (_dispatcher_task, _exec_reaper_task):
+        if task:
+            task.cancel()
+
+    # Shutdown: Cancel container pool reaper and mark pool as shut down
+    try:
+        if _reaper_task:
+            _reaper_task.cancel()
+        from app.core.agent.cli_backends.container_pool import container_pool as _cp
+
+        await _cp.shutdown()
+        logger.info("   ✓ Container pool shut down (containers left running)")
+    except Exception as e:
+        logger.warning(f"   ⚠️  Container pool shutdown failed: {e}")
+
     # Shutdown: Drain sandbox pool (stop all containers gracefully)
     try:
         from app.services.sandbox_manager import _sandbox_pool
@@ -254,21 +315,8 @@ async def lifespan(app: FastAPI) -> AsyncGenerator:
 )
 
 
-@app.exception_handler(Exception)
-async def global_exception_handler(request, exc):
-    """Global exception handler"""
-    logger.opt(exception=True).error(f"Unhandled exception: {exc}")
-    return JSONResponse(
-        status_code=500,
-        content={"detail": "Internal server error"},
-    )
-
-
 app.include_router(api_router, prefix="/api")
 
-# Sessions router mounted outside /api/v1 to keep /api/sessions path compatible
-app.include_router(sessions_router, prefix="/api/sessions", tags=["sessions"])
-
 
 # Register Router
 @app.get("/", tags=["Root"])
@@ -282,19 +330,6 @@ async def root():
     }
 
 
-@app.websocket("/ws/chat")
-async def chat_websocket_endpoint(websocket: WebSocket):
-    """Persistent WebSocket endpoint for Chat page streaming."""
-    is_authenticated, user_id = await authenticate_websocket(websocket)
-    if not is_authenticated or not user_id:
-        await reject_websocket(websocket, code=WebSocketCloseCode.UNAUTHORIZED, reason="Authentication required")
-        return
-
-    await websocket.accept()
-    handler = ChatWsHandler(user_id=str(user_id), websocket=websocket)
-    await handler.run()
-
-
 async def _run_notification_loop(websocket: WebSocket, user_id: str) -> None:
     """Shared ping/pong loop for notification WebSocket endpoints."""
     import json
@@ -335,16 +370,16 @@ async def notification_websocket_endpoint(websocket: WebSocket):
     await _run_notification_loop(websocket, user_id)
 
 
-@app.websocket("/ws/runs")
-async def runs_websocket_endpoint(websocket: WebSocket):
-    """Subscription endpoint for durable run snapshot/replay/live events."""
+@app.websocket("/ws/executions")
+async def executions_websocket_endpoint(websocket: WebSocket):
+    """Subscription endpoint for CLI execution snapshot/replay/live events."""
     is_authenticated, user_id = await authenticate_websocket(websocket)
 
     if not is_authenticated or not user_id:
         await reject_websocket(websocket, code=WebSocketCloseCode.UNAUTHORIZED, reason="Authentication required")
         return
 
-    await run_subscription_handler.handle_connection(websocket, str(user_id))
+    await execution_subscription_handler.handle_connection(websocket, str(user_id))
 
 
 @app.websocket("/ws/openclaw/dashboard")
diff --git a/backend/app/models/__init__.py b/backend/app/models/__init__.py
index 761a6150f..a8959079e 100644
--- a/backend/app/models/__init__.py
+++ b/backend/app/models/__init__.py
@@ -2,7 +2,6 @@
 Data models
 """
 
-from app.models.conversation import Conversation
 from app.models.message import Message
 
 from .access_control import (
@@ -11,12 +10,14 @@
     WorkspaceInvitation,
     WorkspaceInvitationStatus,
 )
-from .agent_run import AgentRun, AgentRunEvent, AgentRunSnapshot, AgentRunStatus
+from .agent import Agent, AgentRelease, AgentVersion
+from .agent_run import AgentRun
 from .auth import AuthSession, AuthUser
 from .auth import AuthUser as User
 from .base import BaseModel, SoftDeleteMixin, TimestampMixin
 from .chat import Chat
 from .custom_tool import CustomTool
+from .execution import Artifact, Execution, ExecutionEvent
 from .execution_trace import (
     ExecutionObservation,
     ExecutionTrace,
@@ -25,9 +26,6 @@
     ObservationType,
     TraceStatus,
 )
-from .graph import AgentGraph, GraphEdge, GraphNode, GraphNodeSecret
-from .graph_deployment_version import GraphDeploymentVersion
-from .graph_execution import ExecutionStatus, GraphExecution
 from .mcp import McpServer
 from .memory import Memory
 from .model_credential import ModelCredential
@@ -42,17 +40,15 @@
 from .skill import Skill, SkillFile
 from .skill_collaborator import CollaboratorRole, SkillCollaborator
 from .skill_version import SkillVersion, SkillVersionFile
+from .task import Task, TaskPriority, TaskStatus
+from .task_activity import ActivityAuthorType, ActivityType, TaskActivity
+from .thread import Thread
 from .user_sandbox import UserSandbox
-from .workspace import Workspace, WorkspaceFolder, WorkspaceMember, WorkspaceMemberRole, WorkspaceStatus
-from .workspace_files import WorkspaceFile, WorkspaceStoredFile
+from .workspace import Workspace, WorkspaceMember, WorkspaceMemberRole, WorkspaceStatus
 
 __all__ = [
     "BaseModel",
     "AgentRun",
-    "AgentRunEvent",
-    "AgentRunSnapshot",
-    "AgentRunStatus",
-    "Conversation",
     "Message",
     "TimestampMixin",
     "SoftDeleteMixin",
@@ -64,7 +60,6 @@
     "WorkspaceMember",
     "WorkspaceStatus",
     "WorkspaceMemberRole",
-    "WorkspaceFolder",
     "UserSandbox",
     "Chat",
     "Organization",
@@ -76,17 +71,8 @@
     "Environment",
     "WorkspaceEnvironment",
     "Settings",
-    "WorkspaceFile",
-    "WorkspaceStoredFile",
     "CustomTool",
     "McpServer",
-    "AgentGraph",
-    "GraphNode",
-    "GraphEdge",
-    "GraphNodeSecret",
-    "GraphDeploymentVersion",
-    "GraphExecution",
-    "ExecutionStatus",
     "ModelProvider",
     "ModelCredential",
     "ModelInstance",
@@ -106,4 +92,17 @@
     "SkillVersion",
     "SkillVersionFile",
     "PlatformToken",
+    "Task",
+    "TaskStatus",
+    "TaskPriority",
+    "Agent",
+    "AgentRelease",
+    "AgentVersion",
+    "Execution",
+    "ExecutionEvent",
+    "Artifact",
+    "TaskActivity",
+    "ActivityAuthorType",
+    "ActivityType",
+    "Thread",
 ]
diff --git a/backend/app/models/agent.py b/backend/app/models/agent.py
new file mode 100644
index 000000000..98f02d784
--- /dev/null
+++ b/backend/app/models/agent.py
@@ -0,0 +1,139 @@
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import TYPE_CHECKING, List, Optional
+
+from sqlalchemy import DateTime, Enum, ForeignKey, Index, Integer, String, Text, UniqueConstraint, func
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.core.contracts.agent import normalize_engine_kind, normalize_runtime_kind
+from app.core.database import Base
+from app.utils.datetime import utc_now
+
+from .base import BaseModel
+
+if TYPE_CHECKING:
+    pass
+
+
+class Agent(BaseModel):
+    """An agent owned by a workspace."""
+
+    __tablename__ = "agents"
+    __table_args__ = (
+        UniqueConstraint("workspace_id", "slug", name="uq_agents_workspace_slug"),
+        Index("ix_agents_workspace_id", "workspace_id"),
+        Index("ix_agents_status", "status"),
+    )
+
+    workspace_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("workspaces.id", ondelete="CASCADE"), nullable=False
+    )
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
+    slug: Mapped[str] = mapped_column(String(255), nullable=False)
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    avatar: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
+    status: Mapped[str] = mapped_column(
+        Enum("draft", "active", "archived", name="agent_status"), nullable=False, default="draft"
+    )
+    current_draft_version_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agent_versions.id"), nullable=True
+    )
+    active_release_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agent_releases.id"), nullable=True
+    )
+    created_by: Mapped[str] = mapped_column(String(255), ForeignKey("user.id", ondelete="CASCADE"), nullable=False)
+    encrypted_custom_env: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+
+    @property
+    def has_custom_env(self) -> bool:
+        return self.encrypted_custom_env is not None
+
+    @property
+    def engine_kind(self) -> Optional[str]:
+        if not self.current_draft_version:
+            return None
+        return normalize_engine_kind(self.current_draft_version.engine_kind)
+
+    @property
+    def runtime_kind(self) -> Optional[str]:
+        if not self.active_release:
+            return None
+        return normalize_runtime_kind(self.active_release.runtime_kind)
+
+    # Relationships
+    versions: Mapped[List[AgentVersion]] = relationship(
+        "AgentVersion",
+        back_populates="agent",
+        foreign_keys="AgentVersion.agent_id",
+    )
+    current_draft_version: Mapped[Optional[AgentVersion]] = relationship(
+        "AgentVersion",
+        foreign_keys=[current_draft_version_id],
+    )
+    active_release: Mapped[Optional[AgentRelease]] = relationship(
+        "AgentRelease",
+        foreign_keys=[active_release_id],
+    )
+
+
+class AgentVersion(Base):
+    """An immutable snapshot of an agent's configuration at a point in time."""
+
+    __tablename__ = "agent_versions"
+    __table_args__ = (UniqueConstraint("agent_id", "version_number", name="uq_agent_versions_agent_version"),)
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    agent_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agents.id", ondelete="CASCADE"), nullable=False
+    )
+    version_number: Mapped[int] = mapped_column(Integer, nullable=False)
+    status: Mapped[str] = mapped_column(
+        Enum("draft", "frozen", name="agent_version_status"), nullable=False, default="draft"
+    )
+    source_kind: Mapped[str] = mapped_column(String(20), nullable=False, default="manual")
+    engine_kind: Mapped[str] = mapped_column(String(20), nullable=False)
+    definition_payload: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
+    capability_manifest: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
+    changelog: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    created_by: Mapped[str] = mapped_column(String(255), ForeignKey("user.id", ondelete="CASCADE"), nullable=False)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime(timezone=True), default=utc_now, server_default=func.now(), nullable=False
+    )
+
+    # Relationships
+    agent: Mapped[Agent] = relationship(
+        "Agent",
+        back_populates="versions",
+        foreign_keys=[agent_id],
+    )
+
+
+class AgentRelease(Base):
+    """A release artifact built from a specific agent version."""
+
+    __tablename__ = "agent_releases"
+    __table_args__ = (UniqueConstraint("agent_version_id", "release_number", name="uq_agent_releases_version_number"),)
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    agent_version_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agent_versions.id"), nullable=False
+    )
+    release_number: Mapped[int] = mapped_column(Integer, nullable=False)
+    status: Mapped[str] = mapped_column(
+        Enum("ready", "active", "superseded", "failed", "retired", name="agent_release_status"),
+        nullable=False,
+        default="ready",
+    )
+    runtime_kind: Mapped[str] = mapped_column(String(20), nullable=False)
+    builder_kind: Mapped[Optional[str]] = mapped_column(String(20), nullable=True)
+    executable_ref: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    runtime_binding: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
+    published_by: Mapped[Optional[str]] = mapped_column(String(255), ForeignKey("user.id"), nullable=True)
+    published_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    retired_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+
+    # Relationships
+    version: Mapped[AgentVersion] = relationship("AgentVersion")
diff --git a/backend/app/models/agent_run.py b/backend/app/models/agent_run.py
index 3bdb0ef3f..c3f20f14e 100644
--- a/backend/app/models/agent_run.py
+++ b/backend/app/models/agent_run.py
@@ -1,118 +1,61 @@
-"""
-Agent run persistence models.
-"""
+from __future__ import annotations
 
-import enum
 import uuid
 from datetime import datetime
-from typing import Optional
+from typing import TYPE_CHECKING, List, Optional
 
-from sqlalchemy import BigInteger, DateTime, Enum, ForeignKey, Index, String, Text, UniqueConstraint
+from sqlalchemy import CheckConstraint, DateTime, Enum, ForeignKey, String, Text
 from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.core.database import Base
 from app.utils.datetime import utc_now
 
-from .base import BaseModel, TimestampMixin
+if TYPE_CHECKING:
+    from .agent import AgentRelease, AgentVersion
+    from .execution import Execution
 
 
-class AgentRunStatus(str, enum.Enum):
-    QUEUED = "queued"
-    RUNNING = "running"
-    INTERRUPT_WAIT = "interrupt_wait"
-    COMPLETED = "completed"
-    FAILED = "failed"
-    CANCELLED = "cancelled"
-
-
-class AgentRun(BaseModel):
-    """Durable long-running task record."""
-
+class AgentRun(Base):
     __tablename__ = "agent_runs"
-
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    workspace_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspaces.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-    graph_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-    thread_id: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
-
-    run_type: Mapped[str] = mapped_column(String(100), nullable=False)
-    agent_name: Mapped[str] = mapped_column(String(100), nullable=False)
-    source: Mapped[str] = mapped_column(String(100), nullable=False)
-    status: Mapped[AgentRunStatus] = mapped_column(
-        Enum(AgentRunStatus, values_callable=lambda e: [m.value for m in e], name="agentrunstatus"),
-        nullable=False,
-        default=AgentRunStatus.QUEUED,
-    )
-
-    title: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
-    request_payload: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
-    result_summary: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
-    error_code: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
-    error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-    runtime_owner_id: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
-    last_heartbeat_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-
-    trace_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), nullable=True)
-    started_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, default=utc_now)
-    finished_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-    last_seq: Mapped[int] = mapped_column(BigInteger, nullable=False, default=0)
-
     __table_args__ = (
-        Index("agent_runs_user_created_idx", "user_id", "created_at"),
-        Index("agent_runs_thread_created_idx", "thread_id", "created_at"),
-        Index("agent_runs_graph_created_idx", "graph_id", "created_at"),
-        Index("agent_runs_status_updated_idx", "status", "updated_at"),
-        Index("agent_runs_agent_updated_idx", "agent_name", "updated_at"),
-        Index("agent_runs_owner_status_idx", "runtime_owner_id", "status"),
-    )
-
-
-class AgentRunEvent(BaseModel):
-    """Append-only ordered event stream for a run."""
-
-    __tablename__ = "agent_run_events"
-
-    run_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("agent_runs.id", ondelete="CASCADE"),
+        CheckConstraint(
+            "(release_id IS NOT NULL) <> (agent_version_id IS NOT NULL)",
+            name="ck_agent_runs_release_or_version",
+        ),
+    )
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    release_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agent_releases.id"), nullable=True
+    )
+    agent_version_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("agent_versions.id"), nullable=True
+    )
+    workspace_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("workspaces.id"), nullable=False)
+    thread_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("threads.id"), nullable=True)
+    task_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("tasks.id"), nullable=True)
+    trigger_medium: Mapped[str] = mapped_column(String(20), nullable=False)
+    run_purpose: Mapped[str] = mapped_column(String(20), nullable=False)
+    goal: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    input_payload: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    status: Mapped[str] = mapped_column(
+        Enum("pending", "running", "succeeded", "failed", "cancelled", name="agent_run_status"),
         nullable=False,
+        default="pending",
     )
-    seq: Mapped[int] = mapped_column(BigInteger, nullable=False)
-    event_type: Mapped[str] = mapped_column(String(100), nullable=False)
-    payload: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
-    trace_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), nullable=True)
-    observation_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), nullable=True)
-    parent_observation_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), nullable=True)
-
-    __table_args__ = (
-        UniqueConstraint("run_id", "seq", name="uq_agent_run_events_run_seq"),
-        Index("agent_run_events_run_created_idx", "run_id", "created_at"),
+    current_execution_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("executions.id"), nullable=True
     )
+    result_summary: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    started_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    ended_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    created_by: Mapped[Optional[str]] = mapped_column(String(255), ForeignKey("user.id"), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, nullable=False)
 
-
-class AgentRunSnapshot(Base, TimestampMixin):
-    """Latest UI projection for a run."""
-
-    __tablename__ = "agent_run_snapshots"
-
-    run_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("agent_runs.id", ondelete="CASCADE"),
-        primary_key=True,
+    release: Mapped[Optional["AgentRelease"]] = relationship("AgentRelease")
+    agent_version: Mapped[Optional["AgentVersion"]] = relationship("AgentVersion")
+    current_execution: Mapped[Optional["Execution"]] = relationship("Execution", foreign_keys=[current_execution_id])
+    executions: Mapped[List["Execution"]] = relationship(
+        "Execution", back_populates="run", foreign_keys="Execution.run_id"
     )
-    last_seq: Mapped[int] = mapped_column(BigInteger, nullable=False, default=0)
-    status: Mapped[str] = mapped_column(String(100), nullable=False)
-    projection: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
diff --git a/backend/app/models/conversation.py b/backend/app/models/conversation.py
deleted file mode 100644
index d89bd8beb..000000000
--- a/backend/app/models/conversation.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""
-Conversation model
-
-Manage conversations for the LangGraph dialogue system.
-"""
-
-from typing import TYPE_CHECKING
-
-from sqlalchemy import JSON, ForeignKey, Integer, String
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from app.models.base import BaseModel, SoftDeleteMixin
-
-if TYPE_CHECKING:
-    from app.models.message import Message
-
-
-class Conversation(BaseModel, SoftDeleteMixin):
-    """Conversation table -- store dialogue session information.
-
-    Inherit from BaseTableMixin with the following columns:
-    - id: primary key
-    - create_by: creator
-    - update_by: updater
-    - create_time: creation timestamp
-    - update_time: update timestamp
-    - deleted: soft-delete flag
-    """
-
-    __tablename__ = "conversations"
-
-    thread_id: Mapped[str] = mapped_column(String(100), unique=True, index=True, nullable=False, comment="thread ID")
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        index=True,
-        nullable=False,
-        comment="user ID (text)",
-    )
-    title: Mapped[str] = mapped_column(String(200), nullable=False, comment="conversation title")
-    meta_data: Mapped[dict] = mapped_column(JSON, nullable=True, default=dict, comment="metadata")
-    is_active: Mapped[int] = mapped_column(Integer, nullable=False, default=1, comment="active flag (0=no, 1=yes)")
-
-    # relationship: a conversation has many messages; cascade delete on conversation removal
-    messages: Mapped[list["Message"]] = relationship(
-        "Message",
-        cascade="all, delete-orphan",
-        passive_deletes=True,
-        lazy="selectin",
-    )
-
-    def __repr__(self) -> str:
-        return f"<Conversation(id={self.id}, thread_id={self.thread_id}, title={self.title})>"
diff --git a/backend/app/models/execution.py b/backend/app/models/execution.py
new file mode 100644
index 000000000..4bacf7a2f
--- /dev/null
+++ b/backend/app/models/execution.py
@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import TYPE_CHECKING, List, Optional
+
+from sqlalchemy import DateTime, Enum, ForeignKey, Integer, String, Text, UniqueConstraint
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.core.database import Base
+from app.utils.datetime import utc_now
+
+if TYPE_CHECKING:
+    from .agent_run import AgentRun
+
+
+class Execution(Base):
+    __tablename__ = "executions"
+    __table_args__ = (UniqueConstraint("run_id", "attempt_index", name="uq_executions_run_attempt"),)
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    run_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("agent_runs.id"), nullable=False)
+    parent_execution_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True), ForeignKey("executions.id"), nullable=True
+    )
+    attempt_index: Mapped[int] = mapped_column(Integer, nullable=False, default=1)
+    engine_kind: Mapped[str] = mapped_column(String(20), nullable=False)
+    runtime_session_ref: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
+    status: Mapped[str] = mapped_column(
+        Enum(
+            "pending",
+            "dispatched",
+            "running",
+            "approval_wait",
+            "succeeded",
+            "failed",
+            "cancelled",
+            name="execution_status",
+        ),
+        nullable=False,
+        default="pending",
+    )
+    error: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    metrics: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
+    started_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    ended_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, nullable=False)
+
+    run: Mapped["AgentRun"] = relationship("AgentRun", back_populates="executions", foreign_keys=[run_id])
+    events: Mapped[List["ExecutionEvent"]] = relationship("ExecutionEvent", back_populates="execution")
+    children: Mapped[List["Execution"]] = relationship("Execution", foreign_keys=[parent_execution_id])
+    artifacts: Mapped[List["Artifact"]] = relationship("Artifact", back_populates="execution")
+
+
+class ExecutionEvent(Base):
+    __tablename__ = "execution_events"
+    __table_args__ = (UniqueConstraint("execution_id", "sequence_no", name="uq_execution_events_seq"),)
+
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    execution_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("executions.id"), nullable=False)
+    sequence_no: Mapped[int] = mapped_column(Integer, nullable=False)
+    event_type: Mapped[str] = mapped_column(String(50), nullable=False)
+    payload: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, nullable=False)
+
+    execution: Mapped["Execution"] = relationship("Execution", back_populates="events")
+
+
+class Artifact(Base):
+    __tablename__ = "artifacts"
+    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    execution_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("executions.id"), nullable=False)
+    kind: Mapped[str] = mapped_column(String(50), nullable=False)
+    uri: Mapped[str] = mapped_column(Text, nullable=False)
+    metadata_: Mapped[Optional[dict]] = mapped_column("metadata", JSONB, nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utc_now, nullable=False)
+    execution: Mapped["Execution"] = relationship("Execution", back_populates="artifacts")
diff --git a/backend/app/models/graph.py b/backend/app/models/graph.py
deleted file mode 100644
index 753cc3a73..000000000
--- a/backend/app/models/graph.py
+++ /dev/null
@@ -1,217 +0,0 @@
-"""
-Graph models
-"""
-
-import uuid
-from datetime import datetime
-from typing import TYPE_CHECKING, List, Optional
-
-from sqlalchemy import (
-    Boolean,
-    DateTime,
-    ForeignKey,
-    Index,
-    Numeric,
-    String,
-    Text,
-)
-from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel, SoftDeleteMixin
-
-if TYPE_CHECKING:
-    from .auth import AuthUser
-    from .graph_deployment_version import GraphDeploymentVersion
-    from .workspace import Workspace, WorkspaceFolder
-
-
-class AgentGraph(BaseModel, SoftDeleteMixin):
-    """Agent graph model (supports soft-delete)."""
-
-    __tablename__ = "graphs"
-
-    name: Mapped[str] = mapped_column(String(200), nullable=False)
-    description: Mapped[Optional[str]] = mapped_column(String(2000), nullable=True)
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    workspace_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspaces.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-    folder_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspace_folder.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-    parent_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-    color: Mapped[Optional[str]] = mapped_column(String(2000), nullable=True)
-    is_deployed: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-    variables: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
-
-    # deployment fields — correspond to the sim project's workflow table
-    deployed_at: Mapped[Optional[datetime]] = mapped_column(
-        DateTime(timezone=True),
-        nullable=True,
-        default=None,
-    )
-
-    # relationships
-    user: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-    workspace: Mapped[Optional["Workspace"]] = relationship("Workspace", lazy="selectin")
-    folder: Mapped[Optional["WorkspaceFolder"]] = relationship(
-        "WorkspaceFolder",
-        lazy="selectin",
-    )
-    parent: Mapped[Optional["AgentGraph"]] = relationship(
-        "AgentGraph",
-        remote_side="AgentGraph.id",
-        lazy="selectin",
-    )
-    nodes: Mapped[List["GraphNode"]] = relationship(
-        "GraphNode",
-        back_populates="graph",
-        cascade="all, delete-orphan",
-    )
-    edges: Mapped[List["GraphEdge"]] = relationship(
-        "GraphEdge",
-        back_populates="graph",
-        cascade="all, delete-orphan",
-    )
-    deployment_versions: Mapped[List["GraphDeploymentVersion"]] = relationship(
-        "GraphDeploymentVersion",
-        back_populates="graph",
-        cascade="all, delete-orphan",
-        order_by="GraphDeploymentVersion.version.desc()",
-    )
-    __table_args__ = (
-        Index("graphs_user_id_idx", "user_id"),
-        Index("graphs_workspace_id_idx", "workspace_id"),
-        Index("graphs_folder_id_idx", "folder_id"),
-        Index("graphs_parent_id_idx", "parent_id"),
-    )
-
-
-class GraphNode(BaseModel):
-    """Graph node model."""
-
-    __tablename__ = "graph_nodes"
-
-    graph_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    position_x: Mapped[float] = mapped_column(Numeric, nullable=False)
-    position_y: Mapped[float] = mapped_column(Numeric, nullable=False)
-    position_absolute_x: Mapped[Optional[float]] = mapped_column(Numeric, nullable=True)
-    position_absolute_y: Mapped[Optional[float]] = mapped_column(Numeric, nullable=True)
-    width: Mapped[float] = mapped_column(Numeric, nullable=False, default=0)
-    height: Mapped[float] = mapped_column(Numeric, nullable=False, default=0)
-    data: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
-    type: Mapped[str] = mapped_column(String(50), nullable=False)
-
-    # relationship
-    graph: Mapped["AgentGraph"] = relationship("AgentGraph", back_populates="nodes", lazy="selectin")
-    source_edges: Mapped[List["GraphEdge"]] = relationship(
-        "GraphEdge",
-        foreign_keys="GraphEdge.source_node_id",
-        back_populates="source_node",
-        cascade="all, delete-orphan",
-    )
-    target_edges: Mapped[List["GraphEdge"]] = relationship(
-        "GraphEdge",
-        foreign_keys="GraphEdge.target_node_id",
-        back_populates="target_node",
-        cascade="all, delete-orphan",
-    )
-
-    __table_args__ = (
-        Index("graph_nodes_graph_id_idx", "graph_id"),
-        Index("graph_nodes_type_idx", "type"),
-    )
-
-
-class GraphEdge(BaseModel):
-    """Graph edge model.
-
-    Support conditional routing and complex flow patterns:
-    - data.route_key: routing key for conditional routing (maps to RouterNodeExecutor return value)
-    - data.source_handle_id: React Flow Handle ID (e.g. "Yes", "No", "Unknown")
-    - data.condition_expression: edge-level condition expression (optional)
-    - data.edge_type: edge type ("normal" | "conditional" | "loop_back") to distinguish edge kinds
-    - data.label: display label for the edge (optional), used for logging and debugging
-    """
-
-    __tablename__ = "graph_edges"
-
-    graph_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    source_node_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graph_nodes.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    target_node_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graph_nodes.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    # edge metadata storing routing info
-    # structure: { "route_key": str, "source_handle_id": str, "condition_expression": str }
-    data: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
-
-    # relationships
-    graph: Mapped["AgentGraph"] = relationship("AgentGraph", back_populates="edges", lazy="selectin")
-    source_node: Mapped["GraphNode"] = relationship(
-        "GraphNode",
-        foreign_keys=[source_node_id],
-        back_populates="source_edges",
-        lazy="selectin",
-    )
-    target_node: Mapped["GraphNode"] = relationship(
-        "GraphNode",
-        foreign_keys=[target_node_id],
-        back_populates="target_edges",
-        lazy="selectin",
-    )
-
-    __table_args__ = (
-        Index("graph_edges_graph_id_idx", "graph_id"),
-        Index("graph_edges_source_node_id_idx", "source_node_id"),
-        Index("graph_edges_target_node_id_idx", "target_node_id"),
-        Index("graph_edges_graph_source_idx", "graph_id", "source_node_id"),
-        Index("graph_edges_graph_target_idx", "graph_id", "target_node_id"),
-    )
-
-
-class GraphNodeSecret(BaseModel):
-    """Encrypted secrets for graph nodes (e.g. a2a_auth_headers). Not stored in node.data JSONB."""
-
-    __tablename__ = "graph_node_secrets"
-
-    graph_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    node_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graph_nodes.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    key_slug: Mapped[str] = mapped_column(String(64), nullable=False, default="a2a_auth_headers")
-    encrypted_value: Mapped[str] = mapped_column(Text, nullable=False)
-
-    __table_args__ = (Index("graph_node_secrets_graph_node_idx", "graph_id", "node_id"),)
diff --git a/backend/app/models/graph_deployment_version.py b/backend/app/models/graph_deployment_version.py
deleted file mode 100644
index 430863160..000000000
--- a/backend/app/models/graph_deployment_version.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-Graph deployment version model
-"""
-
-import uuid
-from datetime import datetime
-from typing import TYPE_CHECKING, Optional
-
-from sqlalchemy import Boolean, DateTime, ForeignKey, Index, Integer, String, UniqueConstraint, func
-from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel
-
-if TYPE_CHECKING:
-    from .graph import AgentGraph
-
-
-from app.utils.datetime import utc_now
-
-
-class GraphDeploymentVersion(BaseModel):
-    """Agent Graph deployment version.
-
-    - Each deployment creates a new version with an auto-incrementing version number
-    - Only one version is active at a time (is_active=True)
-    - Store a full graph state snapshot (nodes + edges + variables)
-    """
-
-    __tablename__ = "graph_deployment_version"
-
-    graph_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-
-    version: Mapped[int] = mapped_column(Integer, nullable=False)
-
-    name: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
-
-    state: Mapped[dict] = mapped_column(JSONB, nullable=False)
-
-    is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
-
-    created_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True),
-        default=utc_now,
-        server_default=func.now(),
-        nullable=False,
-    )
-
-    created_by: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
-
-    graph: Mapped["AgentGraph"] = relationship(
-        "AgentGraph",
-        back_populates="deployment_versions",
-        lazy="selectin",
-    )
-
-    __table_args__ = (
-        UniqueConstraint("graph_id", "version", name="graph_deployment_version_graph_version_unique"),
-        Index("graph_deployment_version_graph_active_idx", "graph_id", "is_active"),
-        Index("graph_deployment_version_created_at_idx", "created_at"),
-    )
diff --git a/backend/app/models/graph_execution.py b/backend/app/models/graph_execution.py
deleted file mode 100644
index d1d0ff9ca..000000000
--- a/backend/app/models/graph_execution.py
+++ /dev/null
@@ -1,56 +0,0 @@
-"""
-GraphExecution model -- track Graph executions triggered via OpenAPI.
-"""
-
-import enum
-import uuid
-from datetime import datetime
-from typing import Optional
-
-from sqlalchemy import DateTime, Enum, ForeignKey, Index, String, Text
-from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column
-
-from .base import BaseModel
-
-
-class ExecutionStatus(str, enum.Enum):
-    INIT = "init"
-    EXECUTING = "executing"
-    FINISH = "finish"
-    FAILED = "failed"
-
-
-class GraphExecution(BaseModel):
-    """OpenAPI Graph execution record."""
-
-    __tablename__ = "graph_executions"
-
-    graph_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("graphs.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-
-    status: Mapped[ExecutionStatus] = mapped_column(
-        Enum(ExecutionStatus, values_callable=lambda e: [m.value for m in e]),
-        default=ExecutionStatus.INIT,
-        nullable=False,
-    )
-    input_variables: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
-    output: Mapped[Optional[dict]] = mapped_column(JSONB, nullable=True)
-    error_message: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-
-    started_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-    finished_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-
-    __table_args__ = (
-        Index("graph_executions_graph_id_idx", "graph_id"),
-        Index("graph_executions_user_id_idx", "user_id"),
-        Index("graph_executions_status_idx", "status"),
-    )
diff --git a/backend/app/models/task.py b/backend/app/models/task.py
new file mode 100644
index 000000000..5b762ab0b
--- /dev/null
+++ b/backend/app/models/task.py
@@ -0,0 +1,93 @@
+from __future__ import annotations
+
+import enum
+import uuid
+from datetime import datetime
+from typing import TYPE_CHECKING, Optional
+
+from sqlalchemy import Boolean, DateTime, Enum, Float, ForeignKey, Index, String, Text
+from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from .base import BaseModel
+
+if TYPE_CHECKING:
+    from .agent import Agent
+    from .agent_run import AgentRun
+
+
+class TaskStatus(str, enum.Enum):
+    BACKLOG = "backlog"
+    TODO = "todo"
+    IN_PROGRESS = "in_progress"
+    IN_REVIEW = "in_review"
+    DONE = "done"
+    CANCELLED = "cancelled"
+
+
+class TaskPriority(str, enum.Enum):
+    NONE = "none"
+    LOW = "low"
+    MEDIUM = "medium"
+    HIGH = "high"
+    URGENT = "urgent"
+
+
+class Task(BaseModel):
+    __tablename__ = "tasks"
+
+    workspace_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("workspaces.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    title: Mapped[str] = mapped_column(String(500), nullable=False)
+    description: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+    goal: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
+
+    status: Mapped[TaskStatus] = mapped_column(
+        Enum(TaskStatus, values_callable=lambda e: [m.value for m in e], name="taskstatus"),
+        nullable=False,
+        default=TaskStatus.BACKLOG,
+    )
+    priority: Mapped[TaskPriority] = mapped_column(
+        Enum(TaskPriority, values_callable=lambda e: [m.value for m in e], name="taskpriority"),
+        nullable=False,
+        default=TaskPriority.NONE,
+    )
+
+    agent_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("agents.id"),
+        nullable=True,
+    )
+    creator_id: Mapped[str] = mapped_column(
+        String(255),
+        ForeignKey("user.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    parent_task_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("tasks.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+    latest_run_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("agent_runs.id"),
+        nullable=True,
+    )
+
+    due_date: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
+    position: Mapped[float] = mapped_column(Float, nullable=False, default=0.0)
+    tags: Mapped[Optional[list]] = mapped_column(JSONB, nullable=True)
+    auto_approve: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
+
+    # Relationships
+    agent: Mapped[Optional["Agent"]] = relationship("Agent")
+    latest_run: Mapped[Optional["AgentRun"]] = relationship("AgentRun", foreign_keys=[latest_run_id])
+
+    __table_args__ = (
+        Index("tasks_workspace_status_idx", "workspace_id", "status"),
+        Index("tasks_agent_idx", "agent_id"),
+        Index("tasks_creator_idx", "creator_id", "created_at"),
+    )
diff --git a/backend/app/models/task_activity.py b/backend/app/models/task_activity.py
new file mode 100644
index 000000000..7e70353ff
--- /dev/null
+++ b/backend/app/models/task_activity.py
@@ -0,0 +1,61 @@
+from __future__ import annotations
+
+import enum
+import uuid
+from typing import Optional
+
+from sqlalchemy import Enum, ForeignKey, Index, String, Text
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.orm import Mapped, mapped_column
+
+from .base import BaseModel
+
+
+class ActivityAuthorType(str, enum.Enum):
+    MEMBER = "member"
+    AGENT = "agent"
+
+
+class ActivityType(str, enum.Enum):
+    COMMENT = "comment"
+    STATUS_CHANGE = "status_change"
+    PROGRESS_UPDATE = "progress_update"
+    SYSTEM = "system"
+
+
+class TaskActivity(BaseModel):
+    __tablename__ = "task_activities"
+
+    task_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("tasks.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    workspace_id: Mapped[uuid.UUID] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("workspaces.id", ondelete="CASCADE"),
+        nullable=False,
+    )
+    author_type: Mapped[ActivityAuthorType] = mapped_column(
+        Enum(ActivityAuthorType, values_callable=lambda e: [m.value for m in e], name="activityauthortype"),
+        nullable=False,
+    )
+    author_id: Mapped[str] = mapped_column(String(255), nullable=False)
+    content: Mapped[str] = mapped_column(Text, nullable=False)
+    type: Mapped[ActivityType] = mapped_column(
+        Enum(ActivityType, values_callable=lambda e: [m.value for m in e], name="activitytype"),
+        nullable=False,
+        default=ActivityType.COMMENT,
+    )
+    parent_activity_id: Mapped[Optional[uuid.UUID]] = mapped_column(
+        UUID(as_uuid=True),
+        ForeignKey("task_activities.id", ondelete="SET NULL"),
+        nullable=True,
+    )
+
+    __table_args__ = (
+        Index("task_activities_task_created_idx", "task_id", "created_at"),
+        Index("task_activities_workspace_idx", "workspace_id"),
+        Index("task_activities_author_idx", "author_type", "author_id"),
+        Index("task_activities_parent_idx", "parent_activity_id"),
+    )
diff --git a/backend/app/models/thread.py b/backend/app/models/thread.py
new file mode 100644
index 000000000..a266cc72a
--- /dev/null
+++ b/backend/app/models/thread.py
@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+import uuid
+from typing import TYPE_CHECKING, Optional
+
+from sqlalchemy import ForeignKey, String
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from .base import BaseModel
+
+if TYPE_CHECKING:
+    from .agent import Agent
+
+
+class Thread(BaseModel):
+    """A conversation thread between a user and an agent."""
+
+    __tablename__ = "threads"
+
+    agent_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("agents.id"), nullable=False)
+    workspace_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("workspaces.id"), nullable=False)
+    title: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
+    status: Mapped[str] = mapped_column(String(20), nullable=False, default="active")
+    created_by: Mapped[str] = mapped_column(String(255), ForeignKey("user.id"), nullable=False)
+
+    # Relationships
+    agent: Mapped[Agent] = relationship("Agent")
diff --git a/backend/app/models/workspace.py b/backend/app/models/workspace.py
index d89244ea2..b24519d1e 100644
--- a/backend/app/models/workspace.py
+++ b/backend/app/models/workspace.py
@@ -6,7 +6,7 @@
 from enum import Enum as PyEnum
 from typing import TYPE_CHECKING, List, Optional
 
-from sqlalchemy import Boolean, Enum, ForeignKey, Index, Integer, String, Text, UniqueConstraint
+from sqlalchemy import Enum, ForeignKey, String, Text, UniqueConstraint
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
@@ -115,45 +115,3 @@ class WorkspaceMember(BaseModel):
     )
 
     __table_args__ = (UniqueConstraint("workspace_id", "user_id", name="uq_workspace_member"),)
-
-
-class WorkspaceFolder(BaseModel, SoftDeleteMixin):
-    """Workspace folder."""
-
-    __tablename__ = "workspace_folder"
-
-    name: Mapped[str] = mapped_column(String(255), nullable=False)
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    workspace_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspaces.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    parent_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspace_folder.id", ondelete="SET NULL"),
-        nullable=True,
-    )
-
-    color: Mapped[Optional[str]] = mapped_column(String(32), nullable=True, default="#6B7280")
-    is_expanded: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
-    sort_order: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-
-    user: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-    workspace: Mapped["Workspace"] = relationship("Workspace", lazy="selectin")
-    parent: Mapped[Optional["WorkspaceFolder"]] = relationship(
-        "WorkspaceFolder",
-        remote_side="WorkspaceFolder.id",
-        lazy="selectin",
-    )
-
-    __table_args__ = (
-        Index("workspace_folder_user_idx", "user_id"),
-        Index("workspace_folder_workspace_parent_idx", "workspace_id", "parent_id"),
-        Index("workspace_folder_parent_sort_idx", "parent_id", "sort_order"),
-        Index("workspace_folder_deleted_at_idx", "deleted_at"),
-    )
diff --git a/backend/app/models/workspace_files.py b/backend/app/models/workspace_files.py
deleted file mode 100644
index ab11daca3..000000000
--- a/backend/app/models/workspace_files.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""
-File storage models
-"""
-
-import uuid
-from datetime import datetime
-from typing import TYPE_CHECKING, Optional
-
-from sqlalchemy import ForeignKey, Index, Integer, String, func
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel, utc_now
-
-if TYPE_CHECKING:
-    from .auth import AuthUser
-    from .workspace import Workspace
-
-
-class WorkspaceFile(BaseModel):
-    """Workspace file (legacy/simplified table)."""
-
-    __tablename__ = "workspace_file"
-
-    workspace_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspaces.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    name: Mapped[str] = mapped_column(String(255), nullable=False)
-    key: Mapped[str] = mapped_column(String(512), nullable=False, unique=True)
-    size: Mapped[int] = mapped_column(Integer, nullable=False)
-    type: Mapped[str] = mapped_column(String(100), nullable=False)
-    uploaded_by: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    uploaded_at: Mapped[datetime] = mapped_column(
-        nullable=False,
-        default=utc_now,
-        server_default=func.now(),
-    )
-
-    workspace: Mapped["Workspace"] = relationship("Workspace", lazy="selectin")
-    uploader: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-
-    __table_args__ = (
-        Index("workspace_file_workspace_id_idx", "workspace_id"),
-        Index("workspace_file_key_idx", "key"),
-    )
-
-
-class WorkspaceStoredFile(BaseModel):
-    """Unified file storage table (multi-context)."""
-
-    __tablename__ = "workspace_files"
-
-    key: Mapped[str] = mapped_column(String(512), nullable=False, unique=True)
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    workspace_id: Mapped[Optional[uuid.UUID]] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("workspaces.id", ondelete="CASCADE"),
-        nullable=True,
-    )
-    context: Mapped[str] = mapped_column(String(50), nullable=False)
-    original_name: Mapped[str] = mapped_column(String(255), nullable=False)
-    content_type: Mapped[str] = mapped_column(String(255), nullable=False)
-    size: Mapped[int] = mapped_column(Integer, nullable=False)
-    uploaded_at: Mapped[datetime] = mapped_column(
-        nullable=False,
-        default=utc_now,
-        server_default=func.now(),
-    )
-
-    user: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-    workspace: Mapped[Optional["Workspace"]] = relationship("Workspace", lazy="selectin")
-
-    __table_args__ = (
-        Index("workspace_files_key_idx", "key"),
-        Index("workspace_files_user_id_idx", "user_id"),
-        Index("workspace_files_workspace_id_idx", "workspace_id"),
-        Index("workspace_files_context_idx", "context"),
-    )
diff --git a/backend/app/repositories/__init__.py b/backend/app/repositories/__init__.py
index 0dd6bdf04..aeca8f571 100644
--- a/backend/app/repositories/__init__.py
+++ b/backend/app/repositories/__init__.py
@@ -5,8 +5,6 @@
 from .auth_session import AuthSessionRepository
 from .auth_user import AuthUserRepository
 from .base import BaseRepository
-from .graph import GraphEdgeRepository, GraphNodeRepository, GraphRepository
-from .graph_deployment_version import GraphDeploymentVersionRepository
 from .mcp_server import McpServerRepository
 from .user import UserRepository
 
@@ -15,9 +13,5 @@
     "UserRepository",
     "AuthUserRepository",
     "AuthSessionRepository",
-    "GraphRepository",
-    "GraphNodeRepository",
-    "GraphEdgeRepository",
-    "GraphDeploymentVersionRepository",
     "McpServerRepository",
 ]
diff --git a/backend/app/repositories/agent.py b/backend/app/repositories/agent.py
new file mode 100644
index 000000000..29d60da2f
--- /dev/null
+++ b/backend/app/repositories/agent.py
@@ -0,0 +1,59 @@
+"""
+Repositories for Agent and AgentVersion.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List, Optional
+
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import selectinload
+
+from app.models.agent import Agent, AgentVersion
+
+from .base import BaseRepository
+
+
+class AgentRepository(BaseRepository[Agent]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(Agent, db)
+
+    async def get_by_workspace_and_slug(self, workspace_id: uuid.UUID, slug: str) -> Optional[Agent]:
+        query = select(Agent).where(
+            Agent.workspace_id == workspace_id,
+            Agent.slug == slug,
+        )
+        result = await self.db.execute(query)
+        return result.scalar_one_or_none()
+
+    async def list_by_workspace(self, workspace_id: uuid.UUID) -> List[Agent]:
+        query = (
+            select(Agent)
+            .options(
+                selectinload(Agent.current_draft_version),
+                selectinload(Agent.active_release),
+            )
+            .where(Agent.workspace_id == workspace_id)
+            .order_by(Agent.created_at.desc())
+        )
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+
+class AgentVersionRepository(BaseRepository[AgentVersion]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(AgentVersion, db)
+
+    async def list_by_agent(self, agent_id: uuid.UUID) -> List[AgentVersion]:
+        query = (
+            select(AgentVersion).where(AgentVersion.agent_id == agent_id).order_by(AgentVersion.version_number.desc())
+        )
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def get_max_version_number(self, agent_id: uuid.UUID) -> int:
+        query = select(func.coalesce(func.max(AgentVersion.version_number), 0)).where(AgentVersion.agent_id == agent_id)
+        result = await self.db.execute(query)
+        return result.scalar() or 0
diff --git a/backend/app/repositories/agent_release.py b/backend/app/repositories/agent_release.py
new file mode 100644
index 000000000..175eeafcf
--- /dev/null
+++ b/backend/app/repositories/agent_release.py
@@ -0,0 +1,39 @@
+"""
+Repository for AgentRelease.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.agent import AgentRelease, AgentVersion
+
+from .base import BaseRepository
+
+
+class AgentReleaseRepository(BaseRepository[AgentRelease]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(AgentRelease, db)
+
+    async def list_by_agent(self, agent_id: uuid.UUID) -> List[AgentRelease]:
+        """List all releases for an agent (joining through AgentVersion)."""
+        query = (
+            select(AgentRelease)
+            .join(AgentVersion, AgentRelease.agent_version_id == AgentVersion.id)
+            .where(AgentVersion.agent_id == agent_id)
+            .order_by(AgentRelease.release_number.desc())
+        )
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def get_max_release_number(self, agent_version_id: uuid.UUID) -> int:
+        """Get the max release number for a given agent version (for auto-increment)."""
+        query = select(func.coalesce(func.max(AgentRelease.release_number), 0)).where(
+            AgentRelease.agent_version_id == agent_version_id
+        )
+        result = await self.db.execute(query)
+        return result.scalar() or 0
diff --git a/backend/app/repositories/agent_run.py b/backend/app/repositories/agent_run.py
index afe3e8a07..b1562d885 100644
--- a/backend/app/repositories/agent_run.py
+++ b/backend/app/repositories/agent_run.py
@@ -1,18 +1,17 @@
 """
-AgentRun repository helpers.
+Repository for AgentRun.
 """
 
 from __future__ import annotations
 
 import uuid
-from datetime import datetime
-from typing import Optional, Sequence
+from typing import List, Optional
 
-from sqlalchemy import and_, desc, or_, select
-from sqlalchemy import delete as sa_delete
+from sqlalchemy import or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.models.agent_run import AgentRun, AgentRunEvent, AgentRunSnapshot, AgentRunStatus
+from app.models.agent import AgentRelease, AgentVersion
+from app.models.agent_run import AgentRun
 
 from .base import BaseRepository
 
@@ -21,137 +20,69 @@ class AgentRunRepository(BaseRepository[AgentRun]):
     def __init__(self, db: AsyncSession):
         super().__init__(AgentRun, db)
 
-    async def get_by_id_and_user(self, run_id: uuid.UUID, user_id: str) -> Optional[AgentRun]:
-        result = await self.db.execute(
-            select(AgentRun).where(
-                AgentRun.id == run_id,
-                AgentRun.user_id == user_id,
-            )
-        )
-        return result.scalar_one_or_none()
-
-    async def get_snapshot(self, run_id: uuid.UUID) -> Optional[AgentRunSnapshot]:
-        result = await self.db.execute(select(AgentRunSnapshot).where(AgentRunSnapshot.run_id == run_id))
-        return result.scalar_one_or_none()
-
-    async def list_events_after(
-        self, run_id: uuid.UUID, after_seq: int = 0, limit: int = 500
-    ) -> Sequence[AgentRunEvent]:
-        result = await self.db.execute(
-            select(AgentRunEvent)
-            .where(
-                AgentRunEvent.run_id == run_id,
-                AgentRunEvent.seq > after_seq,
-            )
-            .order_by(AgentRunEvent.seq.asc())
+    async def list_by_workspace(self, workspace_id: uuid.UUID, limit: int = 50) -> List[AgentRun]:
+        """List all runs for a workspace."""
+        query = (
+            select(AgentRun)
+            .where(AgentRun.workspace_id == workspace_id)
+            .order_by(AgentRun.created_at.desc())
             .limit(limit)
         )
-        return result.scalars().all()
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
 
-    async def get_run_for_update(self, run_id: uuid.UUID, user_id: Optional[str] = None) -> Optional[AgentRun]:
-        query = select(AgentRun).where(AgentRun.id == run_id)
-        if user_id is not None:
-            query = query.where(AgentRun.user_id == user_id)
-        result = await self.db.execute(query.with_for_update())
-        return result.scalar_one_or_none()
-
-    async def find_latest_active_skill_creator_run(
+    async def list_by_release(
         self,
-        *,
-        user_id: str,
-        graph_id: uuid.UUID,
-        thread_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-        # Wrapper kept for backward compatibility with external callers.
-        return await self.find_latest_active_run(
-            user_id=user_id,
-            agent_name="skill_creator",
-            graph_id=graph_id,
-            thread_id=thread_id,
-        )
-
-    async def find_latest_active_run(
+        release_id: uuid.UUID,
+        workspace_id: uuid.UUID | None = None,
+    ) -> List[AgentRun]:
+        """List all runs for a specific release."""
+        query = select(AgentRun).where(AgentRun.release_id == release_id).order_by(AgentRun.created_at.desc())
+        if workspace_id:
+            query = query.where(AgentRun.workspace_id == workspace_id)
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def list_by_task(
         self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-        active_statuses = (AgentRunStatus.QUEUED, AgentRunStatus.RUNNING, AgentRunStatus.INTERRUPT_WAIT)
-        query = select(AgentRun).where(
-            AgentRun.user_id == user_id,
-            AgentRun.agent_name == agent_name,
-            AgentRun.status.in_(active_statuses),
-        )
-        if graph_id is not None:
-            query = query.where(AgentRun.graph_id == graph_id)
-        if thread_id:
-            query = query.where(AgentRun.thread_id == thread_id)
-        result = await self.db.execute(query.order_by(desc(AgentRun.updated_at)).limit(1))
-        return result.scalar_one_or_none()
-
-    async def list_recent_runs_for_user(
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID | None = None,
+    ) -> List[AgentRun]:
+        """List all runs for a specific task."""
+        query = select(AgentRun).where(AgentRun.task_id == task_id).order_by(AgentRun.created_at.desc())
+        if workspace_id:
+            query = query.where(AgentRun.workspace_id == workspace_id)
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def find_by_agent_and_trigger(
         self,
-        *,
-        user_id: str,
-        run_type: Optional[str] = None,
-        agent_name: Optional[str] = None,
+        agent_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        trigger_medium: Optional[str] = None,
+        run_purpose: Optional[str] = None,
         status: Optional[str] = None,
-        search: Optional[str] = None,
-        graph_id: Optional[uuid.UUID] = None,
-        limit: int = 50,
-    ) -> Sequence[AgentRun]:
-        query = select(AgentRun).where(AgentRun.user_id == user_id)
-        if run_type:
-            query = query.where(AgentRun.run_type == run_type)
-        if agent_name:
-            query = query.where(AgentRun.agent_name == agent_name)
-        if status:
-            query = query.where(AgentRun.status == status)
-        if search:
-            query = query.where(AgentRun.title.ilike(f"%{search}%"))
-        if graph_id:
-            query = query.where(AgentRun.graph_id == graph_id)
-        result = await self.db.execute(query.order_by(desc(AgentRun.updated_at)).limit(limit))
-        return result.scalars().all()
-
-    async def delete_runs_for_graph(
-        self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: uuid.UUID,
-    ) -> int:
-        """Hard-delete all runs (and cascaded events/snapshots) for a graph."""
-        result = await self.db.execute(
-            sa_delete(AgentRun).where(
-                AgentRun.user_id == user_id,
-                AgentRun.agent_name == agent_name,
-                AgentRun.graph_id == graph_id,
-            )
-        )
-        await self.db.commit()
-        return getattr(result, "rowcount", 0) or 0
-
-    async def list_recoverable_stale_runs(
-        self,
-        *,
-        stale_before: datetime,
-    ) -> Sequence[AgentRun]:
-        recoverable_statuses = (AgentRunStatus.QUEUED, AgentRunStatus.RUNNING)
-        result = await self.db.execute(
+    ) -> List[AgentRun]:
+        """Find runs for a specific agent, optionally filtered by trigger_medium, run_purpose and status."""
+        query = (
             select(AgentRun)
-            .where(
-                AgentRun.status.in_(recoverable_statuses),
+            .outerjoin(AgentRelease, AgentRun.release_id == AgentRelease.id)
+            .outerjoin(
+                AgentVersion,
                 or_(
-                    and_(
-                        AgentRun.last_heartbeat_at.is_(None),
-                        AgentRun.updated_at < stale_before,
-                    ),
-                    AgentRun.last_heartbeat_at < stale_before,
+                    AgentRelease.agent_version_id == AgentVersion.id,
+                    AgentRun.agent_version_id == AgentVersion.id,
                 ),
             )
-            .order_by(desc(AgentRun.updated_at))
+            .where(AgentVersion.agent_id == agent_id)
+            .where(AgentRun.workspace_id == workspace_id)
         )
-        return result.scalars().all()
+        if trigger_medium:
+            query = query.where(AgentRun.trigger_medium == trigger_medium)
+        if run_purpose:
+            query = query.where(AgentRun.run_purpose == run_purpose)
+        if status:
+            query = query.where(AgentRun.status == status)
+        query = query.order_by(AgentRun.created_at.desc()).limit(10)
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
diff --git a/backend/app/repositories/execution.py b/backend/app/repositories/execution.py
new file mode 100644
index 000000000..06c66b648
--- /dev/null
+++ b/backend/app/repositories/execution.py
@@ -0,0 +1,73 @@
+"""
+Repository for Execution and ExecutionEvent.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import List
+
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.execution import Execution, ExecutionEvent
+
+from .base import BaseRepository
+
+
+class ExecutionRepository(BaseRepository[Execution]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(Execution, db)
+
+    async def list_by_run(self, run_id: uuid.UUID) -> List[Execution]:
+        """List all executions for a run, ordered by attempt_index."""
+        query = select(Execution).where(Execution.run_id == run_id).order_by(Execution.attempt_index.asc())
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def get_max_attempt(self, run_id: uuid.UUID) -> int:
+        """Get the max attempt_index for a given run."""
+        query = select(func.coalesce(func.max(Execution.attempt_index), 0)).where(Execution.run_id == run_id)
+        result = await self.db.execute(query)
+        return result.scalar() or 0
+
+    async def list_recoverable_stale(
+        self,
+        statuses: tuple[str, ...],
+        stale_before: datetime,
+    ) -> List[Execution]:
+        """Query executions eligible for stale-reaping.
+
+        Args:
+            statuses: execution status values to match (e.g. ``("pending", "dispatched")``).
+            stale_before: cutoff datetime; executions whose ``started_at``
+                (or ``created_at`` if never started) is older than this are stale.
+
+        Returns:
+            List of stale Execution records, oldest first.
+        """
+        cutoff = func.coalesce(Execution.started_at, Execution.created_at)
+        query = (
+            select(Execution)
+            .where(Execution.status.in_(statuses), cutoff < stale_before)
+            .order_by(Execution.created_at.asc())
+        )
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+
+class ExecutionEventRepository(BaseRepository[ExecutionEvent]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(ExecutionEvent, db)
+
+    async def list_by_execution(self, execution_id: uuid.UUID, limit: int = 500) -> List[ExecutionEvent]:
+        """List events for an execution, ordered by sequence_no."""
+        query = (
+            select(ExecutionEvent)
+            .where(ExecutionEvent.execution_id == execution_id)
+            .order_by(ExecutionEvent.sequence_no.asc())
+            .limit(limit)
+        )
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
diff --git a/backend/app/repositories/graph.py b/backend/app/repositories/graph.py
deleted file mode 100644
index 8c60c5e83..000000000
--- a/backend/app/repositories/graph.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""
-Graph repositories
-"""
-
-from __future__ import annotations
-
-import uuid
-from typing import List, Optional
-
-from sqlalchemy import and_, delete, or_, select
-from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import selectinload
-
-from app.models.graph import AgentGraph, GraphEdge, GraphNode
-
-from .base import BaseRepository
-
-
-def _graph_not_deleted(query):
-    """Filter out soft-deleted graphs."""
-    return query.where(AgentGraph.deleted_at.is_(None))
-
-
-class GraphRepository(BaseRepository[AgentGraph]):
-    """Agent Graph Repository (soft-delete aware)"""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(AgentGraph, db)
-
-    async def get(self, id: uuid.UUID, relations: Optional[List[str]] = None):
-        """Get graph by ID; returns None if deleted."""
-        query = select(AgentGraph).where(AgentGraph.id == id)
-        query = _graph_not_deleted(query)
-        if relations:
-            for rel in relations:
-                if hasattr(AgentGraph, rel):
-                    query = query.options(selectinload(getattr(AgentGraph, rel)))
-        result = await self.db.execute(query)
-        return result.scalar_one_or_none()
-
-    async def list_by_user_with_filters(
-        self,
-        user_id: str,
-        parent_id: Optional[uuid.UUID] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-    ) -> List[AgentGraph]:
-        """List graphs by user ID (exclude soft-deleted)."""
-        query = select(AgentGraph).where(AgentGraph.user_id == user_id)
-        query = _graph_not_deleted(query)
-        if parent_id is not None:
-            query = query.where(AgentGraph.parent_id == parent_id)
-        if workspace_id is not None:
-            query = query.where(AgentGraph.workspace_id == workspace_id)
-        query = query.order_by(AgentGraph.created_at.desc(), AgentGraph.id.desc())
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-
-class GraphNodeRepository(BaseRepository[GraphNode]):
-    """Graph Node Repository"""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(GraphNode, db)
-
-    async def list_by_graph(self, graph_id: uuid.UUID) -> List[GraphNode]:
-        """List all nodes for a graph."""
-        query = select(GraphNode).where(GraphNode.graph_id == graph_id)
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-    async def delete_by_graph(self, graph_id: uuid.UUID) -> int:
-        """Delete all nodes of a graph."""
-        stmt = delete(GraphNode).where(GraphNode.graph_id == graph_id)
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
-
-    async def delete_by_ids(self, graph_id: uuid.UUID, node_ids: List[uuid.UUID]) -> int:
-        """Batch-delete nodes by IDs."""
-        if not node_ids:
-            return 0
-        stmt = delete(GraphNode).where(
-            and_(
-                GraphNode.graph_id == graph_id,
-                GraphNode.id.in_(node_ids),
-            )
-        )
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
-
-
-class GraphEdgeRepository(BaseRepository[GraphEdge]):
-    """Graph Edge Repository"""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(GraphEdge, db)
-
-    async def list_by_graph(self, graph_id: uuid.UUID) -> List[GraphEdge]:
-        """List all edges for a graph."""
-        query = select(GraphEdge).where(GraphEdge.graph_id == graph_id)
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-    async def delete_by_graph(self, graph_id: uuid.UUID) -> int:
-        """Delete all edges of a graph."""
-        stmt = delete(GraphEdge).where(GraphEdge.graph_id == graph_id)
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
-
-    async def delete_by_node_ids(self, graph_id: uuid.UUID, node_ids: List[uuid.UUID]) -> int:
-        """Delete all edges connected to the specified nodes."""
-        if not node_ids:
-            return 0
-        stmt = delete(GraphEdge).where(
-            and_(
-                GraphEdge.graph_id == graph_id,
-                or_(
-                    GraphEdge.source_node_id.in_(node_ids),
-                    GraphEdge.target_node_id.in_(node_ids),
-                ),
-            )
-        )
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
diff --git a/backend/app/repositories/graph_deployment_version.py b/backend/app/repositories/graph_deployment_version.py
deleted file mode 100644
index 51e1a21be..000000000
--- a/backend/app/repositories/graph_deployment_version.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-Graph deployment version Repository
-"""
-
-from __future__ import annotations
-
-import uuid
-from datetime import datetime, timezone
-from typing import Any, Dict, List, Optional
-
-from sqlalchemy import and_, delete, func, select, update
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.graph_deployment_version import GraphDeploymentVersion
-
-from .base import BaseRepository
-
-
-class GraphDeploymentVersionRepository(BaseRepository[GraphDeploymentVersion]):
-    """Graph deployment version Repository."""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(GraphDeploymentVersion, db)
-
-    async def get_by_graph_and_version(self, graph_id: uuid.UUID, version: int) -> Optional[GraphDeploymentVersion]:
-        """Get a specific version of a graph."""
-        query = select(GraphDeploymentVersion).where(
-            and_(
-                GraphDeploymentVersion.graph_id == graph_id,
-                GraphDeploymentVersion.version == version,
-            )
-        )
-        result = await self.db.execute(query)
-        return result.scalar_one_or_none()
-
-    async def get_active_version(self, graph_id: uuid.UUID) -> Optional[GraphDeploymentVersion]:
-        """Get the active version of a graph."""
-        query = (
-            select(GraphDeploymentVersion)
-            .where(
-                and_(
-                    GraphDeploymentVersion.graph_id == graph_id,
-                    GraphDeploymentVersion.is_active,
-                )
-            )
-            .order_by(GraphDeploymentVersion.created_at.desc())
-        )
-        result = await self.db.execute(query)
-        return result.scalar_one_or_none()
-
-    async def list_by_graph(self, graph_id: uuid.UUID, include_inactive: bool = True) -> List[GraphDeploymentVersion]:
-        """List all versions of a graph."""
-        query = select(GraphDeploymentVersion).where(GraphDeploymentVersion.graph_id == graph_id)
-
-        if not include_inactive:
-            query = query.where(GraphDeploymentVersion.is_active)
-
-        query = query.order_by(GraphDeploymentVersion.version.desc())
-
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-    async def list_by_graph_paginated(
-        self,
-        graph_id: uuid.UUID,
-        page: int = 1,
-        page_size: int = 10,
-        include_inactive: bool = True,
-    ) -> tuple[List[GraphDeploymentVersion], int]:
-        """List versions of a graph (paginated).
-
-        Returns:
-            tuple: (version list, total count)
-        """
-        base_query = select(GraphDeploymentVersion).where(GraphDeploymentVersion.graph_id == graph_id)
-
-        if not include_inactive:
-            base_query = base_query.where(GraphDeploymentVersion.is_active)
-
-        # get total count
-        count_query = select(func.count()).where(GraphDeploymentVersion.graph_id == graph_id)
-        if not include_inactive:
-            count_query = count_query.where(GraphDeploymentVersion.is_active)
-        count_result = await self.db.execute(count_query)
-        total = count_result.scalar() or 0
-
-        # paginated query
-        offset = (page - 1) * page_size
-        query = base_query.order_by(GraphDeploymentVersion.version.desc()).offset(offset).limit(page_size)
-
-        result = await self.db.execute(query)
-        versions = list(result.scalars().all())
-
-        return versions, total
-
-    async def get_next_version_number(self, graph_id: uuid.UUID) -> int:
-        """Get the next version number."""
-        query = select(func.coalesce(func.max(GraphDeploymentVersion.version), 0)).where(
-            GraphDeploymentVersion.graph_id == graph_id
-        )
-        result = await self.db.execute(query)
-        max_version = result.scalar() or 0
-        return max_version + 1
-
-    async def deactivate_all_versions(self, graph_id: uuid.UUID) -> int:
-        """Deactivate all versions of a graph."""
-        stmt = update(GraphDeploymentVersion).where(GraphDeploymentVersion.graph_id == graph_id).values(is_active=False)
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
-
-    async def create_version(
-        self,
-        graph_id: uuid.UUID,
-        state: Dict[str, Any],
-        created_by: Optional[str] = None,
-        name: Optional[str] = None,
-    ) -> GraphDeploymentVersion:
-        """Create a new version."""
-        next_version = await self.get_next_version_number(graph_id)
-        await self.deactivate_all_versions(graph_id)
-
-        version_data = {
-            "graph_id": graph_id,
-            "version": next_version,
-            "state": state,
-            "is_active": True,
-            "created_at": datetime.now(timezone.utc),
-        }
-        if created_by is not None:
-            version_data["created_by"] = created_by
-        if name is not None:
-            version_data["name"] = name
-
-        instance = GraphDeploymentVersion(**version_data)
-        self.db.add(instance)
-        await self.db.flush()
-        await self.db.refresh(instance)
-
-        return instance
-
-    async def activate_version(self, graph_id: uuid.UUID, version: int) -> Optional[GraphDeploymentVersion]:
-        """Activate a specific version."""
-        await self.deactivate_all_versions(graph_id)
-
-        stmt = (
-            update(GraphDeploymentVersion)
-            .where(
-                and_(
-                    GraphDeploymentVersion.graph_id == graph_id,
-                    GraphDeploymentVersion.version == version,
-                )
-            )
-            .values(is_active=True)
-        )
-        await self.db.execute(stmt)
-        await self.db.flush()
-
-        return await self.get_by_graph_and_version(graph_id, version)
-
-    async def rename_version(self, graph_id: uuid.UUID, version: int, name: str) -> Optional[GraphDeploymentVersion]:
-        """Rename a version."""
-        stmt = (
-            update(GraphDeploymentVersion)
-            .where(
-                and_(
-                    GraphDeploymentVersion.graph_id == graph_id,
-                    GraphDeploymentVersion.version == version,
-                )
-            )
-            .values(name=name)
-        )
-        await self.db.execute(stmt)
-        await self.db.flush()
-
-        return await self.get_by_graph_and_version(graph_id, version)
-
-    async def count_by_graph(self, graph_id: uuid.UUID) -> int:
-        """Count versions for a graph."""
-        query = select(func.count()).where(GraphDeploymentVersion.graph_id == graph_id)
-        result = await self.db.execute(query)
-        return result.scalar() or 0
-
-    async def delete_by_graph(self, graph_id: uuid.UUID) -> int:
-        """Delete all versions of a graph."""
-        stmt = delete(GraphDeploymentVersion).where(GraphDeploymentVersion.graph_id == graph_id)
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
-
-    async def delete_version(self, graph_id: uuid.UUID, version: int) -> int:
-        """Delete a specific version."""
-        stmt = delete(GraphDeploymentVersion).where(
-            and_(
-                GraphDeploymentVersion.graph_id == graph_id,
-                GraphDeploymentVersion.version == version,
-            )
-        )
-        result = await self.db.execute(stmt)
-        return getattr(result, "rowcount", 0) or 0
diff --git a/backend/app/repositories/graph_execution.py b/backend/app/repositories/graph_execution.py
deleted file mode 100644
index c0c96e9e5..000000000
--- a/backend/app/repositories/graph_execution.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
-GraphExecution Repository
-"""
-
-from __future__ import annotations
-
-import uuid
-from typing import Optional
-
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.graph_execution import GraphExecution
-
-from .base import BaseRepository
-
-
-class GraphExecutionRepository(BaseRepository[GraphExecution]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(GraphExecution, db)
-
-    async def get_by_id_and_user(self, execution_id: uuid.UUID, user_id: str) -> Optional[GraphExecution]:
-        """Get an execution record for a specific user."""
-        result = await self.db.execute(
-            select(GraphExecution).where(
-                GraphExecution.id == execution_id,
-                GraphExecution.user_id == user_id,
-            )
-        )
-        return result.scalar_one_or_none()
diff --git a/backend/app/repositories/model_instance.py b/backend/app/repositories/model_instance.py
index 60d845e60..51c4d99a9 100644
--- a/backend/app/repositories/model_instance.py
+++ b/backend/app/repositories/model_instance.py
@@ -32,7 +32,6 @@ async def get_best_instance(
         self,
         model_name: str,
         provider_id: uuid.UUID,
-        provider_name: str = "",  # kept for call-site compatibility; unused
         user_id: Optional[str] = None,
     ) -> ModelInstance | None:
         """Get an instance by provider and model name. Prefer global instances; fall back to any valid one."""
@@ -63,7 +62,6 @@ async def list_all(self) -> list[ModelInstance]:
     async def list_by_provider(
         self,
         provider_id: uuid.UUID,
-        provider_name: Optional[str] = None,  # kept for call-site compatibility; unused
     ) -> list[ModelInstance]:
         """Filter model instances by provider."""
         query = (
diff --git a/backend/app/repositories/task.py b/backend/app/repositories/task.py
new file mode 100644
index 000000000..d7ce60d39
--- /dev/null
+++ b/backend/app/repositories/task.py
@@ -0,0 +1,73 @@
+"""
+Task repository helpers.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Optional, Sequence
+
+from sqlalchemy import desc, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.task import Task, TaskStatus
+
+from .base import BaseRepository
+
+
+class TaskRepository(BaseRepository[Task]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(Task, db)
+
+    async def get_by_id_and_workspace(self, task_id: uuid.UUID, workspace_id: uuid.UUID) -> Optional[Task]:
+        result = await self.db.execute(
+            select(Task).where(
+                Task.id == task_id,
+                Task.workspace_id == workspace_id,
+            )
+        )
+        return result.scalar_one_or_none()
+
+    async def get_for_update(self, task_id: uuid.UUID, workspace_id: Optional[uuid.UUID] = None) -> Optional[Task]:
+        query = select(Task).where(Task.id == task_id)
+        if workspace_id is not None:
+            query = query.where(Task.workspace_id == workspace_id)
+        result = await self.db.execute(query.with_for_update())
+        return result.scalar_one_or_none()
+
+    async def list_by_workspace(
+        self,
+        *,
+        workspace_id: uuid.UUID,
+        status: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        agent_id: Optional[uuid.UUID] = None,
+        parent_task_id: Optional[uuid.UUID] = None,
+        limit: int = 50,
+    ) -> Sequence[Task]:
+        query = select(Task).where(Task.workspace_id == workspace_id)
+        if status:
+            query = query.where(Task.status == status)
+        if creator_id:
+            query = query.where(Task.creator_id == creator_id)
+        if agent_id:
+            query = query.where(Task.agent_id == agent_id)
+        if parent_task_id:
+            query = query.where(Task.parent_task_id == parent_task_id)
+        result = await self.db.execute(query.order_by(Task.position.asc(), desc(Task.created_at)).limit(limit))
+        return result.scalars().all()
+
+    async def list_dispatchable(self, *, workspace_id: Optional[uuid.UUID] = None, limit: int = 10) -> Sequence[Task]:
+        """Find BACKLOG tasks with an agent assigned, ready for dispatch.
+
+        When workspace_id is None, searches across all workspaces.
+        """
+        query = select(Task).where(
+            Task.status == TaskStatus.BACKLOG,
+            Task.agent_id.isnot(None),
+            Task.latest_run_id.is_(None),
+        )
+        if workspace_id is not None:
+            query = query.where(Task.workspace_id == workspace_id)
+        result = await self.db.execute(query.order_by(Task.position.asc(), Task.created_at.asc()).limit(limit))
+        return result.scalars().all()
diff --git a/backend/app/repositories/task_activity.py b/backend/app/repositories/task_activity.py
new file mode 100644
index 000000000..4faaaefc2
--- /dev/null
+++ b/backend/app/repositories/task_activity.py
@@ -0,0 +1,67 @@
+"""
+TaskActivity repository helpers.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional, Sequence
+
+from sqlalchemy import asc, desc, literal, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.task_activity import ActivityAuthorType, TaskActivity
+
+from .base import BaseRepository
+
+
+class TaskActivityRepository(BaseRepository[TaskActivity]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(TaskActivity, db)
+
+    async def list_by_task(
+        self,
+        task_id: uuid.UUID,
+        *,
+        cursor: Optional[datetime] = None,
+        limit: int = 50,
+        order_asc: bool = True,
+    ) -> Sequence[TaskActivity]:
+        query = select(TaskActivity).where(TaskActivity.task_id == task_id)
+        if cursor is not None:
+            if order_asc:
+                query = query.where(TaskActivity.created_at > cursor)
+            else:
+                query = query.where(TaskActivity.created_at < cursor)
+        order = asc(TaskActivity.created_at) if order_asc else desc(TaskActivity.created_at)
+        result = await self.db.execute(query.order_by(order).limit(limit))
+        return result.scalars().all()
+
+    async def get_by_id_and_task(self, activity_id: uuid.UUID, task_id: uuid.UUID) -> Optional[TaskActivity]:
+        result = await self.db.execute(
+            select(TaskActivity).where(
+                TaskActivity.id == activity_id,
+                TaskActivity.task_id == task_id,
+            )
+        )
+        return result.scalar_one_or_none()
+
+    async def has_agent_posted_since(
+        self,
+        task_id: uuid.UUID,
+        agent_id: str,
+        since: datetime,
+    ) -> bool:
+        stmt = (
+            select(literal(True))
+            .where(
+                TaskActivity.task_id == task_id,
+                TaskActivity.author_type == ActivityAuthorType.AGENT,
+                TaskActivity.author_id == agent_id,
+                TaskActivity.created_at >= since,
+            )
+            .limit(1)
+        )
+        result = await self.db.execute(stmt)
+        return result.scalar() is not None
diff --git a/backend/app/repositories/thread.py b/backend/app/repositories/thread.py
new file mode 100644
index 000000000..2c59dfc57
--- /dev/null
+++ b/backend/app/repositories/thread.py
@@ -0,0 +1,30 @@
+"""
+Repositories for Thread.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.thread import Thread
+
+from .base import BaseRepository
+
+
+class ThreadRepository(BaseRepository[Thread]):
+    def __init__(self, db: AsyncSession):
+        super().__init__(Thread, db)
+
+    async def list_by_agent(self, agent_id: uuid.UUID) -> List[Thread]:
+        query = select(Thread).where(Thread.agent_id == agent_id).order_by(Thread.updated_at.desc())
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
+
+    async def list_by_workspace(self, workspace_id: uuid.UUID) -> List[Thread]:
+        query = select(Thread).where(Thread.workspace_id == workspace_id).order_by(Thread.updated_at.desc())
+        result = await self.db.execute(query)
+        return list(result.scalars().all())
diff --git a/backend/app/repositories/workspace_file.py b/backend/app/repositories/workspace_file.py
deleted file mode 100644
index 7c8b75b1a..000000000
--- a/backend/app/repositories/workspace_file.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""
-Workspace file storage Repository
-"""
-
-import uuid
-from typing import List, Optional
-
-from sqlalchemy import func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.workspace_files import WorkspaceStoredFile
-
-from .base import BaseRepository
-
-
-class WorkspaceStoredFileRepository(BaseRepository[WorkspaceStoredFile]):
-    """Workspace file metadata access."""
-
-    CONTEXT_WORKSPACE = "workspace"
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(WorkspaceStoredFile, db)
-
-    async def list_workspace_files(self, workspace_id: uuid.UUID) -> List[WorkspaceStoredFile]:
-        """List workspace files ordered by upload time."""
-        query = (
-            select(WorkspaceStoredFile)
-            .where(
-                WorkspaceStoredFile.workspace_id == workspace_id,
-                WorkspaceStoredFile.context == self.CONTEXT_WORKSPACE,
-            )
-            .order_by(WorkspaceStoredFile.uploaded_at.asc())
-        )
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-    async def get_by_id_and_workspace(
-        self, file_id: uuid.UUID, workspace_id: uuid.UUID
-    ) -> Optional[WorkspaceStoredFile]:
-        """Get a record by file ID and workspace."""
-        query = select(WorkspaceStoredFile).where(
-            WorkspaceStoredFile.id == file_id,
-            WorkspaceStoredFile.workspace_id == workspace_id,
-            WorkspaceStoredFile.context == self.CONTEXT_WORKSPACE,
-        )
-        result = await self.db.execute(query)
-        return result.scalar_one_or_none()
-
-    async def find_by_name(self, workspace_id: uuid.UUID, original_name: str) -> Optional[WorkspaceStoredFile]:
-        """Detect a file with the same name."""
-        query = select(WorkspaceStoredFile).where(
-            WorkspaceStoredFile.workspace_id == workspace_id,
-            WorkspaceStoredFile.original_name == original_name,
-            WorkspaceStoredFile.context == self.CONTEXT_WORKSPACE,
-        )
-        result = await self.db.execute(query)
-        return result.scalar_one_or_none()
-
-    async def sum_user_usage(self, user_id: uuid.UUID) -> int:
-        """Calculate total storage used by all files of a user (bytes)."""
-        query = select(func.coalesce(func.sum(WorkspaceStoredFile.size), 0)).where(
-            WorkspaceStoredFile.user_id == user_id
-        )
-        result = await self.db.execute(query)
-        total = result.scalar() or 0
-        return int(total)
-
-    async def sum_workspace_usage(self, workspace_id: uuid.UUID) -> int:
-        """Calculate total storage used by files in a workspace (bytes)."""
-        query = select(func.coalesce(func.sum(WorkspaceStoredFile.size), 0)).where(
-            WorkspaceStoredFile.workspace_id == workspace_id,
-            WorkspaceStoredFile.context == self.CONTEXT_WORKSPACE,
-        )
-        result = await self.db.execute(query)
-        total = result.scalar() or 0
-        return int(total)
diff --git a/backend/app/repositories/workspace_folder.py b/backend/app/repositories/workspace_folder.py
deleted file mode 100644
index 0c201610a..000000000
--- a/backend/app/repositories/workspace_folder.py
+++ /dev/null
@@ -1,68 +0,0 @@
-"""
-Workspace folder Repository
-"""
-
-import uuid
-from typing import List, Optional, Tuple
-
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.workspace import WorkspaceFolder
-
-from .base import BaseRepository
-
-
-class WorkflowFolderRepository(BaseRepository[WorkspaceFolder]):
-    """Folder data access."""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(WorkspaceFolder, db)
-
-    async def list_by_workspace(self, workspace_id: uuid.UUID) -> List[WorkspaceFolder]:
-        query = (
-            select(WorkspaceFolder)
-            .where(
-                WorkspaceFolder.workspace_id == workspace_id,
-                WorkspaceFolder.deleted_at.is_(None),
-            )
-            .order_by(WorkspaceFolder.sort_order.asc(), WorkspaceFolder.created_at.asc())
-        )
-        result = await self.db.execute(query)
-        return list(result.scalars().all())
-
-    async def max_sort_order(self, workspace_id: uuid.UUID, parent_id: Optional[uuid.UUID]) -> int:
-        """
-        Return the maximum sort_order under the given workspace + parent.
-        Return -1 if no records exist (so the caller can use next_sort = max + 1, starting at 0).
-        """
-        conditions = [
-            WorkspaceFolder.workspace_id == workspace_id,
-            WorkspaceFolder.parent_id.is_(None) if parent_id is None else WorkspaceFolder.parent_id == parent_id,
-            WorkspaceFolder.deleted_at.is_(None),
-        ]
-
-        query = (
-            select(WorkspaceFolder.sort_order).where(*conditions).order_by(WorkspaceFolder.sort_order.desc()).limit(1)
-        )
-        result = await self.db.execute(query)
-        current = result.scalar_one_or_none()
-        return current if current is not None else -1
-
-    async def list_relations_by_workspace(self, workspace_id: uuid.UUID) -> List[Tuple[uuid.UUID, Optional[uuid.UUID]]]:
-        """Get all (id, parent_id) pairs in a workspace for building a tree/subtree."""
-        query = select(WorkspaceFolder.id, WorkspaceFolder.parent_id).where(
-            WorkspaceFolder.workspace_id == workspace_id,
-            WorkspaceFolder.deleted_at.is_(None),
-        )
-
-        result = await self.db.execute(query)
-        return [(row[0], row[1]) for row in result.fetchall()]
-
-    async def ensure_same_workspace(self, folder_id: uuid.UUID, workspace_id: uuid.UUID) -> WorkspaceFolder:
-        folder = await self.get(folder_id)
-        if not folder or folder.workspace_id != workspace_id:
-            from app.common.exceptions import NotFoundException
-
-            raise NotFoundException("Folder not found in workspace")
-        return folder
diff --git a/backend/app/schemas/__init__.py b/backend/app/schemas/__init__.py
index d2fe8edae..3922843ce 100644
--- a/backend/app/schemas/__init__.py
+++ b/backend/app/schemas/__init__.py
@@ -5,28 +5,6 @@
 from .base import BaseResponse
 from .chat import ChatRequest, ChatResponse
 from .common import PaginatedResponse
-from .conversation import (
-    CheckpointResponse,
-    ConversationCreate,
-    ConversationDetailResponse,
-    ConversationExportResponse,
-    ConversationImportRequest,
-    ConversationMessageResponse,
-    ConversationResponse,
-    ConversationUpdate,
-    SearchRequest,
-    SearchResponse,
-    UserStatsResponse,
-)
-from .graph_deployment_version import (
-    GraphDeploymentVersionListResponse,
-    GraphDeploymentVersionResponse,
-    GraphDeploymentVersionResponseCamel,
-    GraphDeployRequest,
-    GraphDeployResponse,
-    GraphRenameVersionRequest,
-    GraphRevertResponse,
-)
 from .mcp import (
     ConnectionTestResult,
     McpServerCreate,
@@ -41,19 +19,8 @@
     "BaseResponse",
     "PaginatedResponse",
     "UserResponse",
-    "ConversationCreate",
-    "ConversationUpdate",
-    "ConversationResponse",
-    "ConversationDetailResponse",
-    "ConversationExportResponse",
-    "ConversationImportRequest",
-    "CheckpointResponse",
     "ChatRequest",
     "ChatResponse",
-    "SearchRequest",
-    "SearchResponse",
-    "UserStatsResponse",
-    "ConversationMessageResponse",
     # MCP Schemas
     "McpServerCreate",
     "McpServerUpdate",
@@ -61,12 +28,4 @@
     "ConnectionTestResult",
     "ToolInfo",
     "ToolResponse",
-    # Graph Deployment Version Schemas
-    "GraphDeploymentVersionResponse",
-    "GraphDeploymentVersionResponseCamel",
-    "GraphDeploymentVersionListResponse",
-    "GraphDeployRequest",
-    "GraphDeployResponse",
-    "GraphRevertResponse",
-    "GraphRenameVersionRequest",
 ]
diff --git a/backend/app/schemas/agent.py b/backend/app/schemas/agent.py
new file mode 100644
index 000000000..546c8de82
--- /dev/null
+++ b/backend/app/schemas/agent.py
@@ -0,0 +1,86 @@
+"""
+Pydantic schemas for Agent API.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Any, Dict, Literal, Optional
+
+from pydantic import BaseModel, Field
+
+from app.core.contracts.agent import EngineKind, RuntimeKind
+
+# ---------------------------------------------------------------------------
+# Literals
+# ---------------------------------------------------------------------------
+
+AgentStatusLiteral = Literal["draft", "active", "archived"]
+
+# ---------------------------------------------------------------------------
+# Request schemas
+# ---------------------------------------------------------------------------
+
+
+class CreateAgentRequest(BaseModel):
+    name: str = Field(..., max_length=255)
+    description: Optional[str] = None
+    avatar: Optional[str] = None
+    engine_kind: EngineKind = "langgraph_visual"
+    definition_payload: Optional[Dict[str, Any]] = None
+    capability_manifest: Optional[Dict[str, Any]] = None
+    custom_env: Optional[Dict[str, str]] = None
+
+
+class UpdateAgentRequest(BaseModel):
+    name: Optional[str] = Field(None, max_length=255)
+    description: Optional[str] = None
+    avatar: Optional[str] = None
+    status: Optional[AgentStatusLiteral] = None
+    custom_env: Optional[Dict[str, str]] = None
+
+
+# ---------------------------------------------------------------------------
+# Response schemas
+# ---------------------------------------------------------------------------
+
+
+class AgentSummary(BaseModel):
+    id: uuid.UUID
+    workspace_id: uuid.UUID
+    name: str
+    slug: str
+    description: Optional[str] = None
+    avatar: Optional[str] = None
+    status: str
+    has_custom_env: bool = False
+    current_draft_version_id: Optional[uuid.UUID] = None
+    active_release_id: Optional[uuid.UUID] = None
+    engine_kind: Optional[EngineKind] = None
+    runtime_kind: Optional[RuntimeKind] = None
+    created_by: str
+    created_at: datetime
+    updated_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class AgentResponse(BaseModel):
+    id: uuid.UUID
+    workspace_id: uuid.UUID
+    name: str
+    slug: str
+    description: Optional[str] = None
+    avatar: Optional[str] = None
+    status: str
+    has_custom_env: bool = False
+    current_draft_version_id: Optional[uuid.UUID] = None
+    active_release_id: Optional[uuid.UUID] = None
+    engine_kind: Optional[EngineKind] = None
+    runtime_kind: Optional[RuntimeKind] = None
+    created_by: str
+    created_at: datetime
+    updated_at: datetime
+
+    model_config = {"from_attributes": True}
diff --git a/backend/app/schemas/agent_release.py b/backend/app/schemas/agent_release.py
new file mode 100644
index 000000000..ece5e6832
--- /dev/null
+++ b/backend/app/schemas/agent_release.py
@@ -0,0 +1,55 @@
+"""
+Pydantic schemas for AgentRelease API.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
+
+from app.core.contracts.agent import RuntimeKind
+from app.core.contracts.execution import ReleaseStatusLiteral
+
+# ---------------------------------------------------------------------------
+# Request schemas
+# ---------------------------------------------------------------------------
+
+
+class CreateAgentReleaseRequest(BaseModel):
+    agent_version_id: uuid.UUID
+    runtime_kind: RuntimeKind
+    builder_kind: Optional[str] = None
+    runtime_binding: dict = {}
+
+
+# ---------------------------------------------------------------------------
+# Response schemas
+# ---------------------------------------------------------------------------
+
+
+class AgentReleaseSummary(BaseModel):
+    id: uuid.UUID
+    release_number: int
+    status: ReleaseStatusLiteral
+    runtime_kind: str
+
+    model_config = {"from_attributes": True}
+
+
+class AgentReleaseResponse(BaseModel):
+    id: uuid.UUID
+    agent_version_id: uuid.UUID
+    release_number: int
+    status: ReleaseStatusLiteral
+    runtime_kind: str
+    builder_kind: Optional[str] = None
+    executable_ref: Optional[dict] = None
+    runtime_binding: dict
+    published_by: Optional[str] = None
+    published_at: Optional[datetime] = None
+    retired_at: Optional[datetime] = None
+
+    model_config = {"from_attributes": True}
diff --git a/backend/app/schemas/agent_run.py b/backend/app/schemas/agent_run.py
new file mode 100644
index 000000000..b5db34cd4
--- /dev/null
+++ b/backend/app/schemas/agent_run.py
@@ -0,0 +1,53 @@
+"""
+Pydantic schemas for AgentRun API.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
+
+from app.core.contracts.execution import RunPurposeLiteral, TriggerMediumLiteral
+
+
+class CreateAgentRunRequest(BaseModel):
+    release_id: uuid.UUID
+    thread_id: Optional[uuid.UUID] = None
+    task_id: Optional[uuid.UUID] = None
+    trigger_medium: TriggerMediumLiteral
+    run_purpose: RunPurposeLiteral
+    goal: Optional[str] = None
+    input_payload: Optional[dict] = None
+
+
+class CreateDraftAgentRunRequest(BaseModel):
+    agent_id: uuid.UUID
+    version_id: uuid.UUID
+    workspace_id: uuid.UUID
+    goal: Optional[str] = None
+    input_payload: Optional[dict] = None
+
+
+class AgentRunResponse(BaseModel):
+    id: uuid.UUID
+    release_id: Optional[uuid.UUID]
+    agent_version_id: Optional[uuid.UUID] = None
+    workspace_id: uuid.UUID
+    thread_id: Optional[uuid.UUID]
+    task_id: Optional[uuid.UUID]
+    trigger_medium: str
+    run_purpose: str
+    goal: Optional[str]
+    input_payload: Optional[dict]
+    status: str
+    current_execution_id: Optional[uuid.UUID]
+    result_summary: Optional[str]
+    started_at: Optional[datetime]
+    ended_at: Optional[datetime]
+    created_by: Optional[str]
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
diff --git a/backend/app/schemas/agent_version.py b/backend/app/schemas/agent_version.py
new file mode 100644
index 000000000..0126b2910
--- /dev/null
+++ b/backend/app/schemas/agent_version.py
@@ -0,0 +1,61 @@
+"""
+Pydantic schemas for AgentVersion API.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Any, Dict, Optional
+
+from pydantic import BaseModel
+
+from app.core.contracts.agent import EngineKind
+
+# ---------------------------------------------------------------------------
+# Request schemas
+# ---------------------------------------------------------------------------
+
+
+class CreateAgentVersionRequest(BaseModel):
+    source_kind: Optional[str] = "manual"
+    engine_kind: EngineKind = "langgraph_visual"
+    definition_payload: Optional[Dict[str, Any]] = None
+    capability_manifest: Optional[Dict[str, Any]] = None
+    changelog: Optional[str] = None
+
+
+class UpdateAgentVersionRequest(BaseModel):
+    definition_payload: Optional[Dict[str, Any]] = None
+    capability_manifest: Optional[Dict[str, Any]] = None
+    changelog: Optional[str] = None
+
+
+# ---------------------------------------------------------------------------
+# Response schemas
+# ---------------------------------------------------------------------------
+
+
+class AgentVersionSummary(BaseModel):
+    id: uuid.UUID
+    version_number: int
+    status: str
+    engine_kind: str
+
+    model_config = {"from_attributes": True}
+
+
+class AgentVersionResponse(BaseModel):
+    id: uuid.UUID
+    agent_id: uuid.UUID
+    version_number: int
+    status: str
+    source_kind: str
+    engine_kind: str
+    definition_payload: Dict[str, Any]
+    capability_manifest: Dict[str, Any]
+    changelog: Optional[str] = None
+    created_by: str
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
diff --git a/backend/app/schemas/artifact.py b/backend/app/schemas/artifact.py
new file mode 100644
index 000000000..306042985
--- /dev/null
+++ b/backend/app/schemas/artifact.py
@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class ArtifactResponse(BaseModel):
+    id: uuid.UUID
+    execution_id: uuid.UUID
+    kind: str
+    uri: str
+    metadata: Optional[dict] = None
+    created_at: datetime
+    model_config = {"from_attributes": True}
diff --git a/backend/app/schemas/common.py b/backend/app/schemas/common.py
index fef124f74..decb96766 100644
--- a/backend/app/schemas/common.py
+++ b/backend/app/schemas/common.py
@@ -4,11 +4,9 @@
 
 import uuid
 from datetime import datetime
-from typing import Any, Generic, List, Optional, TypeVar
+from typing import Generic, List, TypeVar
 
-from pydantic import BaseModel, ConfigDict, Field
-
-from app.schemas.base import BaseResponse
+from pydantic import BaseModel, ConfigDict
 
 T = TypeVar("T")
 
@@ -40,34 +38,3 @@ class IDSchema(TimestampSchema):
     """Schema with ID."""
 
     id: uuid.UUID
-
-
-# Session schemas
-class SessionCreate(BaseModel):
-    """Create session request."""
-
-    title: Optional[str] = "New Session"
-    workspace_path: Optional[str] = None
-
-
-class SessionResponse(BaseResponse):
-    """Session response."""
-
-    session_id: str
-    title: str
-    workspace_path: str
-    is_active: bool
-    created_at: datetime
-    updated_at: datetime
-    message_count: int = 0
-
-
-class SessionMessageResponse(BaseModel):
-    """Session message item (legacy sessions API)."""
-
-    id: uuid.UUID
-    session_id: str
-    content: str
-    role: str
-    metadata: dict[str, Any] = Field(default_factory=dict)
-    created_at: datetime
diff --git a/backend/app/schemas/conversation.py b/backend/app/schemas/conversation.py
deleted file mode 100644
index 3a5e1da40..000000000
--- a/backend/app/schemas/conversation.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-Conversation Pydantic schemas
-
-Request and response validation for conversation management.
-"""
-
-import uuid
-from datetime import datetime
-from typing import Any
-
-from pydantic import BaseModel, ConfigDict, Field
-
-from app.schemas.validators import EnhancedBaseModel
-
-
-class ConversationCreate(EnhancedBaseModel):
-    """Create conversation request."""
-
-    # user_id is obtained from authentication; no longer needed in the request
-    title: str = Field(default="New Conversation", min_length=1, max_length=200, description="conversation title")
-    metadata: dict[str, Any] = Field(default_factory=dict, description="metadata")
-
-
-class ConversationUpdate(EnhancedBaseModel):
-    """Update conversation request."""
-
-    title: str | None = Field(None, min_length=1, max_length=200, description="conversation title")
-    metadata: dict[str, Any] | None = Field(None, description="metadata")
-
-
-class ConversationResponse(BaseModel):
-    """Conversation response."""
-
-    model_config = ConfigDict(from_attributes=True)
-
-    id: uuid.UUID = Field(..., description="conversation ID")
-    thread_id: str = Field(..., description="thread ID")
-    user_id: str = Field(..., description="user ID (text)")
-    title: str = Field(..., description="conversation title")
-    metadata: dict[str, Any] = Field(default_factory=dict, description="metadata")
-    created_at: datetime = Field(..., description="creation time")
-    updated_at: datetime = Field(..., description="update time")
-    message_count: int = Field(default=0, description="message count")
-
-
-class ConversationDetailResponse(BaseModel):
-    """Conversation detail response."""
-
-    conversation: ConversationResponse
-    messages: list[dict[str, Any]] = Field(default_factory=list, description="message list")
-
-
-class ConversationExportResponse(BaseModel):
-    """Conversation export response."""
-
-    conversation: dict[str, Any]
-    messages: list[dict[str, Any]]
-    state: dict[str, Any] | None = None
-
-
-class ConversationImportRequest(BaseModel):
-    """Conversation import request."""
-
-    # user_id is obtained from authentication; no longer needed in the request
-    data: dict[str, Any] = Field(..., description="import data")
-
-
-class CheckpointResponse(BaseModel):
-    """Checkpoint response."""
-
-    thread_id: str
-    checkpoints: list[dict[str, Any]]
-
-
-class SearchRequest(BaseModel):
-    """Search request."""
-
-    # user_id is obtained from authentication; no longer needed in the request
-    query: str = Field(..., description="search keyword")
-    skip: int = Field(default=0, ge=0, description="number to skip")
-    limit: int = Field(default=20, ge=1, le=100, description="number to return")
-
-
-class SearchResponse(BaseModel):
-    """Search response."""
-
-    query: str
-    results: list[dict[str, Any]]
-
-
-class UserStatsResponse(BaseModel):
-    """User statistics response."""
-
-    user_id: str
-    total_conversations: int
-    total_messages: int
-    recent_conversations: list[dict[str, Any]]
-
-
-class ConversationMessageResponse(BaseModel):
-    """Conversation message response."""
-
-    model_config = ConfigDict(from_attributes=True)
-
-    id: uuid.UUID = Field(..., description="message ID")
-    role: str = Field(..., description="message role")
-    content: str = Field(..., description="message content")
-    metadata: dict[str, Any] = Field(default_factory=dict, description="metadata")
-    created_at: datetime = Field(..., description="creation time")
diff --git a/backend/app/schemas/copilot.py b/backend/app/schemas/copilot.py
new file mode 100644
index 000000000..879093aa3
--- /dev/null
+++ b/backend/app/schemas/copilot.py
@@ -0,0 +1,23 @@
+import uuid
+from typing import Any, Optional
+
+from pydantic import BaseModel, Field
+
+
+class CopilotRunRequest(BaseModel):
+    """Dispatch a copilot interaction through the execution engine."""
+
+    agent_id: uuid.UUID
+    version_id: uuid.UUID
+    workspace_id: uuid.UUID
+    prompt: str
+    graph_context: dict[str, Any]
+    conversation_history: list[dict[str, Any]] = Field(default_factory=list)
+    mode: str = "deepagents"
+    provider_name: Optional[str] = None
+    model_name: Optional[str] = None
+
+
+class CopilotRunResponse(BaseModel):
+    run_id: str
+    execution_id: str
diff --git a/backend/app/schemas/execution.py b/backend/app/schemas/execution.py
new file mode 100644
index 000000000..99cb5be29
--- /dev/null
+++ b/backend/app/schemas/execution.py
@@ -0,0 +1,79 @@
+"""
+Pydantic schemas for Execution APIs.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel
+
+
+class AppErrorPayload(BaseModel):
+    code: str
+    message: str
+    data: dict | None = None
+    source: str | None = None
+    retryable: bool = False
+    user_action: str | None = None
+    detail: str | None = None
+
+
+# ---------------------------------------------------------------------------
+# Execution (Phase 4 - new schema)
+# ---------------------------------------------------------------------------
+
+
+class ExecutionResponse(BaseModel):
+    id: uuid.UUID
+    run_id: uuid.UUID
+    parent_execution_id: Optional[uuid.UUID]
+    attempt_index: int
+    engine_kind: str
+    runtime_session_ref: Optional[str]
+    status: str
+    error: Optional[AppErrorPayload]
+    metrics: Optional[dict]
+    started_at: Optional[datetime]
+    ended_at: Optional[datetime]
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class ExecutionEventResponse(BaseModel):
+    id: uuid.UUID
+    execution_id: uuid.UUID
+    sequence_no: int
+    event_type: str
+    payload: dict
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class ExecutionEventItemResponse(BaseModel):
+    id: uuid.UUID
+    execution_id: uuid.UUID
+    seq: int
+    event_type: str
+    payload: dict
+    created_at: datetime
+
+
+class ExecutionEventsPageResponse(BaseModel):
+    execution_id: uuid.UUID
+    events: list[ExecutionEventItemResponse]
+    next_after_seq: int
+
+
+# ---------------------------------------------------------------------------
+# Intervention / Approval
+# ---------------------------------------------------------------------------
+
+
+class ApproveActionRequest(BaseModel):
+    approved: bool
+    message: str | None = None
diff --git a/backend/app/schemas/graph_deployment_version.py b/backend/app/schemas/graph_deployment_version.py
deleted file mode 100644
index 6c26d2593..000000000
--- a/backend/app/schemas/graph_deployment_version.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-Graph deployment version schemas
-"""
-
-import uuid
-from datetime import datetime
-from typing import List, Optional
-
-from pydantic import BaseModel, Field
-
-
-class GraphDeploymentVersionResponse(BaseModel):
-    """Graph deployment version response."""
-
-    id: uuid.UUID
-    version: int
-    name: Optional[str] = None
-    is_active: bool
-    created_at: datetime
-    created_by: Optional[str] = None
-
-    class Config:
-        from_attributes = True
-
-
-class GraphDeploymentVersionResponseCamel(BaseModel):
-    """Graph deployment version response -- camelCase field names."""
-
-    id: str
-    version: int
-    name: Optional[str] = None
-    isActive: bool
-    createdAt: str
-    createdBy: Optional[str] = None
-    createdByName: Optional[str] = None  # creator username
-
-    class Config:
-        from_attributes = True
-
-
-class GraphDeploymentVersionStateResponse(BaseModel):
-    """Graph deployment version state response -- includes full nodes, edges, etc."""
-
-    id: str
-    version: int
-    name: Optional[str] = None
-    isActive: bool
-    createdAt: str
-    createdBy: Optional[str] = None
-    # full graph state; frontend can use this for preview
-    state: dict = Field(default_factory=dict, description="full version state (nodes, edges, variables)")
-
-    class Config:
-        from_attributes = True
-
-
-class GraphDeploymentVersionListResponse(BaseModel):
-    """Graph deployment version list response (paginated)."""
-
-    versions: List[GraphDeploymentVersionResponseCamel]
-    total: int
-    page: int = Field(default=1, description="current page")
-    pageSize: int = Field(default=10, description="page size")
-    totalPages: int = Field(default=1, description="total pages")
-
-
-class GraphDeployRequest(BaseModel):
-    """Deploy graph request."""
-
-    name: Optional[str] = Field(None, description="version name (optional)")
-
-
-class GraphDeployResponse(BaseModel):
-    """Deploy graph response."""
-
-    success: bool
-    message: str
-    version: int
-    isActive: bool
-    needsRedeployment: bool = Field(default=False, description="whether redeployment is needed")
-
-
-class GraphRevertResponse(BaseModel):
-    """Revert version response."""
-
-    success: bool
-    message: str
-    version: int
-    is_active: bool
-
-
-class GraphRenameVersionRequest(BaseModel):
-    """Rename version request."""
-
-    name: str = Field(..., min_length=1, max_length=255, description="new version name")
diff --git a/backend/app/schemas/runs.py b/backend/app/schemas/runs.py
deleted file mode 100644
index 36a97c9da..000000000
--- a/backend/app/schemas/runs.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""
-Schemas for run APIs.
-"""
-
-import uuid
-from datetime import datetime
-from typing import Any, Optional
-
-from pydantic import BaseModel, Field
-
-
-class CreateSkillCreatorRunRequest(BaseModel):
-    message: str = Field(..., description="Initial user prompt")
-    graph_id: uuid.UUID = Field(..., description="Skill Creator graph id")
-    thread_id: Optional[str] = Field(None, description="Existing thread id")
-    edit_skill_id: Optional[str] = Field(None, description="Existing skill id when editing")
-
-
-class CreateRunRequest(BaseModel):
-    agent_name: str = Field(..., description="Registered agent name")
-    graph_id: uuid.UUID = Field(..., description="Graph id")
-    message: str = Field(..., description="Initial user prompt")
-    thread_id: Optional[str] = Field(None, description="Existing thread id")
-    input: Optional[dict[str, Any]] = Field(None, description="Agent-specific input payload")
-
-
-class RunSummary(BaseModel):
-    run_id: uuid.UUID
-    status: str
-    run_type: str
-    agent_name: str
-    agent_display_name: Optional[str] = None
-    source: str
-    thread_id: Optional[str] = None
-    graph_id: Optional[uuid.UUID] = None
-    title: Optional[str] = None
-    started_at: datetime
-    finished_at: Optional[datetime] = None
-    last_seq: int
-    error_code: Optional[str] = None
-    error_message: Optional[str] = None
-    last_heartbeat_at: Optional[datetime] = None
-    updated_at: datetime
-
-
-class CreateRunResponse(BaseModel):
-    run_id: uuid.UUID
-    thread_id: str
-    status: str
-
-
-class RunSnapshotResponse(BaseModel):
-    run_id: uuid.UUID
-    status: str
-    last_seq: int
-    projection: dict[str, Any]
-
-
-class RunEventResponse(BaseModel):
-    seq: int
-    event_type: str
-    payload: dict[str, Any]
-    trace_id: Optional[uuid.UUID] = None
-    observation_id: Optional[uuid.UUID] = None
-    parent_observation_id: Optional[uuid.UUID] = None
-    created_at: datetime
-
-
-class RunEventsPageResponse(BaseModel):
-    run_id: uuid.UUID
-    events: list[RunEventResponse]
-    next_after_seq: int
-
-
-class RunListResponse(BaseModel):
-    items: list[RunSummary]
-
-
-class AgentDefinitionResponse(BaseModel):
-    agent_name: str
-    display_name: str
-
-
-class AgentListResponse(BaseModel):
-    items: list[AgentDefinitionResponse]
diff --git a/backend/app/schemas/task.py b/backend/app/schemas/task.py
new file mode 100644
index 000000000..4d418b3c4
--- /dev/null
+++ b/backend/app/schemas/task.py
@@ -0,0 +1,91 @@
+"""
+Pydantic schemas for Task and Execution APIs.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Any, Literal, Optional
+
+from pydantic import BaseModel, Field
+
+# ---------------------------------------------------------------------------
+# Task
+# ---------------------------------------------------------------------------
+
+TaskStatusLiteral = Literal["backlog", "todo", "in_progress", "done", "in_review", "cancelled"]
+TaskPriorityLiteral = Literal["none", "low", "medium", "high", "urgent"]
+
+
+class CreateTaskRequest(BaseModel):
+    workspace_id: uuid.UUID
+    title: str = Field(..., max_length=500)
+    description: Optional[str] = None
+    goal: Optional[str] = None
+    priority: TaskPriorityLiteral = "none"
+    agent_id: Optional[uuid.UUID] = None
+    parent_task_id: Optional[uuid.UUID] = None
+    tags: Optional[list[str]] = None
+    position: float = 0.0
+    auto_approve: bool = False
+
+
+class UpdateTaskRequest(BaseModel):
+    title: Optional[str] = Field(None, max_length=500)
+    description: Optional[str] = None
+    goal: Optional[str] = None
+    priority: Optional[TaskPriorityLiteral] = None
+    status: Optional[TaskStatusLiteral] = None
+    agent_id: Optional[uuid.UUID] = None
+    parent_task_id: Optional[uuid.UUID] = None
+    due_date: Optional[datetime] = None
+    position: Optional[float] = None
+    tags: Optional[list[str]] = None
+    auto_approve: Optional[bool] = None
+
+
+class AssignTaskRequest(BaseModel):
+    agent_id: uuid.UUID
+
+
+class DispatchTaskRequest(BaseModel):
+    runtime_config: Optional[dict[str, Any]] = None
+
+
+class TaskSummary(BaseModel):
+    id: uuid.UUID
+    workspace_id: uuid.UUID
+    title: str
+    description: Optional[str] = None
+    goal: Optional[str] = None
+    status: str
+    priority: str
+    agent_id: Optional[uuid.UUID] = None
+    creator_id: str
+    latest_run_id: Optional[uuid.UUID] = None
+    parent_task_id: Optional[uuid.UUID] = None
+    tags: Optional[list[str]] = None
+    position: float
+    auto_approve: bool = False
+    due_date: Optional[datetime] = None
+    created_at: datetime
+    updated_at: datetime
+
+
+class TaskListResponse(BaseModel):
+    items: list[TaskSummary]
+
+
+# ---------------------------------------------------------------------------
+# Intervention / Approval
+# ---------------------------------------------------------------------------
+
+
+class InjectMessageRequest(BaseModel):
+    message: str
+
+
+class ApproveActionRequest(BaseModel):
+    approved: bool
+    message: str | None = None
diff --git a/backend/app/schemas/task_activity.py b/backend/app/schemas/task_activity.py
new file mode 100644
index 000000000..aa5e65023
--- /dev/null
+++ b/backend/app/schemas/task_activity.py
@@ -0,0 +1,41 @@
+"""
+Pydantic schemas for Task Activities.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class CreateTaskActivityRequest(BaseModel):
+    content: str = Field(..., min_length=1, max_length=10000)
+    parent_activity_id: Optional[uuid.UUID] = None
+
+
+class UpdateTaskActivityRequest(BaseModel):
+    content: str = Field(..., min_length=1, max_length=10000)
+
+
+class TaskActivityResponse(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: uuid.UUID
+    task_id: uuid.UUID
+    workspace_id: uuid.UUID
+    author_type: str
+    author_id: str
+    content: str
+    type: str
+    parent_activity_id: Optional[uuid.UUID] = None
+    created_at: datetime
+    updated_at: datetime
+
+
+class TaskActivityListResponse(BaseModel):
+    items: list[TaskActivityResponse]
+    has_more: bool = False
+    next_cursor: Optional[str] = None
diff --git a/backend/app/schemas/thread.py b/backend/app/schemas/thread.py
new file mode 100644
index 000000000..0b8f9d707
--- /dev/null
+++ b/backend/app/schemas/thread.py
@@ -0,0 +1,98 @@
+"""
+Pydantic schemas for Thread API.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Any, Dict, List, Literal, Optional
+
+from pydantic import BaseModel, Field
+
+# ---------------------------------------------------------------------------
+# Literals
+# ---------------------------------------------------------------------------
+
+ThreadStatusLiteral = Literal["active", "archived"]
+
+# ---------------------------------------------------------------------------
+# Request schemas
+# ---------------------------------------------------------------------------
+
+
+class CreateThreadRequest(BaseModel):
+    agent_id: uuid.UUID
+    title: Optional[str] = Field(None, max_length=500)
+
+
+class UpdateThreadRequest(BaseModel):
+    title: Optional[str] = Field(None, max_length=500)
+    status: Optional[ThreadStatusLiteral] = None
+
+
+class ChatAttachment(BaseModel):
+    """A file attachment sent alongside a chat message."""
+
+    filename: str = Field(..., min_length=1, max_length=255)
+    storage_ref: str = Field(
+        ..., min_length=1, max_length=500, description="Sandbox path from /v1/files/upload response"
+    )
+    mime_type: str = Field(..., min_length=1, max_length=100)
+    size_bytes: int = Field(..., gt=0)
+
+
+class ChatRequest(BaseModel):
+    message: str = Field(..., min_length=1, max_length=10000)
+    attachments: Optional[List[ChatAttachment]] = Field(None, max_length=10, description="Up to 10 file attachments")
+
+
+# ---------------------------------------------------------------------------
+# Response schemas
+# ---------------------------------------------------------------------------
+
+
+class ThreadSummary(BaseModel):
+    id: uuid.UUID
+    agent_id: uuid.UUID
+    title: Optional[str] = None
+    status: str
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class ThreadResponse(BaseModel):
+    id: uuid.UUID
+    agent_id: uuid.UUID
+    workspace_id: uuid.UUID
+    title: Optional[str] = None
+    status: str
+    created_by: str
+    created_at: datetime
+    updated_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class ChatResponse(BaseModel):
+    run_id: uuid.UUID
+    execution_id: uuid.UUID
+
+
+class ThreadEventResponse(BaseModel):
+    id: uuid.UUID
+    run_id: uuid.UUID
+    execution_id: uuid.UUID
+    sequence_no: int
+    event_type: str
+    payload: Dict[str, Any]
+    execution_status: str
+    created_at: datetime
+
+    model_config = {"from_attributes": True}
+
+
+class ThreadEventsListResponse(BaseModel):
+    events: list[ThreadEventResponse]
+    total: int
diff --git a/backend/app/schemas/validators.py b/backend/app/schemas/validators.py
index 09e7433c8..4eb951c64 100644
--- a/backend/app/schemas/validators.py
+++ b/backend/app/schemas/validators.py
@@ -146,16 +146,20 @@ def validate_max_tokens(tokens: int) -> int:
 def create_validation_error_response(errors: list) -> dict[str, Any]:
     """Create a validation error response."""
     return {
-        "success": False,
-        "code": 422,
+        "code": "REQUEST_VALIDATION_ERROR",
         "message": "Request parameter validation failed",
-        "errors": [
-            ValidationErrorDetail(
-                field=error["loc"][0] if error["loc"] else "unknown",
-                message=error["msg"],
-                value=error.get("input"),
-                type=error["type"],
-            ).model_dump()
-            for error in errors
-        ],
+        "data": {
+            "errors": [
+                ValidationErrorDetail(
+                    field=error["loc"][0] if error["loc"] else "unknown",
+                    message=error["msg"],
+                    value=error.get("input"),
+                    type=error["type"],
+                ).model_dump()
+                for error in errors
+            ]
+        },
+        "source": "validation",
+        "retryable": False,
+        "user_action": "fix_input",
     }
diff --git a/backend/app/services/MODEL.md b/backend/app/services/MODEL.md
index ab09fa633..0229bfeca 100644
--- a/backend/app/services/MODEL.md
+++ b/backend/app/services/MODEL.md
@@ -325,7 +325,7 @@ Service 负责事务管理，通过 `commit()` 方法提交事务。
 
 ### 4. 错误处理
 
-Service 层处理业务逻辑错误，抛出适当的异常（如 `NotFoundException`、`BadRequestException`）。
+Service 层处理业务逻辑错误，抛出适当的异常（如 `NotFoundError`、`InvalidRequestError`）。
 
 ## 数据流
 
diff --git a/backend/app/services/__init__.py b/backend/app/services/__init__.py
index c3cf97a3a..90926e23c 100644
--- a/backend/app/services/__init__.py
+++ b/backend/app/services/__init__.py
@@ -3,7 +3,6 @@
 """
 
 from .base import BaseService
-from .graph_deployment_version_service import GraphDeploymentVersionService
 from .mcp_client_service import McpClientService, McpConnectionConfig, get_mcp_client
 from .mcp_server_service import McpServerService
 from .tool_service import ToolService, initialize_mcp_tools_on_startup
@@ -17,6 +16,4 @@
     "McpConnectionConfig",
     "get_mcp_client",
     "initialize_mcp_tools_on_startup",
-    # graph deployment version service
-    "GraphDeploymentVersionService",
 ]
diff --git a/backend/app/services/agent_publish_service.py b/backend/app/services/agent_publish_service.py
new file mode 100644
index 000000000..bb63e8bce
--- /dev/null
+++ b/backend/app/services/agent_publish_service.py
@@ -0,0 +1,96 @@
+"""
+AgentPublishService — high-level publish/rollback/retire orchestration.
+
+All sub-service calls share the same AsyncSession. Only this service
+calls commit — sub-services only flush.
+"""
+
+from __future__ import annotations
+
+import uuid
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InvalidRequestError, NotFoundError
+from app.core.contracts.agent import infer_runtime_kind
+from app.models.agent import AgentVersion
+from app.repositories.agent import AgentRepository, AgentVersionRepository
+from app.schemas.agent_release import CreateAgentReleaseRequest
+from app.services.agent_release_service import AgentReleaseService
+from app.services.agent_version_service import AgentVersionService
+
+from .base import BaseService
+
+
+class AgentPublishService(BaseService):
+    def __init__(self, db: AsyncSession):
+        super().__init__(db)
+        self.version_svc = AgentVersionService(db)
+        self.release_svc = AgentReleaseService(db)
+        self.agent_repo = AgentRepository(db)
+        self.version_repo = AgentVersionRepository(db)
+
+    async def publish(self, agent_id: uuid.UUID, user_id: str) -> dict:
+        agent = await self.agent_repo.get(agent_id)
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+
+        version = await self._resolve_current_draft(agent)
+
+        if version.status == "draft":
+            await self.version_svc.freeze_version(version.id)
+
+        runtime_kind = infer_runtime_kind(version.engine_kind)
+        release_data = CreateAgentReleaseRequest(
+            agent_version_id=version.id,
+            runtime_kind=runtime_kind,  # type: ignore[arg-type]
+            runtime_binding={},
+        )
+        release = await self.release_svc.publish_release(agent_id, user_id, release_data)
+
+        await self.release_svc.activate_release(agent_id, release.id)
+
+        # Fork a fresh draft so the editor has a writable version after publish.
+        await self.version_svc.fork_draft_from(version, user_id)
+
+        await self.safe_commit()
+        reloaded_agent = await self.agent_repo.get(
+            agent_id,
+            relations=["current_draft_version", "active_release"],
+        )
+        return {"agent": reloaded_agent or agent, "release": release}
+
+    async def rollback(self, agent_id: uuid.UUID, release_id: uuid.UUID) -> dict:  # type: ignore[override]
+        await self.release_svc.activate_release(agent_id, release_id)
+        await self.safe_commit()
+        agent = await self.agent_repo.get(
+            agent_id,
+            relations=["current_draft_version", "active_release"],
+        )
+        return {"agent": agent}
+
+    async def unpublish(self, agent_id: uuid.UUID) -> dict:
+        release = await self.release_svc.unpublish_release(agent_id)
+        await self.safe_commit()
+        agent = await self.agent_repo.get(
+            agent_id,
+            relations=["current_draft_version", "active_release"],
+        )
+        return {"agent": agent, "release": release}
+
+    async def retire(self, agent_id: uuid.UUID, release_id: uuid.UUID) -> dict:
+        release = await self.release_svc.retire_release(agent_id, release_id)
+        await self.safe_commit()
+        return {"release": release}
+
+    async def _resolve_current_draft(self, agent) -> AgentVersion:
+        if not agent.current_draft_version_id:
+            raise InvalidRequestError("Agent has no draft version", code="AGENT_DRAFT_VERSION_MISSING")
+        version = await self.version_repo.get(agent.current_draft_version_id)
+        if not version:
+            raise NotFoundError(
+                "Draft version not found",
+                code="AGENT_DRAFT_VERSION_NOT_FOUND",
+                data={"version_id": str(agent.current_draft_version_id)},
+            )
+        return version
diff --git a/backend/app/services/agent_registry.py b/backend/app/services/agent_registry.py
deleted file mode 100644
index c85fd755f..000000000
--- a/backend/app/services/agent_registry.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""Registry for long-running agent run definitions."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any, Callable
-
-
-@dataclass(frozen=True)
-class AgentDefinition:
-    agent_name: str
-    display_name: str
-    run_type: str
-    reducer: Callable[..., dict[str, Any]]
-    make_initial_projection: Callable[[dict[str, Any], str], dict[str, Any]]
-
-
-class AgentRegistry:
-    def __init__(self) -> None:
-        self._definitions: dict[str, AgentDefinition] = {}
-        self._bootstrapped = False
-
-    def _ensure_loaded(self) -> None:
-        if self._bootstrapped:
-            return
-        self._bootstrapped = True
-        from app.services import run_reducers  # noqa: F401
-
-    def register(self, definition: AgentDefinition) -> AgentDefinition:
-        self._definitions[definition.agent_name] = definition
-        return definition
-
-    def get(self, agent_name: str) -> AgentDefinition:
-        self._ensure_loaded()
-        definition = self.find(agent_name)
-        if definition is None:
-            raise KeyError(f"Unknown agent definition: {agent_name}")
-        return definition
-
-    def find(self, agent_name: str | None) -> AgentDefinition | None:
-        self._ensure_loaded()
-        if not agent_name:
-            return None
-        return self._definitions.get(agent_name)
-
-    def list_definitions(self) -> list[AgentDefinition]:
-        self._ensure_loaded()
-        return sorted(self._definitions.values(), key=lambda definition: definition.display_name.lower())
-
-
-agent_registry = AgentRegistry()
diff --git a/backend/app/services/agent_release_service.py b/backend/app/services/agent_release_service.py
new file mode 100644
index 000000000..de43e533d
--- /dev/null
+++ b/backend/app/services/agent_release_service.py
@@ -0,0 +1,186 @@
+"""
+AgentReleaseService — manages AgentRelease lifecycle.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from loguru import logger
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InvalidRequestError, NotFoundError
+from app.core.state_machines import AGENT_SM, RELEASE_SM
+from app.models.agent import AgentRelease
+from app.repositories.agent import AgentRepository, AgentVersionRepository
+from app.repositories.agent_release import AgentReleaseRepository
+from app.schemas.agent_release import CreateAgentReleaseRequest
+from app.utils.datetime import utc_now
+
+from .base import BaseService
+
+
+class AgentReleaseService(BaseService):
+    """Manages AgentRelease entities."""
+
+    def __init__(self, db: AsyncSession):
+        super().__init__(db)
+        self.release_repo = AgentReleaseRepository(db)
+        self.version_repo = AgentVersionRepository(db)
+        self.agent_repo = AgentRepository(db)
+
+    async def list_releases(self, agent_id: uuid.UUID) -> List[AgentRelease]:
+        return await self.release_repo.list_by_agent(agent_id)
+
+    async def get_release(self, release_id: uuid.UUID) -> AgentRelease:
+        release = await self.release_repo.get(release_id)
+        if not release:
+            raise NotFoundError(
+                "Agent release not found",
+                code="AGENT_RELEASE_NOT_FOUND",
+                data={"release_id": str(release_id)},
+            )
+        return release
+
+    async def _get_release_for_agent(self, agent_id: uuid.UUID, release_id: uuid.UUID) -> AgentRelease:
+        release = await self.release_repo.get(release_id, relations=["version"])
+        if not release:
+            raise NotFoundError(
+                "Agent release not found",
+                code="AGENT_RELEASE_NOT_FOUND",
+                data={"release_id": str(release_id)},
+            )
+        if release.version.agent_id != agent_id:
+            raise InvalidRequestError(
+                "Release does not belong to this agent",
+                code="AGENT_RELEASE_AGENT_MISMATCH",
+                data={"agent_id": str(agent_id), "release_id": str(release_id)},
+            )
+        return release
+
+    async def publish_release(
+        self,
+        agent_id: uuid.UUID,
+        user_id: str,
+        data: CreateAgentReleaseRequest,
+    ) -> AgentRelease:
+        # Verify the version exists and belongs to this agent
+        version = await self.version_repo.get(data.agent_version_id)
+        if not version:
+            raise NotFoundError(
+                "Agent version not found",
+                code="AGENT_VERSION_NOT_FOUND",
+                data={"version_id": str(data.agent_version_id)},
+            )
+        if version.agent_id != agent_id:
+            raise InvalidRequestError(
+                "Version does not belong to this agent",
+                code="AGENT_VERSION_AGENT_MISMATCH",
+                data={"agent_id": str(agent_id), "version_id": str(data.agent_version_id)},
+            )
+        if version.status != "frozen":
+            raise InvalidRequestError(
+                "Version must be frozen before publishing a release",
+                code="AGENT_VERSION_NOT_FROZEN",
+                data={"version_id": str(data.agent_version_id), "status": version.status},
+            )
+
+        # Auto-increment release_number per agent_version_id
+        max_num = await self.release_repo.get_max_release_number(data.agent_version_id)
+        next_num = max_num + 1
+
+        release = await self.release_repo.create(
+            {
+                "agent_version_id": data.agent_version_id,
+                "release_number": next_num,
+                "status": "ready",
+                "runtime_kind": data.runtime_kind,
+                "builder_kind": data.builder_kind,
+                "runtime_binding": data.runtime_binding,
+                "published_by": user_id,
+                "published_at": utc_now(),
+            }
+        )
+
+        logger.info(f"Published release {release.id} (r{next_num}) for agent {agent_id}")
+        return release
+
+    async def _supersede_current_active(self, agent) -> None:
+        """Transition the agent's currently active release to 'superseded'."""
+        if not agent.active_release_id:
+            return
+        current = await self.release_repo.get(agent.active_release_id)
+        if current and current.status == "active":
+            RELEASE_SM.validate(current.status, "superseded")
+            await self.release_repo.update(current.id, {"status": "superseded"})
+
+    async def activate_release(self, agent_id: uuid.UUID, release_id: uuid.UUID) -> AgentRelease:
+        release = await self._get_release_for_agent(agent_id, release_id)
+        if release.status not in ("ready", "superseded"):
+            raise InvalidRequestError(
+                "Only 'ready' or 'superseded' releases can be activated",
+                code="AGENT_RELEASE_NOT_ACTIVATABLE",
+                data={"release_id": str(release_id), "status": release.status},
+            )
+
+        agent = await self.agent_repo.get(agent_id)
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+
+        if agent.active_release_id != release_id:
+            await self._supersede_current_active(agent)
+
+        RELEASE_SM.validate(release.status, "active")
+        updated = await self.release_repo.update(release_id, {"status": "active"})
+        assert updated is not None
+
+        update_data: dict = {"active_release_id": release_id}
+        if agent.status != "active":
+            AGENT_SM.validate(agent.status, "active")
+            update_data["status"] = "active"
+        await self.agent_repo.update(agent_id, update_data)
+        logger.info(f"Activated release {release_id} for agent {agent_id}")
+        return updated
+
+    async def retire_release(self, agent_id: uuid.UUID, release_id: uuid.UUID) -> AgentRelease:
+        release = await self._get_release_for_agent(agent_id, release_id)
+
+        if release.status == "retired":
+            return release
+        if release.status == "active":
+            raise InvalidRequestError(
+                "Cannot retire an active release; unpublish first",
+                code="AGENT_RELEASE_ACTIVE_CANNOT_RETIRE",
+                data={"release_id": str(release_id)},
+            )
+
+        RELEASE_SM.validate(release.status, "retired")
+        updated = await self.release_repo.update(release_id, {"status": "retired", "retired_at": utc_now()})
+        assert updated is not None
+
+        logger.info(f"Retired release {release_id} for agent {agent_id}")
+        return updated
+
+    async def unpublish_release(self, agent_id: uuid.UUID) -> AgentRelease | None:
+        agent = await self.agent_repo.get(agent_id)
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+        if not agent.active_release_id:
+            raise InvalidRequestError(
+                "Agent has no active release to unpublish",
+                code="AGENT_NOT_PUBLISHED",
+                data={"agent_id": str(agent_id)},
+            )
+
+        await self._supersede_current_active(agent)
+        release = await self.release_repo.get(agent.active_release_id)
+
+        update_data: dict = {"active_release_id": None}
+        if agent.status == "active":
+            AGENT_SM.validate(agent.status, "draft")
+            update_data["status"] = "draft"
+        await self.agent_repo.update(agent_id, update_data)
+
+        logger.info(f"Unpublished agent {agent_id}")
+        return release
diff --git a/backend/app/services/agent_run_service.py b/backend/app/services/agent_run_service.py
new file mode 100644
index 000000000..19a70c3fb
--- /dev/null
+++ b/backend/app/services/agent_run_service.py
@@ -0,0 +1,81 @@
+"""
+AgentRunService — read-only queries for AgentRun entities.
+
+All mutations (create / cancel / retry) go through ExecutionOrchestrator
+which publishes events through the EventBus.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List, Optional
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InvalidRequestError, NotFoundError
+from app.models.agent_run import AgentRun
+from app.repositories.agent_run import AgentRunRepository
+
+
+class AgentRunService:
+    """Read-only queries for AgentRun entities."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self.run_repo = AgentRunRepository(db)
+
+    async def list_runs(
+        self,
+        workspace_id: Optional[uuid.UUID] = None,
+        release_id: Optional[uuid.UUID] = None,
+        task_id: Optional[uuid.UUID] = None,
+        agent_id: Optional[uuid.UUID] = None,
+        trigger_medium: Optional[str] = None,
+        run_purpose: Optional[str] = None,
+        status: Optional[str] = None,
+    ) -> List[AgentRun]:
+        """List runs filtered by parameters."""
+        if agent_id:
+            if not workspace_id:
+                raise InvalidRequestError(
+                    "workspace_id is required when filtering by agent_id",
+                    code="AGENT_RUN_WORKSPACE_REQUIRED",
+                    data={"filter": "agent_id"},
+                )
+            return await self.run_repo.find_by_agent_and_trigger(
+                agent_id=agent_id,
+                workspace_id=workspace_id,
+                trigger_medium=trigger_medium,
+                run_purpose=run_purpose,
+                status=status,
+            )
+        elif task_id:
+            if not workspace_id:
+                raise InvalidRequestError(
+                    "workspace_id is required when filtering by task_id",
+                    code="AGENT_RUN_WORKSPACE_REQUIRED",
+                    data={"filter": "task_id"},
+                )
+            return await self.run_repo.list_by_task(task_id, workspace_id)
+        elif release_id:
+            if not workspace_id:
+                raise InvalidRequestError(
+                    "workspace_id is required when filtering by release_id",
+                    code="AGENT_RUN_WORKSPACE_REQUIRED",
+                    data={"filter": "release_id"},
+                )
+            return await self.run_repo.list_by_release(release_id, workspace_id)
+        elif workspace_id:
+            return await self.run_repo.list_by_workspace(workspace_id)
+        else:
+            raise InvalidRequestError(
+                "Must provide workspace_id, release_id, task_id, or agent_id",
+                code="AGENT_RUN_FILTER_REQUIRED",
+            )
+
+    async def get_run(self, run_id: uuid.UUID) -> AgentRun:
+        """Get a run by ID."""
+        run = await self.run_repo.get(run_id)
+        if not run:
+            raise NotFoundError("Agent run not found", code="AGENT_RUN_NOT_FOUND", data={"run_id": str(run_id)})
+        return run
diff --git a/backend/app/services/agent_service.py b/backend/app/services/agent_service.py
new file mode 100644
index 000000000..bfd2e39e8
--- /dev/null
+++ b/backend/app/services/agent_service.py
@@ -0,0 +1,226 @@
+"""
+AgentService — manages Agent lifecycle.
+"""
+
+from __future__ import annotations
+
+import re
+import uuid
+from typing import List
+
+from loguru import logger
+from sqlalchemy import delete, exists, select, update
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError, ResourceConflictError
+from app.core.model.utils import encrypt_credentials
+from app.models.agent import Agent, AgentRelease, AgentVersion
+from app.models.agent_run import AgentRun
+from app.models.execution import Artifact, Execution, ExecutionEvent
+from app.models.task import Task
+from app.models.thread import Thread
+from app.repositories.agent import AgentRepository, AgentVersionRepository
+from app.schemas.agent import CreateAgentRequest, UpdateAgentRequest
+
+from .base import BaseService
+
+
+def _generate_slug(name: str) -> str:
+    slug = re.sub(r"[^a-zA-Z0-9\s-]", "", name.lower())
+    slug = re.sub(r"[\s]+", "-", slug).strip("-")
+    return slug or "agent"
+
+
+class AgentService(BaseService):
+    """Manages the Agent entity and its initial version."""
+
+    RESPONSE_RELATIONS = ["current_draft_version", "active_release"]
+
+    def __init__(self, db: AsyncSession):
+        super().__init__(db)
+        self.agent_repo = AgentRepository(db)
+        self.version_repo = AgentVersionRepository(db)
+
+    async def list_agents(self, workspace_id: uuid.UUID) -> List[Agent]:
+        return await self.agent_repo.list_by_workspace(workspace_id)
+
+    async def get_agent(self, agent_id: uuid.UUID) -> Agent:
+        agent = await self.agent_repo.get(
+            agent_id,
+            relations=self.RESPONSE_RELATIONS,
+        )
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+        return agent
+
+    async def create_agent(
+        self,
+        workspace_id: uuid.UUID,
+        user_id: str,
+        data: CreateAgentRequest,
+    ) -> Agent:
+        base_slug = _generate_slug(data.name)
+        slug = base_slug
+        suffix = 1
+        while await self.agent_repo.get_by_workspace_and_slug(workspace_id, slug):
+            suffix += 1
+            slug = f"{base_slug}-{suffix}"
+
+        # Create the Agent
+        create_data = {
+            "workspace_id": workspace_id,
+            "name": data.name,
+            "slug": slug,
+            "description": data.description,
+            "avatar": data.avatar,
+            "status": "draft",
+            "created_by": user_id,
+        }
+        if data.custom_env:
+            create_data["encrypted_custom_env"] = encrypt_credentials(data.custom_env)
+
+        agent = await self.agent_repo.create(create_data)
+
+        # Create an initial draft AgentVersion (v1)
+        version = await self.version_repo.create(
+            {
+                "agent_id": agent.id,
+                "version_number": 1,
+                "status": "draft",
+                "source_kind": "manual",
+                "engine_kind": data.engine_kind,
+                "definition_payload": data.definition_payload or {},
+                "capability_manifest": data.capability_manifest or {},
+                "created_by": user_id,
+            }
+        )
+
+        # Link the draft version
+        await self.agent_repo.update(agent.id, {"current_draft_version_id": version.id})
+
+        await self.commit()
+        reloaded = await self.agent_repo.get(agent.id, relations=self.RESPONSE_RELATIONS)
+        assert reloaded is not None
+        logger.info(f"Created agent {agent.id} ({data.name}) with initial version {version.id}")
+        return reloaded
+
+    async def update_agent(
+        self,
+        agent_id: uuid.UUID,
+        data: UpdateAgentRequest,
+    ) -> Agent:
+        agent = await self.agent_repo.get(agent_id)
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+
+        update_data = data.model_dump(exclude_unset=True)
+        if not update_data:
+            return agent
+
+        if "custom_env" in update_data:
+            raw = update_data.pop("custom_env")
+            if raw:
+                update_data["encrypted_custom_env"] = encrypt_credentials(raw)
+            else:
+                update_data["encrypted_custom_env"] = None
+
+        updated = await self.agent_repo.update(agent_id, update_data)
+        assert updated is not None
+        await self.commit()
+        reloaded = await self.agent_repo.get(agent_id, relations=self.RESPONSE_RELATIONS)
+        assert reloaded is not None
+        return reloaded
+
+    async def delete_agent(self, agent_id: uuid.UUID) -> None:
+        """Delete an agent and all dependent records.
+
+        FK dependency chain: Agent → Versions → Releases → Runs → Executions → Events/Artifacts.
+        Self-referencing FKs (agent.current_draft_version_id, agent.active_release_id,
+        runs.current_execution_id, executions.parent_execution_id) must be nullified
+        before their targets are deleted.
+        """
+        agent = await self.agent_repo.get(agent_id)
+        if not agent:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+
+        db = self.db
+
+        has_tasks = (await db.execute(select(exists().where(Task.agent_id == agent_id)))).scalar()
+        if has_tasks:
+            raise ResourceConflictError(
+                "Cannot delete agent: tasks still reference it",
+                code="AGENT_DELETE_TASK_REFERENCE_CONFLICT",
+                data={"agent_id": str(agent_id)},
+            )
+
+        version_ids = (
+            (await db.execute(select(AgentVersion.id).where(AgentVersion.agent_id == agent_id))).scalars().all()
+        )
+
+        release_ids = (
+            (await db.execute(select(AgentRelease.id).where(AgentRelease.agent_version_id.in_(version_ids))))
+            .scalars()
+            .all()
+            if version_ids
+            else []
+        )
+
+        release_run_ids = (
+            (await db.execute(select(AgentRun.id).where(AgentRun.release_id.in_(release_ids)))).scalars().all()
+            if release_ids
+            else []
+        )
+
+        draft_run_ids = (
+            (await db.execute(select(AgentRun.id).where(AgentRun.agent_version_id.in_(version_ids)))).scalars().all()
+            if version_ids
+            else []
+        )
+
+        run_ids = list(dict.fromkeys([*release_run_ids, *draft_run_ids]))
+
+        exec_ids = (
+            (await db.execute(select(Execution.id).where(Execution.run_id.in_(run_ids)))).scalars().all()
+            if run_ids
+            else []
+        )
+
+        if exec_ids:
+            await db.execute(delete(ExecutionEvent).where(ExecutionEvent.execution_id.in_(exec_ids)))
+            await db.execute(delete(Artifact).where(Artifact.execution_id.in_(exec_ids)))
+            await db.execute(
+                update(Execution).where(Execution.parent_execution_id.in_(exec_ids)).values(parent_execution_id=None)
+            )
+
+        if run_ids:
+            await db.execute(
+                update(AgentRun).where(AgentRun.id.in_(run_ids)).values(current_execution_id=None, thread_id=None)
+            )
+
+        if exec_ids:
+            await db.execute(delete(Execution).where(Execution.id.in_(exec_ids)))
+
+        if run_ids:
+            await db.execute(delete(AgentRun).where(AgentRun.id.in_(run_ids)))
+
+        await db.execute(delete(Thread).where(Thread.agent_id == agent_id))
+
+        await db.execute(
+            update(Agent)
+            .where(Agent.id == agent_id)
+            .values(
+                current_draft_version_id=None,
+                active_release_id=None,
+            )
+        )
+
+        if release_ids:
+            await db.execute(delete(AgentRelease).where(AgentRelease.id.in_(release_ids)))
+
+        if version_ids:
+            await db.execute(delete(AgentVersion).where(AgentVersion.id.in_(version_ids)))
+
+        await db.execute(delete(Agent).where(Agent.id == agent_id))
+
+        await self.commit()
+        logger.info(f"Deleted agent {agent_id} and all related records")
diff --git a/backend/app/services/agent_version_service.py b/backend/app/services/agent_version_service.py
new file mode 100644
index 000000000..8d78bafd6
--- /dev/null
+++ b/backend/app/services/agent_version_service.py
@@ -0,0 +1,151 @@
+"""
+AgentVersionService — manages AgentVersion lifecycle.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from loguru import logger
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError
+from app.core.state_machines import VERSION_SM
+from app.models.agent import AgentVersion
+from app.repositories.agent import AgentRepository, AgentVersionRepository
+from app.schemas.agent_version import CreateAgentVersionRequest, UpdateAgentVersionRequest
+
+from .base import BaseService
+
+
+class AgentVersionService(BaseService):
+    """Manages AgentVersion entities."""
+
+    def __init__(self, db: AsyncSession):
+        super().__init__(db)
+        self.version_repo = AgentVersionRepository(db)
+        self.agent_repo = AgentRepository(db)
+
+    async def list_versions(self, agent_id: uuid.UUID) -> List[AgentVersion]:
+        return await self.version_repo.list_by_agent(agent_id)
+
+    async def get_version(self, version_id: uuid.UUID) -> AgentVersion:
+        version = await self.version_repo.get(version_id)
+        if not version:
+            raise NotFoundError(
+                "Agent version not found",
+                code="AGENT_VERSION_NOT_FOUND",
+                data={"version_id": str(version_id)},
+            )
+        return version
+
+    async def create_version(
+        self,
+        agent_id: uuid.UUID,
+        user_id: str,
+        data: CreateAgentVersionRequest,
+    ) -> AgentVersion:
+        # Auto-increment version number
+        max_num = await self.version_repo.get_max_version_number(agent_id)
+        next_num = max_num + 1
+
+        version = await self.version_repo.create(
+            {
+                "agent_id": agent_id,
+                "version_number": next_num,
+                "status": "draft",
+                "source_kind": data.source_kind or "manual",
+                "engine_kind": data.engine_kind,
+                "definition_payload": data.definition_payload or {},
+                "capability_manifest": data.capability_manifest or {},
+                "changelog": data.changelog,
+                "created_by": user_id,
+            }
+        )
+
+        # Update agent's current_draft_version_id
+        await self.agent_repo.update(agent_id, {"current_draft_version_id": version.id})
+
+        await self.commit()
+        logger.info(f"Created version {version.id} (v{next_num}) for agent {agent_id}")
+        return version
+
+    async def update_version(
+        self,
+        version_id: uuid.UUID,
+        data: UpdateAgentVersionRequest,
+        user_id: str,
+    ) -> AgentVersion:
+        version = await self.version_repo.get(version_id)
+        if not version:
+            raise NotFoundError(
+                "Agent version not found",
+                code="AGENT_VERSION_NOT_FOUND",
+                data={"version_id": str(version_id)},
+            )
+
+        update_data = data.model_dump(exclude_unset=True)
+
+        # Frozen versions are immutable. If the client still holds a stale
+        # frozen version_id (race with publish), fork a new draft with the
+        # update already applied.
+        if version.status == "frozen":
+            forked = await self.fork_draft_from(version, user_id, overrides=update_data)
+            await self.commit()
+            return forked
+
+        if not update_data:
+            return version
+
+        updated = await self.version_repo.update(version_id, update_data)
+        assert updated is not None
+        await self.commit()
+        return updated
+
+    async def fork_draft_from(
+        self,
+        source: AgentVersion,
+        user_id: str,
+        overrides: dict | None = None,
+    ) -> AgentVersion:
+        """Create a new draft version copying `source`'s payload, optionally
+        overlaying `overrides`, and point the agent's current_draft_version_id
+        at it. Does not commit — caller owns the transaction boundary.
+        """
+        max_num = await self.version_repo.get_max_version_number(source.agent_id)
+        create_data = {
+            "agent_id": source.agent_id,
+            "version_number": max_num + 1,
+            "status": "draft",
+            "source_kind": "fork",
+            "engine_kind": source.engine_kind,
+            "definition_payload": dict(source.definition_payload or {}),
+            "capability_manifest": dict(source.capability_manifest or {}),
+            "changelog": None,
+            "created_by": user_id,
+        }
+        if overrides:
+            create_data.update(overrides)
+        new_version = await self.version_repo.create(create_data)
+        await self.agent_repo.update(source.agent_id, {"current_draft_version_id": new_version.id})
+        logger.info(
+            f"Forked draft version {new_version.id} (v{max_num + 1}) "
+            f"from {source.id} (v{source.version_number}) for agent {source.agent_id}"
+        )
+        return new_version
+
+    async def freeze_version(self, version_id: uuid.UUID) -> AgentVersion:
+        version = await self.version_repo.get(version_id)
+        if not version:
+            raise NotFoundError(
+                "Agent version not found",
+                code="AGENT_VERSION_NOT_FOUND",
+                data={"version_id": str(version_id)},
+            )
+
+        VERSION_SM.validate(version.status, "frozen")
+        updated = await self.version_repo.update(version_id, {"status": "frozen"})
+        assert updated is not None
+        logger.info(f"Froze version {version_id}")
+        return updated
diff --git a/backend/app/services/auth_service.py b/backend/app/services/auth_service.py
index f73b83d08..968e904c7 100644
--- a/backend/app/services/auth_service.py
+++ b/backend/app/services/auth_service.py
@@ -7,7 +7,13 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, UnauthorizedException
+from app.common.app_errors import (
+    AccessDeniedError,
+    AuthenticationError,
+    InternalServiceError,
+    InvalidRequestError,
+    ServiceUnavailableError,
+)
 from app.core.security import (
     generate_email_verify_token,
     generate_password_reset_token,
@@ -182,10 +188,14 @@ async def register(
             JWT login response dict containing user info and tokens.
 
         Raises:
-            BadRequestException: If the email is already registered.
+            InvalidRequestError: If the email is already registered.
         """
         if await self.user_repo.get_by_email(email):
-            raise BadRequestException("Email already registered")
+            raise InvalidRequestError(
+                "Email already registered",
+                code="USER_ALREADY_EXISTS",
+                data={"email": email},
+            )
 
         user = await self.user_repo.create(
             {
@@ -248,33 +258,33 @@ async def login(
             JWT login response dict containing user info and tokens.
 
         Raises:
-            UnauthorizedException: If credentials are invalid, the account is
+            AuthenticationError: If credentials are invalid, the account is
                 inactive, or email verification is required but not completed.
         """
         user = await self.user_repo.get_by_email(email)
         if not user:
-            raise UnauthorizedException("Incorrect email or password")
+            raise AuthenticationError("Incorrect email or password", code="INVALID_CREDENTIALS")
 
         login_success = False
         if not skip_password_check:
             if not user.hashed_password:
-                raise UnauthorizedException("Incorrect email or password")
+                raise AuthenticationError("Incorrect email or password", code="INVALID_CREDENTIALS")
 
             if not password:
-                raise UnauthorizedException("Incorrect email or password")
+                raise AuthenticationError("Incorrect email or password", code="MISSING_CREDENTIALS")
 
             # Validate password format (client-side hashed password)
             password = password.strip().lower()
             if len(password) != 64 or not all(c in "0123456789abcdef" for c in password):
                 # Log the specific error internally without exposing to user
                 logger.warning(f"Invalid password format received for login attempt: email={email}")
-                raise UnauthorizedException("Incorrect email or password")
+                raise AuthenticationError("Incorrect email or password", code="INVALID_CREDENTIALS")
 
             stored_password = user.hashed_password.strip().lower()
             if len(stored_password) != 64 or not all(c in "0123456789abcdef" for c in stored_password):
                 # Log the internal error but don't expose to user
                 logger.error(f"Invalid stored password format for user: {user.id}")
-                raise UnauthorizedException("Incorrect email or password")
+                raise AuthenticationError("Incorrect email or password", code="INVALID_CREDENTIALS")
 
             password_match = verify_password(password, stored_password)
 
@@ -294,15 +304,19 @@ async def login(
                     logger.debug("Failed to log login failure audit event", exc_info=True)
 
                 await self.commit()
-                raise UnauthorizedException("Incorrect email or password")
+                raise AuthenticationError("Incorrect email or password", code="INVALID_CREDENTIALS")
         else:
             login_success = True
 
         if not user.is_active:
-            raise UnauthorizedException("Inactive user")
+            raise AuthenticationError("Inactive user", code="USER_INACTIVE")
 
         if settings.require_email_verification and not user.email_verified:
-            raise UnauthorizedException("Email not verified. Please verify your email before logging in.", code=403)
+            raise AccessDeniedError(
+                "Email not verified. Please verify your email before logging in.",
+                code="EMAIL_NOT_VERIFIED",
+                data={"user_id": user.id, "email": user.email},
+            )
 
         if login_success:
             from app.services.login_init import run_post_login_init
@@ -351,13 +365,13 @@ async def reset_password(self, token: str, new_password: str) -> bool:
             True on success.
 
         Raises:
-            BadRequestException: If the token is invalid or expired.
+            InvalidRequestError: If the token is invalid or expired.
         """
         user = await self.user_repo.get_by_reset_token(token)
         if not user:
-            raise BadRequestException("Invalid or expired reset token")
+            raise InvalidRequestError("Invalid or expired reset token", code="RESET_TOKEN_INVALID")
         if user.password_reset_expires and user.password_reset_expires < datetime.now(timezone.utc):
-            raise BadRequestException("Reset token has expired")
+            raise InvalidRequestError("Reset token has expired", code="RESET_TOKEN_EXPIRED")
         user.hashed_password = get_password_hash(new_password)
         user.password_reset_token = None
         user.password_reset_expires = None
@@ -367,7 +381,7 @@ async def reset_password(self, token: str, new_password: str) -> bool:
     async def reset_password_for_current_user(self, user: AuthUser, new_password: str) -> bool:
         """Reset password for the current logged-in user (no old password required)."""
         if not user or not user.is_active:
-            raise BadRequestException("User not found or inactive")
+            raise InvalidRequestError("User not found or inactive", code="USER_INVALID")
         user.hashed_password = get_password_hash(new_password)
         await self.commit()
         return True
@@ -383,13 +397,13 @@ async def verify_email(self, token: str) -> bool:
             True on success.
 
         Raises:
-            BadRequestException: If the token is invalid or expired.
+            InvalidRequestError: If the token is invalid or expired.
         """
         user = await self.user_repo.get_by_verify_token(token)
         if not user:
-            raise BadRequestException("Invalid or expired verification token")
+            raise InvalidRequestError("Invalid or expired verification token", code="VERIFICATION_TOKEN_INVALID")
         if user.email_verify_expires and user.email_verify_expires < datetime.now(timezone.utc):
-            raise BadRequestException("Verification token has expired")
+            raise InvalidRequestError("Verification token has expired", code="VERIFICATION_TOKEN_EXPIRED")
         user.email_verified = True
         user.email_verify_token = None
         user.email_verify_expires = None
@@ -406,10 +420,10 @@ async def resend_verification_email(self, user: AuthUser) -> bool:
             True on success.
 
         Raises:
-            BadRequestException: If the email is already verified.
+            InvalidRequestError: If the email is already verified.
         """
         if user.email_verified:
-            raise BadRequestException("Email already verified")
+            raise InvalidRequestError("Email already verified", code="EMAIL_ALREADY_VERIFIED")
         token, expires = generate_email_verify_token()
         user.email_verify_token = token
         user.email_verify_expires = expires
@@ -427,25 +441,31 @@ async def refresh_token(self, refresh_token: str) -> dict:
         from app.core.redis import RedisClient
 
         if not RedisClient.is_available():
-            raise UnauthorizedException("Token refresh service unavailable. Please login again.", code=503)
+            raise ServiceUnavailableError(
+                "Token refresh service unavailable. Please login again.",
+                code="TOKEN_REFRESH_UNAVAILABLE",
+            )
 
         redis_client = RedisClient.get_client()
         if not redis_client:
-            raise UnauthorizedException("Token refresh service unavailable. Please login again.", code=503)
+            raise ServiceUnavailableError(
+                "Token refresh service unavailable. Please login again.",
+                code="TOKEN_REFRESH_UNAVAILABLE",
+            )
 
         try:
             refresh_token_key = f"refresh_token:{refresh_token}"
             user_id = await redis_client.get(refresh_token_key)
 
             if not user_id:
-                raise UnauthorizedException("Invalid or expired refresh token")
+                raise AuthenticationError("Invalid or expired refresh token", code="REFRESH_TOKEN_INVALID")
 
             # user_id from redis is a string, but AuthUser.id is also string
             # Use get_by method with id parameter
             user = await self.user_repo.get_by(id=user_id)  # type: ignore[arg-type]
             if not user or not user.is_active:
                 await self._delete_refresh_token(refresh_token, user_id)
-                raise UnauthorizedException("Invalid user")
+                raise AuthenticationError("Invalid user", code="USER_INVALID")
 
             access_token, new_refresh_token, csrf_token, access_expires, refresh_expires = await self._issue_jwt_tokens(
                 user.id
@@ -456,10 +476,13 @@ async def refresh_token(self, refresh_token: str) -> dict:
             return self._build_jwt_login_response(
                 user, access_token, new_refresh_token, csrf_token, access_expires, refresh_expires
             )
-        except UnauthorizedException:
+        except AuthenticationError:
             raise
         except Exception:
-            raise UnauthorizedException("Token refresh failed. Please login again.", code=500)
+            raise InternalServiceError(
+                "Token refresh failed. Please login again.",
+                code="TOKEN_REFRESH_FAILED",
+            )
 
     # ---------------------------------------------------------------- misc
     async def get_user_by_id(self, user_id: str) -> Optional[AuthUser]:
diff --git a/backend/app/services/base.py b/backend/app/services/base.py
index 04b7eb3c0..e60723364 100644
--- a/backend/app/services/base.py
+++ b/backend/app/services/base.py
@@ -4,6 +4,7 @@
 
 from typing import Generic, TypeVar
 
+from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
 T = TypeVar("T")
@@ -26,3 +27,12 @@ async def commit(self):
     async def rollback(self):
         """Roll back the transaction."""
         await self.db.rollback()
+
+    async def safe_commit(self):
+        """Commit with automatic rollback on failure."""
+        try:
+            await self.db.commit()
+        except Exception:
+            logger.warning("DB commit failed, rolling back", exc_info=True)
+            await self.db.rollback()
+            raise
diff --git a/backend/app/services/copilot_service.py b/backend/app/services/copilot_service.py
index f43a5d5de..e6c5861c1 100644
--- a/backend/app/services/copilot_service.py
+++ b/backend/app/services/copilot_service.py
@@ -10,7 +10,7 @@
 
 from loguru import logger
 
-from app.common.exceptions import ModelConfigError
+from app.common.app_errors import ModelConfigError
 from app.core.copilot.action_applier import apply_actions_to_graph_state
 from app.core.copilot.action_types import (
     CopilotResponse,
@@ -37,8 +37,6 @@
 )
 from app.core.copilot.tool_output_parser import parse_tool_output
 from app.core.copilot.tools import reset_node_registry
-from app.repositories.auth_user import AuthUserRepository
-from app.services.graph_service import GraphService
 
 
 class CopilotService:
@@ -76,6 +74,12 @@ async def _resolve_model(self) -> Any:
         Uses the same ModelResolver that graph execution uses,
         ensuring consistent credential handling across the system.
         """
+        if not self.provider_name or not self.model_name:
+            raise ModelConfigError(
+                ModelConfigError.BUILD_COPILOT_MODEL_REQUIRED,
+                "Build Copilot has no model configured. Select a model and try again.",
+            )
+
         from app.core.graph.deep_agents.model_resolver import ModelResolver
         from app.services.model_service import ModelService
 
@@ -84,7 +88,7 @@ async def _resolve_model(self) -> Any:
         resolver = ModelResolver(model_service, user_id=self.user_id)
         return await resolver.resolve(model_name=self.model_name, provider_name=self.provider_name)
 
-    async def _get_copilot_stream(
+    async def get_copilot_stream(
         self,
         prompt: str,
         graph_context: Dict[str, Any],
@@ -125,7 +129,13 @@ async def _get_copilot_stream(
             )
         except Exception as e:
             logger.error(f"[CopilotService] Agent creation error: {e}")
-            yield {"type": "error", "message": f"Failed to create Copilot agent: {str(e)}", "code": "AGENT_ERROR"}
+            yield {
+                "type": "error",
+                "message": f"Failed to create Copilot agent: {str(e)}",
+                "code": "AGENT_ERROR",
+                "source": "runtime",
+                "retryable": False,
+            }
             return
 
         messages = self._build_messages(prompt, conversation_history)
@@ -336,11 +346,11 @@ async def generate_actions_stream(
     ) -> AsyncGenerator[Dict[str, Any], None]:
         """
         Generate graph actions with streaming (SSE events).
-        Consumes the unified _get_copilot_stream and yields events; handles top-level errors with code.
+        Consumes the unified get_copilot_stream and yields events; handles top-level errors with code.
         """
         logger.info(f"[CopilotService] generate_actions_stream start user_id={self.user_id}")
         try:
-            async for event in self._get_copilot_stream(
+            async for event in self.get_copilot_stream(
                 prompt=prompt,
                 graph_context=graph_context,
                 conversation_history=conversation_history,
@@ -349,21 +359,34 @@ async def generate_actions_stream(
             ):
                 yield event
         except ModelConfigError as e:
+            yield {"type": "error", **e.to_payload()}
+        except KeyboardInterrupt:
+            logger.warning("[CopilotService] Stream interrupted by user")
             yield {
                 "type": "error",
-                "message": str(e.detail),
-                "code": e.error_code,
-                "params": e.params,
+                "message": "Request cancelled by user",
+                "code": "CANCELLED",
+                "source": "api",
+                "retryable": False,
             }
-        except KeyboardInterrupt:
-            logger.warning("[CopilotService] Stream interrupted by user")
-            yield {"type": "error", "message": "Request cancelled by user", "code": "CANCELLED"}
         except (CopilotLLMError, CopilotAgentError) as e:
             logger.error(f"[CopilotService] Stream failed: {e}")
-            yield {"type": "error", "message": str(e), "code": type(e).__name__}
+            yield {
+                "type": "error",
+                "message": str(e),
+                "code": type(e).__name__,
+                "source": "runtime",
+                "retryable": False,
+            }
         except Exception as e:
             logger.exception(f"[CopilotService] generate_actions_stream failed: {e}")
-            yield {"type": "error", "message": f"An unexpected error occurred: {str(e)}", "code": "UNKNOWN_ERROR"}
+            yield {
+                "type": "error",
+                "message": f"An unexpected error occurred: {str(e)}",
+                "code": "UNKNOWN_ERROR",
+                "source": "internal",
+                "retryable": False,
+            }
 
     def _handle_chat_model_stream_event(
         self,
@@ -528,55 +551,56 @@ def _extract_final_message(self, result: Dict[str, Any]) -> str:
         return ""
 
     async def _persist_graph_from_actions(self, graph_id: str, final_actions: List[Dict[str, Any]]) -> bool:
-        """Apply actions to graph state and persist in a dedicated transaction. Returns True if saved successfully."""
-        from app.core.database import async_session_factory
+        """Apply actions to graph state and persist via AgentVersion.definition_payload.
 
-        async with async_session_factory() as new_db2:
-            try:
-                current_user = None
-                if self.user_id:
-                    user_repo = AuthUserRepository(new_db2)
-                    current_user = await user_repo.get_by(id=self.user_id)
-
-                graph_service = GraphService(new_db2)
-                graph_uuid = uuid_lib.UUID(graph_id)
-                current_state = await graph_service.load_graph_state(
-                    graph_id=graph_uuid,
-                    current_user=current_user,
-                )
+        Resolves the agent from graph_id (which is an agent_id in the copilot
+        context), reads the current draft version's definition_payload, applies
+        the copilot actions to nodes/edges, and writes the result back.
+        """
+        from sqlalchemy import select
 
-                current_nodes = current_state.get("nodes", [])
-                current_edges = current_state.get("edges", [])
+        from app.models.agent import Agent, AgentVersion
 
-                updated_nodes, updated_edges = apply_actions_to_graph_state(
-                    current_nodes=current_nodes,
-                    current_edges=current_edges,
-                    actions=final_actions,
-                )
+        if not self.db:
+            logger.warning("[CopilotService] _persist_graph_from_actions: no db session, skipping")
+            return False
 
-                viewport = current_state.get("viewport")
-                variables = current_state.get("variables")
+        try:
+            agent = (
+                await self.db.execute(select(Agent).where(Agent.id == uuid_lib.UUID(graph_id)))
+            ).scalar_one_or_none()
 
-                await graph_service.save_graph_state(
-                    graph_id=graph_uuid,
-                    nodes=updated_nodes,
-                    edges=updated_edges,
-                    viewport=viewport,
-                    variables=variables,
-                    current_user=current_user,
-                )
+            if not agent:
+                logger.warning(f"[CopilotService] _persist_graph_from_actions: agent not found graph_id={graph_id}")
+                return False
 
-                await new_db2.commit()
-                logger.info(
-                    f"[CopilotService] Async task saved graph state for graph_id={graph_id}, "
-                    f"nodes={len(updated_nodes)}, edges={len(updated_edges)}"
-                )
-                return True
-            except Exception as e:
-                if new_db2.in_transaction():
-                    await new_db2.rollback()
-                logger.error(
-                    f"[CopilotService] Failed to save graph state for graph_id={graph_id}: {e}",
-                    exc_info=True,
-                )
+            if not agent.current_draft_version_id:
+                logger.warning(f"[CopilotService] _persist_graph_from_actions: no draft version for agent={graph_id}")
                 return False
+
+            version = (
+                await self.db.execute(select(AgentVersion).where(AgentVersion.id == agent.current_draft_version_id))
+            ).scalar_one()
+
+            payload = dict(version.definition_payload or {})
+            current_nodes: List[Dict[str, Any]] = payload.get("nodes", [])
+            current_edges: List[Dict[str, Any]] = payload.get("edges", [])
+
+            updated_nodes, updated_edges = apply_actions_to_graph_state(current_nodes, current_edges, final_actions)
+
+            payload["nodes"] = updated_nodes
+            payload["edges"] = updated_edges
+            version.definition_payload = payload
+
+            await self.db.commit()
+            logger.info(
+                f"[CopilotService] _persist_graph_from_actions ok: "
+                f"agent={graph_id} actions={len(final_actions)} "
+                f"nodes={len(updated_nodes)} edges={len(updated_edges)}"
+            )
+            return True
+
+        except Exception as e:
+            logger.error(f"[CopilotService] _persist_graph_from_actions failed: {e}", exc_info=True)
+            await self.db.rollback()
+            return False
diff --git a/backend/app/services/custom_tool_service.py b/backend/app/services/custom_tool_service.py
index aa8c4c506..6a6a2901e 100644
--- a/backend/app/services/custom_tool_service.py
+++ b/backend/app/services/custom_tool_service.py
@@ -7,7 +7,7 @@
 import uuid
 from typing import Dict, List, Optional
 
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.models.custom_tool import CustomTool
 from app.repositories.custom_tool import CustomToolRepository
 
@@ -37,12 +37,20 @@ async def create_tool(
         """Create a tool."""
         current_count = await self.repo.count_by_user(owner_id)
         if current_count >= MAX_TOOLS_PER_USER:
-            raise BadRequestException("User custom tool quota exceeded")
+            raise InvalidRequestError(
+                "User custom tool quota exceeded",
+                code="CUSTOM_TOOL_QUOTA_EXCEEDED",
+                data={"limit": MAX_TOOLS_PER_USER},
+            )
 
         # check if a tool with the same name exists
         existing = await self.repo.get_by(owner_id=owner_id, name=name)
         if existing:
-            raise BadRequestException("Tool name already exists for this user")
+            raise InvalidRequestError(
+                "Tool name already exists for this user",
+                code="CUSTOM_TOOL_NAME_ALREADY_EXISTS",
+                data={"name": name},
+            )
 
         tool = CustomTool(
             owner_id=owner_id,
@@ -71,16 +79,24 @@ async def update_tool(
         """Update a tool."""
         tool = await self.repo.get(tool_id)
         if not tool:
-            raise NotFoundException("Custom tool not found")
+            raise NotFoundError("Custom tool not found", code="CUSTOM_TOOL_NOT_FOUND", data={"tool_id": str(tool_id)})
 
         # verify ownership
         if tool.owner_id != current_user_id:
-            raise ForbiddenException("You can only update your own tools")
+            raise AccessDeniedError(
+                "You can only update your own tools",
+                code="CUSTOM_TOOL_UPDATE_FORBIDDEN",
+                data={"tool_id": str(tool_id)},
+            )
 
         if name and name != tool.name:
             existing = await self.repo.get_by(owner_id=current_user_id, name=name)
             if existing:
-                raise BadRequestException("Tool name already exists for this user")
+                raise InvalidRequestError(
+                    "Tool name already exists for this user",
+                    code="CUSTOM_TOOL_NAME_ALREADY_EXISTS",
+                    data={"name": name},
+                )
             tool.name = name
         if code is not None:
             tool.code = code
@@ -99,11 +115,15 @@ async def delete_tool(self, tool_id: uuid.UUID, current_user_id: str) -> None:
         """Delete a tool."""
         tool = await self.repo.get(tool_id)
         if not tool:
-            raise NotFoundException("Custom tool not found")
+            raise NotFoundError("Custom tool not found", code="CUSTOM_TOOL_NOT_FOUND", data={"tool_id": str(tool_id)})
 
         # verify ownership
         if tool.owner_id != current_user_id:
-            raise ForbiddenException("You can only delete your own tools")
+            raise AccessDeniedError(
+                "You can only delete your own tools",
+                code="CUSTOM_TOOL_DELETE_FORBIDDEN",
+                data={"tool_id": str(tool_id)},
+            )
 
         await self.repo.delete_by_id(tool_id)
         await self.db.commit()
diff --git a/backend/app/services/dispatch_service.py b/backend/app/services/dispatch_service.py
new file mode 100644
index 000000000..3045a0dd2
--- /dev/null
+++ b/backend/app/services/dispatch_service.py
@@ -0,0 +1,125 @@
+"""
+DispatchService — API layer's single entry point for execution dispatch.
+
+Wraps ExecutionOrchestrator so that API routes never import from core/engine/.
+"""
+
+from __future__ import annotations
+
+import uuid
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.models.agent_run import AgentRun
+from app.services.execution_orchestrator import ExecutionOrchestrator
+
+
+class DispatchService:
+    def __init__(self, db: AsyncSession):
+        self._orchestrator = ExecutionOrchestrator(db)
+
+    async def dispatch_task(
+        self,
+        task_id: uuid.UUID,
+        user_id: str,
+        prompt_override: str | None = None,
+    ) -> AgentRun:
+        return await self._orchestrator.dispatch_task(task_id, user_id, prompt_override)
+
+    async def dispatch_chat(
+        self,
+        thread_id: uuid.UUID,
+        message: str,
+        user_id: str,
+    ) -> AgentRun:
+        return await self._orchestrator.dispatch_chat(thread_id, message, user_id)
+
+    async def dispatch_direct(
+        self,
+        release_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        trigger_medium: str = "api",
+        run_purpose: str = "production",
+        thread_id: uuid.UUID | None = None,
+        task_id: uuid.UUID | None = None,
+        input_payload: dict | None = None,
+    ) -> AgentRun:
+        return await self._orchestrator.dispatch_direct(
+            release_id,
+            prompt,
+            user_id,
+            trigger_medium=trigger_medium,
+            run_purpose=run_purpose,
+            thread_id=thread_id,
+            task_id=task_id,
+            input_payload=input_payload,
+        )
+
+    async def dispatch_draft(
+        self,
+        agent_id: uuid.UUID,
+        version_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        workspace_id: uuid.UUID,
+        input_payload: dict | None = None,
+    ) -> AgentRun:
+        return await self._orchestrator.dispatch_draft(
+            agent_id,
+            version_id,
+            prompt,
+            user_id,
+            workspace_id,
+            input_payload=input_payload,
+        )
+
+    async def dispatch_copilot_draft(
+        self,
+        agent_id: uuid.UUID,
+        version_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        graph_context: dict,
+        conversation_history: list | None = None,
+        mode: str = "deepagents",
+        provider_name: str | None = None,
+        model_name: str | None = None,
+    ) -> AgentRun:
+        return await self._orchestrator.dispatch_copilot_draft(
+            agent_id=agent_id,
+            version_id=version_id,
+            workspace_id=workspace_id,
+            prompt=prompt,
+            user_id=user_id,
+            graph_context=graph_context,
+            conversation_history=conversation_history,
+            mode=mode,
+            provider_name=provider_name,
+            model_name=model_name,
+        )
+
+    async def cancel_run(self, run_id: uuid.UUID) -> AgentRun:
+        return await self._orchestrator.cancel_run(run_id)
+
+    async def retry_run(self, run_id: uuid.UUID, user_id: str) -> AgentRun:
+        return await self._orchestrator.retry_run(run_id, user_id)
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        return await self._orchestrator.send_message(execution_id, message)
+
+    async def emit_user_message(
+        self,
+        *,
+        run: AgentRun,
+        execution_id: uuid.UUID,
+        message: str,
+        attachments: list[dict] | None = None,
+    ) -> None:
+        return await self._orchestrator.emit_user_message(
+            run=run,
+            execution_id=execution_id,
+            message=message,
+            attachments=attachments,
+        )
diff --git a/backend/app/services/execution_event_adapter.py b/backend/app/services/execution_event_adapter.py
new file mode 100644
index 000000000..a393c3967
--- /dev/null
+++ b/backend/app/services/execution_event_adapter.py
@@ -0,0 +1,196 @@
+"""
+ExecutionEventAdapter — implements ExecutionEventPort.
+
+Bridges core/ execution runners to the event bus without core/ importing services/.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any, Mapping, Optional, cast
+
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InternalServiceError
+from app.core.events import ExecutionEventEnvelope, execution_event_bus
+from app.core.events.event_types import ExecutionEventType
+from app.core.ports.execution import EventContext
+from app.models.execution import Execution, ExecutionEvent
+
+
+class ExecutionEventAdapter:
+    """Implements ExecutionEventPort — publishes execution events through the bus."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self._event_ctx: Optional[EventContext] = None
+
+    def set_event_context(self, ctx: EventContext) -> None:
+        self._event_ctx = ctx
+
+    async def mark_status(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        status: str,
+        container_id: Optional[str] = None,
+        session_id: Optional[str] = None,
+        error: Mapping[str, Any] | None = None,
+        result_summary: Optional[dict[str, Any]] = None,
+    ) -> Optional[Execution]:
+        ctx = self._event_ctx
+        if ctx is None:
+            from app.models.agent_run import AgentRun
+
+            result = await self.db.execute(
+                select(Execution, AgentRun.workspace_id)
+                .join(AgentRun, Execution.run_id == AgentRun.id)
+                .where(Execution.id == execution_id)
+            )
+            row = result.one_or_none()
+            if not row:
+                return None
+            execution, ws_id = row
+            ctx = EventContext(
+                run_id=execution.run_id,
+                workspace_id=ws_id,
+            )
+        else:
+            execution = None
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=ctx.run_id,
+            workspace_id=ctx.workspace_id,
+            event_type=ExecutionEventType.EXECUTION_STATUS_CHANGE,
+            payload={"status": status},
+            trigger_medium=ctx.trigger_medium if ctx else None,
+            run_purpose=ctx.run_purpose if ctx else None,
+            thread_id=ctx.thread_id if ctx else None,
+            task_id=ctx.task_id if ctx else None,
+            target_status=status,
+            error=dict(error) if error is not None else None,
+            container_id=container_id or session_id,
+            metrics=result_summary,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+        if execution is None:
+            execution = cast(
+                Optional[Execution],
+                (await self.db.execute(select(Execution).where(Execution.id == execution_id))).scalar_one_or_none(),
+            )
+        else:
+            await self.db.refresh(execution)
+        return cast(Optional[Execution], execution)
+
+    async def append_event(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        event_type: ExecutionEventType,
+        payload: dict[str, Any],
+    ) -> ExecutionEvent:
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=self._event_ctx.run_id,
+            workspace_id=self._event_ctx.workspace_id,
+            event_type=event_type,
+            payload=payload,
+            trigger_medium=self._event_ctx.trigger_medium,
+            run_purpose=self._event_ctx.run_purpose,
+            thread_id=self._event_ctx.thread_id,
+            task_id=self._event_ctx.task_id,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+        return ExecutionEvent(
+            execution_id=execution_id,
+            sequence_no=envelope.seq,
+            event_type=event_type,
+            payload=payload,
+        )
+
+    async def batch_append_events(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        events: list[dict[str, Any]],
+    ) -> list[ExecutionEvent]:
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelopes = [
+            ExecutionEventEnvelope(
+                execution_id=execution_id,
+                run_id=self._event_ctx.run_id,
+                workspace_id=self._event_ctx.workspace_id,
+                event_type=evt["event_type"],
+                payload=evt["payload"],
+                trigger_medium=self._event_ctx.trigger_medium,
+                run_purpose=self._event_ctx.run_purpose,
+                thread_id=self._event_ctx.thread_id,
+                task_id=self._event_ctx.task_id,
+            )
+            for evt in events
+        ]
+        await execution_event_bus.publish_batch(envelopes, self.db)
+
+        return [
+            ExecutionEvent(
+                execution_id=execution_id,
+                sequence_no=env.seq,
+                event_type=env.event_type,
+                payload=env.payload,
+            )
+            for env in envelopes
+        ]
+
+    async def complete_execution(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        terminal_status: str,
+        result_summary: Optional[dict[str, Any]] = None,
+        error: Mapping[str, Any] | None = None,
+        session_id: Optional[str] = None,
+    ) -> None:
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=self._event_ctx.run_id,
+            workspace_id=self._event_ctx.workspace_id,
+            event_type=ExecutionEventType.EXECUTION_COMPLETED,
+            payload={
+                "status": terminal_status,
+                "error": dict(error) if error is not None else None,
+                "result_summary": result_summary,
+            },
+            terminal_status=terminal_status,
+            error=dict(error) if error is not None else None,
+            container_id=session_id,
+            metrics=result_summary,
+            trigger_medium=self._event_ctx.trigger_medium,
+            run_purpose=self._event_ctx.run_purpose,
+            thread_id=self._event_ctx.thread_id,
+            task_id=self._event_ctx.task_id,
+        )
+        await execution_event_bus.publish(envelope, self.db)
diff --git a/backend/app/services/execution_orchestrator.py b/backend/app/services/execution_orchestrator.py
new file mode 100644
index 000000000..bb28da634
--- /dev/null
+++ b/backend/app/services/execution_orchestrator.py
@@ -0,0 +1,986 @@
+"""
+Execution Orchestrator — service-layer entry point for execution dispatch.
+
+Layer 2: sits between API/triggers (Layer 1) and engines (Layer 3).
+Creates AgentRun + Execution, resolves the engine, builds context, and starts execution.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from loguru import logger
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import AppError, InvalidRequestError, NotFoundError, normalize_app_error
+from app.core.engine.protocol import ExecutionContext
+from app.core.engine.registry import engine_registry
+from app.core.events import ExecutionEventEnvelope, execution_event_bus
+from app.core.events.event_types import ExecutionEventType
+from app.core.state_machines.transitions import transition_task
+from app.models.agent import Agent, AgentRelease, AgentVersion
+from app.models.agent_run import AgentRun
+from app.models.execution import Execution
+from app.models.task import Task
+from app.models.thread import Thread
+from app.utils.credentials import build_agent_credentials
+from app.utils.safe_task import safe_create_task
+
+
+class ExecutionOrchestrator:
+    """
+    Unified dispatch: trigger → Run → Engine → Events.
+
+    All entry points (Task dispatch, Chat, API, Scheduler) go through here.
+    """
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+
+    # ------------------------------------------------------------------
+    # Public dispatch methods (Layer 1 calls these)
+    # ------------------------------------------------------------------
+
+    # Statuses from which a task may be dispatched (besides in_progress for re-fire).
+    DISPATCHABLE_STATUSES = {"backlog", "todo", "in_review"}
+
+    async def dispatch_task(
+        self,
+        task_id: uuid.UUID,
+        user_id: str,
+        prompt_override: str | None = None,
+    ) -> AgentRun:
+        """Dispatch a Task → creates Run + Execution, fires engine."""
+        task = await self._get_task(task_id)
+        if task.status == "in_progress" and task.latest_run_id:
+            raise InvalidRequestError(
+                "Task already has an active run. Cancel it first.",
+                code="TASK_RUN_ALREADY_ACTIVE",
+                data={"task_id": str(task_id), "run_id": str(task.latest_run_id)},
+            )
+        if task.status not in self.DISPATCHABLE_STATUSES and task.status != "in_progress":
+            raise InvalidRequestError(
+                f"Cannot dispatch task in '{task.status}' status. Move the task back to backlog first.",
+                code="TASK_STATUS_NOT_DISPATCHABLE",
+                data={"task_id": str(task_id), "status": task.status},
+            )
+        if not task.agent_id:
+            raise InvalidRequestError(
+                "Task has no assigned agent",
+                code="TASK_AGENT_MISSING",
+                data={"task_id": str(task_id)},
+            )
+
+        agent = await self._get_agent(task.agent_id)
+        if not agent.active_release_id:
+            raise InvalidRequestError(
+                f"Agent '{agent.name}' has no active release",
+                code="AGENT_ACTIVE_RELEASE_MISSING",
+                data={"agent_id": str(agent.id), "agent_name": agent.name},
+            )
+
+        prompt = prompt_override or task.goal or task.title
+        run = await self._create_and_fire(
+            agent=agent,
+            release_id=agent.active_release_id,
+            workspace_id=agent.workspace_id,
+            prompt=prompt,
+            trigger_medium="system",
+            run_purpose="production",
+            task_id=task_id,
+            user_id=user_id,
+        )
+
+        # Update task status
+        await transition_task(task, "in_progress", self.db, latest_run_id=run.id)
+        await self.db.commit()
+
+        return run
+
+    async def dispatch_chat(
+        self,
+        thread_id: uuid.UUID,
+        message: str,
+        user_id: str,
+    ) -> AgentRun:
+        """Dispatch from a Thread conversation → creates Run + Execution."""
+        thread = (await self.db.execute(select(Thread).where(Thread.id == thread_id))).scalar_one_or_none()
+        if not thread:
+            raise NotFoundError("Thread not found", code="THREAD_NOT_FOUND", data={"thread_id": str(thread_id)})
+
+        agent = await self._get_agent(thread.agent_id)
+        if not agent.active_release_id:
+            raise InvalidRequestError(
+                f"Agent '{agent.name}' has no active release",
+                code="AGENT_ACTIVE_RELEASE_MISSING",
+                data={"agent_id": str(agent.id), "agent_name": agent.name},
+            )
+
+        return await self._create_and_fire(
+            agent=agent,
+            release_id=agent.active_release_id,
+            workspace_id=agent.workspace_id,
+            prompt=message,
+            trigger_medium="api",
+            run_purpose="production",
+            thread_id=thread_id,
+            user_id=user_id,
+        )
+
+    async def dispatch_direct(
+        self,
+        release_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        trigger_medium: str = "api",
+        run_purpose: str = "production",
+        thread_id: uuid.UUID | None = None,
+        task_id: uuid.UUID | None = None,
+        input_payload: dict | None = None,
+    ) -> AgentRun:
+        """Direct dispatch with explicit release_id (API / Scheduler)."""
+        release = await self._get_release(release_id)
+        version = await self._get_version(release.agent_version_id)
+        agent = await self._get_agent(version.agent_id)
+
+        return await self._create_and_fire(
+            agent=agent,
+            release_id=release_id,
+            workspace_id=agent.workspace_id,
+            prompt=prompt,
+            trigger_medium=trigger_medium,
+            run_purpose=run_purpose,
+            thread_id=thread_id,
+            task_id=task_id,
+            user_id=user_id,
+            input_payload=input_payload,
+        )
+
+    async def dispatch_draft(
+        self,
+        agent_id: uuid.UUID,
+        version_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        workspace_id: uuid.UUID,
+        input_payload: dict | None = None,
+    ) -> AgentRun:
+        """Dispatch a Test Lab run against a draft AgentVersion."""
+        version = await self._get_version(version_id)
+        if version.agent_id != agent_id:
+            raise InvalidRequestError(
+                "Version does not belong to this agent",
+                code="AGENT_VERSION_AGENT_MISMATCH",
+                data={"agent_id": str(agent_id), "version_id": str(version_id)},
+            )
+
+        agent = await self._get_agent(agent_id)
+        if agent.workspace_id != workspace_id:
+            raise InvalidRequestError(
+                "Agent does not belong to this workspace",
+                code="AGENT_WORKSPACE_MISMATCH",
+                data={"agent_id": str(agent_id), "workspace_id": str(workspace_id)},
+            )
+
+        return await self._create_and_fire_draft(
+            agent=agent,
+            version=version,
+            workspace_id=workspace_id,
+            prompt=prompt,
+            trigger_medium="ui",
+            run_purpose="draft_test",
+            user_id=user_id,
+            input_payload=input_payload,
+        )
+
+    async def dispatch_copilot_draft(
+        self,
+        agent_id: uuid.UUID,
+        version_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        graph_context: dict,
+        conversation_history: list | None = None,
+        mode: str = "deepagents",
+        provider_name: str | None = None,
+        model_name: str | None = None,
+    ) -> AgentRun:
+        """Dispatch a copilot interaction against a draft AgentVersion."""
+        version = await self._get_version(version_id)
+        if version.agent_id != agent_id:
+            raise InvalidRequestError(
+                "Version does not belong to this agent",
+                code="AGENT_VERSION_AGENT_MISMATCH",
+                data={"agent_id": str(agent_id), "version_id": str(version_id)},
+            )
+
+        agent = await self._get_agent(agent_id)
+        if agent.workspace_id != workspace_id:
+            raise InvalidRequestError(
+                "Agent does not belong to this workspace",
+                code="AGENT_WORKSPACE_MISMATCH",
+                data={"agent_id": str(agent_id), "workspace_id": str(workspace_id)},
+            )
+
+        copilot_payload = self._build_copilot_payload(
+            agent_id=agent_id,
+            user_id=user_id,
+            graph_context=graph_context,
+            conversation_history=conversation_history,
+            mode=mode,
+            provider_name=provider_name,
+            model_name=model_name,
+        )
+
+        return await self._create_and_fire_draft(
+            agent=agent,
+            version=version,
+            workspace_id=workspace_id,
+            prompt=prompt,
+            trigger_medium="ui",
+            run_purpose="internal_builder",
+            user_id=user_id,
+            input_payload=copilot_payload,
+            engine_kind_override="build_copilot",
+            definition_kind_override="build_copilot",
+            definition_payload_override=copilot_payload,
+        )
+
+    async def dispatch_debug(
+        self,
+        agent_id: uuid.UUID,
+        version_id: uuid.UUID,
+        prompt: str,
+        user_id: str,
+        workspace_id: uuid.UUID,
+        variables: dict | None = None,
+    ) -> AgentRun:
+        """Dispatch a debug run with observation tracing."""
+        version = await self._get_version(version_id)
+        if version.agent_id != agent_id:
+            raise InvalidRequestError(
+                "Version does not belong to this agent",
+                code="AGENT_VERSION_AGENT_MISMATCH",
+                data={"agent_id": str(agent_id), "version_id": str(version_id)},
+            )
+
+        agent = await self._get_agent(agent_id)
+        if agent.workspace_id != workspace_id:
+            raise InvalidRequestError(
+                "Agent does not belong to this workspace",
+                code="AGENT_WORKSPACE_MISMATCH",
+                data={"agent_id": str(agent_id), "workspace_id": str(workspace_id)},
+            )
+
+        run = await self._create_and_fire_draft(
+            agent=agent,
+            version=version,
+            workspace_id=workspace_id,
+            prompt=prompt,
+            trigger_medium="ui",
+            run_purpose="debug",
+            user_id=user_id,
+            input_payload={"debug": True, "variables": variables or {}},
+            debug=True,
+        )
+
+        # Create Trace record for observation tracking
+        from datetime import datetime, timezone
+
+        from app.core.observation.model import Trace
+
+        if run.current_execution_id:
+            trace = Trace(
+                id=run.current_execution_id,
+                name=agent.name,
+                workspace_id=workspace_id,
+                start_time=datetime.now(timezone.utc),
+                status="running",
+                execution_id=run.current_execution_id,
+                agent_version_id=version_id,
+                user_id=uuid.UUID(user_id) if isinstance(user_id, str) else user_id,
+                session_id=f"debug-{user_id}-{version_id}-{datetime.now(timezone.utc).date()}",
+                input={"prompt": prompt, "variables": variables or {}},
+            )
+            self.db.add(trace)
+            await self.db.commit()
+
+        return run
+
+    def _resolve_engine(self, execution: Execution, release: AgentRelease):
+        return engine_registry.get(execution.engine_kind)
+
+    def _resolve_draft_engine_kind(self, version: AgentVersion) -> str:
+        return version.engine_kind
+
+    def _build_copilot_payload(
+        self,
+        *,
+        agent_id: uuid.UUID,
+        user_id: str,
+        graph_context: dict,
+        conversation_history: list | None,
+        mode: str,
+        provider_name: str | None,
+        model_name: str | None,
+    ) -> dict:
+        return {
+            "graph_context": graph_context,
+            "conversation_history": conversation_history,
+            "mode": mode,
+            "provider_name": provider_name,
+            "model_name": model_name,
+            "user_id": user_id,
+            "graph_id": str(agent_id),
+        }
+
+    # ------------------------------------------------------------------
+    # Cancel / Retry / Message / Event helpers
+    # ------------------------------------------------------------------
+
+    async def emit_user_message(
+        self,
+        *,
+        run: AgentRun,
+        execution_id: uuid.UUID,
+        message: str,
+        attachments: list[dict] | None = None,
+    ) -> None:
+        """Emit a USER_MESSAGE event for the given execution."""
+        payload: dict = {"text": message}
+        if attachments:
+            payload["attachments"] = attachments
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=run.id,
+            workspace_id=run.workspace_id,
+            event_type=ExecutionEventType.USER_MESSAGE,
+            payload=payload,
+            trigger_medium=run.trigger_medium,
+            run_purpose=run.run_purpose,
+            thread_id=run.thread_id,
+            task_id=run.task_id,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+    async def cancel_run(self, run_id: uuid.UUID) -> AgentRun:
+        """Cancel a running execution."""
+        run = await self._get_run(run_id)
+        if run.status in ("succeeded", "failed", "cancelled"):
+            raise InvalidRequestError(
+                f"Cannot cancel run in status {run.status}",
+                code="RUN_CANCEL_STATUS_INVALID",
+                data={"run_id": str(run_id), "status": run.status},
+            )
+
+        execution_id = run.current_execution_id or uuid.UUID(int=0)
+
+        if run.current_execution_id:
+            execution = (
+                await self.db.execute(select(Execution).where(Execution.id == run.current_execution_id))
+            ).scalar_one_or_none()
+            if execution:
+                if run.release_id:
+                    release = await self._get_release(run.release_id)
+                    engine = self._resolve_engine(execution, release)
+                elif run.agent_version_id:
+                    version = await self._get_version(run.agent_version_id)
+                    engine = engine_registry.get(self._resolve_draft_engine_kind(version))
+                else:
+                    raise InvalidRequestError(
+                        "Run has neither release_id nor agent_version_id",
+                        code="RUN_BINDING_INVALID",
+                        data={"run_id": str(run_id)},
+                    )
+                await engine.cancel(execution.id)
+
+        await execution_event_bus.publish(
+            ExecutionEventEnvelope(
+                execution_id=execution_id,
+                run_id=run.id,
+                workspace_id=run.workspace_id,
+                event_type=ExecutionEventType.EXECUTION_COMPLETED,
+                payload={"status": "cancelled"},
+                terminal_status="cancelled",
+            ),
+            self.db,
+        )
+        await self.db.refresh(run)
+        return run
+
+    async def retry_run(self, run_id: uuid.UUID, user_id: str) -> AgentRun:
+        """Retry a failed/cancelled run with a new Execution attempt."""
+        run = await self._get_run(run_id)
+        if run.status not in ("failed", "cancelled"):
+            raise InvalidRequestError(
+                "Can only retry failed or cancelled runs",
+                code="RUN_RETRY_STATUS_INVALID",
+                data={"run_id": str(run_id), "status": run.status},
+            )
+        if not run.release_id:
+            raise InvalidRequestError(
+                "Draft Test Lab runs cannot be retried",
+                code="RUN_RETRY_DRAFT_FORBIDDEN",
+                data={"run_id": str(run_id)},
+            )
+
+        release = await self._get_release(run.release_id)
+        version = await self._get_version(release.agent_version_id)
+        agent = await self._get_agent(version.agent_id)
+
+        # Create new execution attempt
+        from sqlalchemy import func
+
+        max_attempt = (
+            await self.db.execute(
+                select(func.coalesce(func.max(Execution.attempt_index), 0)).where(Execution.run_id == run_id)
+            )
+        ).scalar() or 0
+
+        execution = Execution(
+            run_id=run_id,
+            attempt_index=max_attempt + 1,
+            engine_kind=version.engine_kind,
+            status="pending",
+        )
+        self.db.add(execution)
+        await self.db.flush()
+
+        run.current_execution_id = execution.id
+        await self.db.flush()
+
+        await self.publish_run_status_change(
+            self.db,
+            run,
+            execution_id=execution.id,
+            target_status="running",
+        )
+        await self.db.commit()
+
+        # Fire engine in background
+        await self._fire_engine(
+            execution=execution,
+            release=release,
+            version=version,
+            agent=agent,
+            workspace_id=run.workspace_id,
+            prompt=run.goal or "",
+        )
+
+        await self.db.refresh(run)
+        return run
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        """Inject a message into a running execution."""
+        execution = (await self.db.execute(select(Execution).where(Execution.id == execution_id))).scalar_one_or_none()
+        if not execution:
+            raise NotFoundError(
+                "Execution not found",
+                code="EXECUTION_NOT_FOUND",
+                data={"execution_id": str(execution_id)},
+            )
+
+        run = await self._get_run(execution.run_id)
+        if run.release_id:
+            release = await self._get_release(run.release_id)
+            engine = self._resolve_engine(execution, release)
+        elif run.agent_version_id:
+            version = await self._get_version(run.agent_version_id)
+            engine = engine_registry.get(self._resolve_draft_engine_kind(version))
+        else:
+            raise InvalidRequestError(
+                "Run has neither release_id nor agent_version_id",
+                code="RUN_BINDING_INVALID",
+                data={"run_id": str(run.id)},
+            )
+        if not engine.capabilities.supports_message_injection:
+            raise InvalidRequestError(
+                "Execution engine does not support message injection",
+                code="EXECUTION_OPERATION_UNSUPPORTED",
+                data={
+                    "operation": "send_message",
+                    "engine_kind": getattr(engine, "engine_kind", execution.engine_kind),
+                    "execution_id": str(execution_id),
+                },
+            )
+        await engine.send_message(execution_id, message)
+
+    # ------------------------------------------------------------------
+    # Internal: create Run + Execution, fire engine
+    # ------------------------------------------------------------------
+
+    async def _create_and_fire(
+        self,
+        agent: Agent,
+        release_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        prompt: str,
+        trigger_medium: str,
+        run_purpose: str,
+        user_id: str,
+        thread_id: uuid.UUID | None = None,
+        task_id: uuid.UUID | None = None,
+        input_payload: dict | None = None,
+        *,
+        engine_kind_override: str | None = None,
+        definition_kind_override: str | None = None,
+        definition_payload_override: dict | None = None,
+    ) -> AgentRun:
+        release = await self._get_release(release_id)
+        version = await self._get_version(release.agent_version_id)
+
+        # Create Run in pending state — bus will transition to running
+        run = AgentRun(
+            release_id=release_id,
+            workspace_id=workspace_id,
+            thread_id=thread_id,
+            task_id=task_id,
+            trigger_medium=trigger_medium,
+            run_purpose=run_purpose,
+            goal=prompt[:500] if prompt else None,
+            input_payload=input_payload,
+            status="pending",
+            created_by=user_id,
+        )
+        self.db.add(run)
+        await self.db.flush()
+
+        execution = Execution(
+            run_id=run.id,
+            attempt_index=1,
+            engine_kind=engine_kind_override or version.engine_kind,
+            status="pending",
+        )
+        self.db.add(execution)
+        await self.db.flush()
+
+        run.current_execution_id = execution.id
+        await self.db.commit()
+
+        await self.publish_run_status_change(
+            self.db,
+            run,
+            execution_id=execution.id,
+            target_status="running",
+        )
+        await self.db.refresh(run)
+
+        # Fire engine in background
+        try:
+            await self._fire_engine(
+                execution=execution,
+                release=release,
+                version=version,
+                agent=agent,
+                workspace_id=workspace_id,
+                prompt=prompt,
+                engine_kind_override=engine_kind_override,
+                definition_kind_override=definition_kind_override,
+                definition_payload_override=definition_payload_override,
+            )
+        except Exception as exc:
+            logger.error(f"[Orchestrator] _fire_engine failed: {exc}")
+            app_error = normalize_app_error(exc, default_code="EXECUTION_FAILED", source="engine")
+            error_payload = app_error.to_payload()
+            error_payload.setdefault("data", {})["reason"] = "engine_fire_failed"
+            await execution_event_bus.publish(
+                ExecutionEventEnvelope(
+                    execution_id=execution.id,
+                    run_id=run.id,
+                    workspace_id=workspace_id,
+                    event_type=ExecutionEventType.EXECUTION_COMPLETED,
+                    payload={
+                        "status": "failed",
+                        "error": error_payload,
+                        "result_summary": str(exc)[:2000],
+                    },
+                    terminal_status="failed",
+                    error=error_payload,
+                    result_summary=str(exc)[:2000],
+                ),
+                self.db,
+            )
+            await self.db.refresh(run)
+
+        return run
+
+    async def _create_and_fire_draft(
+        self,
+        agent: Agent,
+        version: AgentVersion,
+        workspace_id: uuid.UUID,
+        prompt: str,
+        trigger_medium: str,
+        run_purpose: str,
+        user_id: str,
+        input_payload: dict | None = None,
+        *,
+        debug: bool = False,
+        engine_kind_override: str | None = None,
+        definition_kind_override: str | None = None,
+        definition_payload_override: dict | None = None,
+    ) -> AgentRun:
+        self._validate_draft_overrides(
+            engine_kind_override=engine_kind_override,
+            definition_kind_override=definition_kind_override,
+            definition_payload_override=definition_payload_override,
+        )
+        runtime_binding: dict = {}
+
+        run = AgentRun(
+            release_id=None,
+            agent_version_id=version.id,
+            workspace_id=workspace_id,
+            trigger_medium=trigger_medium,
+            run_purpose=run_purpose,
+            goal=prompt[:500] if prompt else None,
+            input_payload=input_payload,
+            status="pending",
+            created_by=user_id,
+        )
+        self.db.add(run)
+        await self.db.flush()
+
+        execution = Execution(
+            run_id=run.id,
+            attempt_index=1,
+            engine_kind=engine_kind_override or version.engine_kind,
+            status="pending",
+        )
+        self.db.add(execution)
+        await self.db.flush()
+
+        run.current_execution_id = execution.id
+        await self.db.commit()
+
+        await self.publish_run_status_change(
+            self.db,
+            run,
+            execution_id=execution.id,
+            target_status="running",
+        )
+        await self.db.refresh(run)
+
+        try:
+            await self._fire_engine(
+                execution=execution,
+                release_runtime_binding=runtime_binding,
+                version=version,
+                agent=agent,
+                workspace_id=workspace_id,
+                prompt=prompt,
+                engine_kind_override=engine_kind_override,
+                definition_kind_override=definition_kind_override,
+                definition_payload_override=definition_payload_override,
+                debug=debug,
+            )
+        except Exception as exc:
+            logger.error(f"[Orchestrator] _fire_engine failed for draft run: {exc}")
+            app_error = normalize_app_error(exc, default_code="EXECUTION_FAILED", source="engine")
+            error_payload = app_error.to_payload()
+            error_payload.setdefault("data", {})["reason"] = "engine_fire_failed"
+            await execution_event_bus.publish(
+                ExecutionEventEnvelope(
+                    execution_id=execution.id,
+                    run_id=run.id,
+                    workspace_id=workspace_id,
+                    event_type=ExecutionEventType.EXECUTION_COMPLETED,
+                    payload={
+                        "status": "failed",
+                        "error": error_payload,
+                        "result_summary": str(exc)[:2000],
+                    },
+                    terminal_status="failed",
+                    error=error_payload,
+                    result_summary=str(exc)[:2000],
+                ),
+                self.db,
+            )
+            await self.db.refresh(run)
+
+        return run
+
+    def _validate_draft_overrides(
+        self,
+        *,
+        engine_kind_override: str | None,
+        definition_kind_override: str | None,
+        definition_payload_override: dict | None,
+    ) -> None:
+        override_presence = (
+            engine_kind_override is not None,
+            definition_kind_override is not None,
+            definition_payload_override is not None,
+        )
+        if any(override_presence) and not all(override_presence):
+            raise InvalidRequestError(
+                "Draft override parameters must be all absent or all present.",
+                code="DRAFT_OVERRIDE_PARAMETERS_INVALID",
+                data={
+                    "engine_kind_override": engine_kind_override is not None,
+                    "definition_kind_override": definition_kind_override is not None,
+                    "definition_payload_override": definition_payload_override is not None,
+                },
+            )
+
+    async def _fire_engine(
+        self,
+        execution: Execution,
+        version: AgentVersion,
+        agent: Agent,
+        workspace_id: uuid.UUID,
+        prompt: str,
+        *,
+        release: AgentRelease | None = None,
+        release_runtime_binding: dict | None = None,
+        engine_kind_override: str | None = None,
+        definition_kind_override: str | None = None,
+        definition_payload_override: dict | None = None,
+        debug: bool = False,
+    ) -> None:
+        """Build context and fire engine in a background task."""
+        credentials = build_agent_credentials(agent)
+
+        # Resolve auto_approve from task if linked
+        auto_approve = True
+        run = (await self.db.execute(select(AgentRun).where(AgentRun.id == execution.run_id))).scalar_one()
+        if run.task_id:
+            task = (await self.db.execute(select(Task).where(Task.id == run.task_id))).scalar_one_or_none()
+            if task:
+                auto_approve = task.auto_approve
+
+        context = ExecutionContext(
+            db=self.db,
+            execution_id=execution.id,
+            run_id=run.id,
+            workspace_id=workspace_id,
+            credentials=credentials,
+            auto_approve=auto_approve,
+        )
+
+        # Wire context callbacks (pass run metadata to avoid extra DB query)
+        run_meta = dict(
+            trigger_medium=run.trigger_medium,
+            run_purpose=run.run_purpose,
+            thread_id=run.thread_id,
+            task_id=run.task_id,
+        )
+        self._wire_context(context, **run_meta)  # type: ignore[arg-type]
+
+        runtime_binding = release_runtime_binding or (release.runtime_binding if release else {})
+        engine = engine_registry.get(engine_kind_override or execution.engine_kind)
+        _def_kind = definition_kind_override or version.engine_kind
+        _def_payload = definition_payload_override or version.definition_payload
+
+        async def _run_engine():
+            from app.core.database import AsyncSessionLocal
+
+            try:
+                async with AsyncSessionLocal() as db:
+                    # Rebuild context with fresh session
+                    ctx = ExecutionContext(
+                        db=db,
+                        execution_id=execution.id,
+                        run_id=run.id,
+                        workspace_id=workspace_id,
+                        credentials=credentials,
+                        auto_approve=auto_approve,
+                    )
+                    self._wire_context(ctx, **run_meta)
+
+                    collector = None
+                    if debug:
+                        from app.core.observation import ObservationCollector
+                        from app.core.observation.types import ObservationLevel
+                        from app.websocket.execution_subscription_manager import execution_subscription_manager
+
+                        async def _db_factory():
+                            return db
+
+                        async def _broadcast(exec_id: Any, message: dict) -> None:
+                            await execution_subscription_manager.broadcast_event(str(exec_id), message)
+
+                        collector = ObservationCollector(
+                            trace_id=execution.id,
+                            execution_id=execution.id,
+                            workspace_id=workspace_id,
+                            db_session_factory=_db_factory,
+                            broadcast_fn=_broadcast,
+                        )
+                        ctx.debug = True
+                        ctx.collector = collector
+
+                    try:
+                        await engine.start(
+                            ctx,
+                            release_runtime_binding=runtime_binding,
+                            engine_kind=_def_kind,
+                            definition_payload=_def_payload,
+                            prompt=prompt,
+                        )
+                    except Exception as exc:
+                        if collector:
+                            collector.record_event(
+                                f"error:{type(exc).__name__}",
+                                input={"message": str(exc)},
+                                level=ObservationLevel.ERROR,
+                            )
+                        raise
+                    finally:
+                        if collector:
+                            await collector.finalize()
+            except Exception as exc:
+                logger.error(f"[Orchestrator] Engine failed for execution {execution.id}: {exc}")
+                try:
+                    app_error = normalize_app_error(
+                        exc,
+                        default_code="EXECUTION_ENGINE_FAILED",
+                        default_message="Engine execution failed",
+                        default_data={"execution_id": str(execution.id), "run_id": str(run.id)},
+                        source="engine",
+                    )
+                    await ctx._complete_fn("failed", app_error.message[:2000], app_error)
+                except Exception as cleanup_exc:
+                    logger.error(f"[Orchestrator] Failed to mark execution as failed: {cleanup_exc}")
+
+        safe_create_task(_run_engine(), name=f"engine-{execution.id}")
+
+    def _wire_context(
+        self,
+        ctx: ExecutionContext,
+        *,
+        trigger_medium: str | None = None,
+        run_purpose: str | None = None,
+        thread_id: uuid.UUID | None = None,
+        task_id: uuid.UUID | None = None,
+    ) -> None:
+        """Attach emit/status/complete callbacks to context.
+
+        Run metadata is passed in directly by the caller (who already has the
+        run object), avoiding an extra DB query.
+        """
+
+        def _envelope(**overrides: Any) -> ExecutionEventEnvelope:
+            return ExecutionEventEnvelope(
+                execution_id=ctx.execution_id,
+                run_id=ctx.run_id,
+                workspace_id=ctx.workspace_id,
+                trigger_medium=trigger_medium,
+                run_purpose=run_purpose,
+                thread_id=thread_id,
+                task_id=task_id,
+                **overrides,
+            )
+
+        async def _emit(event_type: ExecutionEventType, payload: dict) -> None:
+            await execution_event_bus.publish(
+                _envelope(event_type=event_type, payload=payload),
+                ctx.db,
+            )
+
+        async def _status(status: str) -> None:
+            await execution_event_bus.publish(
+                _envelope(
+                    event_type=ExecutionEventType.EXECUTION_STATUS_CHANGE,
+                    payload={"status": status},
+                    target_status=status,
+                ),
+                ctx.db,
+            )
+
+        async def _complete(
+            status: str,
+            result_summary: str | None = None,
+            error: AppError | None = None,
+        ) -> None:
+            error_payload = error.to_payload() if error is not None else None
+            await execution_event_bus.publish(
+                _envelope(
+                    event_type=ExecutionEventType.EXECUTION_COMPLETED,
+                    payload={
+                        "status": status,
+                        "error": error_payload,
+                    },
+                    terminal_status=status,
+                    error=error_payload,
+                    result_summary=result_summary,
+                ),
+                ctx.db,
+            )
+
+        ctx._emit_fn = _emit
+        ctx._status_fn = _status
+        ctx._complete_fn = _complete
+
+    # ------------------------------------------------------------------
+    # Internal: helpers
+    # ------------------------------------------------------------------
+
+    @staticmethod
+    async def publish_run_status_change(
+        db: AsyncSession,
+        run: AgentRun,
+        *,
+        execution_id: uuid.UUID,
+        target_status: str,
+        result_summary: str | None = None,
+    ) -> None:
+        """Publish a RUN_STATUS_CHANGE event through the bus."""
+        await execution_event_bus.publish(
+            ExecutionEventEnvelope(
+                execution_id=execution_id,
+                run_id=run.id,
+                workspace_id=run.workspace_id,
+                event_type=ExecutionEventType.RUN_STATUS_CHANGE,
+                payload={"status": target_status},
+                target_status=target_status,
+                result_summary=result_summary,
+                trigger_medium=run.trigger_medium,
+                run_purpose=run.run_purpose,
+                thread_id=run.thread_id,
+                task_id=run.task_id,
+            ),
+            db,
+        )
+
+    async def _get_task(self, task_id: uuid.UUID) -> Task:
+        result = (await self.db.execute(select(Task).where(Task.id == task_id))).scalar_one_or_none()
+        if not result:
+            raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+        return result
+
+    async def _get_agent(self, agent_id: uuid.UUID) -> Agent:
+        result = (await self.db.execute(select(Agent).where(Agent.id == agent_id))).scalar_one_or_none()
+        if not result:
+            raise NotFoundError("Agent not found", code="AGENT_NOT_FOUND", data={"agent_id": str(agent_id)})
+        return result
+
+    async def _get_release(self, release_id: uuid.UUID) -> AgentRelease:
+        result = (await self.db.execute(select(AgentRelease).where(AgentRelease.id == release_id))).scalar_one_or_none()
+        if not result:
+            raise NotFoundError(
+                "Agent release not found",
+                code="AGENT_RELEASE_NOT_FOUND",
+                data={"release_id": str(release_id)},
+            )
+        return result
+
+    async def _get_version(self, version_id: uuid.UUID) -> AgentVersion:
+        result = (await self.db.execute(select(AgentVersion).where(AgentVersion.id == version_id))).scalar_one_or_none()
+        if not result:
+            raise NotFoundError(
+                "Agent version not found",
+                code="AGENT_VERSION_NOT_FOUND",
+                data={"version_id": str(version_id)},
+            )
+        return result
+
+    async def _get_run(self, run_id: uuid.UUID) -> AgentRun:
+        result = (await self.db.execute(select(AgentRun).where(AgentRun.id == run_id))).scalar_one_or_none()
+        if not result:
+            raise NotFoundError("Agent run not found", code="AGENT_RUN_NOT_FOUND", data={"run_id": str(run_id)})
+        return result
diff --git a/backend/app/services/execution_reader_adapter.py b/backend/app/services/execution_reader_adapter.py
new file mode 100644
index 000000000..4354e9a6a
--- /dev/null
+++ b/backend/app/services/execution_reader_adapter.py
@@ -0,0 +1,62 @@
+"""
+ExecutionReaderAdapter — implements ExecutionReaderPort.
+
+Wraps the DB queries that ExecutionRunner previously did inline,
+so core/ no longer needs direct ORM access.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Optional
+
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError
+from app.models.agent import AgentRelease
+from app.models.agent_run import AgentRun
+from app.models.execution import Execution
+from app.models.task import Task
+
+
+class ExecutionReaderAdapter:
+    """Implements ExecutionReaderPort — read-only DB queries for core/."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+
+    async def get_execution(self, execution_id: uuid.UUID) -> Execution:
+        result = await self.db.execute(select(Execution).where(Execution.id == execution_id))
+        execution = result.scalar_one_or_none()
+        if not execution:
+            raise NotFoundError(
+                "Execution not found",
+                code="EXECUTION_NOT_FOUND",
+                data={"execution_id": str(execution_id)},
+            )
+        return execution
+
+    async def get_run_for_execution(self, execution_id: uuid.UUID) -> AgentRun:
+        result = await self.db.execute(
+            select(AgentRun).join(Execution, Execution.run_id == AgentRun.id).where(Execution.id == execution_id)
+        )
+        run = result.scalar_one_or_none()
+        if not run:
+            raise NotFoundError(
+                "Agent run not found for execution",
+                code="AGENT_RUN_NOT_FOUND",
+                data={"execution_id": str(execution_id)},
+            )
+        return run
+
+    async def get_release_for_run(self, run_id: uuid.UUID) -> Optional[AgentRelease]:
+        result = await self.db.execute(
+            select(AgentRelease).join(AgentRun, AgentRun.release_id == AgentRelease.id).where(AgentRun.id == run_id)
+        )
+        return result.scalar_one_or_none()
+
+    async def get_task_auto_approve(self, task_id: uuid.UUID) -> bool:
+        result = await self.db.execute(select(Task.auto_approve).where(Task.id == task_id))
+        val = result.scalar_one_or_none()
+        return val if val is not None else True
diff --git a/backend/app/services/execution_service.py b/backend/app/services/execution_service.py
new file mode 100644
index 000000000..a31947fc0
--- /dev/null
+++ b/backend/app/services/execution_service.py
@@ -0,0 +1,402 @@
+"""
+Service layer for CLI agent executions.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import timedelta
+from typing import Any, List, Mapping, Optional, cast
+
+from loguru import logger
+from sqlalchemy import func, select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InternalServiceError, NotFoundError
+from app.core.events import ExecutionEventEnvelope, execution_event_bus
+from app.core.events.event_types import ExecutionEventType
+from app.core.ports.execution import EventContext
+from app.core.state_machines.definitions import EXECUTION_TERMINAL
+from app.models.execution import (
+    Execution,
+    ExecutionEvent,
+)
+from app.repositories.execution import ExecutionEventRepository, ExecutionRepository
+from app.utils.datetime import utc_now
+
+TERMINAL_EXECUTION_STATUSES = EXECUTION_TERMINAL
+
+
+class ExecutionService:
+    """Manages execution lifecycle and event appending."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self.repo = ExecutionRepository(db)
+        self.event_repo = ExecutionEventRepository(db)
+        self._event_ctx: Optional[EventContext] = None
+
+    def set_event_context(self, ctx: EventContext) -> None:
+        """Inject run-level metadata so append_event can build full envelopes."""
+        self._event_ctx = ctx
+
+    async def get_execution_internal(self, execution_id: uuid.UUID) -> Optional[Execution]:
+        """Internal use — no user-scope check, no FOR UPDATE lock."""
+        result = await self.db.execute(select(Execution).where(Execution.id == execution_id))
+        return result.scalar_one_or_none()
+
+    async def get_execution(self, execution_id: uuid.UUID, user_id: Optional[str] = None) -> Optional[Execution]:
+        """Get execution by ID (user_id kept for API compatibility; no row-level auth here).
+
+        Raises NotFoundError when called without user_id (API path) so callers get a clean 404.
+        When user_id is provided (WebSocket path) returns None on miss.
+        """
+        execution = await self.get_execution_internal(execution_id)
+        if execution is None and user_id is None:
+            raise NotFoundError(
+                "Execution not found",
+                code="EXECUTION_NOT_FOUND",
+                data={"execution_id": str(execution_id)},
+            )
+        return execution
+
+    async def list_events_after(
+        self, execution_id: uuid.UUID, user_id: str, after_seq: int = 0, limit: int = 500
+    ) -> list[ExecutionEvent]:
+        execution = await self.get_execution_internal(execution_id)
+        if not execution:
+            return []
+        result = await self.db.execute(
+            select(ExecutionEvent)
+            .where(
+                ExecutionEvent.execution_id == execution_id,
+                ExecutionEvent.sequence_no > after_seq,
+            )
+            .order_by(ExecutionEvent.sequence_no.asc())
+            .limit(limit)
+        )
+        return list(result.scalars().all())
+
+    async def mark_status(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        status: str,
+        container_id: Optional[str] = None,
+        session_id: Optional[str] = None,
+        error: Mapping[str, Any] | None = None,
+        result_summary: Optional[dict[str, Any]] = None,
+    ) -> Optional[Execution]:
+        """Publish a status-change event through the bus.
+
+        StateTransitionSubscriber handles the actual DB transition and
+        metadata writes in Phase 1 of the bus pipeline.
+        """
+        ctx = self._event_ctx
+        if ctx is None:
+            # Fallback for callers without event context (e.g. reaper)
+            from app.models.agent_run import AgentRun
+
+            result = await self.db.execute(
+                select(Execution, AgentRun.workspace_id)
+                .join(AgentRun, Execution.run_id == AgentRun.id)
+                .where(Execution.id == execution_id)
+            )
+            row = result.one_or_none()
+            if not row:
+                return None
+            execution, ws_id = row
+            ctx = EventContext(
+                run_id=execution.run_id,
+                workspace_id=ws_id,
+            )
+        else:
+            execution = None
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=ctx.run_id,
+            workspace_id=ctx.workspace_id,
+            event_type=ExecutionEventType.EXECUTION_STATUS_CHANGE,
+            payload={"status": status},
+            trigger_medium=ctx.trigger_medium,
+            run_purpose=ctx.run_purpose,
+            thread_id=ctx.thread_id,
+            task_id=ctx.task_id,
+            target_status=status,
+            error=dict(error) if error is not None else None,
+            container_id=container_id or session_id,
+            metrics=result_summary,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+        # Return the updated row
+        if execution is None:
+            execution = cast(
+                Optional[Execution],
+                (await self.db.execute(select(Execution).where(Execution.id == execution_id))).scalar_one_or_none(),
+            )
+        else:
+            await self.db.refresh(execution)
+        return cast(Optional[Execution], execution)
+
+    async def append_event(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        event_type: ExecutionEventType,
+        payload: dict[str, Any],
+    ) -> ExecutionEvent:
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=self._event_ctx.run_id,
+            workspace_id=self._event_ctx.workspace_id,
+            event_type=event_type,
+            payload=payload,
+            trigger_medium=self._event_ctx.trigger_medium,
+            run_purpose=self._event_ctx.run_purpose,
+            thread_id=self._event_ctx.thread_id,
+            task_id=self._event_ctx.task_id,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+        return ExecutionEvent(
+            execution_id=execution_id,
+            sequence_no=envelope.seq,
+            event_type=event_type,
+            payload=payload,
+        )
+
+    async def batch_append_events(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        events: list[dict[str, Any]],
+    ) -> list[ExecutionEvent]:
+        """Append multiple events in a single transaction via the event bus."""
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelopes = [
+            ExecutionEventEnvelope(
+                execution_id=execution_id,
+                run_id=self._event_ctx.run_id,
+                workspace_id=self._event_ctx.workspace_id,
+                event_type=evt["event_type"],
+                payload=evt["payload"],
+                trigger_medium=self._event_ctx.trigger_medium,
+                run_purpose=self._event_ctx.run_purpose,
+                thread_id=self._event_ctx.thread_id,
+                task_id=self._event_ctx.task_id,
+            )
+            for evt in events
+        ]
+        await execution_event_bus.publish_batch(envelopes, self.db)
+
+        return [
+            ExecutionEvent(
+                execution_id=execution_id,
+                sequence_no=env.seq,
+                event_type=env.event_type,
+                payload=env.payload,
+            )
+            for env in envelopes
+        ]
+
+    async def complete_execution(
+        self,
+        *,
+        execution_id: uuid.UUID,
+        terminal_status: str,
+        result_summary: dict | None = None,
+        error: Mapping[str, Any] | None = None,
+        session_id: str | None = None,
+    ) -> None:
+        """Publish a single EXECUTION_COMPLETED event with full metadata.
+
+        StateTransitionSubscriber handles Execution + Run terminal transitions.
+        """
+        if self._event_ctx is None:
+            raise InternalServiceError(
+                "Execution event context is not initialized",
+                code="EXECUTION_EVENT_CONTEXT_MISSING",
+                data={"execution_id": str(execution_id)},
+            )
+
+        envelope = ExecutionEventEnvelope(
+            execution_id=execution_id,
+            run_id=self._event_ctx.run_id,
+            workspace_id=self._event_ctx.workspace_id,
+            event_type=ExecutionEventType.EXECUTION_COMPLETED,
+            payload={
+                "status": terminal_status,
+                "error": dict(error) if error is not None else None,
+                "result_summary": result_summary,
+            },
+            terminal_status=terminal_status,
+            error=dict(error) if error is not None else None,
+            container_id=session_id,
+            metrics=result_summary,
+            trigger_medium=self._event_ctx.trigger_medium,
+            run_purpose=self._event_ctx.run_purpose,
+            thread_id=self._event_ctx.thread_id,
+            task_id=self._event_ctx.task_id,
+        )
+        await execution_event_bus.publish(envelope, self.db)
+
+    async def list_executions(self, run_id: uuid.UUID) -> List[Execution]:
+        """List all executions for a run."""
+        return await self.repo.list_by_run(run_id)
+
+    async def list_events(self, execution_id: uuid.UUID) -> List[ExecutionEvent]:
+        """List all events for an execution."""
+        return await self.event_repo.list_by_execution(execution_id)
+
+    async def get_snapshot(self, execution_id: uuid.UUID, user_id: Optional[str] = None):
+        """Return a lightweight snapshot of the execution for WebSocket catch-up.
+
+        Returns an object with ``last_seq`` and ``projection`` attributes.
+        Falls back to a synthetic snapshot built from the execution row when no
+        dedicated snapshot table exists.
+        """
+        execution = await self.get_execution_internal(execution_id)
+        if not execution:
+            return None
+
+        # Compute last_seq from the events table
+        result = await self.db.execute(
+            select(func.coalesce(func.max(ExecutionEvent.sequence_no), 0)).where(
+                ExecutionEvent.execution_id == execution_id
+            )
+        )
+        last_seq = result.scalar() or 0
+
+        # Build a minimal projection from the execution row itself
+        class _Snapshot:
+            last_seq: int
+            projection: dict[str, Any]
+
+        snap = _Snapshot()
+        snap.last_seq = last_seq
+        snap.projection = {
+            "status": execution.status if isinstance(execution.status, str) else execution.status.value,
+            "started_at": execution.started_at.isoformat() if execution.started_at else None,
+            "ended_at": execution.ended_at.isoformat() if execution.ended_at else None,
+            "error": execution.error,
+        }
+        return snap
+
+    async def create_execution(
+        self,
+        *,
+        run_id: uuid.UUID,
+        runtime_type: str = "claude_code",
+        parent_execution_id: Optional[uuid.UUID] = None,
+    ) -> Execution:
+        """Create an Execution record attached to an existing AgentRun."""
+        max_attempt = await ExecutionRepository(self.db).get_max_attempt(run_id)
+        execution = Execution(
+            run_id=run_id,
+            attempt_index=max_attempt + 1,
+            engine_kind=runtime_type,
+            status="pending",
+            parent_execution_id=parent_execution_id,
+        )
+        self.db.add(execution)
+        await self.db.commit()
+        await self.db.refresh(execution)
+        return execution
+
+    async def reap_stale_executions(
+        self,
+        thresholds: list[tuple[tuple[str, ...], timedelta]],
+    ) -> int:
+        """Discover and reap stale executions.
+
+        For each (statuses, threshold) pair:
+          1. Query stale executions           → Repository
+          2. Cancel active runtime session    → session_registry
+          3. Mark execution as failed         → self.mark_status (bus)
+          4. Mark parent run as failed        → RUN_STATUS_CHANGE (bus)
+
+        Args:
+            thresholds: list of ``((status, ...), timedelta)`` pairs defining
+                which execution statuses to scan and how old they must be.
+
+        Returns:
+            Total number of reaped executions.
+        """
+        from app.core.agent.cli_backends.session_registry import session_registry
+        from app.models.agent_run import AgentRun
+
+        now = utc_now()
+        total = 0
+
+        for statuses, threshold in thresholds:
+            stale = await self.repo.list_recoverable_stale(
+                statuses=statuses,
+                stale_before=now - threshold,
+            )
+            for execution in stale:
+                try:
+                    # 1. Cancel active session if any
+                    session = session_registry.get(execution.id)
+                    if session:
+                        await session.cancel()
+
+                    # 2. Load run for envelope metadata
+                    run = (
+                        await self.db.execute(select(AgentRun).where(AgentRun.id == execution.run_id))
+                    ).scalar_one_or_none()
+
+                    # 3. Atomically mark execution + run as failed
+                    error_msg = f"No heartbeat for {int(threshold.total_seconds() // 60)}+ minutes"
+                    stale_error = {
+                        "code": "STALE_REAPED",
+                        "message": error_msg,
+                        "data": {"reason": "stale_execution"},
+                        "source": "runtime",
+                        "retryable": True,
+                        "user_action": "retry",
+                    }
+                    envelope = ExecutionEventEnvelope(
+                        execution_id=execution.id,
+                        run_id=execution.run_id,
+                        workspace_id=run.workspace_id if run else uuid.UUID(int=0),
+                        event_type=ExecutionEventType.EXECUTION_COMPLETED,
+                        payload={
+                            "status": "failed",
+                            "error": stale_error,
+                            "result_summary": "Reaped: stale execution",
+                        },
+                        terminal_status="failed",
+                        error=stale_error,
+                        result_summary="Reaped: stale execution",
+                        trigger_medium=run.trigger_medium if run else None,
+                        run_purpose=run.run_purpose if run else None,
+                        thread_id=run.thread_id if run else None,
+                        task_id=run.task_id if run else None,
+                    )
+                    await execution_event_bus.publish(envelope, self.db)
+
+                    total += 1
+                    logger.info(
+                        f"Reaped stale execution {execution.id} "
+                        f"(status={execution.status}, "
+                        f"age={now - (execution.started_at or execution.created_at)})"
+                    )
+                except Exception as exc:
+                    logger.warning(f"Failed to reap execution {execution.id}: {exc}")
+
+        return total
diff --git a/backend/app/services/graph_deployment_version_service.py b/backend/app/services/graph_deployment_version_service.py
deleted file mode 100644
index 940fb16cb..000000000
--- a/backend/app/services/graph_deployment_version_service.py
+++ /dev/null
@@ -1,568 +0,0 @@
-"""
-Graph deployment version service.
-"""
-
-from __future__ import annotations
-
-import json
-import uuid
-from datetime import datetime, timezone
-from typing import Any, Dict, List, Optional
-
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.exceptions import ForbiddenException, NotFoundException
-from app.models.auth import AuthUser
-from app.models.graph import AgentGraph
-from app.models.graph_deployment_version import GraphDeploymentVersion
-from app.models.workspace import WorkspaceMemberRole
-from app.repositories.auth_user import AuthUserRepository
-from app.repositories.graph import GraphEdgeRepository, GraphNodeRepository, GraphRepository
-from app.repositories.graph_deployment_version import GraphDeploymentVersionRepository
-from app.schemas.graph_deployment_version import (
-    GraphDeploymentVersionListResponse,
-    GraphDeploymentVersionResponseCamel,
-    GraphDeploymentVersionStateResponse,
-    GraphDeployResponse,
-    GraphRevertResponse,
-)
-
-from .base import BaseService
-from .workspace_permission import check_workspace_access
-
-
-class GraphDeploymentVersionService(BaseService):
-    """Graph deployment version service."""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(db)
-        self.version_repo = GraphDeploymentVersionRepository(db)
-        self.graph_repo = GraphRepository(db)
-        self.node_repo = GraphNodeRepository(db)
-        self.edge_repo = GraphEdgeRepository(db)
-        self.user_repo = AuthUserRepository(db)
-
-    async def _ensure_access(
-        self,
-        graph: AgentGraph,
-        current_user: AuthUser,
-        required_role: WorkspaceMemberRole = WorkspaceMemberRole.viewer,
-    ) -> None:
-        """Ensure the user has permission to access the graph."""
-        if current_user.is_superuser:
-            return
-        if graph.user_id == current_user.id:
-            return
-        if graph.workspace_id:
-            has_access = await check_workspace_access(
-                self.db,
-                graph.workspace_id,
-                current_user,
-                required_role,
-            )
-            if has_access:
-                return
-        raise ForbiddenException("No access to graph")
-
-    async def _ensure_can_deploy(self, graph: AgentGraph, current_user: AuthUser) -> None:
-        """Ensure the user can deploy."""
-        if current_user.is_superuser:
-            return
-        if graph.user_id == current_user.id:
-            return
-        if graph.workspace_id:
-            has_access = await check_workspace_access(
-                self.db,
-                graph.workspace_id,
-                current_user,
-                WorkspaceMemberRole.admin,
-            )
-            if has_access:
-                return
-        raise ForbiddenException("Only graph owner or workspace admin can deploy")
-
-    def _normalize_graph_state(self, nodes: List, edges: List, variables: Dict[str, Any]) -> Dict[str, Any]:
-        """Normalize graph state — store into deployment_version.state.
-
-        Important: deep-copy node.data to avoid serialization issues with SQLAlchemy proxy objects.
-        Also ensure config contains all necessary settings (e.g. model, temp, etc.)
-        so that a revert can fully restore the state.
-        """
-        import copy
-
-        normalized_nodes = {}
-        for node in nodes:
-            node_id = str(node.id)
-
-            # deep-copy data to avoid SQLAlchemy proxy object serialization issues
-            node_data = copy.deepcopy(dict(node.data)) if node.data else {}
-
-            # ensure config exists
-            if "config" not in node_data:
-                node_data["config"] = {}
-
-            config = node_data.get("config", {})
-            if not isinstance(config, dict):
-                config = {}
-            node_data["config"] = config
-
-            normalized_nodes[node_id] = {
-                "id": node_id,
-                "type": node.type,
-                "position": {
-                    "x": float(node.position_x) if node.position_x else 0,
-                    "y": float(node.position_y) if node.position_y else 0,
-                },
-                "position_absolute": {
-                    "x": float(node.position_absolute_x) if node.position_absolute_x else None,
-                    "y": float(node.position_absolute_y) if node.position_absolute_y else None,
-                },
-                "width": float(node.width) if node.width else 0,
-                "height": float(node.height) if node.height else 0,
-                "data": node_data,
-            }
-
-        normalized_edges = []
-        for edge in edges:
-            normalized_edges.append(
-                {
-                    "id": str(edge.id),
-                    "source": str(edge.source_node_id),
-                    "target": str(edge.target_node_id),
-                }
-            )
-
-        return {
-            "nodes": normalized_nodes,
-            "edges": normalized_edges,
-            "variables": variables,
-            "lastSaved": int(datetime.now(timezone.utc).timestamp() * 1000),
-        }
-
-    def _compute_state_hash(self, state: Dict[str, Any]) -> str:
-        """Compute a hash of the state for quick comparison."""
-        import hashlib
-
-        # exclude lastSaved field since it differs every time
-        state_copy = {k: v for k, v in state.items() if k != "lastSaved"}
-        state_json = json.dumps(state_copy, sort_keys=True, ensure_ascii=False)
-        return hashlib.sha256(state_json.encode()).hexdigest()[:16]
-
-    def _has_graph_changed(self, current_state: Dict[str, Any], deployed_state: Dict[str, Any]) -> bool:
-        """Check whether the graph has changed (using hash for quick comparison)."""
-        current_hash = self._compute_state_hash(current_state)
-        deployed_hash = self._compute_state_hash(deployed_state)
-        return current_hash != deployed_hash
-
-    async def deploy(
-        self, graph_id: uuid.UUID, current_user: AuthUser, name: Optional[str] = None
-    ) -> GraphDeployResponse:
-        """Deploy a graph."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_can_deploy(graph, current_user)
-
-        nodes = await self.node_repo.list_by_graph(graph_id)
-        edges = await self.edge_repo.list_by_graph(graph_id)
-
-        current_state = self._normalize_graph_state(nodes, edges, graph.variables)
-        active_version = await self.version_repo.get_active_version(graph_id)
-
-        # check if there are changes
-        has_changes = True
-        if active_version:
-            has_changes = self._has_graph_changed(current_state, active_version.state)
-
-        # if no changes and already deployed, return current active version info
-        if not has_changes and graph.is_deployed and active_version:
-            return GraphDeployResponse(
-                success=True,
-                message=f"No changes detected, current version is v{active_version.version}",
-                version=active_version.version,
-                isActive=active_version.is_active,
-                needsRedeployment=False,
-            )
-
-        # changes detected or first deploy, create a new version
-        new_version = await self.version_repo.create_version(
-            graph_id=graph_id,
-            state=current_state,
-            created_by=str(current_user.id),
-            name=name,
-        )
-
-        now = datetime.now(timezone.utc)
-        await self.graph_repo.update(
-            graph_id,
-            {
-                "is_deployed": True,
-                "deployed_at": now,
-            },
-        )
-
-        await self.db.commit()
-
-        return GraphDeployResponse(
-            success=True,
-            message=f"Deployed as version {new_version.version}",
-            version=new_version.version,
-            isActive=new_version.is_active,
-            needsRedeployment=False,
-        )
-
-    async def undeploy(self, graph_id: uuid.UUID, current_user: AuthUser) -> Dict[str, Any]:
-        """Undeploy."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_can_deploy(graph, current_user)
-
-        await self.graph_repo.update(
-            graph_id,
-            {
-                "is_deployed": False,
-                "deployed_at": None,
-            },
-        )
-
-        await self.db.commit()
-
-        return {
-            "isDeployed": False,
-            "deployedAt": None,
-        }
-
-    async def get_deployment_status(self, graph_id: uuid.UUID, current_user: AuthUser) -> Dict[str, Any]:
-        """Get deployment status."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_access(graph, current_user)
-
-        active_version = await self.version_repo.get_active_version(graph_id)
-
-        nodes = await self.node_repo.list_by_graph(graph_id)
-        edges = await self.edge_repo.list_by_graph(graph_id)
-        current_state = self._normalize_graph_state(nodes, edges, graph.variables)
-
-        needs_redeployment = False
-        if active_version:
-            needs_redeployment = self._has_graph_changed(current_state, active_version.state)
-        else:
-            needs_redeployment = True
-
-        return {
-            "isDeployed": graph.is_deployed,
-            "deployedAt": graph.deployed_at.isoformat() if graph.deployed_at else None,
-            "deployment": self._to_response_camel(active_version) if active_version else None,
-            "needsRedeployment": needs_redeployment,
-        }
-
-    async def list_versions(
-        self,
-        graph_id: uuid.UUID,
-        current_user: AuthUser,
-        page: int = 1,
-        page_size: int = 10,
-    ) -> GraphDeploymentVersionListResponse:
-        """Get all versions (paginated)."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_access(graph, current_user)
-
-        versions, total = await self.version_repo.list_by_graph_paginated(graph_id, page=page, page_size=page_size)
-
-        # batch-fetch usernames
-        user_ids = list(set(v.created_by for v in versions if v.created_by))
-        user_names: Dict[str, str] = {}
-        for user_id in user_ids:
-            if user_id:
-                import uuid as uuid_lib
-
-                try:
-                    user_uuid = uuid_lib.UUID(user_id) if isinstance(user_id, str) else user_id
-                    user = await self.user_repo.get(user_uuid)
-                    if user:
-                        user_names[user_id] = user.name
-                except (ValueError, TypeError):
-                    pass
-
-        total_pages = (total + page_size - 1) // page_size if page_size > 0 else 1
-
-        return GraphDeploymentVersionListResponse(
-            versions=[
-                self._to_response_camel(v, user_names.get(v.created_by) if v.created_by else None) for v in versions
-            ],
-            total=total,
-            page=page,
-            pageSize=page_size,
-            totalPages=total_pages,
-        )
-
-    async def get_version(
-        self, graph_id: uuid.UUID, version: int, current_user: AuthUser
-    ) -> GraphDeploymentVersionResponseCamel:
-        """Get a specific version."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_access(graph, current_user)
-
-        deployment_version = await self.version_repo.get_by_graph_and_version(graph_id, version)
-        if not deployment_version:
-            raise NotFoundException("Deployment version not found")
-
-        return self._to_response_camel(deployment_version)
-
-    async def get_version_state(
-        self, graph_id: uuid.UUID, version: int, current_user: AuthUser
-    ) -> GraphDeploymentVersionStateResponse:
-        """Get the full state of a specific version (including nodes, edges, etc. for preview)."""
-        import copy
-
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_access(graph, current_user)
-
-        deployment_version = await self.version_repo.get_by_graph_and_version(graph_id, version)
-        if not deployment_version:
-            raise NotFoundException("Deployment version not found")
-
-        # deep-copy state, convert to frontend-expected format
-        state = copy.deepcopy(deployment_version.state) if deployment_version.state else {}
-
-        # convert state nodes to frontend format (ReactFlow format)
-        frontend_nodes = []
-        nodes_data = state.get("nodes", {})
-        for node_id, node_data in nodes_data.items():
-            position = node_data.get("position", {"x": 0, "y": 0})
-            position_absolute = node_data.get("position_absolute", position)
-
-            frontend_node = {
-                "id": node_id,
-                "type": "custom",  # ReactFlow uses custom type
-                "position": position,
-                "positionAbsolute": {
-                    "x": position_absolute.get("x") if position_absolute else position.get("x", 0),
-                    "y": position_absolute.get("y") if position_absolute else position.get("y", 0),
-                },
-                "width": node_data.get("width", 0),
-                "height": node_data.get("height", 0),
-                "data": node_data.get("data", {}),
-                "selected": False,
-                "dragging": False,
-            }
-            frontend_nodes.append(frontend_node)
-
-        # convert edges format
-        frontend_edges = []
-        edges_data = state.get("edges", [])
-        for edge_data in edges_data:
-            frontend_edge = {
-                "id": edge_data.get("id", f"edge-{edge_data.get('source')}-{edge_data.get('target')}"),
-                "source": edge_data.get("source"),
-                "target": edge_data.get("target"),
-                "animated": True,
-                "style": {"stroke": "#cbd5e1", "strokeWidth": 1.5},
-            }
-            frontend_edges.append(frontend_edge)
-
-        frontend_state = {
-            "nodes": frontend_nodes,
-            "edges": frontend_edges,
-            "variables": state.get("variables", {}),
-        }
-
-        return GraphDeploymentVersionStateResponse(
-            id=str(deployment_version.id),
-            version=deployment_version.version,
-            name=deployment_version.name,
-            isActive=deployment_version.is_active,
-            createdAt=deployment_version.created_at.isoformat(),
-            createdBy=deployment_version.created_by,
-            state=frontend_state,
-        )
-
-    async def activate_version(
-        self, graph_id: uuid.UUID, version: int, current_user: AuthUser
-    ) -> GraphDeploymentVersionResponseCamel:
-        """Activate a version."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_can_deploy(graph, current_user)
-
-        activated_version = await self.version_repo.activate_version(graph_id, version)
-        if not activated_version:
-            raise NotFoundException("Deployment version not found")
-
-        await self.graph_repo.update(
-            graph_id,
-            {
-                "deployed_at": datetime.now(timezone.utc),
-            },
-        )
-
-        await self.db.commit()
-
-        return self._to_response_camel(activated_version)
-
-    async def revert_to_version(self, graph_id: uuid.UUID, version: int, current_user: AuthUser) -> GraphRevertResponse:
-        """Revert to a specific version.
-
-        Restore the full node state from the deployment version, including all settings in data.config.
-        """
-        import copy
-
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_can_deploy(graph, current_user)
-
-        target_version = await self.version_repo.get_by_graph_and_version(graph_id, version)
-        if not target_version:
-            raise NotFoundException("Deployment version not found")
-
-        # restore nodes/edges data
-        state = target_version.state
-        if not state or "nodes" not in state:
-            raise NotFoundException("Version state is invalid")
-
-        # 1. delete all existing nodes and edges
-        await self.node_repo.delete_by_graph(graph_id)
-        await self.edge_repo.delete_by_graph(graph_id)
-
-        # 2. restore nodes (using original IDs)
-        from app.models.graph import GraphNode
-
-        nodes_data = state["nodes"]
-        for node_id, node_data in nodes_data.items():
-            position = node_data.get("position", {})
-            position_absolute = node_data.get("position_absolute")
-
-            # deep-copy data to ensure data integrity
-            restored_data = copy.deepcopy(node_data.get("data", {}))
-
-            node = GraphNode(
-                id=uuid.UUID(node_id),  # use original ID
-                graph_id=graph_id,
-                type=node_data["type"],
-                position_x=position.get("x", 0) if position else 0,
-                position_y=position.get("y", 0) if position else 0,
-                position_absolute_x=position_absolute.get("x") if position_absolute else None,
-                position_absolute_y=position_absolute.get("y") if position_absolute else None,
-                width=node_data.get("width", 0),
-                height=node_data.get("height", 0),
-                data=restored_data,  # full data (including config)
-            )
-            self.db.add(node)
-
-        # flush first to ensure nodes are created
-        await self.db.flush()
-
-        # 3. restore edges
-        from app.models.graph import GraphEdge
-
-        edges_data = state.get("edges", [])
-        for edge_data in edges_data:
-            edge = GraphEdge(
-                id=uuid.UUID(edge_data["id"]),  # use original ID
-                graph_id=graph_id,
-                source_node_id=uuid.UUID(edge_data["source"]),
-                target_node_id=uuid.UUID(edge_data["target"]),
-            )
-            self.db.add(edge)
-
-        # 4. update variables
-        await self.graph_repo.update(
-            graph_id,
-            {
-                "variables": state.get("variables", {}),
-            },
-        )
-
-        # 5. activate version
-        await self.version_repo.activate_version(graph_id, version)
-
-        await self.graph_repo.update(
-            graph_id,
-            {
-                "deployed_at": datetime.now(timezone.utc),
-            },
-        )
-
-        await self.db.commit()
-
-        return GraphRevertResponse(
-            success=True,
-            message=f"Reverted to version {version}",
-            version=version,
-            is_active=True,
-        )
-
-    async def rename_version(
-        self, graph_id: uuid.UUID, version: int, name: str, current_user: AuthUser
-    ) -> GraphDeploymentVersionResponseCamel:
-        """Rename a version."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_access(graph, current_user)
-
-        renamed_version = await self.version_repo.rename_version(graph_id, version, name)
-        if not renamed_version:
-            raise NotFoundException("Deployment version not found")
-
-        await self.db.commit()
-
-        return self._to_response_camel(renamed_version)
-
-    async def delete_version(self, graph_id: uuid.UUID, version: int, current_user: AuthUser) -> Dict[str, Any]:
-        """Delete a version."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        await self._ensure_can_deploy(graph, current_user)
-
-        target_version = await self.version_repo.get_by_graph_and_version(graph_id, version)
-        if not target_version:
-            raise NotFoundException("Deployment version not found")
-
-        # cannot delete the currently active version
-        if target_version.is_active:
-            raise ForbiddenException("Cannot delete the active deployment version")
-
-        await self.version_repo.delete_version(graph_id, version)
-        await self.db.commit()
-
-        return {
-            "success": True,
-            "message": f"Version {version} deleted successfully",
-        }
-
-    def _to_response_camel(
-        self, version: GraphDeploymentVersion, created_by_name: Optional[str] = None
-    ) -> GraphDeploymentVersionResponseCamel:
-        """Convert to camelCase response format."""
-        return GraphDeploymentVersionResponseCamel(
-            id=str(version.id),
-            version=version.version,
-            name=version.name,
-            isActive=version.is_active,
-            createdAt=version.created_at.isoformat(),
-            createdBy=version.created_by,
-            createdByName=created_by_name,
-        )
diff --git a/backend/app/services/graph_service.py b/backend/app/services/graph_service.py
deleted file mode 100644
index 039a65af8..000000000
--- a/backend/app/services/graph_service.py
+++ /dev/null
@@ -1,920 +0,0 @@
-"""
-Graph service.
-"""
-
-import hashlib
-import json
-import time
-import uuid
-from typing import Any, Dict, List, Optional, Tuple
-
-from langgraph.graph.state import CompiledStateGraph
-from loguru import logger
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
-from app.core.graph.deep_agents.builder import build_deep_agents_graph
-from app.core.graph.node_secrets import (
-    hydrate_nodes_a2a_secrets,
-    prepare_node_data_for_save,
-    store_a2a_auth_headers,
-)
-from app.core.graph.runtime_prompt_template import build_runtime_prompt_context
-from app.models.auth import AuthUser
-from app.models.graph import AgentGraph, GraphEdge, GraphNode, GraphNodeSecret
-from app.models.workspace import WorkspaceMemberRole
-from app.repositories.graph import GraphEdgeRepository, GraphNodeRepository, GraphRepository
-
-from .base import BaseService
-from .model_service import ModelService
-from .workspace_permission import check_workspace_access
-
-# In-memory compile cache: (graph_id, updated_at_iso, runtime_context_fingerprint) -> (compiled_graph, cached_at_ts).
-_compile_cache: Dict[Tuple[str, str, str], Tuple[CompiledStateGraph, float]] = {}
-_COMPILE_CACHE_TTL = 300.0
-
-
-def _invalidate_compile_cache(graph_id: uuid.UUID) -> None:
-    """Remove any cache entry for this graph (call after save)."""
-    to_drop = [k for k in _compile_cache if k[0] == str(graph_id)]
-    for k in to_drop:
-        _compile_cache.pop(k, None)
-
-
-def _build_runtime_prompt_context_for_cache(
-    graph: AgentGraph,
-    *,
-    user_id: Optional[Any],
-    thread_id: Optional[str],
-) -> Dict[str, Any]:
-    """Build effective runtime prompt context used by GraphBuilder for cache-keying."""
-    return build_runtime_prompt_context(graph, user_id=user_id, thread_id=thread_id)
-
-
-def _normalize_runtime_prompt_context_for_cache(value: Any) -> Any:
-    """Normalize runtime context into a JSON-serializable deterministic structure."""
-    if isinstance(value, dict):
-        return {
-            str(key): _normalize_runtime_prompt_context_for_cache(value[key])
-            for key in sorted(value, key=lambda item: str(item))
-        }
-    if isinstance(value, list):
-        return [_normalize_runtime_prompt_context_for_cache(item) for item in value]
-    if isinstance(value, tuple):
-        return [_normalize_runtime_prompt_context_for_cache(item) for item in value]
-    if isinstance(value, set):
-        normalized_items = [_normalize_runtime_prompt_context_for_cache(item) for item in value]
-        return sorted(
-            normalized_items,
-            key=lambda item: json.dumps(item, sort_keys=True, separators=(",", ":"), ensure_ascii=True),
-        )
-    if isinstance(value, (str, int, float, bool)) or value is None:
-        return value
-    return str(value)
-
-
-def _build_runtime_aware_compile_cache_key(
-    graph: AgentGraph,
-    *,
-    user_id: Optional[Any],
-    thread_id: Optional[str],
-) -> Tuple[str, str, str]:
-    """Build compile cache key that includes effective runtime prompt context fingerprint."""
-    runtime_context = _build_runtime_prompt_context_for_cache(graph, user_id=user_id, thread_id=thread_id)
-    normalized_context = _normalize_runtime_prompt_context_for_cache(runtime_context)
-    serialized_context = json.dumps(normalized_context, sort_keys=True, separators=(",", ":"), ensure_ascii=True)
-    context_fingerprint = hashlib.sha256(serialized_context.encode("utf-8")).hexdigest()
-    updated_at_iso = graph.updated_at.isoformat() if graph.updated_at else ""
-    return (str(graph.id), updated_at_iso, context_fingerprint)
-
-
-class GraphService(BaseService):
-    """Graph Service"""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(db)
-        self.graph_repo = GraphRepository(db)
-        self.node_repo = GraphNodeRepository(db)
-        self.edge_repo = GraphEdgeRepository(db)
-
-    async def _ensure_access(
-        self,
-        graph: AgentGraph,
-        current_user: AuthUser,
-        required_role: WorkspaceMemberRole = WorkspaceMemberRole.viewer,
-    ) -> None:
-        """
-        Ensure the user has permission to access the graph.
-
-        Args:
-            graph: the graph to access
-            current_user: current user
-            required_role: minimum required workspace role (only applies to workspace graphs)
-
-        Raises:
-            ForbiddenException: if the user has no access
-        """
-        # superuser has all permissions
-        if current_user.is_superuser:
-            return
-
-        # if the user owns the graph, allow directly
-        if graph.user_id == current_user.id:
-            return
-
-        # if it's a workspace graph, check workspace permissions
-        if graph.workspace_id:
-            has_access = await check_workspace_access(
-                self.db,
-                graph.workspace_id,
-                current_user,
-                required_role,
-            )
-            if has_access:
-                return
-
-        # no permission
-        raise ForbiddenException("No access to graph")
-
-    async def _create_graph_with_id(
-        self,
-        graph_id: uuid.UUID,
-        name: str,
-        user_id: uuid.UUID,
-        workspace_id: Optional[uuid.UUID] = None,
-        description: Optional[str] = None,
-    ) -> AgentGraph:
-        """
-        Create a graph with a specified ID (for upsert scenarios).
-
-        Args:
-            graph_id: specified graph ID
-            name: graph name
-            user_id: user ID
-            workspace_id: workspace ID (optional)
-            description: description (optional)
-
-        Returns:
-            The created graph object
-        """
-        graph_data = {
-            "id": graph_id,
-            "name": name,
-            "user_id": user_id,
-            "workspace_id": workspace_id,
-            "description": description,
-            "is_deployed": False,
-            "variables": {},
-        }
-        return await self.graph_repo.create(graph_data)
-
-    async def create_graph(
-        self,
-        name: str,
-        user_id: str,
-        workspace_id: Optional[uuid.UUID] = None,
-        folder_id: Optional[uuid.UUID] = None,
-        parent_id: Optional[uuid.UUID] = None,
-        description: Optional[str] = None,
-        color: Optional[str] = None,
-        variables: Optional[Dict[str, Any]] = None,
-    ) -> AgentGraph:
-        """
-        Create a new graph.
-
-        Args:
-            name: graph name
-            user_id: user ID
-            workspace_id: workspace ID (optional)
-            folder_id: folder ID (optional)
-            parent_id: parent graph ID (optional)
-            description: description (optional)
-            color: color (optional)
-            variables: variables (optional)
-
-        Returns:
-            The created graph object
-
-        Raises:
-            NotFoundException: if the parent graph does not exist
-        """
-        # validate parent_id exists
-        if parent_id:
-            parent_graph = await self.graph_repo.get(parent_id)
-            if not parent_graph:
-                raise NotFoundException(f"Parent graph with id {parent_id} not found")
-
-        # validate folder_id exists and belongs to the specified workspace
-        if folder_id:
-            from app.repositories.workspace_folder import WorkflowFolderRepository
-
-            folder_repo = WorkflowFolderRepository(self.db)
-            folder = await folder_repo.get(folder_id)
-            if not folder:
-                raise NotFoundException(f"Folder with id {folder_id} not found")
-            # if workspace_id is specified, ensure the folder belongs to that workspace
-            if workspace_id and folder.workspace_id != workspace_id:
-                raise BadRequestException(f"Folder {folder_id} does not belong to workspace {workspace_id}")
-            # if workspace_id is not specified, derive it from the folder
-            if not workspace_id:
-                workspace_id = folder.workspace_id
-
-        graph_data = {
-            "name": name,
-            "user_id": user_id,
-            "workspace_id": workspace_id,
-            "folder_id": folder_id,
-            "parent_id": parent_id,
-            "description": description,
-            "color": color,
-            "is_deployed": False,
-            "variables": variables or {},
-        }
-        return await self.graph_repo.create(graph_data)
-
-    async def save_graph_state(
-        self,
-        graph_id: uuid.UUID,
-        nodes: List[Dict[str, Any]],
-        edges: List[Dict[str, Any]],
-        viewport: Optional[Dict[str, Any]] = None,
-        variables: Optional[Dict[str, Any]] = None,
-        current_user: Optional[AuthUser] = None,
-        # upsert params
-        name: Optional[str] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-    ) -> Dict[str, Any]:
-        """
-        Save the complete graph state (nodes and edges) — supports upsert mode.
-
-        If the graph does not exist and a name parameter is provided, automatically create a new graph.
-
-        Frontend format:
-        {
-            "nodes": [...],
-            "edges": [...],
-            "viewport": {...},
-            ...
-        }
-        """
-        # use a transaction to ensure atomicity: all operations succeed or all fail
-        # check if already in a transaction to avoid starting a duplicate
-        if self.db.in_transaction():
-            # already in a transaction, execute directly
-            return await self._save_graph_state_internal(
-                graph_id=graph_id,
-                nodes=nodes,
-                edges=edges,
-                viewport=viewport,
-                variables=variables,
-                current_user=current_user,
-                name=name,
-                workspace_id=workspace_id,
-            )
-        else:
-            # not in a transaction, start a new one
-            async with self.db.begin():
-                return await self._save_graph_state_internal(
-                    graph_id=graph_id,
-                    nodes=nodes,
-                    edges=edges,
-                    viewport=viewport,
-                    variables=variables,
-                    current_user=current_user,
-                    name=name,
-                    workspace_id=workspace_id,
-                )
-
-    async def _save_graph_state_internal(
-        self,
-        graph_id: uuid.UUID,
-        nodes: List[Dict[str, Any]],
-        edges: List[Dict[str, Any]],
-        viewport: Optional[Dict[str, Any]] = None,
-        variables: Optional[Dict[str, Any]] = None,
-        current_user: Optional[AuthUser] = None,
-        # upsert params
-        name: Optional[str] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-    ) -> Dict[str, Any]:
-        """Internal method: execute the actual save graph state logic."""
-        # get the graph
-        graph = await self.graph_repo.get(graph_id)
-        if graph:
-            # permission check: ensure user has write access to the existing graph
-            if current_user:
-                await self._ensure_access(graph, current_user, WorkspaceMemberRole.member)
-        if not graph:
-            # upsert mode: if the graph does not exist, auto-create a new graph
-            if current_user:
-                # if no workspace_id provided, find the user's default workspace
-                if not workspace_id:
-                    from app.repositories.workspace import WorkspaceRepository
-
-                    workspace_repo = WorkspaceRepository(self.db)
-                    workspace = await workspace_repo.get_by_name_and_owner(
-                        name="Default Workspace",
-                        owner_id=current_user.id,
-                    )
-                    if workspace:
-                        workspace_id = workspace.id
-
-                # use default name if none provided
-                graph_name = name or "Untitled Graph"
-
-                import uuid as uuid_lib
-
-                user_uuid = uuid_lib.UUID(current_user.id) if isinstance(current_user.id, str) else current_user.id
-                graph = await self._create_graph_with_id(
-                    graph_id=graph_id,
-                    name=graph_name,
-                    user_id=user_uuid,
-                    workspace_id=workspace_id,
-                )
-            else:
-                raise NotFoundException("Graph not found")
-
-        # load existing nodes, build frontend-ID-to-database-ID mapping
-        existing_nodes = await self.node_repo.list_by_graph(graph_id)
-        existing_node_map: Dict[str, GraphNode] = {}
-        for node in existing_nodes:
-            # frontend uses the database UUID string form as node ID
-            frontend_id = str(node.id)
-            existing_node_map[frontend_id] = node
-
-        # create node mapping (frontend ID -> database UUID)
-        node_id_map: Dict[str, uuid.UUID] = {}
-        nodes_to_create: List[Dict[str, Any]] = []
-        nodes_to_update: List[Tuple[uuid.UUID, Dict[str, Any]]] = []
-
-        # save nodes
-        for node_data in nodes:
-            # convert frontend node format to database format
-            node_id = node_data.get("id")
-            if not node_id:
-                continue
-
-            # try to parse frontend ID as UUID; if successful and node exists, update; otherwise create new node
-            db_node_id: uuid.UUID
-            try:
-                # try to parse frontend ID as UUID
-                node_id_str = str(node_id)
-                parsed_uuid = uuid.UUID(node_id_str)
-                if str(parsed_uuid) in existing_node_map:
-                    # node exists, update
-                    db_node_id = parsed_uuid
-                    nodes_to_update.append((db_node_id, node_data))
-                else:
-                    # UUID format but node does not exist, create new node
-                    db_node_id = uuid.uuid4()
-                    nodes_to_create.append(node_data)
-            except (ValueError, AttributeError):
-                # frontend ID is not UUID format (e.g. node_xxx), create new node
-                db_node_id = uuid.uuid4()
-                nodes_to_create.append(node_data)
-
-            node_id_map[node_id] = db_node_id
-
-        # delete nodes that no longer exist and all edges (edges will be recreated later)
-        # build database UUID set to determine which nodes to delete
-        # node_id_map values are database UUIDs, keys are frontend IDs
-        existing_db_node_ids = set(node_id_map.values())
-        # also include updated nodes (these are kept, should not be deleted)
-        for db_node_id, _ in nodes_to_update:
-            existing_db_node_ids.add(db_node_id)
-
-        nodes_to_delete = [
-            node.id for node_id_str, node in existing_node_map.items() if node.id not in existing_db_node_ids
-        ]
-        if nodes_to_delete:
-            await self.node_repo.delete_by_ids(graph_id, nodes_to_delete)
-            await self.edge_repo.delete_by_graph(graph_id)
-
-        # create new nodes
-        for node_data in nodes_to_create:
-            node_id = node_data.get("id")
-            if not node_id:
-                continue
-            db_node_id_raw = node_id_map.get(node_id)
-            if not db_node_id_raw:
-                continue
-            new_db_node_id: uuid.UUID = db_node_id_raw
-
-            position = node_data.get("position", {})
-            position_absolute = node_data.get("positionAbsolute", position)
-            data_payload = node_data.get("data", {}) or {}
-            data_for_save, headers_to_store = prepare_node_data_for_save(data_payload)
-            if headers_to_store:
-                try:
-                    secret_id = await store_a2a_auth_headers(self.db, graph_id, new_db_node_id, headers_to_store)
-                    if "config" not in data_for_save:
-                        data_for_save["config"] = {}
-                    data_for_save["config"]["a2a_auth_headers"] = {"__secretRef": str(secret_id)}
-                except Exception as e:
-                    logger.warning(f"[GraphService] Failed to store a2a_auth_headers for node {new_db_node_id}: {e}")
-            node_type = data_for_save.get("type") or node_data.get("type") or "agent"
-
-            node_create_data = {
-                "graph_id": graph_id,
-                "id": new_db_node_id,
-                "type": node_type,
-                "position_x": float(position.get("x", 0)),
-                "position_y": float(position.get("y", 0)),
-                "position_absolute_x": float(position_absolute.get("x", position.get("x", 0))),
-                "position_absolute_y": float(position_absolute.get("y", position.get("y", 0))),
-                "width": float(node_data.get("width", 0)),
-                "height": float(node_data.get("height", 0)),
-                "data": data_for_save,
-            }
-
-            await self.node_repo.create(node_create_data)
-
-        # update existing nodes
-        for db_node_id, node_data in nodes_to_update:
-            position = node_data.get("position", {})
-            position_absolute = node_data.get("positionAbsolute", position)
-            data_payload = node_data.get("data", {}) or {}
-            data_for_save, headers_to_store = prepare_node_data_for_save(data_payload)
-            if headers_to_store:
-                try:
-                    from sqlalchemy import delete
-
-                    await self.db.execute(
-                        delete(GraphNodeSecret).where(
-                            GraphNodeSecret.graph_id == graph_id,
-                            GraphNodeSecret.node_id == db_node_id,
-                            GraphNodeSecret.key_slug == "a2a_auth_headers",
-                        )
-                    )
-                    secret_id = await store_a2a_auth_headers(self.db, graph_id, db_node_id, headers_to_store)
-                    if "config" not in data_for_save:
-                        data_for_save["config"] = {}
-                    data_for_save["config"]["a2a_auth_headers"] = {"__secretRef": str(secret_id)}
-                except Exception as e:
-                    logger.warning(f"[GraphService] Failed to store a2a_auth_headers for node {db_node_id}: {e}")
-            node_type = data_for_save.get("type") or node_data.get("type") or "agent"
-
-            update_data = {
-                "type": node_type,
-                "position_x": float(position.get("x", 0)),
-                "position_y": float(position.get("y", 0)),
-                "position_absolute_x": float(position_absolute.get("x", position.get("x", 0))),
-                "position_absolute_y": float(position_absolute.get("y", position.get("y", 0))),
-                "width": float(node_data.get("width", 0)),
-                "height": float(node_data.get("height", 0)),
-                "data": data_for_save,
-            }
-
-            await self.node_repo.update(db_node_id, update_data)
-
-        # save edges (with dedup)
-        saved_edges_count = 0
-        skipped_edges_count = 0
-        seen_edges: set[tuple[str, str]] = set()  # for dedup
-
-        for edge_data in edges:
-            source_id = edge_data.get("source")
-            target_id = edge_data.get("target")
-
-            if not source_id or not target_id:
-                skipped_edges_count += 1
-                continue
-
-            # edge dedup: only save each source-target pair once
-            edge_key = (source_id, target_id)
-            if edge_key in seen_edges:
-                skipped_edges_count += 1
-                continue
-            seen_edges.add(edge_key)
-
-            # find the corresponding database node ID
-            source_node_id = node_id_map.get(source_id)
-            target_node_id = node_id_map.get(target_id)
-
-            if not source_node_id or not target_node_id:
-                skipped_edges_count += 1
-                continue
-
-            # extract edge data fields (including edge_type, route_key, source_handle_id, etc.)
-            edge_data_payload = edge_data.get("data", {}) or {}
-
-            edge_create_data = {
-                "graph_id": graph_id,
-                "source_node_id": source_node_id,
-                "target_node_id": target_node_id,
-                "data": edge_data_payload,  # save edge metadata (edge_type, route_key, etc.)
-            }
-
-            await self.edge_repo.create(edge_create_data)
-            saved_edges_count += 1
-
-        # update graph variables (save viewport and context variables metadata) and updated_at
-        update_data = {}
-        graph_variables = graph.variables or {}
-
-        if viewport:
-            graph_variables["viewport"] = viewport
-
-        # if variables provided, merge into graph_variables
-        if variables:
-            # merge variables, preserving existing viewport and other fields
-            for key, value in variables.items():
-                graph_variables[key] = value
-
-        if viewport or variables:
-            update_data["variables"] = graph_variables
-
-        # update graph updated_at (ensure list sorting is correct)
-        # BaseModel uses the updated_at field; SQLAlchemy's onupdate auto-updates it
-        # but to be safe, we explicitly trigger an update
-        from app.utils.datetime import utc_now
-
-        update_data["updated_at"] = utc_now()
-
-        if update_data:
-            await self.graph_repo.update(graph_id, update_data)
-
-        _invalidate_compile_cache(graph_id)
-
-        return {
-            "graph_id": str(graph_id),
-            "nodes_count": len(nodes),
-            "edges_count": len(edges),
-        }
-
-    async def load_graph_state(
-        self,
-        graph_id: uuid.UUID,
-        current_user: Optional[AuthUser] = None,
-    ) -> Dict[str, Any]:
-        """
-        Load the complete graph state (nodes and edges).
-
-        Return the format expected by the frontend:
-        {
-            "nodes": [...],
-            "edges": [...],
-            "viewport": {...},
-            ...
-        }
-        """
-        # get the graph
-        graph = await self.graph_repo.get(graph_id, relations=["nodes", "edges"])
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        # permission check
-        if current_user:
-            await self._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-
-        # load nodes and edges
-        nodes = await self.node_repo.list_by_graph(graph_id)
-        edges = await self.edge_repo.list_by_graph(graph_id)
-
-        # build node mapping (database UUID -> frontend ID)
-        node_id_map: Dict[uuid.UUID, str] = {}
-        frontend_nodes = []
-
-        for node in nodes:
-            # generate frontend ID (use node ID string form)
-            frontend_id = str(node.id)
-            node_id_map[node.id] = frontend_id
-
-            # build frontend node format
-            # note: ReactFlow's type field should be "custom" (all nodes use the BuilderNode component)
-            # the actual node type (e.g. "agent", "condition") is stored in data.type
-            node_data = node.data or {}
-
-            # ensure data.type exists (used to get colors etc. from nodeRegistry)
-            # if node.data has no type, use the database node.type field
-            if "type" not in node_data:
-                node_data["type"] = node.type
-
-            # restore position info: use saved position and positionAbsolute
-            # if position_absolute_x/y don't exist (old data), fall back to position_x/y
-            pos_x = float(node.position_x)
-            pos_y = float(node.position_y)
-            pos_abs_x = float(node.position_absolute_x) if node.position_absolute_x is not None else pos_x
-            pos_abs_y = float(node.position_absolute_y) if node.position_absolute_y is not None else pos_y
-
-            frontend_node: Dict[str, Any] = {
-                "id": frontend_id,
-                "type": "custom",  # ReactFlow node type, all nodes use BuilderNode
-                "position": {
-                    "x": pos_x,
-                    "y": pos_y,
-                },
-                "positionAbsolute": {
-                    "x": pos_abs_x,
-                    "y": pos_abs_y,
-                },
-                "width": float(node.width),
-                "height": float(node.height),
-                "data": node_data,
-                "selected": False,
-                "dragging": False,
-            }
-
-            # ensure config field exists
-            node_data_dict = frontend_node["data"] if isinstance(frontend_node["data"], dict) else {}
-            if "config" not in node_data_dict:
-                node_data_dict["config"] = {}
-            # redact: if plaintext a2a_auth_headers remain, do not return to frontend
-            a2a_headers = node_data_dict.get("config", {}).get("a2a_auth_headers")
-            if isinstance(a2a_headers, dict) and "__secretRef" not in a2a_headers and a2a_headers:
-                node_data_dict.setdefault("config", {})["a2a_auth_headers"] = {"__redacted": True}
-            frontend_node["data"] = node_data_dict
-
-            frontend_nodes.append(frontend_node)
-
-        # build frontend edge format
-        frontend_edges = []
-        for edge in edges:
-            source_id = node_id_map.get(edge.source_node_id)
-            target_id = node_id_map.get(edge.target_node_id)
-
-            if not source_id or not target_id:
-                continue
-
-            # restore edge data field from database
-            edge_data = edge.data or {}
-            edge_type = edge_data.get("edge_type", "normal")
-
-            # set style and type based on edge_type
-            if edge_type == "loop_back":
-                edge_style = {
-                    "stroke": "#9333ea",  # purple, matches frontend LoopBackEdge
-                    "strokeWidth": 2.5,
-                    "strokeDasharray": "5,5",
-                }
-                edge_type_for_reactflow = "loop_back"
-            elif edge_type == "conditional":
-                edge_style = {
-                    "stroke": "#3b82f6",  # blue, matches frontend condition edge
-                    "strokeWidth": 2,
-                }
-                edge_type_for_reactflow = "default"
-            else:
-                # normal or other types
-                edge_style = {
-                    "stroke": "#cbd5e1",  # matches frontend defaultEdgeOptions color
-                    "strokeWidth": 1.5,
-                }
-                edge_type_for_reactflow = "default"
-
-            # use default edge styles consistent with frontend (matches BuilderCanvas.tsx defaultEdgeOptions)
-            frontend_edge = {
-                "source": source_id,
-                "target": target_id,
-                "sourceHandle": None,
-                "targetHandle": None,
-                "type": edge_type_for_reactflow,  # set ReactFlow edge type
-                "animated": True,
-                "style": edge_style,
-                "data": edge_data,  # restore edge metadata (edge_type, route_key, source_handle_id, etc.)
-                "id": f"reactflow__edge-{source_id}-{target_id}",
-            }
-            frontend_edges.append(frontend_edge)
-
-        # get viewport and variables
-        viewport = graph.variables.get("viewport", {}) if graph.variables else {}
-        variables = graph.variables or {}
-
-        return {
-            "nodes": frontend_nodes,
-            "edges": frontend_edges,
-            "viewport": viewport,
-            "variables": variables,
-        }
-
-    async def get_graph_detail(
-        self,
-        graph_id: uuid.UUID,
-        current_user: Optional[AuthUser] = None,
-    ) -> Dict[str, Any]:
-        """Get detailed graph information (including state)."""
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        if current_user:
-            await self._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-
-        # load state
-        state = await self.load_graph_state(graph_id, current_user)
-
-        return {
-            "id": str(graph.id),
-            "name": graph.name,
-            "description": graph.description,
-            "workspaceId": str(graph.workspace_id) if graph.workspace_id else None,
-            "folderId": str(graph.folder_id) if graph.folder_id else None,
-            "parentId": str(graph.parent_id) if graph.parent_id else None,
-            "color": graph.color,
-            "isDeployed": graph.is_deployed,
-            "variables": graph.variables or {},
-            "createdAt": graph.created_at.isoformat() if graph.created_at else None,
-            "updatedAt": graph.updated_at.isoformat() if graph.updated_at else None,
-            **state,
-        }
-
-    async def create_default_deep_agents_graph(
-        self,
-        user_id: Optional[Any] = None,
-        file_emitter: Optional[Any] = None,
-    ) -> CompiledStateGraph:
-        """
-        Build a default DeepAgents single-node graph in memory (no DB persistence).
-        Used for "default conversation" when graph_id is None in Chat API.
-
-        Constructs one root node with useDeepAgents=true and no edges, then
-        uses GraphBuilder so that DeepAgentsGraphBuilder builds a standalone
-        create_deep_agent graph.
-
-        Returns:
-            CompiledStateGraph: Same type as create_graph_by_graph_id, ready for ainvoke/astream_events.
-        """
-
-        start_time = time.time()
-        graph_id = uuid.uuid4()
-        node_id = uuid.uuid4()
-
-        # In-memory graph (not added to session)
-        graph = AgentGraph(
-            id=graph_id,
-            name="Default Conversation",
-            user_id=str(user_id) if user_id is not None else "",
-            variables={},
-        )
-
-        # Single root node with DeepAgents enabled
-        node = GraphNode(
-            id=node_id,
-            graph_id=graph_id,
-            type="agent",
-            data={
-                "label": "Agent",
-                "config": {"useDeepAgents": True, "skills": ["*"]},
-            },
-            position_x=0,
-            position_y=0,
-            width=0,
-            height=0,
-        )
-
-        nodes: List[GraphNode] = [node]
-        edges: List[GraphEdge] = []
-
-        logger.info(f"[GraphService] ===== create_default_deep_agents_graph START ===== | user_id={user_id}")
-
-        model_service = ModelService(self.db)
-        compiled_graph = await build_deep_agents_graph(
-            graph=graph,
-            nodes=nodes,
-            edges=edges,
-            user_id=user_id,
-            model_service=model_service,
-            file_emitter=file_emitter,
-        )
-
-        elapsed_ms = (time.time() - start_time) * 1000
-        logger.info(
-            f"[GraphService] ===== create_default_deep_agents_graph COMPLETE ===== | "
-            f"user_id={user_id} | elapsed={elapsed_ms:.2f}ms"
-        )
-        return compiled_graph  # type: ignore[no-any-return]
-
-    async def create_skill_creator_graph(
-        self,
-        user_id: str,
-        workspace_id: Optional[uuid.UUID] = None,
-    ) -> AgentGraph:
-        """Create the persisted Skill Creator graph container.
-
-        Frontend currently applies the `skill-creator` template from static assets after graph
-        creation. This helper keeps a stable backend entry point for callers and tests that
-        expect the Skill Creator graph to be a first-class graph type.
-        """
-        return await self.create_graph(
-            name="Skill Creator",
-            user_id=user_id,
-            workspace_id=workspace_id,
-            description="A specialized agent for creating and editing Skills",
-        )
-
-    async def create_graph_by_graph_id(
-        self,
-        graph_id: uuid.UUID,
-        user_id: Optional[Any] = None,
-        current_user: Optional[AuthUser] = None,
-        file_emitter: Optional[Any] = None,
-        thread_id: Optional[str] = None,
-    ) -> CompiledStateGraph:
-        """
-        Create a LangGraph StateGraph from a graph stored in the database.
-
-        Fetches the graph, nodes, and edges from the database and builds
-        a compiled StateGraph where each node is an Agent.
-
-        Args:
-            graph_id: The UUID of the graph to build
-            user_id: User ID for workspace isolation
-            current_user: Current authenticated user for permission checks
-
-        Returns:
-            CompiledStateGraph: The compiled graph ready for execution
-
-        Raises:
-            NotFoundException: If the graph is not found
-            ForbiddenException: If the user doesn't have access to the graph
-        """
-
-        start_time = time.time()
-        logger.info(
-            f"[GraphService] ===== create_graph_by_graph_id START ===== | graph_id={graph_id} | user_id={user_id}"
-        )
-
-        # Fetch the graph
-        logger.debug(f"[GraphService] Fetching graph from database | graph_id={graph_id}")
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            logger.error(f"[GraphService] Graph not found | graph_id={graph_id}")
-            raise NotFoundException(f"Graph with id {graph_id} not found")
-
-        logger.info(
-            f"[GraphService] Graph found | name='{graph.name}' | "
-            f"is_deployed={graph.is_deployed} | workspace_id={graph.workspace_id}"
-        )
-
-        # Check access permissions if current_user is provided
-        if current_user:
-            logger.debug(
-                f"[GraphService] Checking access permissions | user_id={current_user.id} | graph_owner={graph.user_id}"
-            )
-            await self._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-            logger.debug("[GraphService] Access permission check passed")
-
-        # Check in-memory compile cache (keyed by graph + runtime prompt context)
-        cache_key = _build_runtime_aware_compile_cache_key(graph, user_id=user_id, thread_id=thread_id)
-        now_ts = time.time()
-        if cache_key in _compile_cache:
-            cached_graph, cached_at = _compile_cache[cache_key]
-            if (now_ts - cached_at) < _COMPILE_CACHE_TTL:
-                logger.info(f"[GraphService] Using cached compiled graph | graph_id={graph_id}")
-                return cached_graph
-            _compile_cache.pop(cache_key, None)
-
-        # Code mode: bypass GraphBuilder entirely
-        if (graph.variables or {}).get("graph_mode") == "code":
-            logger.info(f"[GraphService] Code mode detected | graph_id={graph_id}")
-            compiled_graph = await self._compile_code_graph(graph)
-            _compile_cache[cache_key] = (compiled_graph, time.time())
-            return compiled_graph  # type: ignore[no-any-return]
-
-        # Load nodes and edges
-        logger.debug(f"[GraphService] Loading nodes and edges for graph_id={graph_id}")
-        nodes = await self.node_repo.list_by_graph(graph_id)
-        edges = await self.edge_repo.list_by_graph(graph_id)
-        await hydrate_nodes_a2a_secrets(self.db, nodes)
-
-        logger.info(f"[GraphService] Loaded graph data | nodes_count={len(nodes)} | edges_count={len(edges)}")
-
-        # Log node details
-        for idx, node in enumerate(nodes):
-            logger.debug(f"[GraphService] Node [{idx + 1}/{len(nodes)}] | id={node.id} | type={node.type}")
-
-        # Build the graph
-        logger.info("[GraphService] Building DeepAgents graph...")
-        model_service = ModelService(self.db)
-        compiled_graph = await build_deep_agents_graph(
-            graph=graph,
-            nodes=nodes,
-            edges=edges,
-            user_id=user_id,
-            model_service=model_service,
-            file_emitter=file_emitter,
-            thread_id=thread_id,
-        )
-
-        elapsed_ms = (time.time() - start_time) * 1000
-        logger.info(
-            f"[GraphService] ===== create_graph_by_graph_id COMPLETE ===== | user_id={user_id} | "
-            f"graph_id={graph_id} | graph_name='{graph.name}' | "
-            f"nodes={len(nodes)} | edges={len(edges)} | elapsed={elapsed_ms:.2f}ms"
-        )
-
-        _compile_cache[cache_key] = (compiled_graph, time.time())
-        return compiled_graph  # type: ignore[no-any-return]
-
-    async def _compile_code_graph(self, graph):
-        """Compile a code-mode graph: exec user code → get StateGraph → compile."""
-        from app.core.agent.checkpointer.checkpointer import get_checkpointer
-        from app.core.code_executor import execute_code
-
-        code = (graph.variables or {}).get("code_content", "")
-        if not code.strip():
-            raise ValueError(f"Code graph {graph.id} has no code")
-
-        state_graph = execute_code(code)
-        compiled = state_graph.compile(checkpointer=get_checkpointer())
-        return compiled
diff --git a/backend/app/services/mcp_client_service.py b/backend/app/services/mcp_client_service.py
index 6e826b876..6f9b9e542 100644
--- a/backend/app/services/mcp_client_service.py
+++ b/backend/app/services/mcp_client_service.py
@@ -13,6 +13,7 @@
 
 from loguru import logger
 
+from app.common.app_errors import InternalServiceError, InvalidRequestError
 from app.core.tools.tool import EnhancedTool
 from app.models.mcp import McpServer
 
@@ -168,7 +169,11 @@ async def _fetch_tools(
 
         # Get tool definitions (MCPTool objects)
         if not toolkit.session:
-            raise RuntimeError(f"Toolkit session not initialized for server: {server.name}")
+            raise InternalServiceError(
+                "Toolkit session is not initialized",
+                code="MCP_TOOLKIT_SESSION_MISSING",
+                data={"server_name": server.name},
+            )
 
         available_tools = await toolkit.session.list_tools()  # type: ignore
         mcp_tool_definitions = available_tools.tools
@@ -197,7 +202,11 @@ def config_from_server(server: McpServer) -> McpConnectionConfig:
             McpConnectionConfig
         """
         if not server.url:
-            raise ValueError("Server URL is required")
+            raise InvalidRequestError(
+                "Server URL is required",
+                code="MCP_SERVER_URL_REQUIRED",
+                data={"server_id": str(server.id) if getattr(server, "id", None) else None, "name": server.name},
+            )
         return McpConnectionConfig(
             url=server.url,
             transport=server.transport or "streamable-http",
diff --git a/backend/app/services/mcp_server_service.py b/backend/app/services/mcp_server_service.py
index c9a3679cf..38b223d5a 100644
--- a/backend/app/services/mcp_server_service.py
+++ b/backend/app/services/mcp_server_service.py
@@ -13,7 +13,7 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, NotFoundException
+from app.common.app_errors import InternalServiceError, InvalidRequestError, NotFoundError
 from app.models.enums import McpConnectionStatus
 from app.models.mcp import McpServer
 from app.repositories.mcp_server import McpServerRepository
@@ -61,7 +61,11 @@ async def create(
         existing = await self.repo.get_by_name(user_id, data.name)
         if existing:
             logger.warning(f"[McpServerService] Duplicate name: {data.name} for user {user_id}")
-            raise BadRequestException(f"MCP server with name '{data.name}' already exists")
+            raise InvalidRequestError(
+                f"MCP server with name '{data.name}' already exists",
+                code="MCP_SERVER_NAME_ALREADY_EXISTS",
+                data={"name": data.name},
+            )
 
         server = await self.repo.create(
             {
@@ -106,7 +110,11 @@ async def update(
         if data.name and data.name != server.name:
             existing = await self.repo.get_by_name(user_id, data.name)
             if existing:
-                raise BadRequestException(f"MCP server with name '{data.name}' already exists")
+                raise InvalidRequestError(
+                    f"MCP server with name '{data.name}' already exists",
+                    code="MCP_SERVER_NAME_ALREADY_EXISTS",
+                    data={"name": data.name},
+                )
 
         # Build update dict
         update_data = {}
@@ -120,7 +128,11 @@ async def update(
 
         updated_server = await self.repo.update(server_id, update_data)
         if updated_server is None:
-            raise ValueError(f"MCP server {server_id} not found")
+            raise InternalServiceError(
+                "MCP server update failed because the server record disappeared",
+                code="MCP_SERVER_UPDATE_TARGET_MISSING",
+                data={"server_id": str(server_id)},
+            )
         await self.commit()
         logger.info(f"Updated MCP server: {updated_server.name}")
         return updated_server
@@ -235,7 +247,11 @@ async def toggle_enabled(
 
         updated_server = await self.repo.toggle_enabled(server_id, enabled)
         if updated_server is None:
-            raise ValueError(f"MCP server {server_id} not found")
+            raise InternalServiceError(
+                "MCP server enable state update failed because the server record disappeared",
+                code="MCP_SERVER_TOGGLE_TARGET_MISSING",
+                data={"server_id": str(server_id), "enabled": enabled},
+            )
         await self.commit()
         logger.info(f"MCP server {updated_server.name} {'enabled' if enabled else 'disabled'}")
         return updated_server
@@ -298,15 +314,17 @@ async def get_with_permission(
             MCP server
 
         Raises:
-            NotFoundException: server does not exist or no permission
+            NotFoundError: server does not exist or no permission
         """
         server = await self.repo.get(server_id)
 
         if not server or server.deleted_at:
-            raise NotFoundException("MCP server not found")
+            raise NotFoundError("MCP server not found", code="MCP_SERVER_NOT_FOUND", data={"server_id": str(server_id)})
 
         if server.user_id != user_id:
-            raise NotFoundException("MCP server not found")  # Security: don't reveal existence
+            raise NotFoundError(
+                "MCP server not found", code="MCP_SERVER_NOT_FOUND", data={"server_id": str(server_id)}
+            )  # Security: don't reveal existence
 
         return server
 
diff --git a/backend/app/services/memory_service.py b/backend/app/services/memory_service.py
index 2e425f2ca..f9645572b 100644
--- a/backend/app/services/memory_service.py
+++ b/backend/app/services/memory_service.py
@@ -26,6 +26,7 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError
 from app.core.database import AsyncSessionLocal, engine
 from app.models.memory import Memory
 from app.schemas.memory import UserMemory
@@ -74,7 +75,11 @@ def __init__(self, db: Optional[AsyncSession] = None):
     async def _get_table(self, table_type: str = "memories") -> sa.Table:
         # Currently only supports the 'memories' table
         if table_type != "memories":
-            raise ValueError(f"Unsupported table_type: {table_type}")
+            raise InvalidRequestError(
+                "Unsupported memory table type",
+                code="MEMORY_TABLE_TYPE_UNSUPPORTED",
+                data={"table_type": table_type},
+            )
         table: sa.Table = Memory.__table__  # type: ignore[assignment]
         return table
 
@@ -284,16 +289,8 @@ async def get_user_memories(
                     dialect = engine.dialect.name
                     if dialect == "postgresql":
                         # PostgreSQL: Use JSONB @> operator to check if array contains the topic
-                        # Cast JSON to JSONB for proper containment check
                         for topic in topics:
-                            # Check if topics JSON array contains the topic string
-                            # Using JSONB @> operator: topics::jsonb @> '["topic"]'::jsonb
-                            # Escape single quotes in JSON string for SQL safety
-                            topic_array_json = json.dumps([topic])
-                            # Replace single quotes with escaped single quotes for SQL
-                            topic_array_json_escaped = topic_array_json.replace("'", "''")
-                            # Use text() with string formatting (safe for JSON strings from json.dumps)
-                            stmt = stmt.where(text(f"topics::jsonb @> '{topic_array_json_escaped}'::jsonb"))
+                            stmt = stmt.where(text("topics::jsonb @> :val::jsonb").bindparams(val=json.dumps([topic])))
                     else:
                         # SQLite or other: Use LIKE for compatibility
                         for topic in topics:
diff --git a/backend/app/services/model_credential_service.py b/backend/app/services/model_credential_service.py
index 1924c9443..b9f850361 100644
--- a/backend/app/services/model_credential_service.py
+++ b/backend/app/services/model_credential_service.py
@@ -10,7 +10,7 @@
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import NotFoundException
+from app.common.app_errors import InvalidRequestError, NotFoundError
 from app.core.model import validate_provider_credentials
 from app.core.model.utils import decrypt_credentials, encrypt_credentials
 from app.repositories.model_credential import ModelCredentialRepository
@@ -95,7 +95,11 @@ async def upsert_credential(
         """
         provider = await self.provider_repo.get_by_name(provider_name)
         if not provider:
-            raise NotFoundException(f"Provider not found: {provider_name}")
+            raise NotFoundError(
+                "Provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"provider_name": provider_name},
+            )
 
         is_valid = False
         validation_error = None
@@ -131,9 +135,17 @@ async def validate_credential(self, credential_id: uuid.UUID) -> Dict[str, Any]:
         """Re-validate an existing credential. Look up by ID, decrypt, call API to validate."""
         credential = await self.repo.get(credential_id, relations=["provider"])
         if not credential:
-            raise NotFoundException("Credential not found")
+            raise NotFoundError(
+                "Credential not found",
+                code="MODEL_CREDENTIAL_NOT_FOUND",
+                data={"credential_id": str(credential_id)},
+            )
         if not credential.provider:
-            raise NotFoundException("Credential's associated provider not found")
+            raise NotFoundError(
+                "Credential's associated provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"credential_id": str(credential_id)},
+            )
 
         decrypted = decrypt_credentials(credential.credentials)
         is_valid, error = await self._validate_for_provider(credential.provider, decrypted, credential.provider_id)
@@ -153,7 +165,11 @@ async def get_credential(self, credential_id: uuid.UUID, include_credentials: bo
         """Get credential details."""
         credential = await self.repo.get(credential_id, relations=["provider"])
         if not credential:
-            raise NotFoundException("Credential not found")
+            raise NotFoundError(
+                "Credential not found",
+                code="MODEL_CREDENTIAL_NOT_FOUND",
+                data={"credential_id": str(credential_id)},
+            )
 
         pname = credential.provider.name if credential.provider else ""
         pdisplay = credential.provider.display_name if credential.provider else ""
@@ -186,19 +202,23 @@ async def list_credentials(self) -> List[Dict[str, Any]]:
 
     async def delete_credential(self, credential_id: uuid.UUID) -> None:
         """Delete a built-in provider's credential. Custom provider credentials cannot be deleted separately."""
-        from app.common.exceptions import BadRequestException
-
         credential = await self.repo.get(credential_id, relations=["provider"])
         if not credential:
-            raise NotFoundException("Credential not found")
+            raise NotFoundError(
+                "Credential not found",
+                code="MODEL_CREDENTIAL_NOT_FOUND",
+                data={"credential_id": str(credential_id)},
+            )
 
         if (
             credential.provider
             and credential.provider.provider_type == "custom"
             and not credential.provider.is_template
         ):
-            raise BadRequestException(
-                f"Cannot delete credentials for custom provider separately. Use DELETE /model-providers/{credential.provider.name} to remove the entire provider."
+            raise InvalidRequestError(
+                f"Cannot delete credentials for custom provider separately. Use DELETE /model-providers/{credential.provider.name} to remove the entire provider.",
+                code="MODEL_CREDENTIAL_CUSTOM_DELETE_FORBIDDEN",
+                data={"provider_name": credential.provider.name},
             )
 
         await self.repo.delete(credential_id)
diff --git a/backend/app/services/model_provider_service.py b/backend/app/services/model_provider_service.py
index cdc8d2ef7..ba220149c 100644
--- a/backend/app/services/model_provider_service.py
+++ b/backend/app/services/model_provider_service.py
@@ -6,7 +6,7 @@
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, NotFoundException
+from app.common.app_errors import InvalidRequestError, NotFoundError
 from app.core.model import get_factory
 from app.repositories.model_credential import ModelCredentialRepository
 from app.repositories.model_instance import ModelInstanceRepository
@@ -174,18 +174,26 @@ async def update_provider_defaults(self, provider_name: str, default_parameters:
             Updated provider info
 
         Raises:
-            NotFoundException: provider does not exist
+            NotFoundError: provider does not exist
         """
         db_provider = await self.repo.get_by_name(provider_name)
         if not db_provider:
-            raise NotFoundException(f"Provider not found: {provider_name}")
+            raise NotFoundError(
+                "Provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"provider_name": provider_name},
+            )
 
         await self.repo.update_default_parameters(provider_name, default_parameters)
         await self.commit()
 
         result = await self.get_provider(provider_name)
         if not result:
-            raise NotFoundException(f"Provider not found: {provider_name}")
+            raise NotFoundError(
+                "Provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"provider_name": provider_name},
+            )
         return result
 
     async def _create_derived_provider(self, template: Any, name: str, display_name: str, template_name: str) -> Any:
@@ -221,7 +229,11 @@ async def add_custom_provider(
 
         template = self.factory.get_provider("custom")
         if not template:
-            raise NotFoundException("Provider not found: custom")
+            raise NotFoundError(
+                "Provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"provider_name": "custom"},
+            )
 
         is_valid = False
         validation_error = None
@@ -284,11 +296,23 @@ async def delete_provider(self, provider_name: str) -> None:
         if not provider:
             factory_provider = self.factory.get_provider(provider_name)
             if factory_provider:
-                raise BadRequestException(f"Built-in provider cannot be deleted: {provider_name}")
-            raise NotFoundException(f"Provider not found: {provider_name}")
+                raise InvalidRequestError(
+                    f"Built-in provider cannot be deleted: {provider_name}",
+                    code="MODEL_PROVIDER_BUILTIN_DELETE_FORBIDDEN",
+                    data={"provider_name": provider_name},
+                )
+            raise NotFoundError(
+                "Provider not found",
+                code="MODEL_PROVIDER_NOT_FOUND",
+                data={"provider_name": provider_name},
+            )
 
         if provider.provider_type != "custom":
-            raise BadRequestException(f"Only custom providers can be deleted: {provider_name}")
+            raise InvalidRequestError(
+                f"Only custom providers can be deleted: {provider_name}",
+                code="MODEL_PROVIDER_DELETE_FORBIDDEN",
+                data={"provider_name": provider_name},
+            )
 
         await self.repo.delete(provider.id)
         logger.info(f"Deleted custom provider: {provider_name}")
diff --git a/backend/app/services/model_service.py b/backend/app/services/model_service.py
index ecd9544b2..efd3c4b57 100644
--- a/backend/app/services/model_service.py
+++ b/backend/app/services/model_service.py
@@ -9,7 +9,8 @@
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, ModelConfigError, NotFoundException
+from app.common.app_errors import InvalidRequestError, ModelConfigError, NotFoundError
+from app.common.stream_errors import stream_error_event
 from app.core.model import ModelType, create_model_instance
 from app.core.model.factory import get_factory
 from app.models.enums import ModelUsageSource
@@ -261,7 +262,11 @@ async def update_model_instance(
         """Update model instance parameters."""
         instance = await self.repo.get(instance_id)
         if not instance:
-            raise NotFoundException(f"Model instance not found: {instance_id}")
+            raise NotFoundError(
+                "Model instance not found",
+                code="MODEL_INSTANCE_NOT_FOUND",
+                data={"instance_id": str(instance_id)},
+            )
 
         updates: Dict[str, Any] = {}
         if model_parameters is not None:
@@ -324,7 +329,10 @@ async def get_model_instance(
         implementation_name: Optional[str] = None
         model_parameters: Dict[str, Any] = {}
         if not provider_name or not model_name:
-            raise BadRequestException("provider_name and model_name are required")
+            raise InvalidRequestError(
+                "provider_name and model_name are required",
+                code="MODEL_PROVIDER_OR_NAME_REQUIRED",
+            )
 
         provider = await self.provider_repo.get_by_name(provider_name)
         if not provider:
@@ -524,12 +532,13 @@ async def test_output_stream(
         """
         instance = await self.repo.get_by_name(model_name)
         if not instance:
-            err_data = {
-                "error_code": MODEL_NOT_FOUND,
-                "message": f'Model "{model_name}" is not registered.',
-                "params": {"model": model_name or ""},
-            }
-            yield f"event: error\ndata: {json.dumps(err_data)}\n\n"
+            yield stream_error_event(
+                code=MODEL_NOT_FOUND,
+                message=f'Model "{model_name}" is not registered.',
+                data={"model": model_name or ""},
+                source="api",
+                user_action="configure_model",
+            )
             return
 
         provider_name = instance.resolved_provider_name
@@ -539,12 +548,13 @@ async def test_output_stream(
         credentials = await self.credential_service.get_decrypted_credentials(provider_name)
 
         if not credentials:
-            err_data = {
-                "error_code": MODEL_NO_CREDENTIALS,
-                "message": f'No valid API key for provider "{provider_name}".',
-                "params": {"model": model_name or "", "provider": provider_name or ""},
-            }
-            yield f"event: error\ndata: {json.dumps(err_data)}\n\n"
+            yield stream_error_event(
+                code=MODEL_NO_CREDENTIALS,
+                message=f'No valid API key for provider "{provider_name}".',
+                data={"model": model_name or "", "provider": provider_name or ""},
+                source="api",
+                user_action="configure_model",
+            )
             return
 
         effective_params = {**(instance.model_parameters or {})}
@@ -560,7 +570,12 @@ async def test_output_stream(
                 effective_params,
             )
         except Exception as e:
-            yield f"event: error\ndata: {json.dumps({'error': f'Failed to create model instance: {str(e)}'})}\n\n"
+            yield stream_error_event(
+                code="MODEL_INSTANCE_CREATE_FAILED",
+                message="Failed to create model instance.",
+                data={"detail": str(e)},
+                source="runtime",
+            )
             return
 
         start_time = time.monotonic()
@@ -617,4 +632,11 @@ async def test_output_stream(
                 user_id=user_id,
                 source=ModelUsageSource.PLAYGROUND,
             )
-            yield f"event: error\ndata: {json.dumps({'error': str(e)})}\n\n"
+            yield stream_error_event(
+                code="MODEL_STREAM_ERROR",
+                message="Model streaming failed.",
+                data={"detail": str(e)},
+                source="runtime",
+                retryable=True,
+                user_action="retry",
+            )
diff --git a/backend/app/services/oauth_service.py b/backend/app/services/oauth_service.py
index ce987d8dd..aa5c007a7 100644
--- a/backend/app/services/oauth_service.py
+++ b/backend/app/services/oauth_service.py
@@ -20,7 +20,7 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, UnauthorizedException
+from app.common.app_errors import AuthenticationError, InvalidRequestError
 from app.core.oauth import get_oauth_config
 from app.core.redis import RedisClient
 from app.models.auth import AuthUser
@@ -42,6 +42,61 @@ def __init__(self, db: AsyncSession):
         self.user_repo = AuthUserRepository(db)
         self.oauth_config = get_oauth_config()
 
+    def _provider_not_found(self, provider_name: str) -> InvalidRequestError:
+        return InvalidRequestError(
+            f"OAuth provider '{provider_name}' not found",
+            code="OAUTH_PROVIDER_NOT_FOUND",
+            data={"provider_name": provider_name},
+        )
+
+    def _endpoint_discovery_failed(self, provider_name: str, endpoint_type: str) -> InvalidRequestError:
+        code_map = {
+            "authorization": "OAUTH_DISCOVERY_FAILED",
+            "token": "OAUTH_TOKEN_ENDPOINT_DISCOVERY_FAILED",
+            "userinfo": "OAUTH_USERINFO_ENDPOINT_DISCOVERY_FAILED",
+        }
+        message_map = {
+            "authorization": f"Failed to discover OAuth authorization endpoint for {provider_name}",
+            "token": f"Failed to discover OAuth token endpoint for {provider_name}",
+            "userinfo": f"Failed to discover OAuth userinfo endpoint for {provider_name}",
+        }
+        return InvalidRequestError(
+            message_map[endpoint_type],
+            code=code_map[endpoint_type],
+            data={"provider_name": provider_name},
+        )
+
+    def _missing_endpoint(self, provider_name: str, endpoint_type: str) -> InvalidRequestError:
+        code_map = {
+            "authorization": "OAUTH_AUTHORIZE_URL_MISSING",
+            "token": "OAUTH_TOKEN_URL_MISSING",
+            "userinfo": "OAUTH_USERINFO_URL_MISSING",
+        }
+        message_map = {
+            "authorization": f"No authorization URL configured for {provider_name}",
+            "token": f"No token URL configured for {provider_name}",
+            "userinfo": f"No userinfo URL configured for {provider_name}",
+        }
+        return InvalidRequestError(
+            message_map[endpoint_type],
+            code=code_map[endpoint_type],
+            data={"provider_name": provider_name},
+        )
+
+    def _token_exchange_failed(self, provider_name: str) -> InvalidRequestError:
+        return InvalidRequestError(
+            f"Failed to exchange OAuth code for tokens for {provider_name}",
+            code="OAUTH_TOKEN_EXCHANGE_FAILED",
+            data={"provider_name": provider_name},
+        )
+
+    def _userinfo_fetch_failed(self, provider_name: str) -> InvalidRequestError:
+        return InvalidRequestError(
+            f"Failed to fetch OAuth user info for {provider_name}",
+            code="OAUTH_USERINFO_FETCH_FAILED",
+            data={"provider_name": provider_name},
+        )
+
     # ==================== Authorization Flow ====================
 
     async def generate_authorization_url(
@@ -62,11 +117,11 @@ async def generate_authorization_url(
             Tuple of (authorization_url, state)
 
         Raises:
-            BadRequestException: Provider not found or disabled
+            InvalidRequestError: Provider not found or disabled
         """
         provider = self.oauth_config.get_provider(provider_name)
         if not provider:
-            raise BadRequestException(f"OAuth provider '{provider_name}' not found or not enabled")
+            raise self._provider_not_found(provider_name)
 
         # Generate or reuse state
         if not state:
@@ -96,10 +151,10 @@ async def generate_authorization_url(
                 authorize_url = cast(Optional[str], oidc_config.get("authorization_endpoint"))
             except Exception as e:
                 logger.error(f"{LOG_PREFIX} OIDC Discovery failed: {e}")
-                raise BadRequestException(f"Failed to discover OAuth endpoints for {provider_name}")
+                raise self._endpoint_discovery_failed(provider_name, "authorization")
 
         if not authorize_url:
-            raise BadRequestException(f"No authorization URL configured for {provider_name}")
+            raise self._missing_endpoint(provider_name, "authorization")
 
         # Build authorization URL params
         params = {
@@ -167,7 +222,7 @@ async def exchange_code_for_tokens(
         """
         provider = self.oauth_config.get_provider(provider_name)
         if not provider:
-            raise BadRequestException(f"OAuth provider '{provider_name}' not found")
+            raise self._provider_not_found(provider_name)
 
         # Get token URL
         token_url: Optional[str] = provider.token_url or None
@@ -177,10 +232,10 @@ async def exchange_code_for_tokens(
                 token_url = cast(Optional[str], oidc_config.get("token_endpoint"))
             except Exception as e:
                 logger.error(f"{LOG_PREFIX} OIDC Discovery failed: {e}")
-                raise BadRequestException(f"Failed to discover token endpoint for {provider_name}")
+                raise self._endpoint_discovery_failed(provider_name, "token")
 
         if not token_url:
-            raise BadRequestException(f"No token URL configured for {provider_name}")
+            raise self._missing_endpoint(provider_name, "token")
 
         # Build request
         data = {
@@ -228,10 +283,10 @@ async def exchange_code_for_tokens(
 
         except httpx.HTTPStatusError as e:
             logger.error(f"{LOG_PREFIX} Token exchange failed: {e.response.text}")
-            raise BadRequestException("Failed to exchange code for tokens")
+            raise self._token_exchange_failed(provider_name)
         except Exception as e:
             logger.error(f"{LOG_PREFIX} Token exchange error: {e}")
-            raise BadRequestException("Token exchange failed")
+            raise self._token_exchange_failed(provider_name)
 
     # ==================== User Info ====================
 
@@ -252,7 +307,7 @@ async def fetch_userinfo(
         """
         provider = self.oauth_config.get_provider(provider_name)
         if not provider:
-            raise BadRequestException(f"OAuth provider '{provider_name}' not found")
+            raise self._provider_not_found(provider_name)
 
         # Get userinfo URL
         userinfo_url = provider.userinfo_url
@@ -262,9 +317,10 @@ async def fetch_userinfo(
                 userinfo_url = oidc_config.get("userinfo_endpoint")
             except Exception as e:
                 logger.error(f"{LOG_PREFIX} OIDC Discovery failed: {e}")
+                raise self._endpoint_discovery_failed(provider_name, "userinfo")
 
         if not userinfo_url:
-            raise BadRequestException(f"No userinfo URL configured for {provider_name}")
+            raise self._missing_endpoint(provider_name, "userinfo")
 
         headers = {
             "Authorization": f"Bearer {access_token}",
@@ -288,10 +344,10 @@ async def fetch_userinfo(
 
         except httpx.HTTPStatusError as e:
             logger.error(f"{LOG_PREFIX} Failed to fetch userinfo: {e.response.text}")
-            raise BadRequestException("Failed to fetch user info")
+            raise self._userinfo_fetch_failed(provider_name)
         except Exception as e:
             logger.error(f"{LOG_PREFIX} Userinfo fetch error: {e}")
-            raise BadRequestException("Failed to fetch user info")
+            raise self._userinfo_fetch_failed(provider_name)
 
     async def _fetch_github_email(self, access_token: str) -> Optional[str]:
         """Get GitHub primary email."""
@@ -341,7 +397,7 @@ def parse_userinfo(
         """
         provider = self.oauth_config.get_provider(provider_name)
         if not provider:
-            raise BadRequestException(f"OAuth provider '{provider_name}' not found")
+            raise self._provider_not_found(provider_name)
 
         mapping = provider.user_mapping
 
@@ -383,7 +439,7 @@ async def find_or_create_user(
             Tuple of (user, is_new_user)
 
         Raises:
-            UnauthorizedException: User missing and registration disabled
+            AuthenticationError: User missing and registration disabled
         """
         oauth_settings = self.oauth_config.settings
 
@@ -419,11 +475,15 @@ async def find_or_create_user(
 
         # 3) Create new user
         if not oauth_settings.allow_registration:
-            raise UnauthorizedException("Registration via OAuth is not allowed. Please sign up first.")
+            raise AuthenticationError(
+                "Registration via OAuth is not allowed. Please sign up first.", code="OAUTH_REGISTRATION_DISABLED"
+            )
 
         if not email:
-            raise BadRequestException(
-                f"Email is required for registration. Please ensure your {provider_name} account has a verified email."
+            raise InvalidRequestError(
+                f"Email is required for registration. Please ensure your {provider_name} account has a verified email.",
+                code="OAUTH_EMAIL_REQUIRED",
+                data={"provider_name": provider_name},
             )
 
         # Create new user
@@ -551,12 +611,12 @@ async def unlink_oauth_account(
             Whether unlink succeeded
 
         Raises:
-            BadRequestException: User would be unable to sign in
+            InvalidRequestError: User would be unable to sign in
         """
         # Ensure user can still sign in after unlink
         user = await self.user_repo.get_by_id(user_id)
         if not user:
-            raise BadRequestException("User not found")
+            raise InvalidRequestError("User not found", code="USER_NOT_FOUND", data={"user_id": user_id})
 
         # Get all user OAuth bindings
         oauth_accounts = await self.get_user_oauth_accounts(user_id)
@@ -570,7 +630,10 @@ async def unlink_oauth_account(
 
         # Disallow unlink when no password and only one OAuth binding
         if not user.hashed_password and len(oauth_accounts) == 1:
-            raise BadRequestException("Cannot unlink the only OAuth account. Please set a password first.")
+            raise InvalidRequestError(
+                "Cannot unlink the only OAuth account. Please set a password first.",
+                code="OAUTH_LAST_ACCOUNT_UNLINK_FORBIDDEN",
+            )
 
         await self._delete_oauth_account(target_account)
         logger.info(f"{LOG_PREFIX} Unlinked OAuth account: {provider_name} from user {user_id}")
diff --git a/backend/app/services/openapi_graph_service.py b/backend/app/services/openapi_graph_service.py
deleted file mode 100644
index da2d1df39..000000000
--- a/backend/app/services/openapi_graph_service.py
+++ /dev/null
@@ -1,280 +0,0 @@
-"""
-OpenAPI Graph Service — core business logic.
-
-Responsibilities:
-- Start graph background execution (run)
-- Query execution status (status)
-- Abort execution (abort)
-- Get execution result (result)
-"""
-
-from __future__ import annotations
-
-import asyncio
-import uuid
-from datetime import datetime, timezone
-from typing import Any, Dict, Optional
-
-from langchain.messages import AIMessage, HumanMessage
-from loguru import logger
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.exceptions import BadRequestException, NotFoundException
-from app.core.database import AsyncSessionLocal
-from app.models.graph_execution import ExecutionStatus, GraphExecution
-from app.repositories.graph import GraphRepository
-from app.repositories.graph_execution import GraphExecutionRepository
-from app.services.graph_service import GraphService
-from app.utils.task_manager import task_manager
-
-from .base import BaseService
-
-
-class OpenApiGraphService(BaseService):
-    """OpenAPI graph execution service."""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(db)
-        self.exec_repo = GraphExecutionRepository(db)
-        self.graph_repo = GraphRepository(db)
-
-    async def run_graph(
-        self,
-        *,
-        graph_id: uuid.UUID,
-        user_id: str,
-        variables: Optional[Dict[str, Any]] = None,
-    ) -> Dict[str, Any]:
-        """
-        Start graph execution (background async).
-
-        Returns:
-            {"executionId": str, "status": str}
-        """
-        # verify graph exists
-        graph = await self.graph_repo.get(graph_id)
-        if not graph:
-            raise NotFoundException("Graph not found")
-
-        # create execution record
-        execution = GraphExecution(
-            graph_id=graph_id,
-            user_id=user_id,
-            status=ExecutionStatus.INIT,
-            input_variables=variables or {},
-        )
-        self.db.add(execution)
-        await self.db.commit()
-        await self.db.refresh(execution)
-
-        execution_id = execution.id
-        logger.info(f"[OpenAPI] Graph execution created | execution_id={execution_id} graph_id={graph_id}")
-
-        # start background execution task
-        asyncio.create_task(
-            self._execute_graph_background(
-                execution_id=execution_id,
-                graph_id=graph_id,
-                user_id=user_id,
-                variables=variables or {},
-            )
-        )
-
-        return {
-            "executionId": str(execution_id),
-            "status": ExecutionStatus.INIT.value,
-        }
-
-    async def _execute_graph_background(
-        self,
-        execution_id: uuid.UUID,
-        graph_id: uuid.UUID,
-        user_id: str,
-        variables: Dict[str, Any],
-    ) -> None:
-        """Execute graph in background (using an independent DB session)."""
-        try:
-            async with AsyncSessionLocal() as db:
-                # update status to executing
-                exec_repo = GraphExecutionRepository(db)
-                execution = await exec_repo.get(execution_id)
-                if not execution:
-                    return
-
-                execution.status = ExecutionStatus.EXECUTING
-                execution.started_at = datetime.now(timezone.utc)
-                await db.commit()
-
-                # compile graph
-                graph_service = GraphService(db)
-                compiled_graph = await graph_service.create_graph_by_graph_id(
-                    graph_id=graph_id,
-                    user_id=user_id,
-                )
-
-                # build input messages
-                # if variables contains a message field, use it as the user message
-                user_message = variables.pop("message", "")
-                if not user_message:
-                    user_message = variables.pop("query", "Execute task")
-
-                initial_context = {}
-                # put remaining variables into context
-                for key, value in variables.items():
-                    initial_context[key] = value
-
-                # also load graph.variables.context
-                graph_model = await GraphRepository(db).get(graph_id)
-                if graph_model and graph_model.variables:
-                    context_vars = graph_model.variables.get("context", {})
-                    for key, value in context_vars.items():
-                        if key not in initial_context:  # variables take precedence
-                            if isinstance(value, dict) and "value" in value:
-                                initial_context[key] = value["value"]
-                            else:
-                                initial_context[key] = value
-
-                # configuration
-                thread_id = f"openapi_{execution_id}"
-                from langchain_core.runnables.config import RunnableConfig
-
-                config: RunnableConfig = {
-                    "configurable": {"thread_id": thread_id, "user_id": user_id},
-                    "recursion_limit": 150,
-                }
-
-                # register with task_manager to support abort
-                invoke_task = asyncio.create_task(
-                    compiled_graph.ainvoke(
-                        {"messages": [HumanMessage(content=user_message)], "context": initial_context},
-                        config=config,
-                    )
-                )
-                await task_manager.register_task(thread_id, invoke_task)
-
-                try:
-                    result = await invoke_task
-                except asyncio.CancelledError:
-                    # aborted by user
-                    execution = await exec_repo.get(execution_id)
-                    if execution:
-                        execution.status = ExecutionStatus.FAILED
-                        execution.error_message = "Execution aborted by user"
-                        execution.finished_at = datetime.now(timezone.utc)
-                        await db.commit()
-                    return
-                finally:
-                    await task_manager.unregister_task(thread_id)
-
-                # extract result
-                messages = result.get("messages", [])
-                last_ai_msg = next(
-                    (m for m in reversed(messages) if isinstance(m, AIMessage)),
-                    None,
-                )
-
-                output_data: Dict[str, Any] = {}
-                if last_ai_msg:
-                    output_data["content"] = str(last_ai_msg.content) if last_ai_msg.content else ""
-                    if hasattr(last_ai_msg, "tool_calls") and last_ai_msg.tool_calls:
-                        output_data["tool_calls"] = [
-                            {
-                                "name": tc.get("name"),
-                                "args": tc.get("args"),
-                            }
-                            for tc in last_ai_msg.tool_calls
-                        ]
-
-                # update execution record
-                execution = await exec_repo.get(execution_id)
-                if execution:
-                    execution.status = ExecutionStatus.FINISH
-                    execution.output = output_data
-                    execution.finished_at = datetime.now(timezone.utc)
-                    await db.commit()
-
-                logger.info(f"[OpenAPI] Graph execution completed | execution_id={execution_id}")
-
-        except Exception as e:
-            logger.error(f"[OpenAPI] Graph execution failed | execution_id={execution_id} error={e}")
-            try:
-                async with AsyncSessionLocal() as db:
-                    exec_repo = GraphExecutionRepository(db)
-                    execution = await exec_repo.get(execution_id)
-                    if execution:
-                        execution.status = ExecutionStatus.FAILED
-                        execution.error_message = str(e)[:2000]
-                        execution.finished_at = datetime.now(timezone.utc)
-                        await db.commit()
-            except Exception as inner_e:
-                logger.error(f"[OpenAPI] Failed to update execution status: {inner_e}")
-
-    async def get_status(
-        self,
-        execution_id: uuid.UUID,
-        user_id: str,
-    ) -> Dict[str, Any]:
-        """Get execution status."""
-        execution = await self.exec_repo.get_by_id_and_user(execution_id, user_id)
-        if not execution:
-            raise NotFoundException("Execution not found")
-
-        return {
-            "executionId": str(execution.id),
-            "graphId": str(execution.graph_id),
-            "status": execution.status.value,
-            "startedAt": execution.started_at.isoformat() if execution.started_at else None,
-            "finishedAt": execution.finished_at.isoformat() if execution.finished_at else None,
-            "errorMessage": execution.error_message,
-        }
-
-    async def abort_execution(
-        self,
-        execution_id: uuid.UUID,
-        user_id: str,
-    ) -> Dict[str, Any]:
-        """Abort execution."""
-        execution = await self.exec_repo.get_by_id_and_user(execution_id, user_id)
-        if not execution:
-            raise NotFoundException("Execution not found")
-
-        if execution.status != ExecutionStatus.EXECUTING:
-            raise BadRequestException(f"Cannot abort execution with status: {execution.status.value}")
-
-        # stop the task via task_manager
-        thread_id = f"openapi_{execution_id}"
-        stopped = await task_manager.stop_task(thread_id)
-        if stopped:
-            await task_manager.cancel_task(thread_id)
-
-        # update status
-        execution.status = ExecutionStatus.FAILED
-        execution.error_message = "Aborted by user"
-        execution.finished_at = datetime.now(timezone.utc)
-        await self.db.commit()
-
-        return {
-            "executionId": str(execution.id),
-            "graphId": str(execution.graph_id),
-            "status": execution.status.value,
-        }
-
-    async def get_result(
-        self,
-        execution_id: uuid.UUID,
-        user_id: str,
-    ) -> Dict[str, Any]:
-        """Get execution result."""
-        execution = await self.exec_repo.get_by_id_and_user(execution_id, user_id)
-        if not execution:
-            raise NotFoundException("Execution not found")
-
-        return {
-            "executionId": str(execution.id),
-            "graphId": str(execution.graph_id),
-            "status": execution.status.value,
-            "output": execution.output,
-            "errorMessage": execution.error_message,
-            "startedAt": execution.started_at.isoformat() if execution.started_at else None,
-            "finishedAt": execution.finished_at.isoformat() if execution.finished_at else None,
-        }
diff --git a/backend/app/services/openclaw_instance_service.py b/backend/app/services/openclaw_instance_service.py
index 978d1b16f..e3b5289af 100644
--- a/backend/app/services/openclaw_instance_service.py
+++ b/backend/app/services/openclaw_instance_service.py
@@ -23,13 +23,15 @@
 from sqlalchemy import func, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from app.common.app_errors import InvalidRequestError, NotFoundError, ServiceUnavailableError, normalize_app_error
 from app.core.agent.backends.docker_check import get_docker_client
+from app.core.settings import settings
 from app.models.enums import InstanceStatus
 from app.models.openclaw_instance import OpenClawInstance
 from app.services.base import BaseService
 
-OPENCLAW_IMAGE = os.environ.get("OPENCLAW_IMAGE", "jdopensource/joysafeter-openclaw:latest")
-OPENCLAW_NETWORK = os.environ.get("OPENCLAW_NETWORK", "joysafeter-network")
+OPENCLAW_IMAGE = settings.openclaw_image
+OPENCLAW_NETWORK = settings.openclaw_network
 PORT_RANGE_START = 19001
 PORT_RANGE_END = 19999
 GATEWAY_READY_TIMEOUT = 300
@@ -94,7 +96,11 @@ async def _allocate_port(self) -> int:
             for p in range(PORT_RANGE_START, PORT_RANGE_END + 1):
                 if p not in used_ports:
                     return p
-            raise RuntimeError("No available ports for OpenClaw instances")
+            raise ServiceUnavailableError(
+                "No available ports for OpenClaw instances",
+                code="OPENCLAW_PORT_POOL_EXHAUSTED",
+                data={"port_range_start": PORT_RANGE_START, "port_range_end": PORT_RANGE_END},
+            )
         return next_port
 
     async def ensure_instance_running(self, user_id: str) -> OpenClawInstance:
@@ -139,10 +145,16 @@ async def ensure_instance_running(self, user_id: str) -> OpenClawInstance:
             await self.db.refresh(instance)
             return instance
         except Exception as e:
-            logger.error(f"Failed to start OpenClaw instance for user {user_id}: {e}")
-            await self._update_status(instance.id, InstanceStatus.FAILED, error_message=str(e))
+            app_error = normalize_app_error(
+                e,
+                default_code="OPENCLAW_INSTANCE_START_FAILED",
+                default_message="Failed to start OpenClaw instance",
+                default_data={"user_id": user_id, "instance_id": instance.id},
+            )
+            logger.error(f"Failed to start OpenClaw instance for user {user_id}: {app_error}")
+            await self._update_status(instance.id, InstanceStatus.FAILED, error_message=app_error.message)
             await self.db.refresh(instance)
-            raise RuntimeError(f"Failed to start OpenClaw instance: {e}")
+            raise app_error
 
     async def _create_container(self, instance: OpenClawInstance, recreate: bool = False) -> str:
         """Create and start a Docker container for the instance, or start an existing one."""
@@ -156,7 +168,11 @@ async def _create_container(self, instance: OpenClawInstance, recreate: bool = F
         try:
             client = get_docker_client()
         except Exception as e:
-            raise RuntimeError(f"Failed to connect to Docker daemon: {e}")
+            raise ServiceUnavailableError(
+                "Failed to connect to Docker daemon",
+                code="DOCKER_DAEMON_UNAVAILABLE",
+                data={"detail": str(e)},
+            )
 
         # Try to find and start existing container
         if not recreate:
@@ -220,17 +236,9 @@ async def _create_container(self, instance: OpenClawInstance, recreate: bool = F
         }
 
         # Pass through AI provider keys from host environment
-        for key in (
-            "ANTHROPIC_API_KEY",
-            "OPENAI_API_KEY",
-            "AI_GATEWAY_BASE_URL",
-            "AI_GATEWAY_API_KEY",
-            "AI_GATEWAY_PROVIDER",
-            "AI_GATEWAY_MODEL",
-            "ANTHROPIC_BASE_URL",
-            "ANTHROPIC_AUTH_TOKEN",
-            "ANTHROPIC_MODEL",
-        ):
+        from app.utils.credentials import PASSTHROUGH_ENV_KEYS
+
+        for key in PASSTHROUGH_ENV_KEYS:
             val = os.environ.get(key)
             if val:
                 env_vars[key] = val
@@ -240,7 +248,16 @@ async def _create_container(self, instance: OpenClawInstance, recreate: bool = F
         has_anthropic = all(k in env_vars for k in ("ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_MODEL"))
 
         if not (has_ai_gw or has_anthropic):
-            raise ValueError("Missing required environment variables for AI Gateway (need AI_GATEWAY_* or ANTHROPIC_*)")
+            raise InvalidRequestError(
+                "Missing required environment variables for AI Gateway",
+                code="OPENCLAW_GATEWAY_ENV_MISSING",
+                data={
+                    "required_any_of": [
+                        ["AI_GATEWAY_BASE_URL", "AI_GATEWAY_API_KEY", "AI_GATEWAY_MODEL"],
+                        ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_MODEL"],
+                    ]
+                },
+            )
 
         # Also pass config overrides
         if instance.config_json:
@@ -276,7 +293,11 @@ async def _create_container(self, instance: OpenClawInstance, recreate: bool = F
                 restart_policy={"Name": "unless-stopped"},
             )
         except Exception as e:
-            raise RuntimeError(f"docker run failed: {str(e)}")
+            raise ServiceUnavailableError(
+                "Failed to create OpenClaw container",
+                code="OPENCLAW_CONTAINER_CREATE_FAILED",
+                data={"container_name": container_name, "detail": str(e)},
+            )
 
         container_id = str(container.id)[:12]
         logger.info(
@@ -309,13 +330,25 @@ async def _wait_for_gateway(self, instance: OpenClawInstance) -> None:
             if container.status != "running":
                 logs = await asyncio.to_thread(container.logs, tail=30)
                 logs_str = logs.decode("utf-8") if isinstance(logs, bytes) else str(logs)
-                raise RuntimeError(f"Container died during startup. Logs:\n{logs_str}")
+                raise ServiceUnavailableError(
+                    "OpenClaw container exited during startup",
+                    code="OPENCLAW_CONTAINER_STARTUP_FAILED",
+                    data={"container_id": instance.container_id, "detail": logs_str},
+                )
         except docker.errors.NotFound:
-            raise RuntimeError("Container was removed during startup.")
+            raise NotFoundError(
+                "OpenClaw container was removed during startup",
+                code="OPENCLAW_CONTAINER_NOT_FOUND",
+                data={"container_id": instance.container_id},
+            )
         except Exception as e:
             logger.warning(f"Failed to check container status: {e}")
 
-        raise RuntimeError(f"Gateway not ready within {GATEWAY_READY_TIMEOUT}s")
+        raise ServiceUnavailableError(
+            "OpenClaw gateway did not become ready in time",
+            code="OPENCLAW_GATEWAY_TIMEOUT",
+            data={"gateway_port": instance.gateway_port, "timeout_seconds": GATEWAY_READY_TIMEOUT},
+        )
 
     async def _health_check(self, instance: OpenClawInstance) -> bool:
         """Quick health check via HTTP OPTIONS to the gateway."""
diff --git a/backend/app/services/organization_service.py b/backend/app/services/organization_service.py
index 9be6b1030..1b107499d 100644
--- a/backend/app/services/organization_service.py
+++ b/backend/app/services/organization_service.py
@@ -7,11 +7,11 @@
 
 from pydantic import EmailStr
 
-from app.common.exceptions import (
-    BadRequestException,
-    ConflictException,
-    ForbiddenException,
-    NotFoundException,
+from app.common.app_errors import (
+    AccessDeniedError,
+    InvalidRequestError,
+    NotFoundError,
+    ResourceConflictError,
 )
 from app.models.auth import AuthUser as User
 from app.models.enums import OrgRole
@@ -47,7 +47,11 @@ async def create_organization(
     ) -> Dict:
         """Create an organization and set the current user as owner."""
         if await self.org_repo.slug_exists(slug):
-            raise ConflictException("Slug already exists")
+            raise ResourceConflictError(
+                "Slug already exists",
+                code="ORGANIZATION_SLUG_ALREADY_EXISTS",
+                data={"slug": slug},
+            )
 
         organization = await self.org_repo.create(
             {
@@ -84,7 +88,11 @@ async def set_active_organization(
         """Set the active organization (currently only validates membership and returns org info)."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         member = await self._ensure_member(organization_id, current_user.id)
         # if persistence is needed, write to user settings/session here
@@ -99,7 +107,11 @@ async def get_organization(
         """Get organization details."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         member = await self._ensure_member(organization_id, current_user.id)
         return self._serialize_org(organization, member.role, include_seats)
@@ -116,7 +128,11 @@ async def update_organization(
         """Update organization basic info."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         member = await self._ensure_member(organization_id, current_user.id)
         self._ensure_admin_or_owner(member)
@@ -128,7 +144,11 @@ async def update_organization(
             update_data["logo"] = logo
         if slug is not None:
             if await self.org_repo.slug_exists(slug, exclude_id=organization.id):
-                raise ConflictException("Slug already exists")
+                raise ResourceConflictError(
+                    "Slug already exists",
+                    code="ORGANIZATION_SLUG_ALREADY_EXISTS",
+                    data={"slug": slug},
+                )
             update_data["slug"] = slug
 
         if update_data:
@@ -147,18 +167,30 @@ async def update_seats(
         """Update seats info."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         member = await self._ensure_member(organization_id, current_user.id)
         self._ensure_admin_or_owner(member)
 
         self._validate_plan_for_seats(organization)
         if seats < 1 or seats > 50:
-            raise BadRequestException("Seats must be between 1 and 50")
+            raise InvalidRequestError(
+                "Seats must be between 1 and 50",
+                code="ORGANIZATION_SEATS_INVALID",
+                data={"seats": seats},
+            )
 
         current_members = await self.member_repo.count_by_org(organization.id)
         if seats < current_members:
-            raise BadRequestException("Seats cannot be less than current member count")
+            raise InvalidRequestError(
+                "Seats cannot be less than current member count",
+                code="ORGANIZATION_SEATS_BELOW_MEMBER_COUNT",
+                data={"seats": seats, "member_count": current_members},
+            )
 
         metadata = organization.metadata_ or {}
         seats_config = metadata.get("seats", {}) or {}
@@ -181,7 +213,11 @@ async def list_members(
         """Get member list."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         await self._ensure_member(organization_id, current_user.id)
         members = await self.member_repo.list_by_org(organization.id)
@@ -198,28 +234,47 @@ async def invite_member(
         """Invite/add a new member."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         inviter = await self._ensure_member(organization_id, current_user.id)
         self._ensure_admin_or_owner(inviter)
 
         normalized_role = role or OrgRole.MEMBER
         if normalized_role not in self.SUPPORTED_ROLES:
-            raise BadRequestException("Invalid role")
+            raise InvalidRequestError(
+                "Invalid role",
+                code="ORGANIZATION_MEMBER_ROLE_INVALID",
+                data={"role": normalized_role},
+            )
         if normalized_role == OrgRole.OWNER:
-            raise BadRequestException("Cannot assign owner when inviting")
+            raise InvalidRequestError(
+                "Cannot assign owner when inviting",
+                code="ORGANIZATION_OWNER_INVITE_FORBIDDEN",
+            )
 
         invitee = await self.user_repo.get_by_email(email)
         if not invitee:
-            raise NotFoundException("User not found")
+            raise NotFoundError("User not found", code="USER_NOT_FOUND", data={"email": str(email)})
 
         existing = await self.member_repo.get_by_user_and_org(invitee.id, organization.id)
         if existing:
-            raise ConflictException("User is already a member")
+            raise ResourceConflictError(
+                "User is already a member",
+                code="ORGANIZATION_MEMBER_ALREADY_EXISTS",
+                data={"user_id": str(invitee.id)},
+            )
 
         seat_info = self._build_seats_info(organization)
         if seat_info["available"] <= 0:
-            raise BadRequestException("No available seats")
+            raise InvalidRequestError(
+                "No available seats",
+                code="ORGANIZATION_SEATS_UNAVAILABLE",
+                data=seat_info,
+            )
 
         member = await self.member_repo.create(
             {
@@ -242,15 +297,21 @@ async def get_member(
         """Get member details."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         requester = await self._ensure_member(organization_id, current_user.id)
         target = await self.member_repo.get_with_user(member_id)
         if not target or target.organization_id != organization.id:
-            raise NotFoundException("Member not found")
+            raise NotFoundError(
+                "Member not found", code="ORGANIZATION_MEMBER_NOT_FOUND", data={"member_id": str(member_id)}
+            )
 
         if requester.user_id != target.user_id and requester.role not in [OrgRole.OWNER, OrgRole.ADMIN]:
-            raise ForbiddenException("Not allowed to view this member")
+            raise AccessDeniedError("Not allowed to view this member", code="ORGANIZATION_MEMBER_VIEW_FORBIDDEN")
 
         return self._serialize_member(target, include_usage)
 
@@ -265,27 +326,43 @@ async def update_member_role(
         """Update member role."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         actor = await self._ensure_member(organization_id, current_user.id)
         target = await self.member_repo.get_with_user(member_id)
         if not target or target.organization_id != organization.id:
-            raise NotFoundException("Member not found")
+            raise NotFoundError(
+                "Member not found", code="ORGANIZATION_MEMBER_NOT_FOUND", data={"member_id": str(member_id)}
+            )
 
         if role not in self.SUPPORTED_ROLES:
-            raise BadRequestException("Invalid role")
+            raise InvalidRequestError(
+                "Invalid role",
+                code="ORGANIZATION_MEMBER_ROLE_INVALID",
+                data={"role": role},
+            )
         if role == OrgRole.OWNER:
-            raise BadRequestException("Owner role cannot be reassigned")
+            raise InvalidRequestError(
+                "Owner role cannot be reassigned", code="ORGANIZATION_OWNER_ROLE_REASSIGN_FORBIDDEN"
+            )
         if target.role == OrgRole.OWNER:
-            raise ForbiddenException("Cannot modify owner role")
+            raise AccessDeniedError("Cannot modify owner role", code="ORGANIZATION_OWNER_ROLE_MODIFY_FORBIDDEN")
 
         # access control: only owner can promote to admin; admins can also demote
         if role == OrgRole.ADMIN and actor.role != OrgRole.OWNER:
-            raise ForbiddenException("Only owner can promote to admin")
+            raise AccessDeniedError("Only owner can promote to admin", code="ORGANIZATION_ADMIN_PROMOTE_FORBIDDEN")
         if actor.role not in [OrgRole.OWNER, OrgRole.ADMIN]:
-            raise ForbiddenException("Insufficient permission to update roles")
+            raise AccessDeniedError(
+                "Insufficient permission to update roles", code="ORGANIZATION_MEMBER_ROLE_UPDATE_FORBIDDEN"
+            )
         if actor.role == OrgRole.ADMIN and target.role in [OrgRole.ADMIN, OrgRole.OWNER]:
-            raise ForbiddenException("Admin cannot change other admins/owner")
+            raise AccessDeniedError(
+                "Admin cannot change other admins/owner", code="ORGANIZATION_ADMIN_ROLE_TARGET_FORBIDDEN"
+            )
 
         target.role = role
         await self.commit()
@@ -303,19 +380,27 @@ async def remove_member(
         """Remove a member."""
         organization = await self.org_repo.get_with_members(organization_id)
         if not organization:
-            raise NotFoundException("Organization not found")
+            raise NotFoundError(
+                "Organization not found",
+                code="ORGANIZATION_NOT_FOUND",
+                data={"organization_id": str(organization_id)},
+            )
 
         actor = await self._ensure_member(organization_id, current_user.id)
         target = await self.member_repo.get_with_user(member_id)
         if not target or target.organization_id != organization.id:
-            raise NotFoundException("Member not found")
+            raise NotFoundError(
+                "Member not found", code="ORGANIZATION_MEMBER_NOT_FOUND", data={"member_id": str(member_id)}
+            )
 
         if target.role == OrgRole.OWNER:
-            raise ForbiddenException("Cannot remove organization owner")
+            raise AccessDeniedError("Cannot remove organization owner", code="ORGANIZATION_OWNER_REMOVE_FORBIDDEN")
         if actor.role == OrgRole.ADMIN and target.role in [OrgRole.ADMIN, OrgRole.OWNER]:
-            raise ForbiddenException("Admin cannot remove admins or owner")
+            raise AccessDeniedError(
+                "Admin cannot remove admins or owner", code="ORGANIZATION_ADMIN_REMOVE_TARGET_FORBIDDEN"
+            )
         if actor.role not in [OrgRole.OWNER, OrgRole.ADMIN] and actor.user_id != target.user_id:
-            raise ForbiddenException("Not allowed to remove this member")
+            raise AccessDeniedError("Not allowed to remove this member", code="ORGANIZATION_MEMBER_REMOVE_FORBIDDEN")
 
         members_before = await self.member_repo.count_by_org(organization.id)
         await self.member_repo.delete(target.id)
@@ -341,17 +426,23 @@ async def _ensure_member(self, organization_id: uuid.UUID, user_id: str | uuid.U
         user_id_str = str(user_id)
         member = await self.member_repo.get_by_user_and_org(user_id_str, organization_id)
         if not member:
-            raise ForbiddenException("No access to this organization")
+            raise AccessDeniedError("No access to this organization", code="ORGANIZATION_ACCESS_DENIED")
         return member  # type: ignore
 
     def _ensure_admin_or_owner(self, member: Member) -> None:
         if member.role not in [OrgRole.OWNER, OrgRole.ADMIN]:
-            raise ForbiddenException("Only owner or admin can perform this action")
+            raise AccessDeniedError(
+                "Only owner or admin can perform this action", code="ORGANIZATION_PERMISSION_DENIED"
+            )
 
     def _validate_plan_for_seats(self, organization: Organization) -> None:
         plan = (organization.metadata_ or {}).get("plan_type", self.TEAM_PLAN)
         if plan != self.TEAM_PLAN:
-            raise BadRequestException("Seat management is available only for team plan")
+            raise InvalidRequestError(
+                "Seat management is available only for team plan",
+                code="ORGANIZATION_PLAN_UNSUPPORTED",
+                data={"plan": plan},
+            )
 
     def _serialize_org(self, organization: Organization, role: str, include_seats: bool) -> Dict:
         data = {
@@ -412,8 +503,9 @@ def _serialize_member(self, member: Member, include_usage: bool) -> Dict:
         return data
 
     def _build_member_usage(self, member: Member) -> Dict:
-        # Stub: usage stats not yet implemented
+        # TODO: implement real usage stats per member
         return {
-            "messages": 0,
-            "storage_bytes": 0,
+            "messages": None,
+            "storage_bytes": None,
+            "_note": "Usage stats not yet implemented",
         }
diff --git a/backend/app/services/platform_token_service.py b/backend/app/services/platform_token_service.py
index 26ecfcb48..aabc37b2a 100644
--- a/backend/app/services/platform_token_service.py
+++ b/backend/app/services/platform_token_service.py
@@ -7,7 +7,7 @@
 from datetime import datetime
 from typing import List, Optional, Tuple
 
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.common.permissions import VALID_SCOPES
 from app.models.enums import OrgRole
 from app.models.platform_token import PlatformToken
@@ -40,19 +40,32 @@ async def create_token(
         # Check limit
         active_count = await self.repo.count_active_by_user(user_id)
         if active_count >= MAX_ACTIVE_TOKENS_PER_USER:
-            raise BadRequestException(f"Maximum of {MAX_ACTIVE_TOKENS_PER_USER} active tokens reached")
+            raise InvalidRequestError(
+                f"Maximum of {MAX_ACTIVE_TOKENS_PER_USER} active tokens reached",
+                code="PLATFORM_TOKEN_LIMIT_EXCEEDED",
+                data={"limit": MAX_ACTIVE_TOKENS_PER_USER},
+            )
 
         # Validate scopes
         invalid = set(scopes) - set(VALID_SCOPES)
         if invalid:
-            raise BadRequestException(f"Invalid scopes: {invalid}")
+            raise InvalidRequestError(
+                f"Invalid scopes: {invalid}",
+                code="PLATFORM_TOKEN_SCOPES_INVALID",
+                data={"scopes": sorted(invalid)},
+            )
 
         # Validate resource_type/resource_id pair
         if (resource_type is None) != (resource_id is None):
-            raise BadRequestException("resource_type and resource_id must both be provided or both be null")
+            raise InvalidRequestError(
+                "resource_type and resource_id must both be provided or both be null",
+                code="PLATFORM_TOKEN_RESOURCE_BINDING_INVALID",
+            )
         if resource_type is not None and resource_type not in self.VALID_RESOURCE_TYPES:
-            raise BadRequestException(
-                f"Invalid resource_type: {resource_type}. Must be one of {self.VALID_RESOURCE_TYPES}"
+            raise InvalidRequestError(
+                f"Invalid resource_type: {resource_type}. Must be one of {self.VALID_RESOURCE_TYPES}",
+                code="PLATFORM_TOKEN_RESOURCE_TYPE_INVALID",
+                data={"resource_type": resource_type},
             )
 
         # Validate resource exists and user has permission
@@ -65,11 +78,19 @@ async def create_token(
                 skill_repo = SkillRepository(self.db)
                 skill = await skill_repo.get(resource_id)
                 if not skill:
-                    raise NotFoundException(f"Skill {resource_id} not found")
+                    raise NotFoundError(
+                        "Skill not found",
+                        code="SKILL_NOT_FOUND",
+                        data={"skill_id": str(resource_id)},
+                    )
                 try:
                     await check_skill_access(self.db, skill, user_id, CollaboratorRole.editor)
-                except ForbiddenException:
-                    raise ForbiddenException("No permission to create token for this skill")
+                except AccessDeniedError:
+                    raise AccessDeniedError(
+                        "No permission to create token for this skill",
+                        code="PLATFORM_TOKEN_SKILL_ACCESS_DENIED",
+                        data={"skill_id": str(resource_id)},
+                    )
             elif resource_type == "graph":
                 from app.repositories.workspace import WorkspaceMemberRepository, WorkspaceRepository
 
@@ -77,20 +98,36 @@ async def create_token(
                 member_repo = WorkspaceMemberRepository(self.db)
                 workspace = await workspace_repo.get(resource_id)
                 if not workspace:
-                    raise NotFoundException(f"Workspace {resource_id} not found")
+                    raise NotFoundError(
+                        "Workspace not found",
+                        code="WORKSPACE_NOT_FOUND",
+                        data={"workspace_id": str(resource_id)},
+                    )
                 if workspace.owner_id != user_id:
                     member = await member_repo.get_member(resource_id, user_id)
                     if not member or member.role not in {OrgRole.ADMIN, OrgRole.OWNER}:
-                        raise ForbiddenException("No permission to create token for this workspace")
+                        raise AccessDeniedError(
+                            "No permission to create token for this workspace",
+                            code="PLATFORM_TOKEN_WORKSPACE_ACCESS_DENIED",
+                            data={"workspace_id": str(resource_id)},
+                        )
             elif resource_type == "tool":
                 from app.repositories.tool import ToolRepository
 
                 tool_repo = ToolRepository(self.db)
                 tool = await tool_repo.get(resource_id)
                 if not tool:
-                    raise NotFoundException(f"Tool {resource_id} not found")
+                    raise NotFoundError(
+                        "Tool not found",
+                        code="TOOL_NOT_FOUND",
+                        data={"tool_id": str(resource_id)},
+                    )
                 if tool.owner_id != user_id:
-                    raise ForbiddenException("No permission to create token for this tool")
+                    raise AccessDeniedError(
+                        "No permission to create token for this tool",
+                        code="PLATFORM_TOKEN_TOOL_ACCESS_DENIED",
+                        data={"tool_id": str(resource_id)},
+                    )
 
         # Generate token
         raw_secret = secrets.token_urlsafe(36)
@@ -133,8 +170,12 @@ async def revoke_token(
     ) -> None:
         pt = await self.repo.get(token_id)
         if not pt:
-            raise NotFoundException("Token not found")
+            raise NotFoundError("Token not found", code="PLATFORM_TOKEN_NOT_FOUND", data={"token_id": str(token_id)})
         if pt.user_id != user_id:
-            raise ForbiddenException("You can only revoke your own tokens")
+            raise AccessDeniedError(
+                "You can only revoke your own tokens",
+                code="PLATFORM_TOKEN_REVOKE_FORBIDDEN",
+                data={"token_id": str(token_id)},
+            )
         pt.is_active = False
         await self.db.commit()
diff --git a/backend/app/services/run_reducers/__init__.py b/backend/app/services/run_reducers/__init__.py
deleted file mode 100644
index 703fd951e..000000000
--- a/backend/app/services/run_reducers/__init__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""Run projection reducers."""
-
-from app.services.agent_registry import AgentDefinition, agent_registry
-
-from .chat import apply_chat_event
-from .chat import make_initial_projection as chat_make_initial_projection
-from .copilot import apply_copilot_event
-from .copilot import make_initial_projection as copilot_make_initial_projection
-from .skill_creator import apply_skill_creator_event, make_initial_projection
-
-agent_registry.register(
-    AgentDefinition(
-        agent_name="skill_creator",
-        display_name="Skill Creator",
-        run_type="skill_creator",
-        reducer=apply_skill_creator_event,
-        make_initial_projection=make_initial_projection,
-    )
-)
-
-agent_registry.register(
-    AgentDefinition(
-        agent_name="chat",
-        display_name="Chat",
-        run_type="chat_turn",
-        reducer=apply_chat_event,
-        make_initial_projection=chat_make_initial_projection,
-    )
-)
-
-agent_registry.register(
-    AgentDefinition(
-        agent_name="copilot",
-        display_name="Copilot",
-        run_type="copilot_turn",
-        reducer=apply_copilot_event,
-        make_initial_projection=copilot_make_initial_projection,
-    )
-)
-
-__all__ = [
-    "agent_registry",
-    "apply_chat_event",
-    "apply_copilot_event",
-    "apply_skill_creator_event",
-    "chat_make_initial_projection",
-    "copilot_make_initial_projection",
-    "make_initial_projection",
-]
diff --git a/backend/app/services/run_reducers/chat.py b/backend/app/services/run_reducers/chat.py
deleted file mode 100644
index 9b4cae0c7..000000000
--- a/backend/app/services/run_reducers/chat.py
+++ /dev/null
@@ -1,171 +0,0 @@
-"""
-Chat run projection reducer.
-
-Each chat turn is tracked as a single run projection containing one
-user_message and one assistant_message (with optional tool_calls),
-rather than a messages array as in skill_creator.
-"""
-
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-
-def _deepcopy_projection(projection: dict[str, Any] | None) -> dict[str, Any]:
-    if projection is not None:
-        return deepcopy(projection)
-    return {
-        "version": 1,
-        "run_type": "chat_turn",
-        "status": "queued",
-        "graph_id": None,
-        "thread_id": None,
-        "user_message": None,
-        "assistant_message": None,
-        "file_tree": {},
-        "preview_data": None,
-        "node_execution_log": [],
-        "interrupt": None,
-        "meta": {},
-    }
-
-
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    projection = _deepcopy_projection(None)
-    projection["status"] = status
-    projection["graph_id"] = payload.get("graph_id")
-    projection["thread_id"] = payload.get("thread_id")
-    return projection
-
-
-def apply_chat_event(
-    projection: dict[str, Any] | None,
-    *,
-    event_type: str,
-    payload: dict[str, Any],
-    status: str,
-) -> dict[str, Any]:
-    next_projection = _deepcopy_projection(projection)
-    next_projection["status"] = status
-
-    if event_type == "run_initialized":
-        return make_initial_projection(
-            {
-                "graph_id": payload.get("graph_id"),
-                "thread_id": payload.get("thread_id"),
-            },
-            status,
-        )
-
-    if event_type == "user_message_added":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_projection["user_message"] = message
-        return next_projection
-
-    if event_type == "assistant_message_started":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_projection["assistant_message"] = message
-        return next_projection
-
-    if event_type == "content_delta":
-        message_id = payload.get("message_id")
-        delta = payload.get("delta") or ""
-        if not message_id or not delta:
-            return next_projection
-        msg = next_projection["assistant_message"]
-        if isinstance(msg, dict) and msg.get("id") == message_id:
-            msg["content"] = f"{msg.get('content', '')}{delta}"
-        return next_projection
-
-    if event_type == "tool_start":
-        message_id = payload.get("message_id")
-        tool = payload.get("tool")
-        if not message_id or not isinstance(tool, dict):
-            return next_projection
-        msg = next_projection["assistant_message"]
-        if isinstance(msg, dict) and msg.get("id") == message_id:
-            tools = msg.setdefault("tool_calls", [])
-            tools.append(tool)
-        return next_projection
-
-    if event_type == "tool_end":
-        tool_id = payload.get("tool_id")
-        tool_output = payload.get("tool_output")
-        tool_name = payload.get("tool_name")
-        end_time = payload.get("end_time")
-        if isinstance(next_projection["assistant_message"], dict):
-            msg = next_projection["assistant_message"]
-            for tool in msg.get("tool_calls", []):
-                if tool_id and tool.get("id") != tool_id:
-                    continue
-                if not tool_id and tool.get("status") != "running":
-                    continue
-                tool["status"] = "completed"
-                tool["result"] = tool_output
-                if end_time is not None:
-                    tool["endTime"] = end_time
-                break
-        if tool_name == "preview_skill" and tool_output is not None:
-            next_projection["preview_data"] = tool_output
-        return next_projection
-
-    if event_type == "file_event":
-        path = payload.get("path")
-        action = payload.get("action")
-        if not path or not action:
-            return next_projection
-        if action == "delete":
-            next_projection["file_tree"].pop(path, None)
-        else:
-            next_projection["file_tree"][path] = {
-                "action": action,
-                "size": payload.get("size"),
-                "timestamp": payload.get("timestamp"),
-            }
-        return next_projection
-
-    if event_type == "node_start":
-        node_id = payload.get("node_id")
-        node_name = payload.get("node_name")
-        start_time = payload.get("start_time")
-        next_projection["node_execution_log"].append(
-            {
-                "node_id": node_id,
-                "node_name": node_name,
-                "status": "running",
-                "start_time": start_time,
-                "end_time": None,
-            }
-        )
-        return next_projection
-
-    if event_type == "node_end":
-        node_name = payload.get("node_name")
-        end_time = payload.get("end_time")
-        for entry in reversed(next_projection["node_execution_log"]):
-            if entry.get("node_name") == node_name and entry.get("status") == "running":
-                entry["status"] = "completed"
-                entry["end_time"] = end_time
-                break
-        return next_projection
-
-    if event_type == "interrupt":
-        next_projection["interrupt"] = payload.get("interrupt")
-        return next_projection
-
-    if event_type == "error":
-        next_projection["meta"]["error"] = payload.get("message")
-        return next_projection
-
-    if event_type == "done":
-        next_projection["meta"]["completed"] = True
-        return next_projection
-
-    if event_type == "status":
-        next_projection["meta"]["status_message"] = payload.get("message")
-        return next_projection
-
-    return next_projection
diff --git a/backend/app/services/run_reducers/copilot.py b/backend/app/services/run_reducers/copilot.py
deleted file mode 100644
index 4ca5bcc54..000000000
--- a/backend/app/services/run_reducers/copilot.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-Copilot run projection reducer.
-
-Each copilot turn is tracked as a single run projection containing
-streaming content, thought steps, tool calls/results, and final
-result message + graph actions.
-"""
-
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-_INITIAL: dict[str, Any] = {
-    "version": 1,
-    "run_type": "copilot_turn",
-    "status": "queued",
-    "stage": None,
-    "content": "",
-    "thought_steps": [],
-    "tool_calls": [],
-    "tool_results": [],
-    "result_message": None,
-    "result_actions": [],
-    "error": None,
-    "graph_id": None,
-    "mode": None,
-}
-
-
-def _deepcopy_projection(projection: dict[str, Any] | None) -> dict[str, Any]:
-    if projection is not None:
-        return deepcopy(projection)
-    return deepcopy(_INITIAL)
-
-
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    projection = _deepcopy_projection(None)
-    projection["status"] = status
-    projection["graph_id"] = payload.get("graph_id")
-    projection["mode"] = payload.get("mode")
-    return projection
-
-
-def apply_copilot_event(
-    projection: dict[str, Any] | None,
-    *,
-    event_type: str,
-    payload: dict[str, Any],
-    status: str,
-) -> dict[str, Any]:
-    next_p = _deepcopy_projection(projection)
-    next_p["status"] = status
-
-    if event_type == "run_initialized":
-        return make_initial_projection(
-            {"graph_id": payload.get("graph_id"), "mode": payload.get("mode")},
-            status,
-        )
-
-    if event_type == "status":
-        next_p["stage"] = payload.get("stage")
-        return next_p
-
-    if event_type == "content_delta":
-        next_p["content"] += payload.get("delta", "")
-        return next_p
-
-    if event_type == "thought_step":
-        step = payload.get("step")
-        if step:
-            next_p["thought_steps"].append(step)
-        return next_p
-
-    if event_type == "tool_call":
-        next_p["tool_calls"].append(
-            {
-                "tool": payload.get("tool", ""),
-                "input": payload.get("input", {}),
-            }
-        )
-        return next_p
-
-    if event_type == "tool_result":
-        action = payload.get("action")
-        if action:
-            next_p["tool_results"].append(action)
-        return next_p
-
-    if event_type == "result":
-        next_p["result_message"] = payload.get("message", "")
-        next_p["result_actions"] = payload.get("actions", [])
-        return next_p
-
-    if event_type == "error":
-        next_p["status"] = "failed"
-        next_p["error"] = payload.get("message")
-        return next_p
-
-    if event_type == "done":
-        if next_p["status"] != "failed":
-            next_p["status"] = "completed"
-        return next_p
-
-    return next_p
diff --git a/backend/app/services/run_reducers/skill_creator.py b/backend/app/services/run_reducers/skill_creator.py
deleted file mode 100644
index 8b11b9cfd..000000000
--- a/backend/app/services/run_reducers/skill_creator.py
+++ /dev/null
@@ -1,152 +0,0 @@
-"""
-Skill Creator run projection reducer.
-"""
-
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-
-def _deepcopy_projection(projection: dict[str, Any] | None) -> dict[str, Any]:
-    if projection is not None:
-        return deepcopy(projection)
-    return {
-        "version": 1,
-        "run_type": "skill_creator",
-        "status": "queued",
-        "graph_id": None,
-        "thread_id": None,
-        "edit_skill_id": None,
-        "messages": [],
-        "current_assistant_message_id": None,
-        "preview_data": None,
-        "file_tree": {},
-        "interrupt": None,
-        "meta": {},
-    }
-
-
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    projection = _deepcopy_projection(None)
-    projection["status"] = status
-    projection["graph_id"] = payload.get("graph_id")
-    projection["thread_id"] = payload.get("thread_id")
-    projection["edit_skill_id"] = payload.get("edit_skill_id")
-    return projection
-
-
-def apply_skill_creator_event(
-    projection: dict[str, Any] | None,
-    *,
-    event_type: str,
-    payload: dict[str, Any],
-    status: str,
-) -> dict[str, Any]:
-    next_projection = _deepcopy_projection(projection)
-    next_projection["status"] = status
-
-    if event_type == "run_initialized":
-        return make_initial_projection(
-            {
-                "graph_id": payload.get("graph_id"),
-                "thread_id": payload.get("thread_id"),
-                "edit_skill_id": payload.get("edit_skill_id"),
-            },
-            status,
-        )
-
-    if event_type == "user_message_added":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_projection["messages"].append(message)
-        return next_projection
-
-    if event_type == "assistant_message_started":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_projection["messages"].append(message)
-            next_projection["current_assistant_message_id"] = message.get("id")
-        return next_projection
-
-    if event_type == "content_delta":
-        message_id = payload.get("message_id")
-        delta = payload.get("delta") or ""
-        if not message_id or not delta:
-            return next_projection
-        for message in next_projection["messages"]:
-            if message.get("id") == message_id:
-                message["content"] = f"{message.get('content', '')}{delta}"
-                break
-        return next_projection
-
-    if event_type == "tool_start":
-        message_id = payload.get("message_id")
-        tool = payload.get("tool")
-        if not message_id or not isinstance(tool, dict):
-            return next_projection
-        for message in next_projection["messages"]:
-            if message.get("id") == message_id:
-                tools = message.setdefault("tool_calls", [])
-                tools.append(tool)
-                break
-        return next_projection
-
-    if event_type == "tool_end":
-        message_id = payload.get("message_id")
-        tool_id = payload.get("tool_id")
-        tool_output = payload.get("tool_output")
-        tool_name = payload.get("tool_name")
-        end_time = payload.get("end_time")
-        for message in next_projection["messages"]:
-            if message.get("id") != message_id:
-                continue
-            for tool in message.get("tool_calls", []):
-                if tool_id and tool.get("id") != tool_id:
-                    continue
-                if not tool_id and tool.get("status") != "running":
-                    continue
-                tool["status"] = "completed"
-                tool["result"] = tool_output
-                if end_time is not None:
-                    tool["endTime"] = end_time
-                break
-            break
-        if tool_name == "preview_skill" and tool_output is not None:
-            next_projection["preview_data"] = tool_output
-        return next_projection
-
-    if event_type == "file_event":
-        path = payload.get("path")
-        action = payload.get("action")
-        if not path or not action:
-            return next_projection
-        if action == "delete":
-            next_projection["file_tree"].pop(path, None)
-        else:
-            next_projection["file_tree"][path] = {
-                "action": action,
-                "size": payload.get("size"),
-                "timestamp": payload.get("timestamp"),
-            }
-        return next_projection
-
-    if event_type == "interrupt":
-        next_projection["interrupt"] = payload.get("interrupt")
-        next_projection["current_assistant_message_id"] = None
-        return next_projection
-
-    if event_type == "error":
-        next_projection["meta"]["error"] = payload.get("message")
-        return next_projection
-
-    if event_type == "done":
-        next_projection["meta"]["completed"] = True
-        next_projection["current_assistant_message_id"] = None
-        return next_projection
-
-    if event_type == "status":
-        next_projection["meta"]["status_message"] = payload.get("message")
-        return next_projection
-
-    return next_projection
diff --git a/backend/app/services/run_service.py b/backend/app/services/run_service.py
deleted file mode 100644
index f32b6532a..000000000
--- a/backend/app/services/run_service.py
+++ /dev/null
@@ -1,638 +0,0 @@
-"""
-Service layer for durable agent runs.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import uuid
-from datetime import datetime
-from typing import Any, Awaitable, Optional
-
-from loguru import logger
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.core.redis import RedisClient
-from app.core.settings import settings
-from app.models.agent_run import AgentRun, AgentRunEvent, AgentRunSnapshot, AgentRunStatus
-from app.models.enums import ModelUsageSource
-from app.repositories.agent_run import AgentRunRepository
-from app.services.agent_registry import AgentDefinition
-from app.services.run_reducers import agent_registry
-from app.utils.datetime import utc_now
-from app.websocket.run_subscription_manager import run_subscription_manager
-
-# Throttle Redis snapshot writes for content_delta events (500ms per run).
-_SNAPSHOT_THROTTLE_SECONDS = 0.5
-_snapshot_last_published: dict[str, float] = {}
-
-
-def _build_snapshot_dict(run_id: str, snapshot: AgentRunSnapshot) -> dict[str, Any]:
-    return {
-        "run_id": run_id,
-        "status": snapshot.status,
-        "last_seq": snapshot.last_seq,
-        "projection": snapshot.projection,
-    }
-
-
-class RunService:
-    """Orchestrates durable agent run lifecycle, event sourcing, and snapshot management."""
-
-    def __init__(self, db: AsyncSession):
-        self.db = db
-        self.repo = AgentRunRepository(db)
-
-    async def list_agents(self) -> list[AgentDefinition]:
-        """Return all registered agent definitions.
-
-        Returns:
-            List of available agent definitions.
-        """
-        return agent_registry.list_definitions()
-
-    def get_agent_definition(self, agent_name: str) -> AgentDefinition:
-        """Look up an agent definition by name.
-
-        Args:
-            agent_name: Registered name of the agent.
-
-        Returns:
-            The matching agent definition.
-
-        Raises:
-            ValueError: If no agent with the given name is registered.
-        """
-        try:
-            return agent_registry.get(agent_name)
-        except KeyError:
-            raise ValueError(f"Unknown agent: {agent_name}")
-
-    def get_agent_display_name(self, agent_name: str | None) -> str | None:
-        """Return the human-readable display name for an agent.
-
-        Args:
-            agent_name: Registered agent name, or None.
-
-        Returns:
-            The display name if the agent is found, otherwise the raw agent_name.
-        """
-        definition = agent_registry.find(agent_name)
-        return definition.display_name if definition else agent_name
-
-    async def create_run(
-        self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: uuid.UUID,
-        thread_id: Optional[str],
-        message: str,
-        input: Optional[dict[str, Any]] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-        source: str = "run_center",
-        run_type: Optional[str] = None,
-    ) -> AgentRun:
-        """Create a new agent run with its initial snapshot and user message event.
-
-        Args:
-            user_id: ID of the user initiating the run.
-            agent_name: Registered agent name to execute.
-            graph_id: Graph to run the agent against.
-            thread_id: Conversation thread ID; auto-generated if None.
-            message: Initial user message for the run.
-            input: Optional extra input parameters forwarded to the agent.
-            workspace_id: Optional workspace scope for the run.
-            source: Origin label (e.g. "run_center", "skills_creator_page").
-            run_type: Override the agent's default run type if provided.
-
-        Returns:
-            The newly created AgentRun record.
-
-        Raises:
-            ValueError: If agent_name is not registered.
-        """
-        definition = self.get_agent_definition(agent_name)
-        resolved_thread_id = thread_id or str(uuid.uuid4())
-        run_input = dict(input or {})
-
-        from app.core.trace_context import get_trace_id
-
-        trace_id = get_trace_id()
-        run = AgentRun(
-            user_id=user_id,
-            workspace_id=workspace_id,
-            graph_id=graph_id,
-            thread_id=resolved_thread_id,
-            run_type=definition.run_type if run_type is None else run_type,
-            agent_name=agent_name,
-            source=source,
-            status=AgentRunStatus.QUEUED,
-            title=message[:100] if message else definition.display_name,
-            request_payload={
-                "agent_name": agent_name,
-                "message": message,
-                "graph_id": str(graph_id),
-                "thread_id": resolved_thread_id,
-                "input": run_input,
-                # Spread run_input at top level so consumers that read keys
-                # directly (e.g. edit_skill_id) continue to work.
-                **run_input,
-            },
-            last_heartbeat_at=utc_now(),
-            trace_id=uuid.UUID(trace_id) if trace_id else None,
-        )
-        self.db.add(run)
-        await self.db.flush()
-
-        snapshot = AgentRunSnapshot(
-            run_id=run.id,
-            last_seq=0,
-            status=run.status.value,
-            projection=definition.make_initial_projection(
-                {
-                    "graph_id": str(graph_id),
-                    "thread_id": resolved_thread_id,
-                    **run_input,
-                },
-                run.status.value,
-            ),
-        )
-        self.db.add(snapshot)
-        await self.db.flush()
-
-        await self.append_event(
-            run_id=run.id,
-            event_type="user_message_added",
-            payload={
-                "message": {
-                    "id": f"msg-user-{uuid.uuid4()}",
-                    "role": "user",
-                    "content": message,
-                    "timestamp": int(utc_now().timestamp() * 1000),
-                }
-            },
-            commit=False,
-        )
-        await self.db.commit()
-        await self.db.refresh(run)
-        await RedisClient.set_run_snapshot(
-            str(run.id),
-            _build_snapshot_dict(str(run.id), snapshot),
-        )
-        return run
-
-    async def create_skill_creator_run(
-        self,
-        *,
-        user_id: str,
-        graph_id: uuid.UUID,
-        thread_id: Optional[str],
-        message: str,
-        edit_skill_id: Optional[str],
-        workspace_id: Optional[uuid.UUID] = None,
-    ) -> AgentRun:
-        """Create a run specifically for the skill_creator agent.
-
-        Args:
-            user_id: ID of the user initiating the run.
-            graph_id: Graph to run the agent against.
-            thread_id: Conversation thread ID; auto-generated if None.
-            message: Initial user message for skill creation/editing.
-            edit_skill_id: Existing skill ID to edit, or None for new skill creation.
-            workspace_id: Optional workspace scope for the run.
-
-        Returns:
-            The newly created AgentRun record.
-        """
-        return await self.create_run(
-            user_id=user_id,
-            agent_name="skill_creator",
-            graph_id=graph_id,
-            thread_id=thread_id,
-            message=message,
-            input={"edit_skill_id": edit_skill_id},
-            workspace_id=workspace_id,
-            source=ModelUsageSource.SKILLS_CREATOR,
-        )
-
-    async def get_run(self, run_id: uuid.UUID, user_id: str) -> Optional[AgentRun]:
-        """Fetch a single run by ID, scoped to the given user.
-
-        Args:
-            run_id: Unique identifier of the run.
-            user_id: Owner user ID used for access control.
-
-        Returns:
-            The AgentRun if found and owned by the user, otherwise None.
-        """
-        return await self.repo.get_by_id_and_user(run_id, user_id)
-
-    async def get_snapshot(self, run_id: uuid.UUID, user_id: str) -> Optional[AgentRunSnapshot]:
-        """Fetch the latest projection snapshot for a run.
-
-        Args:
-            run_id: Unique identifier of the run.
-            user_id: Owner user ID used for access control.
-
-        Returns:
-            The snapshot if the run exists and belongs to the user, otherwise None.
-        """
-        run = await self.get_run(run_id, user_id)
-        if not run:
-            return None
-        return await self.repo.get_snapshot(run_id)
-
-    async def list_events_after(
-        self, run_id: uuid.UUID, user_id: str, after_seq: int = 0, limit: int = 500
-    ) -> list[AgentRunEvent]:
-        """List run events with sequence numbers greater than after_seq.
-
-        Args:
-            run_id: Unique identifier of the run.
-            user_id: Owner user ID used for access control.
-            after_seq: Return only events with seq > this value.
-            limit: Maximum number of events to return.
-
-        Returns:
-            List of events ordered by sequence number, or empty list if the
-            run is not found.
-        """
-        run = await self.get_run(run_id, user_id)
-        if not run:
-            return []
-        return list(await self.repo.list_events_after(run_id, after_seq=after_seq, limit=limit))
-
-    async def find_latest_active_skill_creator_run(
-        self, *, user_id: str, graph_id: uuid.UUID, thread_id: Optional[str] = None
-    ) -> Optional[AgentRun]:
-        """Find the most recent active skill_creator run for a user and graph.
-
-        Args:
-            user_id: Owner user ID.
-            graph_id: Graph the run belongs to.
-            thread_id: Optional thread ID to narrow the search.
-
-        Returns:
-            The latest active skill_creator run, or None.
-        """
-        return await self.find_latest_active_run(
-            user_id=user_id,
-            agent_name="skill_creator",
-            graph_id=graph_id,
-            thread_id=thread_id,
-        )
-
-    async def find_latest_active_run(
-        self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-        """Find the most recent active run for a given agent, user, and graph.
-
-        Args:
-            user_id: Owner user ID.
-            agent_name: Registered agent name.
-            graph_id: Graph the run belongs to.
-            thread_id: Optional thread ID to narrow the search.
-
-        Returns:
-            The latest active AgentRun, or None if no active run exists.
-        """
-        return await self.repo.find_latest_active_run(
-            user_id=user_id,
-            agent_name=agent_name,
-            graph_id=graph_id,
-            thread_id=thread_id,
-        )
-
-    async def list_recent_runs(
-        self,
-        *,
-        user_id: str,
-        run_type: Optional[str] = None,
-        agent_name: Optional[str] = None,
-        status: Optional[str] = None,
-        search: Optional[str] = None,
-        limit: int = 50,
-    ) -> list[AgentRun]:
-        """List recent runs for a user with optional filters.
-
-        Args:
-            user_id: Owner user ID.
-            run_type: Filter by run type (e.g. "skill_creator").
-            agent_name: Filter by agent name.
-            status: Filter by run status string.
-            search: Free-text search against run titles.
-            limit: Maximum number of runs to return.
-
-        Returns:
-            List of matching AgentRun records, most recent first.
-        """
-        return list(
-            await self.repo.list_recent_runs_for_user(
-                user_id=user_id,
-                run_type=run_type,
-                agent_name=agent_name,
-                status=status,
-                search=search,
-                limit=limit,
-            )
-        )
-
-    async def mark_status(
-        self,
-        *,
-        run_id: uuid.UUID,
-        user_id: Optional[str],
-        status: AgentRunStatus,
-        runtime_owner_id: Optional[str] = None,
-        error_code: Optional[str] = None,
-        error_message: Optional[str] = None,
-        result_summary: Optional[dict[str, Any]] = None,
-    ) -> Optional[AgentRun]:
-        """Transition a run to a new status, update its snapshot, and broadcast the change.
-
-        Handles runtime ownership assignment on RUNNING, clears it on terminal
-        states, and publishes status updates via Redis and WebSocket.
-
-        Args:
-            run_id: Unique identifier of the run.
-            user_id: Owner user ID, or None for system-level transitions.
-            status: Target status to transition to.
-            runtime_owner_id: Runtime instance claiming this run (for RUNNING).
-            error_code: Machine-readable error code (for FAILED).
-            error_message: Human-readable error description (for FAILED).
-            result_summary: Optional summary dict merged into the run record.
-
-        Returns:
-            The updated AgentRun, or None if the run was not found.
-        """
-        run = await self.repo.get_run_for_update(run_id, user_id=user_id)
-        if not run:
-            return None
-
-        heartbeat_at = utc_now()
-        run.status = status
-        run.error_code = error_code
-        run.error_message = error_message
-        run.last_heartbeat_at = heartbeat_at
-        if status == AgentRunStatus.RUNNING:
-            run.runtime_owner_id = runtime_owner_id or run.runtime_owner_id or settings.run_runtime_instance_id
-        elif status in {
-            AgentRunStatus.INTERRUPT_WAIT,
-            AgentRunStatus.COMPLETED,
-            AgentRunStatus.FAILED,
-            AgentRunStatus.CANCELLED,
-        }:
-            run.runtime_owner_id = None
-        if result_summary is not None:
-            run.result_summary = result_summary
-        if status in {AgentRunStatus.COMPLETED, AgentRunStatus.FAILED, AgentRunStatus.CANCELLED}:
-            run.finished_at = heartbeat_at
-            _snapshot_last_published.pop(str(run_id), None)
-
-        snapshot = await self.repo.get_snapshot(run_id)
-        if snapshot:
-            snapshot.status = status.value
-            projection = dict(snapshot.projection or {})
-            projection["status"] = status.value
-            if error_message:
-                meta = dict(projection.get("meta") or {})
-                meta["error"] = error_message
-                projection["meta"] = meta
-            snapshot.projection = projection
-
-        await self.db.commit()
-        try:
-            coros: list[Awaitable[Any]] = []
-            if snapshot:
-                coros.append(
-                    RedisClient.set_run_snapshot(
-                        str(run.id),
-                        _build_snapshot_dict(str(run.id), snapshot),
-                    )
-                )
-            coros.append(
-                run_subscription_manager.broadcast_event(
-                    str(run.id),
-                    {
-                        "type": "run_status",
-                        "run_id": str(run.id),
-                        "status": status.value,
-                        "error_code": error_code,
-                        "error_message": error_message,
-                    },
-                )
-            )
-            await asyncio.gather(*coros)
-        except Exception as exc:
-            logger.warning(f"Failed to publish run status to Redis/WS | run_id={run_id} | error={exc}")
-        return run
-
-    async def touch_run_heartbeat(
-        self,
-        *,
-        run_id: uuid.UUID,
-        runtime_owner_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-        """Update the heartbeat timestamp for an active run to prevent stale-run recovery.
-
-        Only updates runs in QUEUED or RUNNING status. Also sets the
-        runtime_owner_id if not already assigned.
-
-        Args:
-            run_id: Unique identifier of the run.
-            runtime_owner_id: Runtime instance ID to record as the owner.
-
-        Returns:
-            The updated AgentRun, or None if the run was not found.
-        """
-        run = await self.repo.get_run_for_update(run_id)
-        if not run:
-            return None
-        if run.status not in {AgentRunStatus.QUEUED, AgentRunStatus.RUNNING}:
-            return run
-
-        run.runtime_owner_id = runtime_owner_id or run.runtime_owner_id or settings.run_runtime_instance_id
-        run.last_heartbeat_at = utc_now()
-        await self.db.commit()
-        return run
-
-    async def recover_stale_incomplete_runs(
-        self,
-        *,
-        runtime_owner_id: str,
-        stale_before: datetime,
-    ) -> list[AgentRun]:
-        """Mark stale incomplete runs as FAILED and record recovery metadata.
-
-        Finds runs whose last heartbeat is older than stale_before and
-        transitions them to FAILED with a ``runtime_recovered`` error code.
-
-        Args:
-            runtime_owner_id: ID of the runtime performing the recovery.
-            stale_before: Cutoff timestamp; runs with an older heartbeat are
-                considered stale.
-
-        Returns:
-            List of AgentRun records that were recovered (marked as FAILED).
-        """
-        stale_runs = await self.repo.list_recoverable_stale_runs(
-            stale_before=stale_before,
-        )
-        recovered: list[AgentRun] = []
-        recovered_at = utc_now().isoformat()
-        for run in stale_runs:
-            result_summary = dict(run.result_summary or {})
-            result_summary.update(
-                {
-                    "recovered_by_runtime": runtime_owner_id,
-                    "recovered_at": recovered_at,
-                    "previous_runtime_owner_id": run.runtime_owner_id,
-                }
-            )
-            error_message = (
-                "Recovered stale run after runtime heartbeat timeout"
-                if run.runtime_owner_id
-                else "Recovered stale run without active runtime owner heartbeat"
-            )
-            updated_run = await self.mark_status(
-                run_id=run.id,
-                user_id=run.user_id,
-                status=AgentRunStatus.FAILED,
-                error_code="runtime_recovered",
-                error_message=error_message,
-                result_summary=result_summary,
-            )
-            if updated_run is not None:
-                recovered.append(updated_run)
-        return recovered
-
-    async def append_event(
-        self,
-        *,
-        run_id: uuid.UUID,
-        event_type: str,
-        payload: dict[str, Any],
-        trace_id: Optional[uuid.UUID] = None,
-        observation_id: Optional[uuid.UUID] = None,
-        parent_observation_id: Optional[uuid.UUID] = None,
-        commit: bool = True,
-    ) -> AgentRunEvent:
-        """Append a new event to a run's event log and update its snapshot projection.
-
-        Increments the run's sequence counter, applies the agent's reducer to
-        update the snapshot projection, and publishes the event via Redis and
-        WebSocket. Snapshot writes to Redis are throttled for content_delta events.
-
-        Args:
-            run_id: Unique identifier of the run.
-            event_type: Type label for the event (e.g. "user_message_added",
-                "content_delta").
-            payload: Arbitrary event data.
-            trace_id: Optional tracing ID for observability.
-            observation_id: Optional observation ID for observability.
-            parent_observation_id: Optional parent observation ID for nesting.
-            commit: Whether to commit the transaction and publish to Redis/WS.
-
-        Returns:
-            The newly created AgentRunEvent.
-
-        Raises:
-            ValueError: If the run is not found.
-        """
-        run = await self.repo.get_run_for_update(run_id)
-        if not run:
-            raise ValueError(f"Run not found: {run_id}")
-
-        next_seq = int(run.last_seq) + 1
-        event = AgentRunEvent(
-            run_id=run.id,
-            seq=next_seq,
-            event_type=event_type,
-            payload=payload,
-            trace_id=trace_id,
-            observation_id=observation_id,
-            parent_observation_id=parent_observation_id,
-        )
-        self.db.add(event)
-        run.last_seq = next_seq
-        run.last_heartbeat_at = utc_now()
-
-        snapshot = await self.repo.get_snapshot(run.id)
-        if snapshot is None:
-            snapshot = AgentRunSnapshot(
-                run_id=run.id,
-                last_seq=0,
-                status=run.status.value,
-                projection={},
-            )
-            self.db.add(snapshot)
-
-        definition = agent_registry.find(run.agent_name)
-        if definition is not None:
-            snapshot.projection = definition.reducer(
-                snapshot.projection,
-                event_type=event_type,
-                payload=payload,
-                status=run.status.value,
-            )
-        snapshot.last_seq = next_seq
-        snapshot.status = run.status.value
-
-        await self.db.flush()
-        if commit:
-            await self.db.commit()
-            try:
-                # Throttle Redis snapshot writes for content_delta —
-                # always publish the event, but skip the heavier snapshot
-                # cache refresh if we published one within the last 500ms.
-                run_id_str = str(run.id)
-                now = utc_now().timestamp()
-                should_publish_snapshot = True
-                if event_type == "content_delta":
-                    last = _snapshot_last_published.get(run_id_str, 0.0)
-                    if (now - last) < _SNAPSHOT_THROTTLE_SECONDS:
-                        should_publish_snapshot = False
-
-                if should_publish_snapshot:
-                    await RedisClient.set_run_snapshot(
-                        run_id_str,
-                        _build_snapshot_dict(run_id_str, snapshot),
-                    )
-                    _snapshot_last_published[run_id_str] = now
-
-                await asyncio.gather(
-                    RedisClient.publish_run_event(
-                        run_id_str,
-                        {
-                            "run_id": run_id_str,
-                            "seq": event.seq,
-                            "event_type": event.event_type,
-                            "data": event.payload,
-                        },
-                    ),
-                    run_subscription_manager.broadcast_event(
-                        run_id_str,
-                        {
-                            "type": "event",
-                            "run_id": run_id_str,
-                            "seq": event.seq,
-                            "event_type": event.event_type,
-                            "data": event.payload,
-                            "trace_id": str(event.trace_id) if event.trace_id else None,
-                            "observation_id": str(event.observation_id) if event.observation_id else None,
-                            "parent_observation_id": (
-                                str(event.parent_observation_id) if event.parent_observation_id else None
-                            ),
-                            "created_at": event.created_at.isoformat() if event.created_at else None,
-                        },
-                    ),
-                )
-            except Exception as exc:
-                logger.warning(f"Failed to publish run event to Redis/WS | run_id={run_id} | error={exc}")
-        return event
diff --git a/backend/app/services/runner_factory.py b/backend/app/services/runner_factory.py
new file mode 100644
index 000000000..e1e361eaf
--- /dev/null
+++ b/backend/app/services/runner_factory.py
@@ -0,0 +1,13 @@
+"""Factory for creating ExecutionRunner with port adapters."""
+
+from __future__ import annotations
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.core.agent.cli_backends.execution_runner import ExecutionRunner
+from app.services.execution_event_adapter import ExecutionEventAdapter
+from app.services.execution_reader_adapter import ExecutionReaderAdapter
+
+
+def create_execution_runner(db: AsyncSession) -> ExecutionRunner:
+    return ExecutionRunner(ExecutionEventAdapter(db), ExecutionReaderAdapter(db))
diff --git a/backend/app/services/sandbox_manager.py b/backend/app/services/sandbox_manager.py
index aed8b0915..bb7fa254e 100644
--- a/backend/app/services/sandbox_manager.py
+++ b/backend/app/services/sandbox_manager.py
@@ -7,12 +7,11 @@
 from datetime import datetime, timezone
 from typing import Any, Dict, Optional, cast
 
-from fastapi import status
 from loguru import logger
 from sqlalchemy import CursorResult, delete, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import AppException
+from app.common.app_errors import ServiceUnavailableError
 from app.core.agent.backends.constants import (
     DEFAULT_USER_SANDBOX_AUTO_REMOVE,
     DEFAULT_USER_SANDBOX_CPU_LIMIT,
@@ -240,10 +239,7 @@ async def _ensure_sandbox_running_locked(self, user_id: str) -> PydanticSandboxA
         except Exception as e:
             logger.error(f"Failed to start sandbox for user {user_id}: {e}")
             await self._update_status(sandbox_record.id, InstanceStatus.FAILED, error_message=str(e))
-            raise AppException(
-                status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                message=_classify_sandbox_error(e),
-            )
+            raise ServiceUnavailableError(message=_classify_sandbox_error(e))
 
     @staticmethod
     def _force_remove_container(container_id: str) -> None:
diff --git a/backend/app/services/session_service.py b/backend/app/services/session_service.py
deleted file mode 100644
index 3a6094cb5..000000000
--- a/backend/app/services/session_service.py
+++ /dev/null
@@ -1,201 +0,0 @@
-"""Session management service."""
-
-import uuid
-from pathlib import Path
-from typing import Any, Dict, List, Optional
-
-from loguru import logger
-from sqlalchemy import func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.core.ai_adapter import AgentBridge
-from app.core.settings import settings
-from app.models import Conversation, Message
-from app.schemas.common import SessionCreate, SessionResponse
-from app.utils.datetime import utc_now
-
-
-class SessionService:
-    """Service for managing user sessions."""
-
-    def __init__(self, db: AsyncSession):
-        self.db = db
-
-    async def _get_conversation(
-        self, session_id: str, user_id=None, active_only: bool = True
-    ) -> Optional[Conversation]:
-        where_clauses = [Conversation.thread_id == session_id]
-        if user_id is not None:
-            where_clauses.append(Conversation.user_id == user_id)
-        if active_only:
-            where_clauses.append(Conversation.is_active == 1)
-        result = await self.db.execute(select(Conversation).where(*where_clauses))
-        return result.scalar_one_or_none()
-
-    async def create_session(self, session_data: SessionCreate, user_id) -> SessionResponse:
-        """Create a new session."""
-        session_id = str(uuid.uuid4())
-
-        # Create workspace directory
-        workspace_root = Path(settings.WORKSPACE_ROOT)
-        workspace_path = session_data.workspace_path or str(workspace_root / session_id)
-        workspace = Path(workspace_path)
-        workspace.mkdir(parents=True, exist_ok=True)
-
-        # Create database record
-        conversation = Conversation(
-            thread_id=session_id,
-            user_id=user_id,
-            title=session_data.title or "New Session",
-            meta_data={"workspace_path": str(workspace)},
-            is_active=1,
-        )
-
-        self.db.add(conversation)
-        await self.db.commit()
-        await self.db.refresh(conversation)
-
-        return await self._to_response(conversation)
-
-    async def get_session(self, session_id: str) -> Optional[SessionResponse]:
-        """Get session by ID."""
-        conversation = await self._get_conversation(session_id, user_id=None, active_only=True)
-        if not conversation:
-            return None
-
-        return await self._to_response(conversation)
-
-    async def get_session_for_user(self, session_id: str, user_id) -> Optional[SessionResponse]:
-        """Get a session by ID, ensuring it belongs to the given user."""
-        conversation = await self._get_conversation(session_id, user_id=user_id, active_only=True)
-        if not conversation:
-            return None
-        return await self._to_response(conversation)
-
-    async def get_user_sessions(self, user_id) -> List[SessionResponse]:
-        """Get all sessions for a user."""
-        result = await self.db.execute(
-            select(Conversation)
-            .where(Conversation.user_id == user_id, Conversation.is_active == 1)
-            .order_by(Conversation.updated_at.desc())
-        )
-        conversations = result.scalars().all()
-        responses: List[SessionResponse] = []
-        for conv in conversations:
-            responses.append(await self._to_response(conv))
-        return responses
-
-    async def update_session_title(self, session_id: str, title: str, user_id=None) -> Optional[SessionResponse]:
-        """Update session title."""
-        conversation = await self._get_conversation(session_id, user_id=user_id, active_only=False)
-
-        if not conversation:
-            return None
-
-        conversation.title = title
-        conversation.updated_at = utc_now()
-        await self.db.commit()
-        await self.db.refresh(conversation)
-
-        return await self._to_response(conversation)
-
-    async def delete_session(self, session_id: str, user_id=None) -> bool:
-        """Delete a session."""
-        conversation = await self._get_conversation(session_id, user_id=user_id, active_only=False)
-
-        if not conversation:
-            return False
-
-        # Mark as inactive (soft delete)
-        conversation.is_active = 0
-        conversation.updated_at = utc_now()
-        await self.db.commit()
-
-        # Optionally clean up files
-        try:
-            workspace_path = (conversation.meta_data or {}).get("workspace_path")
-            if workspace_path:
-                workspace = Path(workspace_path)
-            else:
-                workspace = Path(settings.WORKSPACE_ROOT) / session_id
-            if workspace.exists() and workspace.is_dir():
-                import shutil
-
-                shutil.rmtree(workspace)
-        except Exception:
-            logger.debug("Workspace directory cleanup failed for session %s", session_id, exc_info=True)
-
-        return True
-
-    async def add_message(
-        self,
-        session_id: str,
-        content: str,
-        role: str,
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> Message:
-        """Add a message to the session."""
-        message = Message(
-            thread_id=session_id,
-            content=content,
-            role=role,
-            meta_data=metadata or {},
-        )
-
-        self.db.add(message)
-
-        # Update session timestamp
-        result = await self.db.execute(select(Conversation).where(Conversation.thread_id == session_id))
-        conversation = result.scalar_one_or_none()
-        if conversation:
-            conversation.updated_at = utc_now()
-
-        await self.db.commit()
-        await self.db.refresh(message)
-
-        return message
-
-    async def get_session_messages(self, session_id: str, limit: int = 100, user_id=None) -> List[Message]:
-        """Get messages for a session."""
-        if user_id is not None:
-            conv = await self._get_conversation(session_id, user_id=user_id, active_only=False)
-            if not conv:
-                return []
-        result = await self.db.execute(
-            select(Message).where(Message.thread_id == session_id).order_by(Message.created_at.desc()).limit(limit)
-        )
-        return list(result.scalars().all())
-
-    async def get_ai_adapter(self, session_id: str, user_id=None) -> Optional[AgentBridge]:
-        """Get AI adapter for a session (lightweight, no CLI coupling)."""
-        conversation = await self._get_conversation(session_id, user_id=user_id, active_only=True)
-        if not conversation:
-            return None
-        workspace_path = (conversation.meta_data or {}).get("workspace_path")
-        if not workspace_path:
-            workspace_path = str(Path(settings.WORKSPACE_ROOT) / session_id)
-        # Construct adapter using the decoupled AgentBridge (engine may be injected elsewhere)
-        return AgentBridge(session_id, workspace_path)
-
-    async def _to_response(self, conversation: Conversation) -> SessionResponse:
-        """Convert database model to response schema."""
-        count_result = await self.db.execute(
-            select(func.count(Message.id)).where(Message.thread_id == conversation.thread_id)
-        )
-        message_count = count_result.scalar() or 0
-        workspace_path = (conversation.meta_data or {}).get("workspace_path") or str(
-            Path(settings.WORKSPACE_ROOT) / conversation.thread_id
-        )
-
-        return SessionResponse(
-            success=True,
-            code=200,
-            msg="Success",
-            session_id=conversation.thread_id,
-            title=conversation.title,
-            workspace_path=workspace_path,
-            is_active=conversation.is_active == 1,
-            created_at=conversation.created_at,
-            updated_at=conversation.updated_at,
-            message_count=message_count,
-        )
diff --git a/backend/app/services/skill_collaborator_service.py b/backend/app/services/skill_collaborator_service.py
index 2d8a69ec0..1b87ec5b7 100644
--- a/backend/app/services/skill_collaborator_service.py
+++ b/backend/app/services/skill_collaborator_service.py
@@ -5,7 +5,7 @@
 import uuid
 from typing import List
 
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.common.skill_permissions import check_skill_access
 from app.models.skill import Skill
 from app.models.skill_collaborator import CollaboratorRole, SkillCollaborator
@@ -56,11 +56,17 @@ async def add_collaborator(
         )
 
         if target_user_id == skill.owner_id:
-            raise BadRequestException("Cannot add the owner as a collaborator")
+            raise InvalidRequestError(
+                "Cannot add the owner as a collaborator", code="SKILL_OWNER_COLLABORATOR_FORBIDDEN"
+            )
 
         existing = await self.repo.get_by_skill_and_user(skill_id, target_user_id)
         if existing:
-            raise BadRequestException("User is already a collaborator")
+            raise InvalidRequestError(
+                "User is already a collaborator",
+                code="SKILL_COLLABORATOR_ALREADY_EXISTS",
+                data={"user_id": target_user_id},
+            )
 
         collab = SkillCollaborator(
             skill_id=skill_id,
@@ -92,7 +98,11 @@ async def update_collaborator_role(
 
         collab = await self.repo.get_by_skill_and_user(skill_id, target_user_id)
         if not collab:
-            raise NotFoundException("Collaborator not found")
+            raise NotFoundError(
+                "Collaborator not found",
+                code="SKILL_COLLABORATOR_NOT_FOUND",
+                data={"user_id": target_user_id},
+            )
 
         collab.role = new_role
         await self.db.commit()
@@ -117,7 +127,11 @@ async def remove_collaborator(
 
         deleted = await self.repo.delete_by_skill_and_user(skill_id, target_user_id)
         if not deleted:
-            raise NotFoundException("Collaborator not found")
+            raise NotFoundError(
+                "Collaborator not found",
+                code="SKILL_COLLABORATOR_NOT_FOUND",
+                data={"user_id": target_user_id},
+            )
         await self.db.commit()
 
     async def transfer_ownership(
@@ -130,12 +144,16 @@ async def transfer_ownership(
         skill = await self._get_skill_or_404(skill_id)
 
         if skill.owner_id != current_user_id:
-            raise ForbiddenException("Only the owner can transfer ownership")
+            raise AccessDeniedError("Only the owner can transfer ownership", code="SKILL_OWNER_TRANSFER_FORBIDDEN")
 
         # Check new owner doesn't have a skill with the same name
         existing = await self.skill_repo.get_by_name_and_owner(skill.name, new_owner_id)
         if existing:
-            raise BadRequestException(f"New owner already has a skill named '{skill.name}'")
+            raise InvalidRequestError(
+                f"New owner already has a skill named '{skill.name}'",
+                code="SKILL_NAME_ALREADY_EXISTS",
+                data={"name": skill.name, "owner_id": new_owner_id},
+            )
 
         # Remove new owner from collaborators if present
         await self.repo.delete_by_skill_and_user(skill_id, new_owner_id)
@@ -161,5 +179,5 @@ async def transfer_ownership(
     async def _get_skill_or_404(self, skill_id: uuid.UUID) -> Skill:
         skill = await self.skill_repo.get(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
         return skill  # type: ignore[return-value,no-any-return]
diff --git a/backend/app/services/skill_service.py b/backend/app/services/skill_service.py
index 68d44b5c6..658cc4913 100644
--- a/backend/app/services/skill_service.py
+++ b/backend/app/services/skill_service.py
@@ -10,7 +10,7 @@
 
 from loguru import logger
 
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.common.skill_permissions import check_skill_access
 from app.core.skill.validators import (
     truncate_compatibility,
@@ -40,6 +40,15 @@ def __init__(self, db):
         self.repo = SkillRepository(db)
         self.file_repo = SkillFileRepository(db)
 
+    def _invalid_import_files_error(self, invalid_files: List[str]) -> InvalidRequestError:
+        invalid_list = "\n".join(f"  - {file_name}" for file_name in invalid_files)
+        return InvalidRequestError(
+            f"The following files cannot be imported (binary files or system files):\n{invalid_list}\n\n"
+            f"Skill import only supports text files (.py, .md, .json, .yaml, etc.)",
+            code="SKILL_IMPORT_FILES_INVALID",
+            data={"files": invalid_files},
+        )
+
     async def list_skills(
         self,
         current_user_id: Optional[str] = None,
@@ -62,7 +71,7 @@ async def get_skill(
         """Get Skill details"""
         skill = await self.repo.get_with_files(skill_id)
         if not skill or not isinstance(skill, Skill):
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
 
         # Permission check: collaborator-aware
         if current_user_id:
@@ -73,7 +82,7 @@ async def get_skill(
                 CollaboratorRole.viewer,
             )
         elif not skill.is_public:
-            raise ForbiddenException("You don't have permission to access this skill")
+            raise AccessDeniedError("You don't have permission to access this skill", code="SKILL_ACCESS_DENIED")
 
         # Type assertion: get_with_files returns Optional[Skill], we've already checked it's not None
         skill = await self._attach_latest_version(skill)
@@ -183,7 +192,11 @@ async def create_skill(
         is_valid, error = validate_skill_name(name)
         if not is_valid:
             logger.warning(f"Invalid skill name rejected: {name!r} — {error}")
-            raise BadRequestException(f"Invalid skill name: {error}")
+            raise InvalidRequestError(
+                f"Invalid skill name: {error}",
+                code="SKILL_NAME_INVALID",
+                data={"validation_error": error, "name": name},
+            )
 
         # Validate and truncate description per Agent Skills specification
         is_valid, error = validate_skill_description(description)
@@ -203,7 +216,11 @@ async def create_skill(
         # Check if Skill with same name exists (same owner)
         existing = await self.repo.get_by_name_and_owner(name, owner_id)
         if existing:
-            raise BadRequestException(f"Skill name '{name}' already exists for this owner")
+            raise InvalidRequestError(
+                f"Skill name '{name}' already exists for this owner",
+                code="SKILL_NAME_ALREADY_EXISTS",
+                data={"name": name},
+            )
 
         skill = Skill(
             name=name,
@@ -268,11 +285,7 @@ async def create_skill(
 
             # If there are invalid files, raise an error
             if invalid_files:
-                invalid_list = "\n".join(f"  - {f}" for f in invalid_files)
-                raise BadRequestException(
-                    f"The following files cannot be imported (binary files or system files):\n{invalid_list}\n\n"
-                    f"Skill import only supports text files (.py, .md, .json, .yaml, etc.)"
-                )
+                raise self._invalid_import_files_error(invalid_files)
 
         await self.db.commit()
         await self.db.refresh(skill)
@@ -305,7 +318,7 @@ async def update_skill(
         """
         skill = await self.repo.get(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
 
         # Permission check: collaborator-aware (editor role)
         await check_skill_access(
@@ -358,10 +371,18 @@ async def update_skill(
             is_valid, error = validate_skill_name(name)
             if not is_valid:
                 logger.warning(f"Invalid skill name rejected: {name!r} — {error}")
-                raise BadRequestException(f"Invalid skill name: {error}")
+                raise InvalidRequestError(
+                    f"Invalid skill name: {error}",
+                    code="SKILL_NAME_INVALID",
+                    data={"validation_error": error, "name": name},
+                )
             existing = await self.repo.get_by_name_and_owner(name, skill.owner_id)
             if existing:
-                raise BadRequestException(f"Skill name '{name}' already exists for this owner")
+                raise InvalidRequestError(
+                    f"Skill name '{name}' already exists for this owner",
+                    code="SKILL_NAME_ALREADY_EXISTS",
+                    data={"name": name},
+                )
             skill.name = name
 
         # Validate and update description if provided
@@ -451,11 +472,7 @@ async def update_skill(
 
             # If there are invalid files, raise an error
             if invalid_files:
-                invalid_list = "\n".join(f"  - {f}" for f in invalid_files)
-                raise BadRequestException(
-                    f"The following files cannot be imported (binary files or system files):\n{invalid_list}\n\n"
-                    f"Skill import only supports text files (.py, .md, .json, .yaml, etc.)"
-                )
+                raise self._invalid_import_files_error(invalid_files)
 
         await self.db.commit()
         await self.db.refresh(skill)
@@ -470,11 +487,11 @@ async def delete_skill(
         """Delete Skill"""
         skill = await self.repo.get(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
 
         # Permission check: Only owner can delete
         if skill.owner_id != current_user_id:
-            raise ForbiddenException("Only the owner can delete a skill")
+            raise AccessDeniedError("Only the owner can delete a skill", code="SKILL_DELETE_FORBIDDEN")
 
         # Delete associated files
         await self.file_repo.delete_by_skill(skill_id)
@@ -504,7 +521,7 @@ async def add_file(
         """Add file to Skill"""
         skill = await self.repo.get(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
 
         # Permission check: collaborator-aware (editor role)
         await check_skill_access(
@@ -516,14 +533,20 @@ async def add_file(
 
         # Check if it's a system file
         if is_system_file(path) or is_system_file(file_name):
-            raise BadRequestException(f"File '{path}' is a system file and cannot be imported")
+            raise InvalidRequestError(
+                f"File '{path}' is a system file and cannot be imported",
+                code="SKILL_SYSTEM_FILE_IMPORT_FORBIDDEN",
+                data={"path": path},
+            )
 
         # Validate content if provided
         if content is not None:
             is_valid, error_msg = is_valid_text_content(content)
             if not is_valid:
-                raise BadRequestException(
-                    f"File '{path}' {error_msg}. Skill import only supports text files (.py, .md, .json, .yaml, etc.)"
+                raise InvalidRequestError(
+                    f"File '{path}' {error_msg}. Skill import only supports text files (.py, .md, .json, .yaml, etc.)",
+                    code="SKILL_FILE_CONTENT_INVALID",
+                    data={"path": path},
                 )
 
         # Log warning for uncommon file extensions (but don't reject)
@@ -560,11 +583,11 @@ async def delete_file(
         """Delete file"""
         file_obj = await self.file_repo.get(file_id)
         if not file_obj:
-            raise NotFoundException("Skill file not found")
+            raise NotFoundError("Skill file not found", code="SKILL_FILE_NOT_FOUND", data={"file_id": str(file_id)})
 
         skill = await self.repo.get(file_obj.skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(file_obj.skill_id)})
 
         # Permission check: collaborator-aware (editor role)
         await check_skill_access(
@@ -588,11 +611,11 @@ async def update_file(
         """Update file content"""
         file_obj = await self.file_repo.get(file_id)
         if not file_obj:
-            raise NotFoundException("Skill file not found")
+            raise NotFoundError("Skill file not found", code="SKILL_FILE_NOT_FOUND", data={"file_id": str(file_id)})
 
         skill = await self.repo.get(file_obj.skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(file_obj.skill_id)})
 
         # Permission check: collaborator-aware (editor role)
         await check_skill_access(
@@ -605,7 +628,11 @@ async def update_file(
         # Check if it's a system file (if path is being updated)
         if path is not None:
             if is_system_file(path) or is_system_file(file_obj.file_name):
-                raise BadRequestException(f"File '{path}' is a system file and cannot be imported")
+                raise InvalidRequestError(
+                    f"File '{path}' is a system file and cannot be imported",
+                    code="SKILL_SYSTEM_FILE_IMPORT_FORBIDDEN",
+                    data={"path": path},
+                )
 
             # Log warning for uncommon file extensions (but don't reject)
             is_common, warning = validate_file_extension(path)
@@ -616,8 +643,10 @@ async def update_file(
             # Validate content
             is_valid, error_msg = is_valid_text_content(content)
             if not is_valid:
-                raise BadRequestException(
-                    f"File '{file_obj.path}' {error_msg}. Skill import only supports text files (.py, .md, .json, .yaml, etc.)"
+                raise InvalidRequestError(
+                    f"File '{file_obj.path}' {error_msg}. Skill import only supports text files (.py, .md, .json, .yaml, etc.)",
+                    code="SKILL_FILE_CONTENT_INVALID",
+                    data={"path": file_obj.path},
                 )
 
             file_obj.content = content
diff --git a/backend/app/services/skill_version_service.py b/backend/app/services/skill_version_service.py
index 6aaf27a59..e0a92e9b2 100644
--- a/backend/app/services/skill_version_service.py
+++ b/backend/app/services/skill_version_service.py
@@ -8,7 +8,7 @@
 
 import semver
 
-from app.common.exceptions import BadRequestException, NotFoundException
+from app.common.app_errors import InvalidRequestError, NotFoundError
 from app.common.skill_permissions import check_skill_access
 from app.models.skill import Skill, SkillFile
 from app.models.skill_collaborator import CollaboratorRole
@@ -51,17 +51,27 @@ async def publish_version(
         try:
             new_ver = semver.Version.parse(version_str)
         except ValueError:
-            raise BadRequestException(f"Invalid version format: '{version_str}'. Must be MAJOR.MINOR.PATCH")
+            raise InvalidRequestError(
+                f"Invalid version format: '{version_str}'. Must be MAJOR.MINOR.PATCH",
+                code="SKILL_VERSION_FORMAT_INVALID",
+                data={"version": version_str},
+            )
         # Reject pre-release / build metadata
         if new_ver.prerelease or new_ver.build:
-            raise BadRequestException("Pre-release and build metadata are not supported")
+            raise InvalidRequestError(
+                "Pre-release and build metadata are not supported", code="SKILL_VERSION_PRERELEASE_UNSUPPORTED"
+            )
 
         # Check > highest existing
         highest_str = await self.repo.get_highest_version_str(skill_id)
         if highest_str:
             highest = semver.Version.parse(highest_str)
             if new_ver <= highest:
-                raise BadRequestException(f"Version {version_str} must be greater than current highest {highest_str}")
+                raise InvalidRequestError(
+                    f"Version {version_str} must be greater than current highest {highest_str}",
+                    code="SKILL_VERSION_NOT_GREATER_THAN_LATEST",
+                    data={"version": version_str, "latest_version": highest_str},
+                )
 
         # Snapshot
         sv = SkillVersion(
@@ -141,7 +151,11 @@ async def get_version(
         )
         sv = await self.repo.get_by_version(skill_id, version_str)
         if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
+            raise NotFoundError(
+                "Skill version not found",
+                code="SKILL_VERSION_NOT_FOUND",
+                data={"skill_id": str(skill_id), "version": version_str},
+            )
         return sv  # type: ignore[return-value,no-any-return]
 
     async def get_latest_version(
@@ -163,7 +177,9 @@ async def get_latest_version(
         )
         sv = await self.repo.get_latest(skill_id)
         if not sv:
-            raise NotFoundException("No published versions found")
+            raise NotFoundError(
+                "No published versions found", code="SKILL_VERSION_NOT_FOUND", data={"skill_id": str(skill_id)}
+            )
         return sv  # type: ignore[return-value,no-any-return]
 
     async def delete_version(
@@ -186,7 +202,11 @@ async def delete_version(
         )
         sv = await self.repo.get_by_version(skill_id, version_str)
         if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
+            raise NotFoundError(
+                "Skill version not found",
+                code="SKILL_VERSION_NOT_FOUND",
+                data={"skill_id": str(skill_id), "version": version_str},
+            )
         await self.db.delete(sv)
         await self.db.commit()
 
@@ -210,7 +230,11 @@ async def restore_draft(
         )
         sv = await self.repo.get_by_version(skill_id, version_str)
         if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
+            raise NotFoundError(
+                "Skill version not found",
+                code="SKILL_VERSION_NOT_FOUND",
+                data={"skill_id": str(skill_id), "version": version_str},
+            )
 
         # Overwrite draft
         skill.name = sv.skill_name
@@ -245,11 +269,11 @@ async def restore_draft(
     async def _get_skill_or_404(self, skill_id: uuid.UUID) -> Skill:
         skill = await self.skill_repo.get(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
         return skill  # type: ignore[return-value,no-any-return]
 
     async def _get_skill_with_files_or_404(self, skill_id: uuid.UUID) -> Skill:
         skill = await self.skill_repo.get_with_files(skill_id)
         if not skill:
-            raise NotFoundException("Skill not found")
+            raise NotFoundError("Skill not found", code="SKILL_NOT_FOUND", data={"skill_id": str(skill_id)})
         return skill  # type: ignore[return-value,no-any-return]
diff --git a/backend/app/services/task_activity_service.py b/backend/app/services/task_activity_service.py
new file mode 100644
index 000000000..b1ad64cc1
--- /dev/null
+++ b/backend/app/services/task_activity_service.py
@@ -0,0 +1,272 @@
+"""
+Task activity service — create/read/update/delete.
+"""
+
+from __future__ import annotations
+
+import uuid
+from datetime import datetime
+from typing import Optional
+
+from loguru import logger
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError
+from app.models.task import Task, TaskStatus
+from app.models.task_activity import ActivityAuthorType, ActivityType, TaskActivity
+from app.repositories.task import TaskRepository
+from app.repositories.task_activity import TaskActivityRepository
+
+
+class TaskActivityService:
+    """Manages task activities."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self.repo = TaskActivityRepository(db)
+        self.task_repo = TaskRepository(db)
+
+    async def create_activity(
+        self,
+        *,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        author_type: ActivityAuthorType,
+        author_id: str,
+        content: str,
+        activity_type: ActivityType = ActivityType.COMMENT,
+        parent_activity_id: Optional[uuid.UUID] = None,
+    ) -> tuple[TaskActivity, Task, bool, list[uuid.UUID]]:
+        """Returns (activity, task, should_dispatch_agent, mentioned_agent_ids)."""
+        task = await self.task_repo.get_by_id_and_workspace(task_id, workspace_id)
+        if not task:
+            raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+
+        if parent_activity_id is not None:
+            parent = await self.repo.get(parent_activity_id)
+            if parent and parent.parent_activity_id is not None:
+                parent_activity_id = parent.parent_activity_id
+
+        activity = TaskActivity(
+            task_id=task_id,
+            workspace_id=workspace_id,
+            author_type=author_type,
+            author_id=author_id,
+            content=content,
+            type=activity_type,
+            parent_activity_id=parent_activity_id,
+        )
+        self.db.add(activity)
+        await self.db.commit()
+        await self.db.refresh(activity)
+
+        should_dispatch = False
+        mentioned_agent_ids: list[uuid.UUID] = []
+
+        if author_type == ActivityAuthorType.MEMBER and activity_type == ActivityType.COMMENT:
+            should_dispatch = self._should_enqueue_on_activity(task)
+
+            from app.utils.mentions import agent_mentions
+
+            mentions = agent_mentions(content)
+            seen: set[uuid.UUID] = set()
+            for m in mentions:
+                if m.id != task.agent_id and m.id not in seen:
+                    seen.add(m.id)
+                    mentioned_agent_ids.append(m.id)
+
+        return activity, task, should_dispatch, mentioned_agent_ids
+
+    async def list_activities(
+        self,
+        *,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        cursor: Optional[str] = None,
+        limit: int = 50,
+    ) -> tuple[list[TaskActivity], bool, Optional[str]]:
+        """Return (activities, has_more, next_cursor)."""
+        task = await self.task_repo.get_by_id_and_workspace(task_id, workspace_id)
+        if not task:
+            raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+
+        cursor_dt = None
+        if cursor:
+            cursor_dt = datetime.fromisoformat(cursor)
+
+        activities = list(await self.repo.list_by_task(task_id, cursor=cursor_dt, limit=limit + 1, order_asc=True))
+
+        has_more = len(activities) > limit
+        if has_more:
+            activities = activities[:limit]
+
+        next_cursor = activities[-1].created_at.isoformat() if has_more and activities else None
+        return activities, has_more, next_cursor
+
+    async def _get_owned_activity(
+        self,
+        activity_id: uuid.UUID,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        author_id: str,
+    ) -> Optional[TaskActivity]:
+        task = await self.task_repo.get_by_id_and_workspace(task_id, workspace_id)
+        if not task:
+            return None
+        activity = await self.repo.get_by_id_and_task(activity_id, task_id)
+        if not activity:
+            return None
+        if activity.author_id != author_id:
+            raise PermissionError("Only the author can modify this activity")
+        return activity
+
+    async def update_activity(
+        self,
+        *,
+        activity_id: uuid.UUID,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        author_id: str,
+        content: str,
+    ) -> Optional[TaskActivity]:
+        activity = await self._get_owned_activity(activity_id, task_id, workspace_id, author_id)
+        if not activity:
+            return None
+        activity.content = content
+        await self.db.commit()
+        await self.db.refresh(activity)
+        return activity
+
+    async def delete_activity(
+        self,
+        *,
+        activity_id: uuid.UUID,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        author_id: str,
+    ) -> bool:
+        activity = await self._get_owned_activity(activity_id, task_id, workspace_id, author_id)
+        if not activity:
+            return False
+        await self.db.delete(activity)
+        await self.db.commit()
+        return True
+
+    @staticmethod
+    def _should_enqueue_on_activity(task: Task) -> bool:
+        if task.agent_id is None:
+            return False
+        if task.status in {TaskStatus.DONE, TaskStatus.CANCELLED, TaskStatus.BACKLOG}:
+            return False
+        if task.latest_run_id is not None and task.status == TaskStatus.IN_PROGRESS:
+            return False
+        return True
+
+    async def post_run_activity(
+        self,
+        *,
+        run,
+        result_status: str,
+        result_output: str = "",
+        error_message: str = "",
+    ) -> Optional[TaskActivity]:
+        """Auto-post agent activity after run completion."""
+        if not run.task_id:
+            return None
+
+        agent_id = str(run.created_by) if run.created_by else None
+        if not agent_id:
+            return None
+
+        if result_status == "succeeded":
+            if run.started_at:
+                already = await self.repo.has_agent_posted_since(run.task_id, agent_id, run.started_at)
+                if already:
+                    return None
+            content = result_output.strip() if result_output else "Run completed."
+            activity_type = ActivityType.PROGRESS_UPDATE
+        elif result_status == "failed":
+            content = error_message.strip() if error_message else "Run failed."
+            activity_type = ActivityType.SYSTEM
+        else:
+            return None
+
+        # Need workspace_id — fetch task
+        from sqlalchemy import select
+
+        from app.models.task import Task
+
+        result = await self.db.execute(select(Task).where(Task.id == run.task_id))
+        task = result.scalar_one_or_none()
+        if not task:
+            return None
+
+        activity = TaskActivity(
+            task_id=run.task_id,
+            workspace_id=task.workspace_id,
+            author_type=ActivityAuthorType.AGENT,
+            author_id=agent_id,
+            content=content[:5000],
+            type=activity_type,
+            parent_activity_id=None,
+        )
+        self.db.add(activity)
+        await self.db.commit()
+        await self.db.refresh(activity)
+        logger.info(f"Auto-posted {activity_type.value} activity {activity.id} for run {run.id}")
+        return activity
+
+    async def post_execution_activity(
+        self,
+        *,
+        execution,
+        task_id: uuid.UUID,
+        result_status: str,
+        result_output: str = "",
+        error_message: str = "",
+    ) -> Optional[TaskActivity]:
+        """Post an activity after execution completion."""
+        agent_id = str(execution.agent_id) if hasattr(execution, "agent_id") and execution.agent_id else None
+        if not agent_id:
+            # Try to get from created_by
+            agent_id = str(execution.created_by) if hasattr(execution, "created_by") and execution.created_by else None
+        if not agent_id:
+            return None
+
+        if result_status == "succeeded":
+            if hasattr(execution, "started_at") and execution.started_at:
+                already = await self.repo.has_agent_posted_since(task_id, agent_id, execution.started_at)
+                if already:
+                    return None
+            content = result_output.strip() if result_output else "Execution completed."
+            activity_type = ActivityType.PROGRESS_UPDATE
+        elif result_status == "failed":
+            content = error_message.strip() if error_message else "Execution failed."
+            activity_type = ActivityType.SYSTEM
+        else:
+            return None
+
+        # Need workspace_id — fetch task
+        from sqlalchemy import select
+
+        from app.models.task import Task
+
+        result = await self.db.execute(select(Task).where(Task.id == task_id))
+        task = result.scalar_one_or_none()
+        if not task:
+            return None
+
+        activity = TaskActivity(
+            task_id=task_id,
+            workspace_id=task.workspace_id,
+            author_type=ActivityAuthorType.AGENT,
+            author_id=agent_id,
+            content=content[:5000],
+            type=activity_type,
+            parent_activity_id=None,
+        )
+        self.db.add(activity)
+        await self.db.commit()
+        await self.db.refresh(activity)
+        logger.info(f"Auto-posted {activity_type.value} activity {activity.id} for execution {execution.id}")
+        return activity
diff --git a/backend/app/services/task_service.py b/backend/app/services/task_service.py
new file mode 100644
index 000000000..1863c1401
--- /dev/null
+++ b/backend/app/services/task_service.py
@@ -0,0 +1,174 @@
+"""
+Task service layer — pure CRUD + status machine.
+
+Execution dispatch logic lives in ExecutionLifecycleService.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any, Optional
+
+from loguru import logger
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import InvalidRequestError, NotFoundError
+from app.core.state_machines.engine import InvalidTransition
+from app.core.state_machines.transitions import transition_task
+from app.models.task import Task, TaskPriority, TaskStatus
+from app.repositories.task import TaskRepository
+
+
+class TaskService:
+    """Manages task CRUD and status transitions."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self.repo = TaskRepository(db)
+
+    async def create_task(
+        self,
+        *,
+        workspace_id: uuid.UUID,
+        creator_id: str,
+        title: str,
+        description: Optional[str] = None,
+        goal: Optional[str] = None,
+        priority: TaskPriority = TaskPriority.NONE,
+        agent_id: Optional[uuid.UUID] = None,
+        parent_task_id: Optional[uuid.UUID] = None,
+        tags: Optional[list] = None,
+        position: float = 0.0,
+        auto_approve: bool = False,
+    ) -> Task:
+        task = Task(
+            workspace_id=workspace_id,
+            creator_id=creator_id,
+            title=title,
+            description=description,
+            goal=goal,
+            priority=priority,
+            status=TaskStatus.BACKLOG,
+            agent_id=agent_id,
+            parent_task_id=parent_task_id,
+            tags=tags,
+            position=position,
+            auto_approve=auto_approve,
+        )
+        self.db.add(task)
+        await self.db.commit()
+        await self.db.refresh(task)
+        logger.info(f"Created task: {task.id} ({title})")
+        return task
+
+    async def get_task(self, task_id: uuid.UUID, workspace_id: uuid.UUID) -> Optional[Task]:
+        return await self.repo.get_by_id_and_workspace(task_id, workspace_id)
+
+    async def list_tasks(
+        self,
+        *,
+        workspace_id: uuid.UUID,
+        status: Optional[str] = None,
+        creator_id: Optional[str] = None,
+        agent_id: Optional[uuid.UUID] = None,
+        parent_task_id: Optional[uuid.UUID] = None,
+        limit: int = 50,
+    ) -> list[Task]:
+        return list(
+            await self.repo.list_by_workspace(
+                workspace_id=workspace_id,
+                status=status,
+                creator_id=creator_id,
+                agent_id=agent_id,
+                parent_task_id=parent_task_id,
+                limit=limit,
+            )
+        )
+
+    @classmethod
+    def get_transitions(cls) -> dict[str, list[str]]:
+        from app.core.state_machines.definitions import TASK_STATES
+
+        return {status: sorted(targets) for status, targets in TASK_STATES.items()}
+
+    async def update_task(
+        self,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        **kwargs: Any,
+    ) -> Optional[Task]:
+        task = await self.repo.get_by_id_and_workspace(task_id, workspace_id)
+        if not task:
+            return None
+
+        new_status = kwargs.get("status")
+        if new_status is not None:
+            try:
+                new_status = TaskStatus(new_status)
+            except ValueError:
+                raise InvalidRequestError(
+                    f"Invalid status: {new_status}",
+                    code="TASK_STATUS_INVALID",
+                    data={"status": str(new_status)},
+                )
+
+            if new_status != task.status:
+                try:
+                    await transition_task(task, new_status, self.db)
+                except InvalidTransition:
+                    from_status = task.status.value if hasattr(task.status, "value") else str(task.status)
+                    to_status = new_status.value if hasattr(new_status, "value") else str(new_status)
+                    raise InvalidRequestError(
+                        f"Cannot transition from '{task.status}' to '{new_status}'",
+                        code="TASK_STATUS_TRANSITION_INVALID",
+                        data={"from_status": from_status, "to_status": to_status},
+                    )
+
+        allowed = {
+            "title",
+            "description",
+            "goal",
+            "priority",
+            "agent_id",
+            "parent_task_id",
+            "due_date",
+            "position",
+            "tags",
+            "auto_approve",
+        }
+        for key, value in kwargs.items():
+            if key in allowed:
+                setattr(task, key, value)
+        await self.db.commit()
+        await self.db.refresh(task)
+        return task
+
+    async def cancel_task(self, task: Task) -> None:
+        """Cancel a task that has no active run."""
+        await transition_task(task, "cancelled", self.db)
+        await self.db.commit()
+
+    async def assign_to_agent(
+        self,
+        *,
+        task_id: uuid.UUID,
+        workspace_id: uuid.UUID,
+        agent_id: uuid.UUID,
+    ) -> Task:
+        """Assign a task to an agent."""
+        from app.core.state_machines.transitions import transition_task
+
+        task = await self.repo.get_for_update(task_id, workspace_id)
+        if not task:
+            raise NotFoundError("Task not found", code="TASK_NOT_FOUND", data={"task_id": str(task_id)})
+
+        task.agent_id = agent_id
+        # Only auto-transition to IN_PROGRESS from dispatchable states.
+        # Tasks in DONE or CANCELLED must be moved back to BACKLOG explicitly
+        # before they can be reassigned and re-dispatched.
+        if task.status in (TaskStatus.BACKLOG, TaskStatus.TODO):
+            await transition_task(task, "in_progress", self.db)
+        await self.db.commit()
+        await self.db.refresh(task)
+        logger.info(f"Assigned task {task_id} to agent {agent_id}")
+        return task
diff --git a/backend/app/services/thread_service.py b/backend/app/services/thread_service.py
new file mode 100644
index 000000000..8c2cb66f7
--- /dev/null
+++ b/backend/app/services/thread_service.py
@@ -0,0 +1,145 @@
+"""
+ThreadService — manages Thread lifecycle.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import List
+
+from loguru import logger
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from app.common.app_errors import NotFoundError
+from app.models.thread import Thread
+from app.repositories.thread import ThreadRepository
+from app.schemas.thread import CreateThreadRequest, UpdateThreadRequest
+
+
+class ThreadService:
+    """Manages Thread entities."""
+
+    def __init__(self, db: AsyncSession):
+        self.db = db
+        self.thread_repo = ThreadRepository(db)
+
+    # ---- Thread CRUD ----
+
+    async def list_threads(self, agent_id: uuid.UUID) -> List[Thread]:
+        return await self.thread_repo.list_by_agent(agent_id)
+
+    async def get_thread(self, thread_id: uuid.UUID) -> Thread:
+        thread = await self.thread_repo.get(thread_id)
+        if not thread:
+            raise NotFoundError("Thread not found", code="THREAD_NOT_FOUND", data={"thread_id": str(thread_id)})
+        return thread
+
+    async def create_thread(
+        self,
+        workspace_id: uuid.UUID,
+        user_id: str,
+        data: CreateThreadRequest,
+    ) -> Thread:
+        thread = await self.thread_repo.create(
+            {
+                "agent_id": data.agent_id,
+                "workspace_id": workspace_id,
+                "title": data.title,
+                "status": "active",
+                "created_by": user_id,
+            }
+        )
+        await self.db.commit()
+        await self.db.refresh(thread)
+        logger.info(f"Created thread {thread.id} for agent {data.agent_id}")
+        return thread
+
+    async def update_thread(
+        self,
+        thread_id: uuid.UUID,
+        data: UpdateThreadRequest,
+    ) -> Thread:
+        thread = await self.thread_repo.get(thread_id)
+        if not thread:
+            raise NotFoundError("Thread not found", code="THREAD_NOT_FOUND", data={"thread_id": str(thread_id)})
+
+        update_data = data.model_dump(exclude_unset=True)
+        if not update_data:
+            return thread
+
+        updated = await self.thread_repo.update(thread_id, update_data)
+        assert updated is not None
+        await self.db.commit()
+        await self.db.refresh(updated)
+        return updated
+
+    async def archive_thread(self, thread_id: uuid.UUID) -> Thread:
+        thread = await self.thread_repo.get(thread_id)
+        if not thread:
+            raise NotFoundError("Thread not found", code="THREAD_NOT_FOUND", data={"thread_id": str(thread_id)})
+
+        updated = await self.thread_repo.update(thread_id, {"status": "archived"})
+        assert updated is not None
+        await self.db.commit()
+        await self.db.refresh(updated)
+        logger.info(f"Archived thread {thread_id}")
+        return updated
+
+    # ---- Thread Events (aggregation) ----
+
+    async def list_thread_events(
+        self,
+        thread_id: uuid.UUID,
+        after_id: uuid.UUID | None = None,
+        limit: int = 200,
+    ) -> tuple[list[dict], int]:
+        """Aggregate execution events across all runs in a thread."""
+        from sqlalchemy import and_, func, not_, select
+
+        from app.models.agent_run import AgentRun
+        from app.models.execution import Execution, ExecutionEvent
+
+        thread = await self.thread_repo.get(thread_id)
+        if not thread:
+            raise NotFoundError("Thread not found", code="THREAD_NOT_FOUND", data={"thread_id": str(thread_id)})
+
+        base_filter = and_(
+            AgentRun.thread_id == thread_id,
+            not_(ExecutionEvent.event_type.like("copilot_%")),
+        )
+
+        count_q = (
+            select(func.count(ExecutionEvent.id))
+            .join(Execution, ExecutionEvent.execution_id == Execution.id)
+            .join(AgentRun, Execution.run_id == AgentRun.id)
+            .where(base_filter)
+        )
+        total = (await self.db.execute(count_q)).scalar() or 0
+
+        query = (
+            select(
+                ExecutionEvent.id,
+                ExecutionEvent.execution_id,
+                ExecutionEvent.sequence_no,
+                ExecutionEvent.event_type,
+                ExecutionEvent.payload,
+                ExecutionEvent.created_at,
+                Execution.status.label("execution_status"),
+                AgentRun.id.label("run_id"),
+            )
+            .join(Execution, ExecutionEvent.execution_id == Execution.id)
+            .join(AgentRun, Execution.run_id == AgentRun.id)
+            .where(base_filter)
+            .order_by(AgentRun.created_at, Execution.attempt_index, ExecutionEvent.sequence_no)
+        )
+
+        if after_id:
+            ref_event = (
+                await self.db.execute(select(ExecutionEvent.created_at).where(ExecutionEvent.id == after_id))
+            ).scalar()
+            if ref_event:
+                query = query.where(ExecutionEvent.created_at > ref_event)
+
+        query = query.limit(limit)
+        rows = (await self.db.execute(query)).mappings().all()
+        return [dict(r) for r in rows], total
diff --git a/backend/app/services/tool_service.py b/backend/app/services/tool_service.py
index 1986282e5..a6f5ac23e 100644
--- a/backend/app/services/tool_service.py
+++ b/backend/app/services/tool_service.py
@@ -20,7 +20,7 @@
 from loguru import logger
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException
+from app.common.app_errors import InvalidRequestError, ServiceUnavailableError
 from app.core.tools.tool import EnhancedTool, ToolFilter, ToolSourceType
 from app.core.tools.tool_registry import ToolRegistry, get_global_registry
 from app.models.enums import McpConnectionStatus
@@ -232,7 +232,11 @@ async def refresh_server_tools(
         server = await self._server_service.get(server_id, user_id)
 
         if not server.enabled:
-            raise BadRequestException("Cannot refresh tools for disabled server")
+            raise InvalidRequestError(
+                "Cannot refresh tools for disabled server",
+                code="MCP_SERVER_REFRESH_DISABLED",
+                data={"server_id": str(server_id)},
+            )
 
         return await self._sync_server_tools(server)
 
@@ -369,7 +373,11 @@ async def _sync_server_tools(self, server: McpServer) -> List[ToolInfo]:
 
             if not result.success:
                 await self._server_service.update_connection_status(server.id, McpConnectionStatus.ERROR, result.error)
-                raise Exception(result.error)
+                raise ServiceUnavailableError(
+                    "Failed to connect to MCP server",
+                    code="MCP_SERVER_CONNECTION_FAILED",
+                    data={"server_id": str(server.id), "server_name": server.name, "detail": result.error},
+                )
 
             # Unregister old tools
             await self._unregister_server_tools(server)
@@ -594,7 +602,11 @@ async def initialize_mcp_tools_on_startup(
                             f"{result.error}"
                         )
                         if not allow_partial_failure:
-                            raise Exception(f"Failed to load tools from MCP server {server.name}: {result.error}")
+                            raise ServiceUnavailableError(
+                                "Failed to load tools from MCP server during startup",
+                                code="MCP_STARTUP_SYNC_FAILED",
+                                data={"server_id": str(server.id), "server_name": server.name, "detail": result.error},
+                            )
                         break
 
             except Exception as e:
diff --git a/backend/app/services/trace_service.py b/backend/app/services/trace_service.py
deleted file mode 100644
index 728c75041..000000000
--- a/backend/app/services/trace_service.py
+++ /dev/null
@@ -1,263 +0,0 @@
-"""
-Execution trace service.
-
-Encapsulate CRUD operations for ExecutionTrace / ExecutionObservation.
-"""
-
-import uuid
-from datetime import datetime, timezone
-from typing import Optional
-
-from sqlalchemy import func, select
-from sqlalchemy.orm import selectinload
-
-from app.models.execution_trace import (
-    ExecutionObservation,
-    ExecutionTrace,
-    ObservationLevel,
-    ObservationStatus,
-    ObservationType,
-    TraceStatus,
-)
-from app.services.base import BaseService
-
-
-class TraceService(BaseService):
-    """Execution trace service."""
-
-    # ==================== Query Helpers ====================
-
-    @staticmethod
-    def _apply_trace_filters(
-        stmt,
-        *,
-        graph_id: Optional[uuid.UUID] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-    ):
-        if graph_id is not None:
-            stmt = stmt.where(ExecutionTrace.graph_id == graph_id)
-        if workspace_id is not None:
-            stmt = stmt.where(ExecutionTrace.workspace_id == workspace_id)
-        if thread_id is not None:
-            stmt = stmt.where(ExecutionTrace.thread_id == thread_id)
-        return stmt
-
-    # ==================== Trace CRUD ====================
-
-    async def create_trace(
-        self,
-        *,
-        trace_id: Optional[uuid.UUID] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-        graph_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        name: Optional[str] = None,
-        input_data: Optional[dict] = None,
-        metadata: Optional[dict] = None,
-        tags: Optional[list] = None,
-    ) -> ExecutionTrace:
-        """Create a new execution trace."""
-        trace = ExecutionTrace(
-            id=trace_id or uuid.uuid4(),
-            workspace_id=workspace_id,
-            graph_id=graph_id,
-            thread_id=thread_id,
-            user_id=user_id,
-            name=name,
-            status=TraceStatus.RUNNING,
-            input=input_data,
-            metadata_=metadata,
-            tags=tags,
-            start_time=datetime.now(timezone.utc),
-        )
-        self.db.add(trace)
-        await self.db.flush()
-        return trace
-
-    async def complete_trace(
-        self,
-        trace_id: uuid.UUID,
-        *,
-        status: TraceStatus = TraceStatus.COMPLETED,
-        output: Optional[dict] = None,
-        total_tokens: Optional[int] = None,
-        total_cost: Optional[float] = None,
-    ) -> Optional[ExecutionTrace]:
-        """Complete an execution trace."""
-        result = await self.db.execute(select(ExecutionTrace).where(ExecutionTrace.id == trace_id))
-        trace = result.scalar_one_or_none()
-        if trace is None:
-            return None
-
-        now = datetime.now(timezone.utc)
-        trace.status = status
-        trace.output = output
-        trace.end_time = now
-        trace.duration_ms = int((now - trace.start_time).total_seconds() * 1000)
-        trace.total_tokens = total_tokens
-        trace.total_cost = total_cost
-        trace.updated_at = now
-        await self.db.flush()
-        return trace
-
-    async def get_trace(self, trace_id: uuid.UUID) -> Optional[ExecutionTrace]:
-        """Get a single Trace (with observations)."""
-        result = await self.db.execute(
-            select(ExecutionTrace)
-            .options(selectinload(ExecutionTrace.observations))
-            .where(ExecutionTrace.id == trace_id)
-        )
-        return result.scalar_one_or_none()
-
-    async def list_traces(
-        self,
-        *,
-        graph_id: Optional[uuid.UUID] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-        limit: int = 20,
-        offset: int = 0,
-    ) -> list[ExecutionTrace]:
-        """List traces (without observation details, to reduce overhead)."""
-        stmt = select(ExecutionTrace).order_by(ExecutionTrace.start_time.desc())
-        stmt = self._apply_trace_filters(stmt, graph_id=graph_id, workspace_id=workspace_id, thread_id=thread_id)
-
-        stmt = stmt.limit(limit).offset(offset)
-        result = await self.db.execute(stmt)
-        return list(result.scalars().all())
-
-    async def count_traces(
-        self,
-        *,
-        graph_id: Optional[uuid.UUID] = None,
-        workspace_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-    ) -> int:
-        """Count traces matching the given filters (for pagination total)."""
-        stmt = select(func.count()).select_from(ExecutionTrace)
-        stmt = self._apply_trace_filters(stmt, graph_id=graph_id, workspace_id=workspace_id, thread_id=thread_id)
-        result = await self.db.execute(stmt)
-        total = result.scalar_one()
-        return int(total or 0)
-
-    # ==================== Observation CRUD ====================
-
-    async def create_observation(
-        self,
-        *,
-        observation_id: Optional[uuid.UUID] = None,
-        trace_id: uuid.UUID,
-        parent_observation_id: Optional[uuid.UUID] = None,
-        type: ObservationType,
-        name: Optional[str] = None,
-        level: ObservationLevel = ObservationLevel.DEFAULT,
-        start_time: Optional[datetime] = None,
-        input_data: Optional[dict] = None,
-        model_name: Optional[str] = None,
-        model_provider: Optional[str] = None,
-        model_parameters: Optional[dict] = None,
-        metadata: Optional[dict] = None,
-    ) -> ExecutionObservation:
-        """Create a new Observation."""
-        obs = ExecutionObservation(
-            id=observation_id or uuid.uuid4(),
-            trace_id=trace_id,
-            parent_observation_id=parent_observation_id,
-            type=type,
-            name=name,
-            level=level,
-            start_time=start_time or datetime.now(timezone.utc),
-            input=input_data,
-            model_name=model_name,
-            model_provider=model_provider,
-            model_parameters=model_parameters,
-            metadata_=metadata,
-        )
-        self.db.add(obs)
-        await self.db.flush()
-        return obs
-
-    async def complete_observation(
-        self,
-        observation_id: uuid.UUID,
-        *,
-        output: Optional[dict] = None,
-        level: Optional[ObservationLevel] = None,
-        status_message: Optional[str] = None,
-        prompt_tokens: Optional[int] = None,
-        completion_tokens: Optional[int] = None,
-        total_tokens: Optional[int] = None,
-        input_cost: Optional[float] = None,
-        output_cost: Optional[float] = None,
-        total_cost: Optional[float] = None,
-        completion_start_time: Optional[datetime] = None,
-    ) -> Optional[ExecutionObservation]:
-        """Complete an Observation."""
-        result = await self.db.execute(select(ExecutionObservation).where(ExecutionObservation.id == observation_id))
-        obs = result.scalar_one_or_none()
-        if obs is None:
-            return None
-
-        now = datetime.now(timezone.utc)
-        obs.end_time = now
-        obs.duration_ms = int((now - obs.start_time).total_seconds() * 1000)
-        obs.status = ObservationStatus.FAILED if (level == ObservationLevel.ERROR) else ObservationStatus.COMPLETED
-        if output is not None:
-            obs.output = output
-        if level is not None:
-            obs.level = level
-        if status_message is not None:
-            obs.status_message = status_message
-        if prompt_tokens is not None:
-            obs.prompt_tokens = prompt_tokens
-        if completion_tokens is not None:
-            obs.completion_tokens = completion_tokens
-        if total_tokens is not None:
-            obs.total_tokens = total_tokens
-        if input_cost is not None:
-            obs.input_cost = input_cost
-        if output_cost is not None:
-            obs.output_cost = output_cost
-        if total_cost is not None:
-            obs.total_cost = total_cost
-        if completion_start_time is not None:
-            obs.completion_start_time = completion_start_time
-
-        await self.db.flush()
-        return obs
-
-    async def get_observations_for_trace(self, trace_id: uuid.UUID) -> list[ExecutionObservation]:
-        """Get all Observations for a Trace (flat list, sorted by time)."""
-        result = await self.db.execute(
-            select(ExecutionObservation)
-            .where(ExecutionObservation.trace_id == trace_id)
-            .order_by(ExecutionObservation.start_time.asc())
-        )
-        return list(result.scalars().all())
-
-    # ==================== Batch operations ====================
-
-    async def batch_create_trace_with_observations(
-        self,
-        trace: ExecutionTrace,
-        observations: list[ExecutionObservation],
-    ) -> ExecutionTrace:
-        """Batch-create a Trace and all its Observations (single commit)."""
-        self.db.add(trace)
-        for obs in observations:
-            self.db.add(obs)
-        await self.db.flush()
-        return trace
-
-    async def aggregate_trace_tokens(self, trace_id: uuid.UUID) -> tuple[int, float]:
-        """Aggregate tokens and cost across all GENERATION Observations under a Trace."""
-        observations = await self.get_observations_for_trace(trace_id)
-        total_tokens = 0
-        total_cost = 0.0
-        for obs in observations:
-            if obs.type == ObservationType.GENERATION:
-                total_tokens += obs.total_tokens or 0
-                total_cost += obs.total_cost or 0.0
-        return total_tokens, total_cost
diff --git a/backend/app/services/user_service.py b/backend/app/services/user_service.py
index c94089415..f0a806428 100644
--- a/backend/app/services/user_service.py
+++ b/backend/app/services/user_service.py
@@ -8,7 +8,7 @@
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.common.exceptions import BadRequestException, NotFoundException
+from app.common.app_errors import InvalidRequestError, NotFoundError
 from app.models.auth import AuthUser as User
 from app.repositories.user import UserRepository
 
@@ -60,7 +60,11 @@ async def create_user(
         Note: does not include password setup; password operations live in AuthService.
         """
         if await self.user_repo.email_exists(email):
-            raise BadRequestException("Email already registered")
+            raise InvalidRequestError(
+                "Email already registered",
+                code="USER_ALREADY_EXISTS",
+                data={"email": email},
+            )
 
         user_data = {
             "name": name,
@@ -91,7 +95,11 @@ async def update_user(
             user.name = name
         if email is not None:
             if email != user.email and await self.user_repo.email_exists(email, exclude_id=user.id):
-                raise BadRequestException("Email already registered")
+                raise InvalidRequestError(
+                    "Email already registered",
+                    code="USER_ALREADY_EXISTS",
+                    data={"email": email},
+                )
             user.email = email
         if image is not None:
             user.image = image
@@ -115,7 +123,7 @@ async def delete_user(self, user_id: str) -> bool:
         """Delete a user."""
         user = await self.user_repo.get_by_id(user_id)
         if not user:
-            raise NotFoundException("User not found")
+            raise NotFoundError("User not found", code="USER_NOT_FOUND", data={"user_id": user_id})
 
         import uuid as uuid_lib
 
diff --git a/backend/app/services/workspace_file_service.py b/backend/app/services/workspace_file_service.py
deleted file mode 100644
index 8178ae82c..000000000
--- a/backend/app/services/workspace_file_service.py
+++ /dev/null
@@ -1,275 +0,0 @@
-"""
-Workspace file storage service.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import secrets
-import uuid
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-from typing import Dict, List, Optional
-
-from fastapi import UploadFile
-from jose import JWTError, jwt
-
-from app.common.exceptions import BadRequestException, ConflictException, ForbiddenException, NotFoundException
-from app.core.settings import settings
-from app.models.access_control import PermissionType
-from app.models.auth import AuthUser as User
-from app.models.workspace import WorkspaceMemberRole
-from app.repositories.workspace import WorkspaceMemberRepository, WorkspaceRepository
-from app.repositories.workspace_file import WorkspaceStoredFileRepository
-from app.utils.path_utils import sanitize_filename
-
-from .base import BaseService
-
-
-class WorkspaceFileService(BaseService):
-    """Workspace file business logic."""
-
-    CONTEXT = WorkspaceStoredFileRepository.CONTEXT_WORKSPACE
-    MAX_FILE_SIZE_BYTES = 100 * 1024 * 1024  # 100MB per-file limit
-    DEFAULT_STORAGE_LIMIT_BYTES = 5 * 1024 * 1024 * 1024  # 5GB simple quota (adjustable / billable)
-    DOWNLOAD_TOKEN_EXPIRE_MINUTES = 15
-
-    def __init__(self, db):
-        super().__init__(db)
-        self.workspace_repo = WorkspaceRepository(db)
-        self.member_repo = WorkspaceMemberRepository(db)
-        self.file_repo = WorkspaceStoredFileRepository(db)
-
-    # ------------------------------------------------------------------ #
-    # internal utilities
-    # ------------------------------------------------------------------ #
-    def _storage_root(self) -> Path:
-        """Unified file storage root directory."""
-        return Path(settings.WORKSPACE_ROOT) / "workspace_files"
-
-    def _sanitize_filename(self, filename: str) -> str:
-        """Sanitize filename to prevent path traversal.
-
-        Use the unified sanitize_filename utility function.
-        """
-        return sanitize_filename(filename or "unnamed")
-
-    def _generate_key(self, workspace_id: uuid.UUID, filename: str) -> str:
-        """Generate a storage key: workspace/<workspace_id>/<timestamp>-<random>-<safe_name>."""
-        timestamp = int(datetime.now(timezone.utc).timestamp() * 1000)
-        random_part = secrets.token_hex(4)
-        safe_name = self._sanitize_filename(filename).replace(" ", "-")
-        return f"workspace/{workspace_id}/{timestamp}-{random_part}-{safe_name}"
-
-    def _build_serve_path(self, workspace_id: uuid.UUID, file_id: uuid.UUID) -> str:
-        """Generate the external file access path (without signature)."""
-        return f"/api/workspaces/{workspace_id}/files/{file_id}/serve"
-
-    async def _write_file(self, path: Path, content: bytes) -> None:
-        path.parent.mkdir(parents=True, exist_ok=True)
-        await asyncio.to_thread(path.write_bytes, content)
-
-    def _get_permission_by_role(self, role: WorkspaceMemberRole | None) -> PermissionType:
-        if role in (WorkspaceMemberRole.owner, WorkspaceMemberRole.admin, WorkspaceMemberRole.member):
-            return PermissionType.write
-        return PermissionType.read
-
-    def _check_permission(self, required: PermissionType, actual: PermissionType) -> None:
-        if required == PermissionType.read:
-            return
-        if required == PermissionType.write and actual != PermissionType.write:
-            raise ForbiddenException("Write permission required")
-
-    async def _ensure_member_role(self, workspace_id: uuid.UUID, user: User) -> WorkspaceMemberRole:
-        workspace = await self.workspace_repo.get(workspace_id)
-        if not workspace:
-            raise NotFoundException("Workspace not found")
-
-        if user.is_superuser or workspace.owner_id == user.id:
-            return WorkspaceMemberRole.owner
-
-        member = await self.member_repo.get_member(workspace_id, user.id)
-        if not member:
-            raise ForbiddenException("No access to workspace")
-        return member.role  # type: ignore
-
-    def _token_payload(self, workspace_id: uuid.UUID, file_id: uuid.UUID, user_id: uuid.UUID) -> Dict:
-        now = datetime.now(timezone.utc)
-        return {
-            "sub": str(user_id),
-            "workspace_id": str(workspace_id),
-            "file_id": str(file_id),
-            "type": "workspace_file",
-            "iat": now,
-            "exp": now + timedelta(minutes=self.DOWNLOAD_TOKEN_EXPIRE_MINUTES),
-        }
-
-    def _validate_download_token(self, token: str, workspace_id: uuid.UUID, file_id: uuid.UUID) -> Optional[str]:
-        try:
-            payload = jwt.decode(
-                token,
-                settings.secret_key,
-                algorithms=[settings.algorithm],
-                options={"verify_aud": False},
-            )
-            if payload.get("type") != "workspace_file":
-                return None
-            if payload.get("workspace_id") != str(workspace_id):
-                return None
-            if payload.get("file_id") != str(file_id):
-                return None
-            sub = payload.get("sub")
-            return str(sub) if sub is not None else None
-        except JWTError:
-            return None
-
-    def _file_path_from_key(self, key: str) -> Path:
-        return self._storage_root() / key
-
-    def get_file_path(self, record) -> Path:
-        """Get the absolute file path."""
-        return self._file_path_from_key(record.key)
-
-    def _serialize_file(self, record) -> Dict:
-        serve_path = self._build_serve_path(record.workspace_id, record.id)
-        return {
-            "id": str(record.id),
-            "workspaceId": str(record.workspace_id) if record.workspace_id else None,
-            "name": record.original_name,
-            "key": record.key,
-            "path": serve_path,
-            "url": serve_path,
-            "size": record.size,
-            "type": record.content_type,
-            "uploadedBy": str(record.user_id),
-            "uploadedAt": record.uploaded_at,
-        }
-
-    # ------------------------------------------------------------------ #
-    # public methods
-    # ------------------------------------------------------------------ #
-    async def list_files(self, workspace_id: uuid.UUID, current_user: User) -> List[Dict]:
-        role = await self._ensure_member_role(workspace_id, current_user)
-        self._check_permission(PermissionType.read, self._get_permission_by_role(role))
-
-        records = await self.file_repo.list_workspace_files(workspace_id)
-        return [self._serialize_file(rec) for rec in records]
-
-    async def upload_file(self, workspace_id: uuid.UUID, file: UploadFile, current_user: User) -> Dict:
-        role = await self._ensure_member_role(workspace_id, current_user)
-        self._check_permission(PermissionType.write, self._get_permission_by_role(role))
-
-        content = await file.read()
-        size = len(content)
-        if size == 0:
-            raise BadRequestException("File is empty")
-        if size > self.MAX_FILE_SIZE_BYTES:
-            raise BadRequestException("File exceeds size limit (100MB)")
-
-        original_name = self._sanitize_filename(file.filename or "unnamed")
-        exists = await self.file_repo.find_by_name(workspace_id, original_name)
-        if exists:
-            # aligned with legacy project: duplicate file returns 409 with isDuplicate flag
-            raise ConflictException(
-                f'A file named "{original_name}" already exists in this workspace',
-                data={"isDuplicate": True},
-            )
-
-        # simple quota check
-        current_usage = await self.file_repo.sum_user_usage(current_user.id)
-        if current_usage + size > self.DEFAULT_STORAGE_LIMIT_BYTES:
-            raise ForbiddenException("Storage limit exceeded")
-
-        key = self._generate_key(workspace_id, original_name)
-        path = self._file_path_from_key(key)
-
-        await self._write_file(path, content)
-
-        record = await self.file_repo.create(
-            {
-                "key": key,
-                "user_id": current_user.id,
-                "workspace_id": workspace_id,
-                "context": self.CONTEXT,
-                "original_name": original_name,
-                "content_type": file.content_type or "application/octet-stream",
-                "size": size,
-            }
-        )
-        await self.commit()
-
-        return self._serialize_file(record)
-
-    async def delete_file(self, workspace_id: uuid.UUID, file_id: uuid.UUID, current_user: User) -> None:
-        role = await self._ensure_member_role(workspace_id, current_user)
-        self._check_permission(PermissionType.write, self._get_permission_by_role(role))
-
-        record = await self.file_repo.get_by_id_and_workspace(file_id, workspace_id)
-        if not record:
-            raise NotFoundException("File not found")
-
-        file_path = self._file_path_from_key(record.key)
-        if file_path.exists():
-            await asyncio.to_thread(file_path.unlink)
-
-        await self.file_repo.delete(record.id)
-        await self.commit()
-
-    async def generate_download_url(self, workspace_id: uuid.UUID, file_id: uuid.UUID, current_user: User) -> str:
-        role = await self._ensure_member_role(workspace_id, current_user)
-        self._check_permission(PermissionType.read, self._get_permission_by_role(role))
-
-        record = await self.file_repo.get_by_id_and_workspace(file_id, workspace_id)
-        if not record:
-            raise NotFoundException("File not found")
-
-        import uuid as uuid_lib
-
-        file_uuid = file_id if isinstance(file_id, uuid.UUID) else uuid_lib.UUID(str(file_id))
-        user_uuid = current_user.id if isinstance(current_user.id, uuid.UUID) else uuid_lib.UUID(str(current_user.id))
-        token = jwt.encode(
-            self._token_payload(workspace_id, file_uuid, user_uuid),
-            settings.secret_key,
-            algorithm=settings.algorithm,
-        )
-        return f"{self._build_serve_path(workspace_id, file_id)}?token={token}"
-
-    async def get_file_record(self, workspace_id: uuid.UUID, file_id: uuid.UUID):
-        record = await self.file_repo.get_by_id_and_workspace(file_id, workspace_id)
-        if not record:
-            raise NotFoundException("File not found")
-        return record
-
-    async def read_file_bytes(self, record) -> bytes:
-        file_path = self._file_path_from_key(record.key)
-        if not file_path.exists():
-            raise NotFoundException("File content missing")
-        return await asyncio.to_thread(file_path.read_bytes)
-
-    async def validate_token_or_user(
-        self,
-        workspace_id: uuid.UUID,
-        file_id: uuid.UUID,
-        token: Optional[str],
-        current_user: Optional[User],
-    ) -> None:
-        if token:
-            user_sub = self._validate_download_token(token, workspace_id, file_id)
-            if not user_sub:
-                raise ForbiddenException("Invalid or expired download token")
-            return
-
-        if not current_user:
-            raise ForbiddenException("Authentication required")
-        role = await self._ensure_member_role(workspace_id, current_user)
-        self._check_permission(PermissionType.read, self._get_permission_by_role(role))
-
-    async def get_user_storage_usage(self, user: User) -> Dict:
-        used = await self.file_repo.sum_user_usage(user.id)
-        limit_bytes = self.DEFAULT_STORAGE_LIMIT_BYTES
-        percent_used = (used / limit_bytes * 100) if limit_bytes else 0
-        return {
-            "usedBytes": used,
-            "limitBytes": limit_bytes,
-            "percentUsed": percent_used,
-        }
diff --git a/backend/app/services/workspace_folder_service.py b/backend/app/services/workspace_folder_service.py
deleted file mode 100644
index a2575a2ff..000000000
--- a/backend/app/services/workspace_folder_service.py
+++ /dev/null
@@ -1,357 +0,0 @@
-"""
-Folder business logic.
-"""
-
-from __future__ import annotations
-
-import uuid
-from datetime import datetime, timezone
-from typing import Dict, List, Optional, Set, Tuple
-
-from sqlalchemy import select
-
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
-from app.models.auth import AuthUser as User
-from app.models.workspace import WorkspaceFolder, WorkspaceMemberRole
-from app.repositories.workspace import WorkspaceMemberRepository, WorkspaceRepository
-from app.repositories.workspace_folder import WorkflowFolderRepository
-
-from .base import BaseService
-
-# max folder depth limit: only two levels (root depth is 0, first level depth is 1)
-MAX_FOLDER_DEPTH = 1
-
-
-class FolderService(BaseService[WorkspaceFolder]):
-    """Folder service."""
-
-    def __init__(self, db):
-        super().__init__(db)
-        self.folder_repo = WorkflowFolderRepository(db)
-        self.workspace_repo = WorkspaceRepository(db)
-        self.member_repo = WorkspaceMemberRepository(db)
-
-    # ------------------------------------------------------------------ #
-    # permission checks
-    # ------------------------------------------------------------------ #
-    async def _get_member_role(self, workspace_id: uuid.UUID, current_user: User) -> Optional[str]:
-        workspace = await self.workspace_repo.get(workspace_id)
-        if not workspace:
-            raise NotFoundException("Workspace not found")
-        if current_user.is_superuser or workspace.owner_id == current_user.id:
-            return WorkspaceMemberRole.owner
-        member = await self.member_repo.get_member(workspace_id, current_user.id)
-        return member.role if member else None
-
-    async def _ensure_permission(
-        self,
-        workspace_id: uuid.UUID,
-        current_user: User,
-        required: str,
-    ) -> str:
-        role = await self._get_member_role(workspace_id, current_user)
-        if role is None:
-            raise ForbiddenException("No access to workspace")
-
-        if required == "read":
-            return role
-
-        if required == "write" and role in {
-            WorkspaceMemberRole.owner,
-            WorkspaceMemberRole.admin,
-            WorkspaceMemberRole.member,
-        }:
-            return role
-
-        if required == "admin" and role in {WorkspaceMemberRole.owner, WorkspaceMemberRole.admin}:
-            return role
-
-        raise ForbiddenException("Insufficient workspace permission")
-
-    # ------------------------------------------------------------------ #
-    # queries
-    # ------------------------------------------------------------------ #
-    async def list_folders(self, workspace_id: uuid.UUID, *, current_user: User) -> List[WorkspaceFolder]:
-        await self._ensure_permission(workspace_id, current_user, "read")
-        result = await self.folder_repo.list_by_workspace(workspace_id)
-        return list(result) if result is not None else []
-
-    # ------------------------------------------------------------------ #
-    # tree/cycle detection helpers
-    # ------------------------------------------------------------------ #
-    async def _build_children_index(self, workspace_id: uuid.UUID) -> Dict[Optional[uuid.UUID], List[uuid.UUID]]:
-        relations = await self.folder_repo.list_relations_by_workspace(workspace_id)
-        children: Dict[Optional[uuid.UUID], List[uuid.UUID]] = {}
-        for fid, pid in relations:
-            children.setdefault(pid, []).append(fid)
-        return children
-
-    async def _collect_subtree_ids(self, workspace_id: uuid.UUID, root_id: uuid.UUID) -> List[uuid.UUID]:
-        """
-        Return root_id and all its descendant folder IDs (BFS), for deletion/duplication.
-        Only traverse within the workspace to avoid cross-workspace parentId pollution.
-        """
-        children_index = await self._build_children_index(workspace_id)
-        queue: List[uuid.UUID] = [root_id]
-        visited: Set[uuid.UUID] = set()
-        out: List[uuid.UUID] = []
-
-        while queue:
-            current = queue.pop(0)
-            if current in visited:
-                continue
-            visited.add(current)
-            out.append(current)
-            for child_id in children_index.get(current, []):
-                if child_id not in visited:
-                    queue.append(child_id)
-
-        return out
-
-    async def _would_create_cycle(
-        self,
-        *,
-        workspace_id: uuid.UUID,
-        folder_id: uuid.UUID,
-        new_parent_id: uuid.UUID,
-    ) -> bool:
-        """Check whether a cycle would be created."""
-        seen: Set[uuid.UUID] = set()
-        current: Optional[uuid.UUID] = new_parent_id
-
-        while current is not None:
-            if current == folder_id:
-                return True
-            if current in seen:
-                return True
-            seen.add(current)
-
-            node = await self.folder_repo.ensure_same_workspace(current, workspace_id)
-            current = node.parent_id
-
-        return False
-
-    async def _calculate_depth(self, folder_id: uuid.UUID, workspace_id: uuid.UUID) -> int:
-        """
-        Calculate the folder depth (starting from root, root depth is 0).
-        """
-        depth = 0
-        current_id: Optional[uuid.UUID] = folder_id
-
-        while current_id is not None:
-            folder = await self.folder_repo.ensure_same_workspace(current_id, workspace_id)
-            if folder.parent_id is None:
-                break
-            depth += 1
-            current_id = folder.parent_id
-            if depth > MAX_FOLDER_DEPTH:
-                break
-
-        return depth
-
-    async def _check_depth_limit(self, parent_id: Optional[uuid.UUID], workspace_id: uuid.UUID) -> None:
-        """Check whether creating a subfolder under the specified parent would exceed the depth limit."""
-        if parent_id is None:
-            return
-
-        parent_depth = await self._calculate_depth(parent_id, workspace_id)
-        if parent_depth >= MAX_FOLDER_DEPTH:
-            raise BadRequestException(f"Maximum folder depth ({MAX_FOLDER_DEPTH + 1}) would be exceeded")
-
-    # ------------------------------------------------------------------ #
-    # create
-    # ------------------------------------------------------------------ #
-    async def create_folder(
-        self,
-        *,
-        workspace_id: uuid.UUID,
-        current_user: User,
-        name: str,
-        color: Optional[str] = None,
-        parent_id: Optional[uuid.UUID] = None,
-        is_expanded: bool = False,
-    ) -> WorkspaceFolder:
-        await self._ensure_permission(workspace_id, current_user, "write")
-        await self._check_depth_limit(parent_id, workspace_id)
-
-        if parent_id:
-            await self.folder_repo.ensure_same_workspace(parent_id, workspace_id)
-
-        next_sort = (await self.folder_repo.max_sort_order(workspace_id, parent_id)) + 1
-        folder = await self.folder_repo.create(
-            {
-                "name": name.strip(),
-                "user_id": current_user.id,
-                "workspace_id": workspace_id,
-                "parent_id": parent_id,
-                "color": color or "#6B7280",
-                "is_expanded": is_expanded,
-                "sort_order": next_sort,
-            }
-        )
-        await self.commit()
-        result = folder
-        return result  # type: ignore
-
-    # ------------------------------------------------------------------ #
-    # update
-    # ------------------------------------------------------------------ #
-    async def update_folder(
-        self,
-        folder_id: uuid.UUID,
-        *,
-        workspace_id: uuid.UUID,
-        current_user: User,
-        name: Optional[str] = None,
-        color: Optional[str] = None,
-        is_expanded: Optional[bool] = None,
-        parent_id: Optional[uuid.UUID] = None,
-    ) -> WorkspaceFolder:
-        await self._ensure_permission(workspace_id, current_user, "write")
-        folder = await self.folder_repo.ensure_same_workspace(folder_id, workspace_id)
-
-        if parent_id is not None:
-            if parent_id == folder.id:
-                raise BadRequestException("Folder cannot be its own parent")
-            if parent_id:
-                await self.folder_repo.ensure_same_workspace(parent_id, workspace_id)
-                if await self._would_create_cycle(
-                    workspace_id=workspace_id, folder_id=folder.id, new_parent_id=parent_id
-                ):
-                    raise BadRequestException("Cannot create circular folder reference")
-                await self._check_depth_limit(parent_id, workspace_id)
-
-        update_data: Dict[str, object] = {}
-        if name is not None:
-            update_data["name"] = name.strip()
-        if color is not None:
-            update_data["color"] = color
-        if is_expanded is not None:
-            update_data["is_expanded"] = is_expanded
-        if parent_id is not None:
-            update_data["parent_id"] = parent_id
-
-        if update_data:
-            folder = await self.folder_repo.update(folder.id, update_data)  # type: ignore
-            await self.commit()
-        result = folder
-        return result  # type: ignore
-
-    # ------------------------------------------------------------------ #
-    # delete
-    # ------------------------------------------------------------------ #
-    async def delete_folder(
-        self,
-        folder_id: uuid.UUID,
-        *,
-        workspace_id: uuid.UUID,
-        current_user: User,
-    ) -> int:
-        stats = await self.delete_folder_tree(
-            folder_id,
-            workspace_id=workspace_id,
-            current_user=current_user,
-        )
-        return stats["folders"]
-
-    async def delete_folder_tree(
-        self,
-        folder_id: uuid.UUID,
-        *,
-        workspace_id: uuid.UUID,
-        current_user: User,
-    ) -> Dict[str, int]:
-        """Recursively soft-delete the entire folder subtree; requires write permission (member and above)."""
-        await self._ensure_permission(workspace_id, current_user, "write")
-        await self.folder_repo.ensure_same_workspace(folder_id, workspace_id)
-
-        target_ids = await self._collect_subtree_ids(workspace_id, folder_id)
-        deleted_at = datetime.now(timezone.utc)
-        for folder_id_to_delete in target_ids:
-            await self.folder_repo.update(folder_id_to_delete, {"deleted_at": deleted_at})
-
-        await self.commit()
-        return {"folders": len(target_ids), "workflows": 0}
-
-    # ------------------------------------------------------------------ #
-    # duplicate
-    # ------------------------------------------------------------------ #
-    async def duplicate_folder(
-        self,
-        folder_id: uuid.UUID,
-        *,
-        workspace_id: uuid.UUID,
-        current_user: User,
-        name: Optional[str] = None,
-        parent_id: Optional[uuid.UUID] = None,
-        color: Optional[str] = None,
-    ) -> WorkspaceFolder:
-        source = await self.folder_repo.get(folder_id)
-        if not source:
-            raise NotFoundException("Folder not found")
-
-        await self._ensure_permission(source.workspace_id, current_user, "read")
-        await self._ensure_permission(workspace_id, current_user, "write")
-
-        effective_parent_id: Optional[uuid.UUID]
-        if parent_id is not None:
-            effective_parent_id = parent_id
-        else:
-            effective_parent_id = source.parent_id if workspace_id == source.workspace_id else None
-
-        if effective_parent_id:
-            await self.folder_repo.ensure_same_workspace(effective_parent_id, workspace_id)
-
-        source_subtree_ids = await self._collect_subtree_ids(source.workspace_id, source.id)
-        folders_result = await self.db.execute(
-            select(WorkspaceFolder).where(WorkspaceFolder.id.in_(source_subtree_ids))
-        )
-        source_folders = list(folders_result.scalars().all())
-        source_by_id: Dict[uuid.UUID, WorkspaceFolder] = {f.id: f for f in source_folders}
-        folder_id_map: Dict[uuid.UUID, uuid.UUID] = {fid: uuid.uuid4() for fid in source_subtree_ids}
-
-        async with self.db.begin():
-            new_root_id = folder_id_map[source.id]
-            new_root = WorkspaceFolder(
-                id=new_root_id,
-                name=(name or f"{source.name} Copy").strip(),
-                user_id=current_user.id,
-                workspace_id=workspace_id,
-                parent_id=effective_parent_id,
-                color=color or source.color,
-                is_expanded=False,
-                sort_order=source.sort_order,
-            )
-            self.db.add(new_root)
-            await self.db.flush()
-
-            children_index = await self._build_children_index(source.workspace_id)
-            queue: List[Tuple[uuid.UUID, uuid.UUID]] = [(source.id, new_root_id)]
-
-            while queue:
-                old_parent_id, new_parent_id = queue.pop(0)
-                for old_child_id in children_index.get(old_parent_id, []):
-                    if old_child_id not in source_by_id:
-                        continue
-                    old_child = source_by_id[old_child_id]
-                    new_child_id = folder_id_map[old_child_id]
-
-                    self.db.add(
-                        WorkspaceFolder(
-                            id=new_child_id,
-                            name=old_child.name.strip(),
-                            user_id=current_user.id,
-                            workspace_id=workspace_id,
-                            parent_id=new_parent_id,
-                            color=old_child.color,
-                            is_expanded=False,
-                            sort_order=old_child.sort_order,
-                        )
-                    )
-                    queue.append((old_child_id, new_child_id))
-
-            await self.db.flush()
-
-        await self.commit()
-        result = await self.folder_repo.get(new_root_id)
-        return result  # type: ignore
diff --git a/backend/app/services/workspace_service.py b/backend/app/services/workspace_service.py
index f6fc4930d..3d2cea474 100644
--- a/backend/app/services/workspace_service.py
+++ b/backend/app/services/workspace_service.py
@@ -5,7 +5,7 @@
 import uuid
 from typing import Any, Dict, List, Optional
 
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
+from app.common.app_errors import AccessDeniedError, InvalidRequestError, NotFoundError
 from app.common.pagination import PageResult, PaginationParams
 from app.models.auth import AuthUser as User
 from app.models.workspace import Workspace, WorkspaceMemberRole, WorkspaceType
@@ -59,12 +59,16 @@ async def _get_role(self, workspace: Workspace, current_user: User) -> Workspace
     async def _ensure_member(self, workspace_id: uuid.UUID, current_user: User) -> WorkspaceMemberRole:
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
         if current_user.is_superuser or workspace.owner_id == current_user.id:
             return WorkspaceMemberRole.owner
         member = await self.member_repo.get_member(workspace_id, current_user.id)
         if not member:
-            raise ForbiddenException("No access to workspace")
+            raise AccessDeniedError("No access to workspace", code="WORKSPACE_ACCESS_DENIED")
         return member.role  # type: ignore
 
     async def get_user_role(self, workspace_id: uuid.UUID, current_user: User) -> Optional[WorkspaceMemberRole]:
@@ -77,13 +81,13 @@ async def get_user_role(self, workspace_id: uuid.UUID, current_user: User) -> Op
         try:
             # reuse the existing _ensure_member method, which already handles all cases (superuser, owner, regular member)
             return await self._ensure_member(workspace_id, current_user)
-        except (NotFoundException, ForbiddenException):
+        except (NotFoundError, AccessDeniedError):
             # if the user is not a member, return None instead of raising (this is a query method, not a validation method)
             return None
 
     def _ensure_admin_role(self, role: WorkspaceMemberRole):
         if role not in {WorkspaceMemberRole.owner, WorkspaceMemberRole.admin}:
-            raise ForbiddenException("Admin permission required")
+            raise AccessDeniedError("Admin permission required", code="WORKSPACE_PERMISSION_DENIED")
 
     async def list_workspaces(self, current_user: User) -> List[Dict]:
         workspaces = await self.workspace_repo.list_for_user(current_user.id)
@@ -146,7 +150,11 @@ async def create_workspace(
     async def get_workspace(self, workspace_id: uuid.UUID, current_user: User) -> Dict:
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
         await self._ensure_member(workspace_id, current_user)
         return await self._serialize_workspace(workspace, current_user)
 
@@ -164,7 +172,11 @@ async def update_workspace(
 
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         update_data: Dict[str, Any] = {}
         if name is not None:
@@ -202,10 +214,18 @@ async def delete_workspace(
         # check if it's a personal workspace; personal workspaces cannot be deleted
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         if workspace.type == WorkspaceType.personal:
-            raise BadRequestException("Personal workspace cannot be deleted")
+            raise InvalidRequestError(
+                "Personal workspace cannot be deleted",
+                code="PERSONAL_WORKSPACE_DELETE_FORBIDDEN",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         # Revoke all tokens bound to this workspace
         from app.services.platform_token_service import PlatformTokenService
@@ -229,14 +249,22 @@ async def duplicate_workspace(
         # get source workspace
         source_workspace = await self.workspace_repo.get(workspace_id)
         if not source_workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         # ensure user has permission to access the source workspace
         await self._ensure_member(workspace_id, current_user)
 
         # check if it's a personal workspace; personal workspaces cannot be duplicated
         if source_workspace.type == WorkspaceType.personal:
-            raise BadRequestException("Personal workspace cannot be duplicated")
+            raise InvalidRequestError(
+                "Personal workspace cannot be duplicated",
+                code="PERSONAL_WORKSPACE_DUPLICATE_FORBIDDEN",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         # generate new name
         new_name = name or f"{source_workspace.name} (Copy)"
@@ -276,18 +304,22 @@ async def add_member(
         self._ensure_admin_role(member_role)
 
         if role not in WorkspaceMemberRole._value2member_map_:
-            raise BadRequestException("Invalid role")
+            raise InvalidRequestError("Invalid role", code="WORKSPACE_MEMBER_ROLE_INVALID", data={"role": role})
 
         target_role = WorkspaceMemberRole(role)
 
         # owner role cannot be assigned via add member
         if target_role == WorkspaceMemberRole.owner:
-            raise BadRequestException("Cannot assign owner role")
+            raise InvalidRequestError("Cannot assign owner role", code="WORKSPACE_OWNER_ROLE_ASSIGNMENT_FORBIDDEN")
 
         # role hierarchy protection: non-owner cannot add a role >= their own
         if member_role != WorkspaceMemberRole.owner:
             if ROLE_RANK.get(target_role, 0) >= ROLE_RANK.get(member_role, 0):
-                raise ForbiddenException("Cannot add a member with a role equal to or higher than your own")
+                raise AccessDeniedError(
+                    "Cannot add a member with a role equal to or higher than your own",
+                    code="WORKSPACE_MEMBER_ROLE_TOO_HIGH",
+                    data={"role": target_role.value},
+                )
 
         from app.repositories.auth_user import AuthUserRepository
 
@@ -295,11 +327,15 @@ async def add_member(
         target_user = await user_repo.get_by_email(email.lower())
 
         if not target_user:
-            raise NotFoundException("User not found")
+            raise NotFoundError("User not found", code="USER_NOT_FOUND", data={"email": email})
 
         existing_member = await self.member_repo.get_member(workspace_id, target_user.id)
         if existing_member:
-            raise BadRequestException(f"User with email {email} is already a member of this workspace")
+            raise InvalidRequestError(
+                f"User with email {email} is already a member of this workspace",
+                code="WORKSPACE_MEMBER_ALREADY_EXISTS",
+                data={"email": email, "workspace_id": str(workspace_id)},
+            )
 
         await self.member_repo.create({"workspace_id": workspace_id, "user_id": target_user.id, "role": target_role})
         await self.commit()
@@ -328,7 +364,11 @@ async def list_members_paginated(
 
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         await self._ensure_member(workspace_id, current_user)
 
@@ -401,7 +441,11 @@ async def update_member_role(
         """Update member role."""
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         # ensure current user is admin
         current_role = await self._ensure_member(workspace_id, current_user)
@@ -410,28 +454,38 @@ async def update_member_role(
         # get target member
         target_member = await self.member_repo.get_member(workspace_id, target_user_id)
         if not target_member:
-            raise NotFoundException("User not found in workspace")
+            raise NotFoundError(
+                "User not found in workspace",
+                code="WORKSPACE_MEMBER_NOT_FOUND",
+                data={"user_id": str(target_user_id), "workspace_id": str(workspace_id)},
+            )
 
         # cannot modify the owner's role
         if workspace.owner_id == target_user_id:
-            raise BadRequestException("Cannot change owner role")
+            raise InvalidRequestError("Cannot change owner role", code="WORKSPACE_OWNER_ROLE_CHANGE_FORBIDDEN")
 
         # owner role cannot be assigned via role update
         if new_role == WorkspaceMemberRole.owner:
-            raise BadRequestException("Cannot assign owner role")
+            raise InvalidRequestError("Cannot assign owner role", code="WORKSPACE_OWNER_ROLE_ASSIGNMENT_FORBIDDEN")
 
         # role hierarchy protection: non-owner cannot modify members >= their own level
         if current_role != WorkspaceMemberRole.owner:
             if ROLE_RANK.get(target_member.role, 0) >= ROLE_RANK.get(current_role, 0):
-                raise ForbiddenException("Cannot modify a member with equal or higher role")
+                raise AccessDeniedError(
+                    "Cannot modify a member with equal or higher role", code="WORKSPACE_MEMBER_ROLE_TOO_HIGH"
+                )
             if ROLE_RANK.get(new_role, 0) >= ROLE_RANK.get(current_role, 0):
-                raise ForbiddenException("Cannot assign a role equal to or higher than your own")
+                raise AccessDeniedError(
+                    "Cannot assign a role equal to or higher than your own", code="WORKSPACE_MEMBER_ROLE_TOO_HIGH"
+                )
 
         # if modifying an admin, check if they are the last admin
         if target_member.role in {WorkspaceMemberRole.owner, WorkspaceMemberRole.admin}:
             admin_count = await self.member_repo.count_admins(workspace_id)
             if admin_count <= 1 and new_role not in {WorkspaceMemberRole.owner, WorkspaceMemberRole.admin}:
-                raise BadRequestException("Cannot remove the last admin from a workspace")
+                raise InvalidRequestError(
+                    "Cannot remove the last admin from a workspace", code="WORKSPACE_LAST_ADMIN_REMOVE_FORBIDDEN"
+                )
 
         # update role
         updated_member = await self.member_repo.update_member_role(workspace_id, target_user_id, new_role)
@@ -474,16 +528,24 @@ async def remove_member(
         """
         workspace = await self.workspace_repo.get(workspace_id)
         if not workspace:
-            raise NotFoundException("Workspace not found")
+            raise NotFoundError(
+                "Workspace not found",
+                code="WORKSPACE_NOT_FOUND",
+                data={"workspace_id": str(workspace_id)},
+            )
 
         # get target user's member record
         target_member = await self.member_repo.get_member(workspace_id, str(target_user_id))
         if not target_member:
-            raise NotFoundException("User not found in workspace")
+            raise NotFoundError(
+                "User not found in workspace",
+                code="WORKSPACE_MEMBER_NOT_FOUND",
+                data={"user_id": str(target_user_id), "workspace_id": str(workspace_id)},
+            )
 
         # cannot remove the workspace owner
         if str(workspace.owner_id) == str(target_user_id):
-            raise BadRequestException("Cannot remove workspace owner")
+            raise InvalidRequestError("Cannot remove workspace owner", code="WORKSPACE_OWNER_REMOVE_FORBIDDEN")
 
         # get current user's role
         current_role = await self._get_role(workspace, current_user)
@@ -491,19 +553,23 @@ async def remove_member(
         is_self = str(target_user_id) == current_user.id
 
         if not is_admin and not is_self:
-            raise ForbiddenException("Insufficient permissions")
+            raise AccessDeniedError("Insufficient permissions", code="WORKSPACE_PERMISSION_DENIED")
 
         # role hierarchy protection: non-owner cannot remove members >= their own level
         if is_admin and not is_self and current_role != WorkspaceMemberRole.owner:
             assert isinstance(current_role, WorkspaceMemberRole)
             if ROLE_RANK.get(target_member.role, 0) >= ROLE_RANK.get(current_role, 0):
-                raise ForbiddenException("Cannot remove a member with equal or higher role")
+                raise AccessDeniedError(
+                    "Cannot remove a member with equal or higher role", code="WORKSPACE_MEMBER_ROLE_TOO_HIGH"
+                )
 
         # if removing an admin/owner role member, check if they are the last admin
         if target_member.role in {WorkspaceMemberRole.owner, WorkspaceMemberRole.admin}:
             admin_count = await self.member_repo.count_admins(workspace_id)
             if admin_count <= 1:
-                raise BadRequestException("Cannot remove the last admin from a workspace")
+                raise InvalidRequestError(
+                    "Cannot remove the last admin from a workspace", code="WORKSPACE_LAST_ADMIN_REMOVE_FORBIDDEN"
+                )
 
         # execute deletion
         await self.member_repo.delete_member(workspace_id, str(target_user_id))
diff --git a/backend/app/utils/credentials.py b/backend/app/utils/credentials.py
new file mode 100644
index 000000000..de8b81ff1
--- /dev/null
+++ b/backend/app/utils/credentials.py
@@ -0,0 +1,55 @@
+"""
+Shared credential helpers for CLI agent containers.
+"""
+
+from __future__ import annotations
+
+import os
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from app.models.agent import Agent
+
+# Host env keys that should be passed through to CLI agent containers
+PASSTHROUGH_ENV_KEYS = (
+    "ANTHROPIC_API_KEY",
+    "OPENAI_API_KEY",
+    "AI_GATEWAY_BASE_URL",
+    "AI_GATEWAY_API_KEY",
+    "AI_GATEWAY_PROVIDER",
+    "AI_GATEWAY_MODEL",
+    "ANTHROPIC_BASE_URL",
+    "ANTHROPIC_AUTH_TOKEN",
+    "ANTHROPIC_MODEL",
+)
+
+
+def build_credentials(custom_env: dict[str, str] | None) -> dict[str, str]:
+    """Merge agent custom_env with host AI provider keys (agent overrides host).
+
+    Raises ValueError if no Anthropic API key is found from any source.
+    """
+    env: dict[str, str] = {}
+    for key in PASSTHROUGH_ENV_KEYS:
+        val = os.environ.get(key)
+        if val:
+            env[key] = val
+    if custom_env:
+        env.update(custom_env)
+
+    has_key = env.get("ANTHROPIC_API_KEY") or env.get("ANTHROPIC_AUTH_TOKEN")
+    if not has_key:
+        raise ValueError(
+            "CLI agent requires an Anthropic API key. "
+            "Set ANTHROPIC_API_KEY or ANTHROPIC_AUTH_TOKEN in "
+            "the backend environment (.env) or in the agent's custom_env."
+        )
+    return env
+
+
+def build_agent_credentials(agent: Agent) -> dict[str, str]:
+    """Build credentials for an agent, merging its custom_env with host keys."""
+    from app.core.model.utils import decrypt_credentials
+
+    custom_env = decrypt_credentials(agent.encrypted_custom_env) if agent.encrypted_custom_env else None
+    return build_credentials(custom_env)
diff --git a/backend/app/utils/mcp.py b/backend/app/utils/mcp.py
index c969326fa..17387092c 100644
--- a/backend/app/utils/mcp.py
+++ b/backend/app/utils/mcp.py
@@ -14,6 +14,7 @@
     raise ImportError("`mcp` not installed. Please install using `pip install mcp`")
 
 
+from app.common.app_errors import InternalServiceError
 from app.utils import Audio, File, Image, Video
 
 
@@ -64,14 +65,18 @@ async def call_tool(tool_name: str, **kwargs) -> ToolResult:
     return partial(call_tool, tool_name=tool.name)
 
 
-class ToolExecutionError(Exception):
+class ToolExecutionError(InternalServiceError):
     """Tool execution error."""
 
     def __init__(self, message: str, error_type: str = "unknown", retryable: bool = False):
-        self.message = message
-        self.error_type = error_type  # 'network', 'timeout', 'config', 'permission', 'unknown'
-        self.retryable = retryable
-        super().__init__(self.message)
+        self.error_type = error_type
+        super().__init__(
+            code="TOOL_EXECUTION_FAILED",
+            message=message,
+            source="tool",
+            retryable=retryable,
+            data={"error_type": error_type} if error_type != "unknown" else None,
+        )
 
 
 def _is_retryable_error(error: Exception) -> bool:
diff --git a/backend/app/utils/mentions.py b/backend/app/utils/mentions.py
new file mode 100644
index 000000000..eabfdb579
--- /dev/null
+++ b/backend/app/utils/mentions.py
@@ -0,0 +1,33 @@
+"""
+Mention parsing for comments.
+
+Format: [@DisplayName](mention://agent/<uuid>) or [@DisplayName](mention://member/<uuid>)
+"""
+
+from __future__ import annotations
+
+import re
+import uuid
+from dataclasses import dataclass
+
+_MENTION_RE = re.compile(
+    r"\[@([^\]]*)\]\(mention://(agent|member)/([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})\)"
+)
+
+
+@dataclass(frozen=True)
+class Mention:
+    display_name: str
+    type: str  # "agent" | "member"
+    id: uuid.UUID
+
+
+def parse_mentions(content: str) -> list[Mention]:
+    return [
+        Mention(display_name=m.group(1), type=m.group(2), id=uuid.UUID(m.group(3)))
+        for m in _MENTION_RE.finditer(content)
+    ]
+
+
+def agent_mentions(content: str) -> list[Mention]:
+    return [m for m in parse_mentions(content) if m.type == "agent"]
diff --git a/backend/app/utils/safe_task.py b/backend/app/utils/safe_task.py
new file mode 100644
index 000000000..95e3cd97d
--- /dev/null
+++ b/backend/app/utils/safe_task.py
@@ -0,0 +1,30 @@
+"""
+safe_create_task — drop-in replacement for asyncio.create_task with error logging.
+
+Usage:
+    from app.utils.safe_task import safe_create_task
+
+    safe_create_task(some_coroutine(), name="my-task")
+"""
+
+import asyncio
+
+from loguru import logger
+
+
+def safe_create_task(coro, *, name: str | None = None) -> asyncio.Task:
+    """Create an asyncio task with automatic exception logging via done-callback."""
+    task = asyncio.create_task(coro, name=name)
+    task.add_done_callback(_log_task_exception)
+    return task
+
+
+def _log_task_exception(task: asyncio.Task) -> None:
+    if task.cancelled():
+        return
+    exc = task.exception()
+    if exc:
+        logger.error(
+            f"Background task '{task.get_name()}' failed: {exc}",
+            exc_info=exc,
+        )
diff --git a/backend/app/utils/stream_event_handler.py b/backend/app/utils/stream_event_handler.py
deleted file mode 100644
index 225fa6ccc..000000000
--- a/backend/app/utils/stream_event_handler.py
+++ /dev/null
@@ -1,1043 +0,0 @@
-"""
-Stream Event Handler (Production)
-
-Process LangGraph event streams and convert them to standardized SSE format.
-Use map-based hierarchy tracking (modeled after Langfuse CallbackHandler architecture),
-establishing N-level observation hierarchy via run_id + parent_run_id.
-
-Core design:
-- StreamState: map-based observation management (replaces stack)
-- ObservationRecord: enhanced in-memory observation record
-- StreamEventHandler: event -> SSE conversion; all handlers receive run_id/parent_run_id
-- format_sse: safe serialization with graceful degradation
-"""
-
-import json
-import time
-import uuid
-from dataclasses import dataclass
-from enum import Enum
-from typing import Any, Optional
-
-from langchain_core.messages.base import BaseMessage
-from loguru import logger
-
-from app.utils.message_serializer import serialize_messages, truncate_data
-from app.utils.token_usage import extract_usage_from_output
-
-# ============ LangGraph control-flow exceptions (not marked as ERROR) ============
-
-CONTROL_FLOW_EXCEPTIONS: set[type] = set()
-try:
-    from langgraph.errors import GraphBubbleUp
-
-    CONTROL_FLOW_EXCEPTIONS.add(GraphBubbleUp)
-except ImportError:
-    pass
-
-
-# ============ Observation Enums ============
-
-
-class ObsType(str, Enum):
-    SPAN = "SPAN"
-    GENERATION = "GENERATION"
-    TOOL = "TOOL"
-    EVENT = "EVENT"
-
-
-class ObsLevel(str, Enum):
-    DEBUG = "DEBUG"
-    DEFAULT = "DEFAULT"
-    WARNING = "WARNING"
-    ERROR = "ERROR"
-
-
-class ObsStatus(str, Enum):
-    RUNNING = "RUNNING"
-    COMPLETED = "COMPLETED"
-    FAILED = "FAILED"
-    INTERRUPTED = "INTERRUPTED"
-
-
-# ============ ObservationRecord ============
-
-
-@dataclass
-class ObservationRecord:
-    """
-    In-memory observation record.
-    Batch-written to the database after the SSE stream ends.
-    """
-
-    id: str
-    trace_id: str
-    parent_observation_id: Optional[str]
-    type: ObsType
-    name: Optional[str]
-    start_time: float  # epoch ms
-    # Lifecycle
-    end_time: Optional[float] = None
-    duration_ms: Optional[int] = None
-    status: ObsStatus = ObsStatus.RUNNING
-    # I/O
-    input_data: Optional[Any] = None
-    output_data: Optional[Any] = None
-    # Model info (GENERATION only)
-    model_name: Optional[str] = None
-    model_provider: Optional[str] = None
-    model_parameters: Optional[dict] = None
-    # Token usage (GENERATION only)
-    prompt_tokens: Optional[int] = None
-    completion_tokens: Optional[int] = None
-    total_tokens: Optional[int] = None
-    # Level / status
-    level: ObsLevel = ObsLevel.DEFAULT
-    status_message: Optional[str] = None
-    # Timestamps
-    completion_start_time: Optional[float] = None  # time-to-first-token (GENERATION)
-    # Meta
-    metadata: Optional[dict] = None
-    version: Optional[str] = None  # code/model version
-
-
-# ============ StreamState ============
-
-
-class StreamState:
-    """
-    Streaming state tracker.
-
-    Use map-based hierarchy tracking (modeled after Langfuse runs + _child_to_parent_run_id_map)
-    instead of stack-based approach, correctly supporting concurrent and out-of-order events.
-    """
-
-    def __init__(self, thread_id: str):
-        self.thread_id = thread_id
-        self.all_messages: list[BaseMessage] = []
-        self.assistant_content = ""
-        self.stopped = False
-        self.has_error = False
-
-        # agent run artifacts directory (artifacts API)
-        self.artifact_run_id: str = str(uuid.uuid4())
-
-        # interrupt state
-        self.interrupted = False
-        self.interrupt_node: str | None = None
-        self.interrupt_state: dict | None = None
-
-        # ============ Trace / Observation tracking ============
-        from app.core.trace_context import get_trace_id
-
-        self.trace_id: str = get_trace_id() or str(uuid.uuid4())
-        self.trace_start_time: float = time.time() * 1000  # epoch ms
-
-        # core mappings (modeled after Langfuse CallbackHandler)
-        # run_id -> ObservationRecord (active observations)
-        self._active: dict[str, ObservationRecord] = {}
-        # run_id -> parent_run_id (hierarchy)
-        self._parent_map: dict[str, Optional[str]] = {}
-        # all completed observations (for persistence)
-        self._completed: list[ObservationRecord] = []
-        # run_id -> observation_id mapping
-        self._run_to_obs: dict[str, str] = {}
-        # observation_id -> run_id (reverse mapping)
-        self._obs_to_run: dict[str, str] = {}
-        # first-token tracking
-        self._completion_start_tracked: set[str] = set()
-
-    def append_content(self, chunk: str):
-        """Append a content chunk."""
-        self.assistant_content += chunk
-
-    # ============ Observation lifecycle ============
-
-    def create_observation(
-        self,
-        *,
-        run_id: str,
-        parent_run_id: Optional[str] = None,
-        obs_type: ObsType,
-        name: Optional[str] = None,
-        input_data: Optional[Any] = None,
-        model_name: Optional[str] = None,
-        model_provider: Optional[str] = None,
-        model_parameters: Optional[dict] = None,
-        metadata: Optional[dict] = None,
-    ) -> str:
-        """
-        Create an observation, establishing hierarchy via parent_run_id (not stack push).
-
-        Modeled after Langfuse _attach_observation() + _child_to_parent_run_id_map.
-
-        Returns:
-            observation_id
-        """
-        obs_id = str(uuid.uuid4())
-
-        # establish hierarchy
-        self._parent_map[run_id] = parent_run_id
-
-        # resolve parent_observation_id (similar to Langfuse _get_parent_observation)
-        parent_obs_id: Optional[str] = None
-        if parent_run_id and parent_run_id in self._run_to_obs:
-            parent_obs_id = self._run_to_obs[parent_run_id]
-
-        record = ObservationRecord(
-            id=obs_id,
-            trace_id=self.trace_id,
-            parent_observation_id=parent_obs_id,
-            type=obs_type,
-            name=name,
-            start_time=time.time() * 1000,
-            input_data=input_data,
-            model_name=model_name,
-            model_provider=model_provider,
-            model_parameters=model_parameters,
-            metadata=metadata,
-        )
-
-        self._active[obs_id] = record
-        self._run_to_obs[run_id] = obs_id
-        self._obs_to_run[obs_id] = run_id
-
-        return obs_id
-
-    def end_observation(
-        self,
-        run_id: str,
-        *,
-        output_data: Optional[Any] = None,
-        level: Optional[ObsLevel] = None,
-        status_message: Optional[str] = None,
-        prompt_tokens: Optional[int] = None,
-        completion_tokens: Optional[int] = None,
-        total_tokens: Optional[int] = None,
-        status: ObsStatus = ObsStatus.COMPLETED,
-    ) -> Optional[str]:
-        """
-        Complete an observation and move it to the completed list.
-
-        Modeled after Langfuse _detach_observation().
-
-        Returns:
-            observation_id, or None if run_id was not found
-        """
-        obs_id = self._run_to_obs.get(run_id)
-        if not obs_id:
-            logger.debug(f"end_observation: no observation for run_id={run_id[:8]}...")
-            return None
-
-        record = self._active.pop(obs_id, None)
-        if not record:
-            logger.debug(f"end_observation: observation {obs_id[:8]} not active")
-            return obs_id  # may have already been ended
-
-        now = time.time() * 1000
-        record.end_time = now
-        record.duration_ms = int(now - record.start_time)
-        record.status = status
-
-        if output_data is not None:
-            record.output_data = output_data
-        if level is not None:
-            record.level = level
-        if status_message is not None:
-            record.status_message = status_message[:2000]  # cap length
-        if prompt_tokens is not None:
-            record.prompt_tokens = prompt_tokens
-        if completion_tokens is not None:
-            record.completion_tokens = completion_tokens
-        if total_tokens is not None:
-            record.total_tokens = total_tokens
-
-        self._completed.append(record)
-
-        # clean up mappings
-        del self._run_to_obs[run_id]
-        self._obs_to_run.pop(obs_id, None)
-
-        return obs_id
-
-    def get_observation_id(self, run_id: str) -> Optional[str]:
-        """Return the observation_id for a given run_id."""
-        return self._run_to_obs.get(run_id)
-
-    def get_parent_observation_id(self, run_id: str) -> Optional[str]:
-        """Return the parent observation_id for a run_id (used in SSE envelope)."""
-        parent_run = self._parent_map.get(run_id)
-        if parent_run and parent_run in self._run_to_obs:
-            return self._run_to_obs[parent_run]
-        return None
-
-    def track_completion_start(self, run_id: str) -> None:
-        """Record time-to-first-token for a GENERATION observation."""
-        obs_id = self._run_to_obs.get(run_id)
-        if obs_id and obs_id not in self._completion_start_tracked:
-            record = self._active.get(obs_id)
-            if record and record.type == ObsType.GENERATION:
-                record.completion_start_time = time.time() * 1000
-                self._completion_start_tracked.add(obs_id)
-
-    def get_all_observations(self) -> list[ObservationRecord]:
-        """
-        Return all observations (completed + incomplete).
-        Mark incomplete ones as INTERRUPTED.
-        """
-        all_obs = list(self._completed)
-        for obs in self._active.values():
-            obs.status = ObsStatus.INTERRUPTED
-            obs.end_time = time.time() * 1000
-            obs.duration_ms = int(obs.end_time - obs.start_time)
-            all_obs.append(obs)
-        return all_obs
-
-
-# ============ StreamEventHandler ============
-
-
-class StreamEventHandler:
-    """
-    Production-grade streaming event handler.
-
-    All handle_* methods uniformly accept run_id and parent_run_id,
-    using StreamState's map-based observation management.
-    """
-
-    @staticmethod
-    def _extract_metadata(event: dict) -> dict:
-        """Extract standardized metadata."""
-        metadata = event.get("metadata", {})
-        if not isinstance(metadata, dict):
-            metadata = {}
-        config = metadata.get("config", {})
-        if not isinstance(config, dict):
-            config = {}
-        return {
-            "node_name": metadata.get("langgraph_node") or event.get("name") or "unknown",
-            "run_id": event.get("run_id", ""),
-            "tags": config.get("tags") or metadata.get("tags") or event.get("tags") or [],
-            "timestamp": int(time.time() * 1000),
-        }
-
-    @staticmethod
-    def _extract_node_info(event: dict) -> dict:
-        """Extract node info (name, label, ID, etc.)."""
-        metadata = event.get("metadata", {})
-        if not isinstance(metadata, dict):
-            metadata = {}
-        config = metadata.get("config", {})
-        if not isinstance(config, dict):
-            config = {}
-
-        node_name = metadata.get("langgraph_node") or event.get("name") or "unknown"
-
-        tags = config.get("tags") or metadata.get("tags") or event.get("tags") or []
-        if not isinstance(tags, list):
-            tags = []
-
-        first_tag = tags[0] if tags else None
-        first_tag_label = first_tag.get("label") if isinstance(first_tag, dict) else None
-
-        node_label = (
-            config.get("node_label")
-            or metadata.get("node_label")
-            or first_tag_label
-            or node_name.replace("_", " ").title()
-        )
-
-        return {
-            "node_name": node_name,
-            "node_label": node_label,
-            "node_id": config.get("node_id") or metadata.get("node_id"),
-            "node_type": config.get("node_type") or metadata.get("node_type"),
-        }
-
-    @staticmethod
-    def _extract_model_parameters(event: dict) -> Optional[dict]:
-        """Extract model parameters (temperature, max_tokens, etc.) from a LangGraph event."""
-        metadata = event.get("metadata", {})
-        if not isinstance(metadata, dict):
-            return None
-        invocation_params = metadata.get("ls_model_kwargs") or {}
-        if not isinstance(invocation_params, dict):
-            return None
-
-        params = {}
-        for key in [
-            "temperature",
-            "max_tokens",
-            "max_completion_tokens",
-            "top_p",
-            "frequency_penalty",
-            "presence_penalty",
-            "stop",
-            "request_timeout",
-        ]:
-            if key in invocation_params:
-                params[key] = invocation_params[key]
-
-        return params if params else None
-
-    @staticmethod
-    def format_sse(
-        event_type: str,
-        payload: dict,
-        thread_id: str,
-        state: Optional["StreamState"] = None,
-    ) -> str:
-        """
-        Build a standard SSE envelope.
-
-        Include trace / observation hierarchy info.
-        Degrade to a simplified event on serialization failure.
-        """
-        meta = payload.pop("_meta", {})
-
-        def _default(obj: Any) -> Any:
-            if isinstance(obj, BaseMessage):
-                return {
-                    "type": obj.__class__.__name__,
-                    "content": str(obj.content) if hasattr(obj, "content") else str(obj),
-                }
-            if isinstance(obj, Enum):
-                return obj.value
-            if hasattr(obj, "model_dump"):
-                try:
-                    return obj.model_dump()
-                except Exception:
-                    logger.debug("model_dump() failed in SSE serializer", exc_info=True)
-            if hasattr(obj, "dict"):
-                try:
-                    return obj.dict()
-                except Exception:
-                    logger.debug("dict() failed in SSE serializer", exc_info=True)
-            return str(obj)
-
-        envelope = {
-            "type": event_type,
-            "thread_id": thread_id,
-            "run_id": meta.get("run_id", ""),
-            "node_name": meta.get("node_name", "system"),
-            "timestamp": meta.get("timestamp", int(time.time() * 1000)),
-            "tags": meta.get("tags", []),
-            "trace_id": meta.get("trace_id", state.trace_id if state else ""),
-            "observation_id": meta.get("observation_id", ""),
-            "parent_observation_id": meta.get("parent_observation_id", ""),
-            "data": payload,
-        }
-
-        try:
-            return f"data: {json.dumps(envelope, ensure_ascii=False, default=_default)}\n\n"
-        except (TypeError, ValueError, OverflowError) as e:
-            logger.warning(f"SSE serialization failed for {event_type}: {e}")
-            fallback = {
-                "type": event_type,
-                "thread_id": thread_id,
-                "timestamp": int(time.time() * 1000),
-                "trace_id": state.trace_id if state else "",
-                "data": {"_serialization_error": str(e)[:200]},
-            }
-            return f"data: {json.dumps(fallback)}\n\n"
-
-    # ==================== Handler Methods ====================
-
-    # Max chars per message content in the model_input SSE frame.
-    # The system prompt + full conversation history in skill-creator turns can
-    # easily exceed 500 KB, causing the WS frame to be dropped by the browser.
-    _MODEL_INPUT_MSG_CONTENT_LIMIT = 2000
-
-    @staticmethod
-    def _truncate_messages_for_sse(messages: list[dict]) -> list[dict]:
-        """Truncate individual message content so the model_input SSE frame stays small.
-
-        Keeps message structure (role, tool_calls, etc.) intact; only shortens
-        the 'content' field of each message to avoid oversized WS frames.
-        """
-        limit = StreamEventHandler._MODEL_INPUT_MSG_CONTENT_LIMIT
-        result = []
-        for msg in messages:
-            content = msg.get("content")
-            if isinstance(content, str) and len(content) > limit:
-                msg = {**msg, "content": content[:limit] + "… [truncated]"}
-            elif isinstance(content, list):
-                # Multimodal content blocks — truncate text parts
-                truncated_parts = []
-                for part in content:
-                    if isinstance(part, dict) and part.get("type") == "text":
-                        text = part.get("text", "")
-                        if len(text) > limit:
-                            part = {**part, "text": text[:limit] + "… [truncated]"}
-                    truncated_parts.append(part)
-                msg = {**msg, "content": truncated_parts}
-            result.append(msg)
-        return result
-
-    async def handle_chat_model_start(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> str:
-        """Handle model start event. Create a GENERATION observation."""
-        try:
-            event_data = event.get("data", {})
-            input_data = event_data.get("input", {})
-            raw_messages = input_data.get("messages", [])
-
-            serialized_messages = serialize_messages(raw_messages)
-
-            metadata = event.get("metadata", {})
-            if not isinstance(metadata, dict):
-                metadata = {}
-            model_name = metadata.get("ls_model_name") or event.get("name", "unknown")
-            model_provider = metadata.get("ls_provider") or "unknown"
-            model_parameters = self._extract_model_parameters(event)
-
-            obs_id = state.create_observation(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
-                obs_type=ObsType.GENERATION,
-                name=model_name,
-                input_data=truncate_data({"messages": serialized_messages}),
-                model_name=model_name,
-                model_provider=model_provider,
-                model_parameters=model_parameters,
-            )
-
-            meta = self._extract_metadata(event)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse(
-                "model_input",
-                {
-                    "messages": self._truncate_messages_for_sse(serialized_messages),
-                    "model_name": model_name,
-                    "model_provider": model_provider,
-                    "_meta": meta,
-                },
-                state.thread_id,
-                state,
-            )
-        except Exception as e:
-            logger.exception(f"handle_chat_model_start failed: {e}")
-            return self.format_sse(
-                "model_input",
-                {
-                    "messages": [],
-                    "model_name": "unknown",
-                    "model_provider": "unknown",
-                    "_meta": self._extract_metadata(event),
-                },
-                state.thread_id,
-                state,
-            )
-
-    async def handle_chat_model_stream(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> Optional[str]:
-        """Handle text stream event. Record time-to-first-token."""
-        try:
-            chunk = event.get("data", {}).get("chunk")
-            if not chunk or not hasattr(chunk, "content") or not chunk.content:
-                return None
-
-            content = chunk.content
-            state.append_content(content)
-
-            # record time-to-first-token
-            state.track_completion_start(run_id)
-
-            obs_id = state.get_observation_id(run_id) or ""
-
-            meta = self._extract_metadata(event)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse("content", {"delta": content, "_meta": meta}, state.thread_id, state)
-        except Exception as e:
-            logger.exception(f"handle_chat_model_stream failed: {e}")
-            return None
-
-    async def handle_chat_model_end(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> str:
-        """Handle model end event. Parse token usage precisely (multi-vendor compatible)."""
-        try:
-            event_data = event.get("data", {})
-            output = event_data.get("output")
-
-            metadata = event.get("metadata", {})
-            if not isinstance(metadata, dict):
-                metadata = {}
-            model_name = metadata.get("ls_model_name") or event.get("name", "unknown")
-            model_provider = metadata.get("ls_provider") or "unknown"
-
-            # multi-source token usage extraction
-            usage = extract_usage_from_output(output)
-            prompt_tokens = usage.get("input", 0) if usage else 0
-            completion_tokens = usage.get("output", 0) if usage else 0
-            total_tokens = usage.get("total", 0) if usage else 0
-
-            # raw usage_metadata for frontend display
-            usage_metadata = None
-            if output and hasattr(output, "usage_metadata") and output.usage_metadata:
-                um = output.usage_metadata
-                if hasattr(um, "__dict__"):
-                    usage_metadata = {k: v for k, v in um.__dict__.items() if not k.startswith("_")}
-                elif isinstance(um, dict):
-                    usage_metadata = um
-
-            # complete GENERATION observation
-            output_summary = truncate_data(str(output), max_length=2000) if output else None
-            obs_id = state.end_observation(
-                run_id,
-                output_data={"output": output_summary} if output_summary else None,
-                prompt_tokens=prompt_tokens or None,
-                completion_tokens=completion_tokens or None,
-                total_tokens=total_tokens or None,
-            )
-
-            meta = self._extract_metadata(event)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id or ""
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse(
-                "model_output",
-                {
-                    "output": output,
-                    "model_name": model_name,
-                    "model_provider": model_provider,
-                    "usage_metadata": usage_metadata,
-                    "prompt_tokens": prompt_tokens,
-                    "completion_tokens": completion_tokens,
-                    "total_tokens": total_tokens,
-                    "_meta": meta,
-                },
-                state.thread_id,
-                state,
-            )
-        except Exception as e:
-            logger.exception(f"handle_chat_model_end failed: {e}")
-            return self.format_sse(
-                "model_output",
-                {
-                    "output": None,
-                    "model_name": "unknown",
-                    "model_provider": "unknown",
-                    "_meta": self._extract_metadata(event),
-                },
-                state.thread_id,
-                state,
-            )
-
-    async def handle_tool_start(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> str:
-        """Handle tool start event. Create a TOOL observation."""
-        try:
-            tool_input = event.get("data", {}).get("input", {})
-            if isinstance(tool_input, dict):
-                tool_input = {k: v for k, v in tool_input.items() if k != "runtime"}
-
-            tool_name = event.get("name")
-
-            obs_id = state.create_observation(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
-                obs_type=ObsType.TOOL,
-                name=tool_name,
-                input_data=truncate_data({"tool_input": tool_input}),
-            )
-
-            meta = self._extract_metadata(event)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse(
-                "tool_start",
-                {"tool_name": tool_name, "tool_input": tool_input, "_meta": meta},
-                state.thread_id,
-                state,
-            )
-        except Exception as e:
-            logger.exception(f"handle_tool_start failed: {e}")
-            return self.format_sse(
-                "tool_start",
-                {"tool_name": event.get("name"), "tool_input": {}, "_meta": self._extract_metadata(event)},
-                state.thread_id,
-                state,
-            )
-
-    async def handle_tool_end(self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]) -> str:
-        """Handle tool end event. Complete the TOOL observation."""
-        try:
-            raw_output = event.get("data", {}).get("output")
-            output = raw_output.content if hasattr(raw_output, "content") else raw_output
-            tool_name = event.get("name")
-
-            # detect errors
-            has_error = _detect_error(output)
-
-            output_summary = truncate_data(str(output), max_length=2000) if output else None
-            obs_id = state.end_observation(
-                run_id,
-                output_data={"tool_output": output_summary} if output_summary else None,
-                level=ObsLevel.ERROR if has_error else ObsLevel.DEFAULT,
-                status_message=str(output)[:500] if has_error else None,
-                status=ObsStatus.FAILED if has_error else ObsStatus.COMPLETED,
-            )
-
-            # compute duration
-            record = None
-            for rec in state._completed:
-                if rec.id == obs_id:
-                    record = rec
-                    break
-            duration = record.duration_ms if record else None
-
-            meta = self._extract_metadata(event)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id or ""
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse(
-                "tool_end",
-                {
-                    "tool_name": tool_name,
-                    "tool_output": output,
-                    "duration": duration,
-                    "status": "error" if has_error else "success",
-                    "_meta": meta,
-                },
-                state.thread_id,
-                state,
-            )
-        except Exception as e:
-            logger.exception(f"handle_tool_end failed: {e}")
-            return self.format_sse(
-                "tool_end",
-                {
-                    "tool_name": event.get("name"),
-                    "tool_output": None,
-                    "status": "error",
-                    "_meta": self._extract_metadata(event),
-                },
-                state.thread_id,
-                state,
-            )
-
-    async def handle_node_start(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> str:
-        """Handle node start event. Create a SPAN observation."""
-        try:
-            node_info = self._extract_node_info(event)
-            node_name = node_info["node_name"]
-
-            obs_id = state.create_observation(
-                run_id=run_id,
-                parent_run_id=parent_run_id,
-                obs_type=ObsType.SPAN,
-                name=node_name,
-                metadata={"node_label": node_info.get("node_label"), "node_type": node_info.get("node_type")},
-            )
-
-            meta = self._extract_metadata(event)
-            meta.update(node_info)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            return self.format_sse(
-                "node_start",
-                {
-                    "node_name": node_name,
-                    "node_label": node_info.get("node_label", node_name),
-                    "node_id": node_info.get("node_id"),
-                    "_meta": meta,
-                },
-                state.thread_id,
-                state,
-            )
-        except Exception as e:
-            logger.exception(f"handle_node_start failed: {e}")
-            return self.format_sse(
-                "node_start",
-                {"node_name": "unknown", "node_label": "Unknown", "_meta": self._extract_metadata(event)},
-                state.thread_id,
-                state,
-            )
-
-    async def handle_node_end(
-        self, event: dict, state: StreamState, run_id: str, parent_run_id: Optional[str]
-    ) -> list[str]:
-        """Handle node end event. Return multiple SSE events."""
-        try:
-            node_info = self._extract_node_info(event)
-            node_name = node_info["node_name"]
-            node_type = node_info.get("node_type", "unknown")
-
-            output = event.get("data", {}).get("output")
-            has_error = _detect_error(output)
-
-            # complete SPAN observation
-            output_summary = None
-            if output and isinstance(output, dict):
-                output_summary = truncate_data(
-                    {k: str(v)[:500] for k, v in list(output.items())[:10]},
-                    max_length=5000,
-                )
-
-            obs_id = state.end_observation(
-                run_id,
-                output_data=output_summary,
-                level=ObsLevel.ERROR if has_error else ObsLevel.DEFAULT,
-                status_message=str(output)[:500] if has_error else None,
-                status=ObsStatus.FAILED if has_error else ObsStatus.COMPLETED,
-            )
-
-            # compute duration
-            record = None
-            for rec in state._completed:
-                if rec.id == obs_id:
-                    record = rec
-                    break
-            duration = record.duration_ms if record else None
-
-            meta = self._extract_metadata(event)
-            meta.update(node_info)
-            meta["trace_id"] = state.trace_id
-            meta["observation_id"] = obs_id or ""
-            meta["parent_observation_id"] = state.get_parent_observation_id(run_id) or ""
-
-            events: list[str] = []
-
-            # 0. CodeAgent events
-            if output and isinstance(output, dict):
-                code_agent_events = output.get("code_agent_events", [])
-                if code_agent_events:
-                    events.extend(self._process_code_agent_events(code_agent_events, node_name, meta, state))
-
-            # get the current node's local output (if using Option B data flow)
-            local_payload = None
-            if output and isinstance(output, dict):
-                node_outputs = output.get("node_outputs", {})
-                if node_id := node_info.get("node_id"):
-                    local_payload = node_outputs.get(node_id)
-                elif node_name in node_outputs:  # Fallback backwards compat
-                    local_payload = node_outputs.get(node_name)
-
-            # 1. node_end event
-            events.append(
-                self.format_sse(
-                    "node_end",
-                    {
-                        "node_name": node_name,
-                        "node_label": node_info.get("node_label", node_name),
-                        "node_id": node_info.get("node_id"),
-                        "duration": duration,
-                        "status": "error" if has_error else "success",
-                        "payload": local_payload,  # Option B localized output
-                        "_meta": meta,
-                    },
-                    state.thread_id,
-                    state,
-                )
-            )
-
-            # 2. Command / state related events
-            if output and isinstance(output, dict):
-                events.extend(self._process_output_events(output, node_info, node_type, meta, state))
-
-            return events
-        except Exception as e:
-            logger.exception(f"handle_node_end failed: {e}")
-            meta = self._extract_metadata(event)
-            return [
-                self.format_sse(
-                    "node_end",
-                    {"node_name": "unknown", "status": "error", "_meta": meta},
-                    state.thread_id,
-                    state,
-                )
-            ]
-
-    # ==================== Private Helpers ====================
-
-    def _process_code_agent_events(
-        self, code_agent_events: list, node_name: str, meta: dict, state: StreamState
-    ) -> list[str]:
-        """Process a list of CodeAgent events."""
-        events = []
-        type_map = {
-            "thought": "code_agent_thought",
-            "code": "code_agent_code",
-            "observation": "code_agent_observation",
-            "final_answer": "code_agent_final_answer",
-            "planning": "code_agent_planning",
-            "error": "code_agent_error",
-        }
-
-        for ca_event in code_agent_events:
-            ca_type = ca_event.get("type", "unknown")
-            ca_content = ca_event.get("content", "")
-            ca_step = ca_event.get("step", 0)
-            ca_metadata = ca_event.get("metadata", {})
-
-            sse_type = type_map.get(ca_type)
-            if not sse_type:
-                continue
-
-            payload: dict[str, Any] = {"node_name": node_name, "step": ca_step, "_meta": meta}
-
-            if ca_type == "thought":
-                payload["content"] = ca_content
-            elif ca_type == "code":
-                payload["code"] = ca_content
-            elif ca_type == "observation":
-                payload["observation"] = ca_content
-                payload["has_error"] = bool(ca_metadata.get("error"))
-            elif ca_type == "final_answer":
-                payload["answer"] = ca_content
-            elif ca_type == "planning":
-                payload["plan"] = ca_content
-                payload["is_update"] = ca_metadata.get("is_update", False)
-            elif ca_type == "error":
-                payload["error"] = ca_content
-
-            events.append(self.format_sse(sse_type, payload, state.thread_id, state))
-
-        return events
-
-    def _process_output_events(
-        self, output: dict, node_info: dict, node_type: str, meta: dict, state: StreamState
-    ) -> list[str]:
-        """Process Command / route / loop / parallel events from node output."""
-        events = []
-        node_name = node_info["node_name"]
-        route_decision = output.get("route_decision")
-        route_reason = output.get("route_reason")
-
-        # routing decision
-        if node_type in ["condition", "router", "loop"] and route_decision:
-            events.append(
-                self.format_sse(
-                    "route_decision",
-                    {
-                        "node_id": node_info.get("node_id") or node_name,
-                        "node_type": node_type,
-                        "result": route_decision,
-                        "reason": route_reason or f"routing decision: {route_decision}",
-                        "goto": "unknown",
-                    },
-                    state.thread_id,
-                    state,
-                )
-            )
-
-        # Command events
-        cleaned_update = {}
-        for k, v in output.items():
-            if k in ["route_decision", "route_reason"]:
-                continue
-            if k == "task_results" and isinstance(v, list):
-                cleaned_update[k] = _clean_task_results(v)
-            else:
-                cleaned_update[k] = v
-
-        events.append(
-            self.format_sse(
-                "command",
-                {"update": cleaned_update, "goto": None, "reason": route_reason},
-                state.thread_id,
-                state,
-            )
-        )
-
-        # loop iteration
-        loop_count = output.get("loop_count")
-        if loop_count is not None:
-            events.append(
-                self.format_sse(
-                    "loop_iteration",
-                    {
-                        "loop_node_id": node_info.get("node_id") or node_name,
-                        "iteration": loop_count,
-                        "max_iterations": output.get("max_loop_iterations", 0),
-                        "condition_met": output.get("loop_condition_met", False),
-                        "reason": output.get("route_reason") or f"iteration {loop_count}",
-                    },
-                    state.thread_id,
-                    state,
-                )
-            )
-
-        # parallel tasks
-        task_states = output.get("task_states")
-        if task_states and isinstance(task_states, dict):
-            for task_id, task_state in task_states.items():
-                if isinstance(task_state, dict):
-                    status_map = {"running": "started", "completed": "completed", "error": "error"}
-                    events.append(
-                        self.format_sse(
-                            "parallel_task",
-                            {
-                                "task_id": task_id,
-                                "status": status_map.get(task_state.get("status", ""), "started"),
-                                "result": task_state.get("result"),
-                                "error_msg": task_state.get("error_msg"),
-                            },
-                            state.thread_id,
-                            state,
-                        )
-                    )
-
-        # state update
-        updated_fields = [k for k in output.keys() if k not in ["route_decision", "route_reason"]]
-        if updated_fields:
-            events.append(
-                self.format_sse(
-                    "state_update",
-                    {"updated_fields": updated_fields, "state_snapshot": output},
-                    state.thread_id,
-                    state,
-                )
-            )
-
-        return events
-
-
-# ============ Module-level Helpers ============
-
-
-def _detect_error(output: Any) -> bool:
-    """Detect whether the output contains error information."""
-    if isinstance(output, dict):
-        return any(output.get(k) is not None for k in ("error", "exception", "Error"))
-    if isinstance(output, str):
-        lower = output.lower()
-        return any(kw in lower for kw in ("error", "exception", "failed", "failure"))
-    return False
-
-
-def _clean_task_results(task_results: list) -> list:
-    """Remove circular references from task_results."""
-    cleaned = []
-    for tr in task_results:
-        if isinstance(tr, dict):
-            result = {"status": tr.get("status"), "task_id": tr.get("task_id")}
-            if "error_msg" in tr:
-                result["error_msg"] = tr.get("error_msg")
-            rv = tr.get("result")
-            if isinstance(rv, dict):
-                result["result"] = {k: v for k, v in rv.items() if k != "task_results"}
-            else:
-                result["result"] = rv
-            cleaned.append(result)
-        else:
-            cleaned.append(tr)
-    return cleaned
diff --git a/backend/app/utils/string.py b/backend/app/utils/string.py
index 31bac13bf..78328c8b3 100644
--- a/backend/app/utils/string.py
+++ b/backend/app/utils/string.py
@@ -1,9 +1,7 @@
 import hashlib
 import json
 import re
-import uuid
 from typing import Optional, Tuple, Type
-from uuid import uuid4
 
 from loguru import logger
 from pydantic import BaseModel, ValidationError
@@ -199,19 +197,3 @@ def parse_response_model_str(content: str, output_schema: Type[BaseModel]) -> Op
                     logger.warning("All parsing attempts failed.")
 
     return structured_output
-
-
-def generate_id(seed: Optional[str] = None) -> str:
-    """
-    Generate a deterministic UUID5 based on a seed string.
-    If no seed is provided, generate a random UUID4.
-
-    Args:
-        seed (str): The seed string to generate the UUID from.
-
-    Returns:
-        str: A deterministic UUID5 string.
-    """
-    if seed is None:
-        return str(uuid4())
-    return str(uuid.uuid5(uuid.NAMESPACE_DNS, seed))
diff --git a/backend/app/utils/token_usage.py b/backend/app/utils/token_usage.py
index 0ae18c3aa..648c78565 100644
--- a/backend/app/utils/token_usage.py
+++ b/backend/app/utils/token_usage.py
@@ -140,9 +140,6 @@ def extract_usage_from_output(output: Any) -> Optional[dict[str, int]]:
             # 4. amazon-bedrock-invocationMetrics (Bedrock-Titan)
             if raw_usage is None:
                 raw_usage = rm.get("amazon-bedrock-invocationMetrics")
-            # 5. usage_metadata (legacy fallback)
-            if raw_usage is None:
-                raw_usage = rm.get("usage_metadata")
 
     if raw_usage is None:
         return None
diff --git a/backend/app/websocket/chat_commands.py b/backend/app/websocket/chat_commands.py
deleted file mode 100644
index c0a1c6770..000000000
--- a/backend/app/websocket/chat_commands.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""Command types and dispatch for chat WebSocket frames."""
-
-from __future__ import annotations
-
-import uuid as uuid_lib
-from dataclasses import dataclass, field
-from typing import Any, Mapping
-
-from app.websocket.chat_protocol import ParsedChatExtension, ParsedChatStartFrame, ParsedCopilotExtension
-
-
-@dataclass(frozen=True)
-class StandardChatTurnCommand:
-    """Command representing a normal user chat message."""
-
-    request_id: str
-    message: str
-    thread_id: str | None
-    graph_id: uuid_lib.UUID | None
-    provider_name: str | None
-    model_name: str | None
-    metadata: dict[str, Any]
-    files: list[dict[str, Any]]
-
-
-@dataclass(frozen=True)
-class SkillCreatorTurnCommand(StandardChatTurnCommand):
-    """Command for a Skill Creator turn, extending the standard command."""
-
-    run_id: str | None
-    edit_skill_id: str | None
-
-
-@dataclass(frozen=True)
-class ChatRunTurnCommand(StandardChatTurnCommand):
-    """Command for a Chat run turn, extending the standard command."""
-
-    run_id: str | None = None
-
-
-@dataclass(frozen=True)
-class CopilotTurnCommand(StandardChatTurnCommand):
-    """Command for a Copilot turn, extending the standard command."""
-
-    run_id: str | None = None
-    graph_context: dict[str, Any] = field(default_factory=dict)
-    conversation_history: list[dict[str, Any]] = field(default_factory=list)
-    mode: str = "deepagents"
-
-
-ChatTurnCommand = StandardChatTurnCommand | SkillCreatorTurnCommand | ChatRunTurnCommand | CopilotTurnCommand
-
-
-def build_command_from_parsed_frame(frame: ParsedChatStartFrame) -> ChatTurnCommand:
-    """Convert a validated ParsedChatStartFrame into a ChatTurnCommand."""
-    metadata, files = _sanitize_metadata_files(frame.metadata, frame.input.files)
-    provider_name = frame.input.provider_name
-    model_name = frame.input.model_name
-
-    extension = frame.extension
-    if extension is None:
-        return StandardChatTurnCommand(
-            request_id=frame.request_id,
-            message=frame.input.message,
-            thread_id=frame.thread_id,
-            graph_id=frame.graph_id,
-            provider_name=provider_name,
-            model_name=model_name,
-            metadata=metadata,
-            files=files,
-        )
-
-    if isinstance(extension, ParsedCopilotExtension):
-        return CopilotTurnCommand(
-            request_id=frame.request_id,
-            message=frame.input.message,
-            thread_id=frame.thread_id,
-            graph_id=frame.graph_id,
-            provider_name=provider_name,
-            model_name=model_name,
-            metadata=metadata,
-            files=files,
-            run_id=extension.run_id,
-            graph_context=extension.graph_context,
-            conversation_history=extension.conversation_history,
-            mode=extension.mode,
-        )
-
-    if isinstance(extension, ParsedChatExtension):
-        return ChatRunTurnCommand(
-            request_id=frame.request_id,
-            message=frame.input.message,
-            thread_id=frame.thread_id,
-            graph_id=frame.graph_id,
-            provider_name=provider_name,
-            model_name=model_name,
-            metadata=metadata,
-            files=files,
-            run_id=extension.run_id,
-        )
-
-    # skill_creator path
-    if extension.edit_skill_id:
-        metadata["edit_skill_id"] = extension.edit_skill_id
-
-    return SkillCreatorTurnCommand(
-        request_id=frame.request_id,
-        message=frame.input.message,
-        thread_id=frame.thread_id,
-        graph_id=frame.graph_id,
-        provider_name=provider_name,
-        model_name=model_name,
-        metadata=metadata,
-        files=files,
-        run_id=extension.run_id,
-        edit_skill_id=extension.edit_skill_id,
-    )
-
-
-def _normalize_files(files: list[Any]) -> list[dict[str, Any]]:
-    return [f for f in files if isinstance(f, dict)]
-
-
-def _sanitize_metadata_files(
-    metadata: Mapping[str, Any], raw_files: Any
-) -> tuple[dict[str, Any], list[dict[str, Any]]]:
-    sanitized = dict(metadata)
-    sanitized.pop("files", None)
-
-    files = _normalize_files(raw_files if isinstance(raw_files, list) else [])
-    if files:
-        sanitized["files"] = files
-
-    return sanitized, files
diff --git a/backend/app/websocket/chat_protocol.py b/backend/app/websocket/chat_protocol.py
deleted file mode 100644
index 3c5bfd036..000000000
--- a/backend/app/websocket/chat_protocol.py
+++ /dev/null
@@ -1,197 +0,0 @@
-"""Chat WebSocket protocol: frame parsing, validation, and message types."""
-
-from __future__ import annotations
-
-import uuid as uuid_lib
-from dataclasses import dataclass
-from typing import Any, Literal
-
-RESERVED_METADATA_KEYS = {"mode", "run_id", "edit_skill_id", "extension", "kind", "files"}
-ALLOWED_CLIENT_FRAME_TYPES = {
-    "ping",
-    "chat.start",
-    "chat.resume",
-    "chat.stop",
-}
-
-
-class ChatProtocolError(Exception):
-    """Raised when a client frame violates the chat protocol."""
-
-    def __init__(self, message: str, request_id: str | None = None) -> None:
-        super().__init__(message)
-        self.message = message
-        self.request_id = request_id
-
-
-@dataclass(frozen=True)
-class ParsedChatInput:
-    """Validated user input extracted from a chat.start frame."""
-
-    message: str
-    files: list[dict[str, Any]]
-    provider_name: str | None
-    model_name: str | None
-
-
-@dataclass(frozen=True)
-class ParsedSkillCreatorExtension:
-    """Extension payload for Skill Creator turns."""
-
-    kind: Literal["skill_creator"]
-    run_id: str | None
-    edit_skill_id: str | None
-
-
-@dataclass(frozen=True)
-class ParsedChatExtension:
-    """Extension payload for Chat run turns."""
-
-    kind: Literal["chat"]
-    run_id: str | None
-
-
-@dataclass(frozen=True)
-class ParsedCopilotExtension:
-    """Extension payload for Copilot turns."""
-
-    kind: Literal["copilot"]
-    run_id: str | None
-    graph_context: dict[str, Any]
-    conversation_history: list[dict[str, Any]]
-    mode: str
-
-
-@dataclass(frozen=True)
-class ParsedChatStartFrame:
-    """Fully validated chat.start frame ready for command construction."""
-
-    request_id: str
-    thread_id: str | None
-    graph_id: uuid_lib.UUID | None
-    input: ParsedChatInput
-    extension: ParsedSkillCreatorExtension | ParsedChatExtension | ParsedCopilotExtension | None
-    metadata: dict[str, Any]
-
-
-def parse_client_frame(frame: dict[str, Any]) -> ParsedChatStartFrame | dict[str, Any]:
-    """Parse and validate a raw client JSON frame.
-
-    Returns:
-        A ParsedChatStartFrame for chat.start frames, or the raw dict
-        for other recognized frame types (ping, resume, stop).
-
-    Raises:
-        ChatProtocolError: If the frame type is unknown or invalid.
-    """
-    frame_type = str(frame.get("type") or "")
-    if frame_type not in ALLOWED_CLIENT_FRAME_TYPES:
-        raise ChatProtocolError(f"unknown frame type: {frame_type or '<missing>'}")
-    if frame_type == "chat.start":
-        return _parse_chat_start_frame(frame)
-    return frame
-
-
-def _parse_chat_start_frame(frame: dict[str, Any]) -> ParsedChatStartFrame:
-    request_id = _coerce_request_id(frame.get("request_id"))
-    if not request_id:
-        raise ChatProtocolError("chat.start frame must include request_id")
-
-    metadata_raw = frame.get("metadata")
-    metadata = dict(metadata_raw) if isinstance(metadata_raw, dict) else {}
-    reserved = RESERVED_METADATA_KEYS.intersection(metadata.keys())
-    if reserved:
-        raise ChatProtocolError(
-            "reserved metadata keys are not allowed",
-            request_id=request_id,
-        )
-
-    input_payload = frame.get("input")
-    if not isinstance(input_payload, dict):
-        raise ChatProtocolError("chat.start frame must include an input object", request_id=request_id)
-
-    message = str(input_payload.get("message") or "")
-    files_raw = input_payload.get("files")
-    files = [f for f in files_raw if isinstance(f, dict)] if isinstance(files_raw, list) else []
-    provider_name_raw = input_payload.get("provider_name")
-    provider_name = str(provider_name_raw).strip() if provider_name_raw else None
-    model_name_raw = input_payload.get("model_name")
-    model_name = str(model_name_raw).strip() if model_name_raw else None
-
-    extension = _parse_extension(frame.get("extension"), request_id)
-
-    thread_id = _coerce_request_id(frame.get("thread_id"))
-    graph_id = _coerce_optional_uuid(frame.get("graph_id"), request_id=request_id, field_name="graph_id")
-
-    return ParsedChatStartFrame(
-        request_id=request_id,
-        thread_id=thread_id,
-        graph_id=graph_id,
-        input=ParsedChatInput(message=message, files=files, provider_name=provider_name, model_name=model_name),
-        extension=extension,
-        metadata=metadata,
-    )
-
-
-def _parse_extension(
-    raw_extension: Any, request_id: str
-) -> ParsedSkillCreatorExtension | ParsedChatExtension | ParsedCopilotExtension | None:
-    if raw_extension is None:
-        return None
-    if not isinstance(raw_extension, dict):
-        raise ChatProtocolError("extension must be an object", request_id=request_id)
-
-    kind = raw_extension.get("kind")
-    run_id = _coerce_request_id(raw_extension.get("run_id"))
-
-    if kind == "skill_creator":
-        edit_skill_id = _coerce_request_id(raw_extension.get("edit_skill_id"))
-        return ParsedSkillCreatorExtension(kind="skill_creator", run_id=run_id, edit_skill_id=edit_skill_id)
-
-    if kind == "chat":
-        return ParsedChatExtension(kind="chat", run_id=run_id)
-
-    if kind == "copilot":
-        graph_context = raw_extension.get("graph_context")
-        if not isinstance(graph_context, dict):
-            raise ChatProtocolError("copilot extension requires graph_context object", request_id=request_id)
-        conversation_history_raw = raw_extension.get("conversation_history")
-        conversation_history = (
-            [item for item in conversation_history_raw if isinstance(item, dict)]
-            if isinstance(conversation_history_raw, list)
-            else []
-        )
-        mode = str(raw_extension.get("mode") or "deepagents")
-        return ParsedCopilotExtension(
-            kind="copilot",
-            run_id=run_id,
-            graph_context=graph_context,
-            conversation_history=conversation_history,
-            mode=mode,
-        )
-
-    raise ChatProtocolError(
-        f"unsupported extension kind: {kind or '<missing>'}",
-        request_id=request_id,
-    )
-
-
-def _coerce_request_id(value: Any) -> str | None:
-    if value is None:
-        return None
-    text = str(value).strip()
-    return text or None
-
-
-def _coerce_optional_uuid(value: Any, *, request_id: str, field_name: str) -> uuid_lib.UUID | None:
-    text = _coerce_request_id(value)
-    if text is None:
-        return None
-
-    try:
-        return uuid_lib.UUID(text)
-    except (ValueError, TypeError) as exc:
-        raise ChatProtocolError(
-            f"chat.start frame {field_name} must be a valid UUID",
-            request_id=request_id,
-        ) from exc
diff --git a/backend/app/websocket/chat_task_supervisor.py b/backend/app/websocket/chat_task_supervisor.py
deleted file mode 100644
index 8adaa5c90..000000000
--- a/backend/app/websocket/chat_task_supervisor.py
+++ /dev/null
@@ -1,202 +0,0 @@
-"""Supervisor for cancellable async tasks tied to a WebSocket connection."""
-
-from __future__ import annotations
-
-import asyncio
-import uuid as uuid_lib
-from dataclasses import dataclass
-from typing import Any, Awaitable, Callable, Coroutine, cast
-
-from loguru import logger
-
-from app.utils.task_manager import task_manager
-
-_UNSET = object()
-
-
-@dataclass
-class ChatTaskEntry:
-    """Tracks an in-flight chat turn and its associated asyncio task."""
-
-    thread_id: str | None
-    task: asyncio.Task[Any]
-    heartbeat_task: asyncio.Task[Any] | None = None
-    run_id: uuid_lib.UUID | None = None
-    persist_on_disconnect: bool = False
-    request_id: str = ""
-
-
-class ChatTaskSupervisor:
-    """Manages the lifecycle of concurrent chat tasks for one connection.
-
-    Provides request-id and thread-id based lookup, cancellation,
-    and graceful cleanup on disconnect.
-    """
-
-    def __init__(
-        self,
-        *,
-        stop_task: Callable[[str], Awaitable[None]] | None = None,
-    ) -> None:
-        """Initialize the supervisor.
-
-        Args:
-            stop_task: Optional callback to stop a task by thread_id;
-                falls back to the global task_manager.
-        """
-        self._tasks: dict[str, ChatTaskEntry] = {}
-        self._thread_to_request: dict[str, str] = {}
-        self._stop_task = stop_task
-
-    @property
-    def tasks(self) -> dict[str, ChatTaskEntry]:
-        """Return the internal request_id-to-entry mapping."""
-        return self._tasks
-
-    def register(self, request_id: str, entry: ChatTaskEntry) -> None:
-        """Register an already-created task entry."""
-        if not entry.request_id:
-            entry.request_id = request_id
-        self._tasks[request_id] = entry
-        self._bind_thread(request_id, entry.thread_id)
-
-    def create_task(
-        self,
-        request_id: str,
-        runner: Coroutine[Any, Any, Any],
-        *,
-        name: str,
-        thread_id: str | None,
-        run_id: uuid_lib.UUID | None = None,
-        persist_on_disconnect: bool = False,
-    ) -> ChatTaskEntry:
-        """Create an asyncio task from a coroutine, register it, and return the entry."""
-        task = asyncio.create_task(runner, name=name)
-        entry = ChatTaskEntry(
-            request_id=request_id,
-            thread_id=thread_id,
-            task=task,
-            run_id=run_id,
-            persist_on_disconnect=persist_on_disconnect,
-        )
-        self.register(request_id, entry)
-        return entry
-
-    def get(self, request_id: str) -> ChatTaskEntry | None:
-        """Look up a task entry by request_id."""
-        return self._tasks.get(request_id)
-
-    def get_by_thread(self, thread_id: str) -> ChatTaskEntry | None:
-        """Look up the most recent task entry for a thread."""
-        request_id = self._thread_to_request.get(thread_id)
-        if request_id is not None:
-            return self._tasks.get(request_id)
-        return None
-
-    def update(
-        self,
-        request_id: str,
-        *,
-        thread_id: str | None | object = _UNSET,
-        task: asyncio.Task[Any] | object = _UNSET,
-        heartbeat_task: asyncio.Task[Any] | None | object = _UNSET,
-        run_id: uuid_lib.UUID | None | object = _UNSET,
-        persist_on_disconnect: bool | object = _UNSET,
-    ) -> ChatTaskEntry | None:
-        """Patch fields on an existing entry, skipping any that are _UNSET."""
-        entry = self._tasks.get(request_id)
-        if entry is None:
-            return None
-
-        if thread_id is not _UNSET:
-            thread_id_value = cast(str | None, thread_id)
-            entry.thread_id = thread_id_value
-            self._bind_thread(request_id, thread_id_value)
-        if task is not _UNSET:
-            entry.task = cast(asyncio.Task[Any], task)
-        if heartbeat_task is not _UNSET:
-            entry.heartbeat_task = cast(asyncio.Task[Any] | None, heartbeat_task)
-        if run_id is not _UNSET:
-            entry.run_id = cast(uuid_lib.UUID | None, run_id)
-        if persist_on_disconnect is not _UNSET:
-            entry.persist_on_disconnect = cast(bool, persist_on_disconnect)
-
-        return entry
-
-    def has_request(self, request_id: str) -> bool:
-        """Return True if a task is tracked under the given request_id."""
-        return request_id in self._tasks
-
-    def is_thread_active(self, thread_id: str) -> bool:
-        """Return True if any tracked task is running on the given thread."""
-        request_id = self._thread_to_request.get(thread_id)
-        if request_id is not None:
-            entry = self._tasks.get(request_id)
-            if entry is not None and entry.thread_id == thread_id:
-                return True
-            self._thread_to_request.pop(thread_id, None)
-
-        for mapped_request_id, entry in self._tasks.items():
-            if entry.thread_id == thread_id:
-                self._thread_to_request[thread_id] = mapped_request_id
-                return True
-        return False
-
-    async def stop_by_request_id(self, request_id: str) -> None:
-        """Signal a stop and cancel the asyncio task for the given request."""
-        entry = self._tasks.get(request_id)
-        if entry is None:
-            return
-
-        if entry.thread_id:
-            try:
-                await self._stop_thread(entry.thread_id)
-            except Exception:
-                logger.debug("chat task supervisor cleanup error", exc_info=True)
-
-        entry.task.cancel()
-        if entry.heartbeat_task is not None:
-            entry.heartbeat_task.cancel()
-
-    async def finalize(self, request_id: str) -> ChatTaskEntry | None:
-        """Remove a task entry and cancel its heartbeat, returning the entry."""
-        entry = self._tasks.pop(request_id, None)
-        if entry and entry.thread_id:
-            self._thread_to_request.pop(entry.thread_id, None)
-        if entry and entry.heartbeat_task is not None:
-            entry.heartbeat_task.cancel()
-            try:
-                await entry.heartbeat_task
-            except asyncio.CancelledError:
-                logger.debug("task cancelled during cleanup")
-        return entry
-
-    async def cancel_all(self) -> None:
-        """Cancel all non-persistent tasks and await their completion."""
-        cancellable = [
-            (request_id, entry) for request_id, entry in list(self._tasks.items()) if not entry.persist_on_disconnect
-        ]
-
-        for request_id, _ in cancellable:
-            await self.stop_by_request_id(request_id)
-
-        for request_id, entry in cancellable:
-            try:
-                await entry.task
-            except BaseException:
-                logger.debug("suppressed exception during final cleanup", exc_info=True)
-            if request_id in self._tasks:
-                await self.finalize(request_id)
-
-    def _bind_thread(self, request_id: str, thread_id: str | None) -> None:
-        for existing_thread_id, existing_request_id in list(self._thread_to_request.items()):
-            if existing_request_id == request_id:
-                self._thread_to_request.pop(existing_thread_id, None)
-        if thread_id:
-            self._thread_to_request[thread_id] = request_id
-
-    async def _stop_thread(self, thread_id: str) -> None:
-        if self._stop_task is not None:
-            await self._stop_task(thread_id)
-            return
-        await task_manager.stop_task(thread_id)
diff --git a/backend/app/websocket/chat_turn_executor.py b/backend/app/websocket/chat_turn_executor.py
deleted file mode 100644
index 64392cd1b..000000000
--- a/backend/app/websocket/chat_turn_executor.py
+++ /dev/null
@@ -1,1006 +0,0 @@
-"""Executor for a single chat turn (standard or resume)."""
-
-from __future__ import annotations
-
-import asyncio
-import importlib
-import time
-import uuid as uuid_lib
-from dataclasses import dataclass
-from typing import Any
-
-from loguru import logger as _logger
-
-from app.common.exceptions import ModelConfigError
-from app.models.agent_run import AgentRunStatus
-from app.schemas.chat import ChatRequest
-from app.utils.stream_event_handler import StreamState
-from app.websocket.chat_commands import ChatRunTurnCommand, ChatTurnCommand, CopilotTurnCommand, SkillCreatorTurnCommand
-from app.websocket.chat_task_supervisor import ChatTaskEntry
-
-
-async def _release_graph_sandbox(built_graph: Any) -> None:
-    """Release sandbox handle attached to a compiled graph, if any."""
-    if built_graph is None:
-        return
-    handle = getattr(built_graph, "_sandbox_handle", None)
-    if handle is not None:
-        try:
-            await handle.release()
-        except Exception as exc:
-            _logger.warning(f"Failed to release sandbox handle: {exc}")
-
-
-@dataclass(frozen=True)
-class PreparedStandardTurn:
-    """Immutable bundle of validated parameters ready for turn execution."""
-
-    request_id: str
-    payload: ChatRequest
-    run_id: uuid_lib.UUID | None
-    persist_on_disconnect: bool
-
-
-class ChatTurnExecutor:
-    """Runs a single chat turn against the LangGraph agent.
-
-    Handles both new-message (standard) turns and resume turns for
-    interrupted graph executions.
-    """
-
-    def __init__(
-        self,
-        *,
-        handler: Any,
-        dependencies: Any | None = None,
-    ) -> None:
-        """Initialize the executor.
-
-        Args:
-            handler: The owning ChatWsHandler instance.
-            dependencies: Optional module providing helper functions; defaults
-                to the handler's own module.
-        """
-        self._handler = handler
-        self._module = dependencies or importlib.import_module(handler.__class__.__module__)
-
-    def prepare_standard_turn(self, command: ChatTurnCommand) -> PreparedStandardTurn:
-        """Build a PreparedStandardTurn from a client command."""
-        metadata = dict(command.metadata or {})
-        if command.files:
-            metadata["files"] = command.files
-
-        run_id: uuid_lib.UUID | None = None
-        persist_on_disconnect = False
-        if isinstance(command, SkillCreatorTurnCommand):
-            run_id = self._parse_uuid(command.run_id)
-            persist_on_disconnect = run_id is not None
-            if command.edit_skill_id and "edit_skill_id" not in metadata:
-                metadata["edit_skill_id"] = command.edit_skill_id
-        elif isinstance(command, ChatRunTurnCommand):
-            run_id = self._parse_uuid(command.run_id)
-            persist_on_disconnect = run_id is not None
-        elif isinstance(command, CopilotTurnCommand):
-            run_id = self._parse_uuid(command.run_id)
-            persist_on_disconnect = run_id is not None
-
-        return PreparedStandardTurn(
-            request_id=str(command.request_id or ""),
-            payload=ChatRequest(
-                message=str(command.message or ""),
-                thread_id=str(command.thread_id) if command.thread_id else None,
-                graph_id=command.graph_id,
-                provider_name=command.provider_name,
-                model_name=command.model_name,
-                metadata=metadata,
-            ),
-            run_id=run_id,
-            persist_on_disconnect=persist_on_disconnect,
-        )
-
-    async def run_standard_turn(self, prepared: PreparedStandardTurn) -> None:
-        """Dispatch a prepared standard turn to the handler or fallback executor."""
-        run_chat_turn = getattr(self._handler, "_run_chat_turn", None)
-        if not callable(run_chat_turn):
-            run_chat_turn = self.execute_standard_turn
-        await run_chat_turn(request_id=prepared.request_id, payload=prepared.payload)
-
-    async def run_resume_turn(self, request_id: str, thread_id: str, command: dict[str, object]) -> None:
-        """Dispatch a resume turn to the handler or fallback executor."""
-        run_resume_turn = getattr(self._handler, "_run_resume_turn", None)
-        if not callable(run_resume_turn):
-            run_resume_turn = self.execute_resume_turn
-        await run_resume_turn(request_id=request_id, thread_id=thread_id, command=command)
-
-    async def execute_standard_turn(self, request_id: str, payload: ChatRequest) -> None:
-        """Stream a new user message through the graph and emit events to the client."""
-        from app.core.trace_context import set_trace_id
-
-        set_trace_id(request_id)
-        handler = self._handler
-        module = self._module
-        state: StreamState | None = None
-        thread_id: str | None = None
-        built_graph = None
-        graph_workspace_id: str | None = None
-        graph_display_name: str | None = None
-        artifact_collector = module.ArtifactCollector()
-        task_entry = handler._task_supervisor.get(request_id)
-        agent_run_id = task_entry.run_id if task_entry else None
-        tolerate_disconnect = bool(task_entry and task_entry.persist_on_disconnect)
-        assistant_message_id = f"msg-assistant-{uuid_lib.uuid4()}"
-
-        try:
-            file_emitter = module.FileEventEmitter()
-            async with module.AsyncSessionLocal() as db:
-                thread_id, _ = await module.get_or_create_conversation(
-                    payload.thread_id,
-                    payload.message,
-                    handler.user_id,
-                    payload.metadata,
-                    db,
-                )
-                await module.save_user_message(thread_id, payload.message, payload.metadata, db)
-                config, base_context = await module.get_user_config(handler.user_id, thread_id)
-
-                initial_context = base_context.copy()
-                if payload.graph_id:
-                    from app.repositories.graph import GraphRepository
-
-                    graph_repo = GraphRepository(db)
-                    graph_model = await graph_repo.get(payload.graph_id)
-                    if graph_model:
-                        ws_id = getattr(graph_model, "workspace_id", None)
-                        graph_workspace_id = str(ws_id) if ws_id else None
-                        graph_display_name = getattr(graph_model, "name", None) or getattr(graph_model, "title", None)
-                    if graph_model and graph_model.variables:
-                        context_vars = graph_model.variables.get("context", {})
-                        if context_vars:
-                            for key, value in context_vars.items():
-                                if isinstance(value, dict) and "value" in value:
-                                    initial_context[key] = value["value"]
-                                else:
-                                    initial_context[key] = value
-
-                graph_service = module.GraphService(db)
-                if payload.graph_id is None:
-                    built_graph = await graph_service.create_default_deep_agents_graph(
-                        user_id=handler.user_id,
-                        file_emitter=file_emitter,
-                    )
-                else:
-                    from app.repositories.user import UserRepository
-
-                    user_repo = UserRepository(db)
-                    current_user = await user_repo.get_by_id(handler.user_id)
-                    built_graph = await graph_service.create_graph_by_graph_id(
-                        graph_id=payload.graph_id,
-                        user_id=handler.user_id,
-                        current_user=current_user,
-                        file_emitter=file_emitter,
-                        thread_id=thread_id,
-                    )
-
-            state = module.StreamState(thread_id)
-            current_task = asyncio.current_task()
-            if current_task is None:
-                raise RuntimeError("missing current asyncio task")
-            if handler._task_supervisor.get(request_id) is None:
-                handler._task_supervisor.register(
-                    request_id,
-                    ChatTaskEntry(
-                        request_id=request_id,
-                        thread_id=thread_id,
-                        task=current_task,
-                        run_id=agent_run_id,
-                        persist_on_disconnect=tolerate_disconnect,
-                    ),
-                )
-            else:
-                handler._task_supervisor.update(
-                    request_id,
-                    thread_id=thread_id,
-                    task=current_task,
-                    run_id=agent_run_id,
-                    persist_on_disconnect=tolerate_disconnect,
-                )
-            await module.task_manager.register_task(thread_id, current_task)
-
-            if agent_run_id is not None:
-                await handler._mark_run_status(
-                    run_id=agent_run_id,
-                    status=AgentRunStatus.RUNNING,
-                    runtime_owner_id=handler._runtime_owner_id,
-                )
-                heartbeat_task = asyncio.create_task(
-                    handler._run_persisted_run_heartbeat(agent_run_id),
-                    name=f"run-heartbeat:{agent_run_id}",
-                )
-                handler._task_supervisor.update(request_id, heartbeat_task=heartbeat_task)
-                await handler._append_run_event(
-                    run_id=agent_run_id,
-                    event_type="assistant_message_started",
-                    payload={
-                        "message": {
-                            "id": assistant_message_id,
-                            "role": "assistant",
-                            "content": "",
-                            "timestamp": int(time.time() * 1000),
-                            "tool_calls": [],
-                        }
-                    },
-                )
-
-            await handler._send(
-                {
-                    "type": "accepted",
-                    "request_id": request_id,
-                    "thread_id": thread_id,
-                    "run_id": str(agent_run_id) if agent_run_id is not None else None,
-                    "timestamp": int(time.time() * 1000),
-                    "data": {"status": "accepted"},
-                },
-                tolerate_disconnect=tolerate_disconnect,
-            )
-
-            stream_handler = module.StreamEventHandler()
-            artifact_collector.ensure_run_dir(handler.user_id, thread_id, state.artifact_run_id)
-
-            await handler._send_stream_event(
-                stream_handler.format_sse(
-                    "status",
-                    {"status": "connected", "_meta": {"node_name": "system"}},
-                    thread_id,
-                ),
-                request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-
-            enriched_message = module._enrich_message(
-                payload.message,
-                payload.metadata,
-                is_new_thread=(payload.thread_id is None),
-                log=module.logger.bind(user_id=handler.user_id, thread_id=thread_id),
-                endpoint="Chat WS",
-            )
-
-            interrupted = False
-            async for event in built_graph.astream_events(
-                {"messages": [module.HumanMessage(content=enriched_message)], "context": initial_context},
-                config=config,
-                version="v2",
-            ):
-                if await module.task_manager.is_stopped(thread_id):
-                    state.stopped = True
-                    break
-
-                async for sse_str in module._dispatch_stream_event(event, stream_handler, state, file_emitter):
-                    await handler._send_stream_event(
-                        sse_str,
-                        request_id,
-                        tolerate_disconnect=tolerate_disconnect,
-                        agent_run_id=agent_run_id,
-                        assistant_message_id=assistant_message_id,
-                    )
-
-            try:
-                snap = await module.safe_get_state(
-                    built_graph,
-                    config,
-                    max_retries=3,
-                    initial_delay=0.1,
-                    log=module.logger,
-                )
-                if snap.tasks:
-                    next_node = snap.tasks[0].target if snap.tasks else None
-                    current_state = snap.values or {}
-                    if payload.graph_id is None:
-                        module.logger.warning(
-                            f"Default agent interrupted, resume not supported | thread_id={thread_id}"
-                        )
-                    else:
-                        await handler._emit_event(
-                            {
-                                "type": "interrupt",
-                                "thread_id": thread_id,
-                                "node_name": next_node or "unknown",
-                                "node_label": next_node.replace("_", " ").title() if next_node else "Unknown Node",
-                                "data": {
-                                    "node_name": next_node or "unknown",
-                                    "node_label": next_node.replace("_", " ").title() if next_node else "Unknown Node",
-                                    "state": current_state,
-                                    "thread_id": thread_id,
-                                },
-                            },
-                            request_id=request_id,
-                            tolerate_disconnect=tolerate_disconnect,
-                            agent_run_id=agent_run_id,
-                            assistant_message_id=assistant_message_id,
-                        )
-                        async with module.AsyncSessionLocal() as session:
-                            result_query = await session.execute(
-                                module.select(module.Conversation).where(module.Conversation.thread_id == thread_id)
-                            )
-                            if conv := result_query.scalar_one_or_none():
-                                if not conv.meta_data:
-                                    conv.meta_data = {}
-                                conv.meta_data["interrupted_graph_id"] = str(payload.graph_id)
-                                await session.commit()
-                        state.interrupted = True
-                        state.interrupt_node = next_node
-                        state.interrupt_state = current_state
-                        interrupted = True
-            except Exception as exc:
-                module.logger.warning(f"Failed to inspect interrupt state | thread_id={thread_id} | error={exc}")
-
-            if state and not state.all_messages and not state.stopped and not interrupted:
-                try:
-                    snap = await module.safe_get_state(
-                        built_graph,
-                        config,
-                        max_retries=2,
-                        initial_delay=0.05,
-                        log=module.logger,
-                    )
-                    if snap.values and "messages" in snap.values:
-                        msgs = snap.values["messages"]
-                        from langgraph.types import Overwrite
-
-                        state.all_messages = msgs.value if isinstance(msgs, Overwrite) else msgs
-                except Exception as exc:
-                    module.logger.warning(f"Failed to fetch final state | thread_id={thread_id} | error={exc}")
-
-            if state.interrupted:
-                return
-
-            if state.stopped:
-                await handler._emit_event(
-                    {
-                        "type": "error",
-                        "thread_id": thread_id,
-                        "node_name": "system",
-                        "run_id": "",
-                        "timestamp": int(time.time() * 1000),
-                        "data": {"message": "Stopped by user", "code": "stopped"},
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id,
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-
-        except asyncio.CancelledError:
-            if state is not None:
-                state.stopped = True
-            try:
-                await handler._emit_event(
-                    {
-                        "type": "done",
-                        "thread_id": thread_id or payload.thread_id or "",
-                        "node_name": "system",
-                        "run_id": "",
-                        "timestamp": int(time.time() * 1000),
-                        "data": {},
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-            except Exception:
-                _logger.debug("error sending stream event", exc_info=True)
-            raise
-        except Exception as exc:
-            if state is not None and not (module.GraphBubbleUp is not None and type(exc) is module.GraphBubbleUp):
-                state.has_error = True
-            error_data: dict[str, object] = {"message": str(exc)}
-            if isinstance(exc, ModelConfigError):
-                error_data["error_code"] = exc.error_code
-                error_data["params"] = exc.params
-            await handler._emit_event(
-                {
-                    "type": "error",
-                    "thread_id": thread_id or payload.thread_id or "",
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": error_data,
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id or payload.thread_id or "",
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-        finally:
-            await _release_graph_sandbox(built_graph)
-
-            await handler._finalize_task(
-                request_id=request_id,
-                thread_id=thread_id,
-                state=state,
-                built_graph=built_graph,
-                artifact_collector=artifact_collector,
-                graph_id=str(payload.graph_id) if payload.graph_id else None,
-                workspace_id=graph_workspace_id,
-                graph_name=graph_display_name,
-            )
-
-    async def execute_resume_turn(self, request_id: str, thread_id: str, command: dict[str, object]) -> None:
-        """Resume an interrupted graph execution and stream the remaining events."""
-        from app.core.trace_context import set_trace_id
-
-        set_trace_id(request_id)
-        handler = self._handler
-        module = self._module
-        state: StreamState | None = None
-        built_graph = None
-        graph_workspace_id: str | None = None
-        graph_display_name: str | None = None
-        graph_id = None
-        config = None
-        stream_handler = None
-        ws_command = None
-        agent_run_id: uuid_lib.UUID | None = None
-        tolerate_disconnect = False
-        assistant_message_id = f"msg-assistant-{uuid_lib.uuid4()}"
-
-        try:
-            async with module.AsyncSessionLocal() as db:
-                result = await db.execute(
-                    module.select(module.Conversation).where(
-                        module.Conversation.thread_id == thread_id,
-                        module.Conversation.user_id == handler.user_id,
-                    )
-                )
-                conversation = result.scalar_one_or_none()
-                if not conversation:
-                    await handler._send(
-                        {"type": "ws_error", "request_id": request_id, "message": "conversation not found"}
-                    )
-                    return
-
-                if (
-                    conversation.meta_data
-                    and isinstance(conversation.meta_data, dict)
-                    and "interrupted_graph_id" in conversation.meta_data
-                ):
-                    try:
-                        graph_id = uuid_lib.UUID(str(conversation.meta_data["interrupted_graph_id"]))
-                    except (ValueError, TypeError):
-                        graph_id = None
-
-                if graph_id is None:
-                    await handler._send({"type": "ws_error", "request_id": request_id, "message": "graph id not found"})
-                    return
-
-                config, _ = await module.get_user_config(handler.user_id, thread_id)
-
-                from langgraph.types import Command
-
-                from app.repositories.graph import GraphRepository
-                from app.repositories.user import UserRepository
-
-                graph_repo = GraphRepository(db)
-                graph_model = await graph_repo.get(graph_id)
-                if graph_model:
-                    ws_id = getattr(graph_model, "workspace_id", None)
-                    graph_workspace_id = str(ws_id) if ws_id else None
-                    graph_display_name = getattr(graph_model, "name", None) or getattr(graph_model, "title", None)
-
-                user_repo = UserRepository(db)
-                current_user = await user_repo.get_by_id(handler.user_id)
-
-                graph_service = module.GraphService(db)
-                built_graph = await graph_service.create_graph_by_graph_id(
-                    graph_id=graph_id,
-                    user_id=handler.user_id,
-                    current_user=current_user,
-                )
-
-                snap = await module.safe_get_state(
-                    built_graph,
-                    config,
-                    max_retries=3,
-                    initial_delay=0.1,
-                    log=module.logger,
-                )
-                if not snap.tasks:
-                    await handler._send(
-                        {"type": "ws_error", "request_id": request_id, "message": "no interrupt state found"}
-                    )
-                    return
-
-                state = module.StreamState(thread_id)
-                current_task = asyncio.current_task()
-                if current_task is None:
-                    raise RuntimeError("missing current asyncio task")
-                if handler._task_supervisor.get(request_id) is None:
-                    handler._task_supervisor.register(
-                        request_id,
-                        ChatTaskEntry(request_id=request_id, thread_id=thread_id, task=current_task),
-                    )
-                else:
-                    handler._task_supervisor.update(request_id, thread_id=thread_id, task=current_task)
-                await module.task_manager.register_task(thread_id, current_task)
-
-                task_entry = handler._task_supervisor.get(request_id)
-                agent_run_id = task_entry.run_id if task_entry else None
-                tolerate_disconnect = bool(task_entry and task_entry.persist_on_disconnect)
-
-            if agent_run_id is not None:
-                await handler._mark_run_status(
-                    run_id=agent_run_id,
-                    status=AgentRunStatus.RUNNING,
-                    runtime_owner_id=handler._runtime_owner_id,
-                )
-                heartbeat_task = asyncio.create_task(
-                    handler._run_persisted_run_heartbeat(agent_run_id),
-                    name=f"run-heartbeat:{agent_run_id}",
-                )
-                handler._task_supervisor.update(request_id, heartbeat_task=heartbeat_task)
-                await handler._append_run_event(
-                    run_id=agent_run_id,
-                    event_type="assistant_message_started",
-                    payload={
-                        "message": {
-                            "id": assistant_message_id,
-                            "role": "assistant",
-                            "content": "",
-                            "timestamp": int(time.time() * 1000),
-                            "tool_calls": [],
-                        }
-                    },
-                )
-
-            await handler._send(
-                {
-                    "type": "accepted",
-                    "request_id": request_id,
-                    "thread_id": thread_id,
-                    "run_id": str(agent_run_id) if agent_run_id is not None else None,
-                    "timestamp": int(time.time() * 1000),
-                    "data": {"status": "accepted"},
-                },
-                tolerate_disconnect=tolerate_disconnect,
-            )
-
-            stream_handler = module.StreamEventHandler()
-            ws_command = Command(update=command.get("update") or {}, goto=command.get("goto") or None)
-
-            await handler._send_stream_event(
-                stream_handler.format_sse("status", {"status": "resumed", "_meta": {"node_name": "system"}}, thread_id),
-                request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-
-            interrupted = False
-            async for event in built_graph.astream_events(ws_command, config=config, version="v2"):
-                if await module.task_manager.is_stopped(thread_id):
-                    state.stopped = True
-                    break
-                async for sse_str in module._dispatch_stream_event(event, stream_handler, state):
-                    await handler._send_stream_event(
-                        sse_str,
-                        request_id,
-                        tolerate_disconnect=tolerate_disconnect,
-                        agent_run_id=agent_run_id,
-                        assistant_message_id=assistant_message_id,
-                    )
-
-            try:
-                snap = await module.safe_get_state(
-                    built_graph,
-                    config,
-                    max_retries=3,
-                    initial_delay=0.1,
-                    log=module.logger,
-                )
-                if snap.tasks:
-                    next_node = snap.tasks[0].target if snap.tasks else None
-                    current_state = snap.values or {}
-                    await handler._emit_event(
-                        {
-                            "type": "interrupt",
-                            "thread_id": thread_id,
-                            "node_name": next_node or "unknown",
-                            "node_label": next_node.replace("_", " ").title() if next_node else "Unknown Node",
-                            "data": {
-                                "node_name": next_node or "unknown",
-                                "node_label": next_node.replace("_", " ").title() if next_node else "Unknown Node",
-                                "state": current_state,
-                                "thread_id": thread_id,
-                            },
-                        },
-                        request_id=request_id,
-                        tolerate_disconnect=tolerate_disconnect,
-                        agent_run_id=agent_run_id,
-                        assistant_message_id=assistant_message_id,
-                    )
-                    state.interrupted = True
-                    state.interrupt_node = next_node
-                    state.interrupt_state = current_state
-                    interrupted = True
-            except Exception as exc:
-                module.logger.warning(f"Failed to inspect resume interrupt state | thread_id={thread_id} | error={exc}")
-
-            if not state.all_messages and not state.stopped and not interrupted:
-                try:
-                    snap = await module.safe_get_state(
-                        built_graph,
-                        config,
-                        max_retries=2,
-                        initial_delay=0.05,
-                        log=module.logger,
-                    )
-                    if snap.values and "messages" in snap.values:
-                        msgs = snap.values["messages"]
-                        from langgraph.types import Overwrite
-
-                        state.all_messages = msgs.value if isinstance(msgs, Overwrite) else msgs
-                except Exception as exc:
-                    module.logger.warning(f"Failed to fetch final resume state | thread_id={thread_id} | error={exc}")
-
-            if state.interrupted:
-                return
-
-            if state.stopped:
-                await handler._emit_event(
-                    {
-                        "type": "error",
-                        "thread_id": thread_id,
-                        "node_name": "system",
-                        "run_id": "",
-                        "timestamp": int(time.time() * 1000),
-                        "data": {"message": "Stopped by user", "code": "stopped"},
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id,
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-
-        except asyncio.CancelledError:
-            if state is not None:
-                state.stopped = True
-            try:
-                await handler._emit_event(
-                    {
-                        "type": "done",
-                        "thread_id": thread_id,
-                        "node_name": "system",
-                        "run_id": "",
-                        "timestamp": int(time.time() * 1000),
-                        "data": {},
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-            except Exception:
-                _logger.debug("error during turn cleanup", exc_info=True)
-            raise
-        except Exception as exc:
-            if state is not None and not (module.GraphBubbleUp is not None and type(exc) is module.GraphBubbleUp):
-                state.has_error = True
-            await handler._emit_event(
-                {
-                    "type": "error",
-                    "thread_id": thread_id,
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {"message": str(exc)},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id,
-                    "node_name": "system",
-                    "run_id": "",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-        finally:
-            await _release_graph_sandbox(built_graph)
-
-            await handler._finalize_task(
-                request_id=request_id,
-                thread_id=thread_id,
-                state=state,
-                built_graph=built_graph,
-                artifact_collector=None,
-                graph_id=str(graph_id) if graph_id else None,
-                workspace_id=graph_workspace_id,
-                graph_name=graph_display_name,
-            )
-
-    async def execute_copilot_turn(
-        self,
-        request_id: str,
-        payload: ChatRequest,
-        graph_context: dict[str, Any],
-        conversation_history: list[dict[str, Any]],
-        mode: str,
-    ) -> None:
-        """Execute a copilot turn: consume CopilotService stream and emit events."""
-        from app.core.trace_context import set_trace_id
-
-        set_trace_id(request_id)
-        handler = self._handler
-        module = self._module
-        state: StreamState | None = None
-        thread_id: str | None = None
-        task_entry = handler._task_supervisor.get(request_id)
-        agent_run_id = task_entry.run_id if task_entry else None
-        tolerate_disconnect = bool(task_entry and task_entry.persist_on_disconnect)
-        assistant_message_id = f"msg-assistant-{uuid_lib.uuid4()}"
-
-        # Collection vars for graph persistence
-        final_actions: list[dict[str, Any]] = []
-
-        try:
-            async with module.AsyncSessionLocal() as db:
-                # Get or create thread for this copilot turn
-                thread_id, _ = await module.get_or_create_conversation(
-                    payload.thread_id,
-                    payload.message,
-                    handler.user_id,
-                    payload.metadata,
-                    db,
-                )
-                await module.save_user_message(thread_id, payload.message, payload.metadata, db)
-
-            state = module.StreamState(thread_id)
-            current_task = asyncio.current_task()
-            if current_task is None:
-                raise RuntimeError("missing current asyncio task")
-            if handler._task_supervisor.get(request_id) is None:
-                handler._task_supervisor.register(
-                    request_id,
-                    ChatTaskEntry(
-                        request_id=request_id,
-                        thread_id=thread_id,
-                        task=current_task,
-                        run_id=agent_run_id,
-                        persist_on_disconnect=tolerate_disconnect,
-                    ),
-                )
-            else:
-                handler._task_supervisor.update(
-                    request_id,
-                    thread_id=thread_id,
-                    task=current_task,
-                    run_id=agent_run_id,
-                    persist_on_disconnect=tolerate_disconnect,
-                )
-            await module.task_manager.register_task(thread_id, current_task)
-
-            # Start heartbeat if persisted run
-            if agent_run_id is not None:
-                await handler._mark_run_status(
-                    run_id=agent_run_id,
-                    status=AgentRunStatus.RUNNING,
-                    runtime_owner_id=handler._runtime_owner_id,
-                )
-                heartbeat_task = asyncio.create_task(
-                    handler._run_persisted_run_heartbeat(agent_run_id),
-                    name=f"run-heartbeat:{agent_run_id}",
-                )
-                handler._task_supervisor.update(request_id, heartbeat_task=heartbeat_task)
-
-            # Emit accepted
-            await handler._send(
-                {
-                    "type": "accepted",
-                    "request_id": request_id,
-                    "thread_id": thread_id,
-                    "run_id": str(agent_run_id) if agent_run_id is not None else None,
-                    "timestamp": int(time.time() * 1000),
-                    "data": {"status": "accepted"},
-                },
-                tolerate_disconnect=tolerate_disconnect,
-            )
-
-            # Create CopilotService and get stream
-            from app.services.copilot_service import CopilotService
-
-            async with module.AsyncSessionLocal() as db:
-                # payload carries split model fields from frontend
-                service = CopilotService(
-                    user_id=handler.user_id,
-                    provider_name=payload.provider_name,
-                    model_name=payload.model_name,
-                    db=db,
-                )
-                stream = service._get_copilot_stream(
-                    prompt=payload.message,
-                    graph_context=graph_context,
-                    conversation_history=conversation_history,
-                    mode=mode,
-                    graph_id=str(payload.graph_id) if payload.graph_id else None,
-                )
-
-                async for event in stream:
-                    if await module.task_manager.is_stopped(thread_id):
-                        state.stopped = True
-                        break
-
-                    event_type = event.get("type", "")
-
-                    # Collect for persistence
-                    if event_type == "result":
-                        final_actions = event.get("actions", [])
-
-                    # Emit to WS + run events
-                    await handler._emit_event(
-                        {
-                            "type": event_type,
-                            "thread_id": thread_id,
-                            "node_name": "copilot",
-                            "timestamp": int(time.time() * 1000),
-                            "data": event,
-                        },
-                        request_id=request_id,
-                        tolerate_disconnect=tolerate_disconnect,
-                        agent_run_id=agent_run_id,
-                        assistant_message_id=assistant_message_id,
-                    )
-
-            # Persist graph changes
-            # _persist_graph_from_actions creates its own DB session internally,
-            # so we only need user_id set on the service.
-            if payload.graph_id and final_actions:
-                persist_service = CopilotService(user_id=handler.user_id)
-                await persist_service._persist_graph_from_actions(
-                    graph_id=str(payload.graph_id),
-                    final_actions=final_actions,
-                )
-
-            # Emit done
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id,
-                    "node_name": "copilot",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-
-        except asyncio.CancelledError:
-            if state is not None:
-                state.stopped = True
-            try:
-                await handler._emit_event(
-                    {
-                        "type": "done",
-                        "thread_id": thread_id or "",
-                        "node_name": "copilot",
-                        "timestamp": int(time.time() * 1000),
-                        "data": {},
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-            except Exception:
-                _logger.debug("error during copilot turn cleanup", exc_info=True)
-            raise
-        except Exception as exc:
-            if state is not None:
-                state.has_error = True
-            error_data: dict[str, object] = {"message": str(exc)}
-            if isinstance(exc, ModelConfigError):
-                error_data["error_code"] = exc.error_code
-                error_data["params"] = exc.params
-            await handler._emit_event(
-                {
-                    "type": "error",
-                    "thread_id": thread_id or "",
-                    "node_name": "copilot",
-                    "timestamp": int(time.time() * 1000),
-                    "data": error_data,
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id or "",
-                    "node_name": "copilot",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-        finally:
-            await handler._finalize_task(
-                request_id=request_id,
-                thread_id=thread_id,
-                state=state,
-                built_graph=None,
-                artifact_collector=None,
-                graph_id=str(payload.graph_id) if payload.graph_id else None,
-                workspace_id=None,
-                graph_name=None,
-            )
-
-    @staticmethod
-    def _parse_uuid(value: object) -> uuid_lib.UUID | None:
-        """Parse a value into a UUID, returning None on failure."""
-        if not value:
-            return None
-        try:
-            return uuid_lib.UUID(str(value))
-        except (ValueError, TypeError):
-            return None
diff --git a/backend/app/websocket/chat_ws_handler.py b/backend/app/websocket/chat_ws_handler.py
deleted file mode 100644
index 29a9deb1e..000000000
--- a/backend/app/websocket/chat_ws_handler.py
+++ /dev/null
@@ -1,630 +0,0 @@
-"""Persistent WebSocket chat handler for Chat page streaming."""
-
-import asyncio
-import json
-import sys
-import time
-import uuid as uuid_lib
-from typing import Any, cast
-
-from fastapi import WebSocket, WebSocketDisconnect
-from langchain.messages import HumanMessage as HumanMessage
-from loguru import logger
-from sqlalchemy import select as select
-
-# Re-exported names below are part of ChatTurnExecutor's module dependency contract.
-from app.api.v1.chat import (
-    GraphBubbleUp as GraphBubbleUp,
-)
-from app.api.v1.chat import (
-    _clear_interrupt_marker,
-    save_run_result,
-)
-from app.api.v1.chat import (
-    _dispatch_stream_event as _dispatch_stream_event,
-)
-from app.api.v1.chat import (
-    _enrich_message as _enrich_message,
-)
-from app.api.v1.chat import (
-    get_or_create_conversation as get_or_create_conversation,
-)
-from app.api.v1.chat import (
-    get_user_config as get_user_config,
-)
-from app.api.v1.chat import (
-    safe_get_state as safe_get_state,
-)
-from app.api.v1.chat import (
-    save_user_message as save_user_message,
-)
-from app.core.agent.artifacts import ArtifactCollector
-from app.core.database import AsyncSessionLocal as AsyncSessionLocal
-from app.core.database import async_session_factory
-from app.core.settings import settings
-from app.models import Conversation as Conversation
-from app.models.agent_run import AgentRunStatus
-from app.schemas.chat import ChatRequest
-from app.services.graph_service import GraphService as GraphService
-from app.services.run_service import RunService
-from app.utils.file_event_emitter import FileEventEmitter as FileEventEmitter
-from app.utils.stream_event_handler import StreamEventHandler as StreamEventHandler
-from app.utils.stream_event_handler import StreamState
-from app.utils.task_manager import task_manager
-from app.websocket.chat_commands import (
-    ChatTurnCommand,
-    CopilotTurnCommand,
-    build_command_from_parsed_frame,
-)
-from app.websocket.chat_protocol import ChatProtocolError, ParsedChatStartFrame, parse_client_frame
-from app.websocket.chat_task_supervisor import ChatTaskEntry as ChatTaskEntry
-from app.websocket.chat_task_supervisor import ChatTaskSupervisor
-from app.websocket.chat_turn_executor import ChatTurnExecutor
-
-
-class ChatWsHandler:
-    """Handle a persistent `/ws/chat` connection for a single user."""
-
-    def __init__(self, user_id: str, websocket: WebSocket):
-        """Initialize the handler for a single authenticated user connection."""
-        self.user_id = user_id
-        self.websocket = websocket
-        self._task_supervisor = ChatTaskSupervisor(
-            stop_task=self._stop_managed_task,
-        )
-        self._tasks = self._task_supervisor.tasks
-        self._turn_executor = ChatTurnExecutor(handler=self, dependencies=cast(Any, sys.modules[__name__]))
-        self._send_lock = asyncio.Lock()
-        self._socket_connected = True
-        self._runtime_owner_id = settings.run_runtime_instance_id
-
-    async def _stop_managed_task(self, thread_id: str) -> None:
-        """Delegate task cancellation to the global task manager."""
-        await task_manager.stop_task(thread_id)
-
-    async def run(self) -> None:
-        """Read frames in a loop until the client disconnects."""
-        try:
-            while True:
-                raw = await self.websocket.receive_text()
-                await self._handle_frame(raw)
-        except WebSocketDisconnect:
-            self._socket_connected = False
-            logger.info(f"Chat WebSocket disconnected | user_id={self.user_id}")
-        finally:
-            await self._cancel_all_tasks()
-
-    async def _handle_frame(self, raw: str) -> None:
-        """Parse and dispatch a single client frame."""
-        try:
-            frame = json.loads(raw)
-        except json.JSONDecodeError:
-            await self._send({"type": "ws_error", "message": "invalid json frame"})
-            return
-
-        if not isinstance(frame, dict):
-            await self._send({"type": "ws_error", "message": "frame must be a JSON object"})
-            return
-
-        try:
-            parsed_frame = parse_client_frame(frame)
-        except ChatProtocolError as exc:
-            await self._send(
-                {
-                    "type": "ws_error",
-                    "message": exc.message,
-                    "request_id": exc.request_id,
-                }
-            )
-            return
-
-        if isinstance(parsed_frame, ParsedChatStartFrame):
-            await self._handle_chat_start_frame(parsed_frame)
-            return
-
-        frame_type = str(parsed_frame.get("type") or "")
-        if frame_type == "chat.resume":
-            await self._handle_resume(parsed_frame)
-            return
-        if frame_type == "chat.stop":
-            await self._handle_stop(parsed_frame)
-            return
-        if frame_type == "ping":
-            await self._send({"type": "pong"})
-            return
-
-        await self._send({"type": "ws_error", "message": f"unknown frame type: {frame_type}"})
-
-    async def _handle_chat_start_frame(self, frame: ParsedChatStartFrame) -> None:
-        """Convert a parsed chat.start frame into a turn command and launch it."""
-        command = build_command_from_parsed_frame(frame)
-        await self._start_turn_from_command(command)
-
-    async def _start_turn_from_command(self, command: ChatTurnCommand) -> None:
-        """Validate and schedule a new chat turn as a supervised async task."""
-        prepared = self._turn_executor.prepare_standard_turn(command)
-        request_id = prepared.request_id
-        message = prepared.payload.message
-        thread_key = prepared.payload.thread_id
-
-        if not request_id or not message.strip():
-            await self._send({"type": "ws_error", "message": "request_id and message are required"})
-            return
-        if self._task_supervisor.has_request(request_id):
-            await self._send({"type": "ws_error", "message": "duplicate request_id"})
-            return
-        if thread_key and self._task_supervisor.is_thread_active(thread_key):
-            await self._send(
-                {
-                    "type": "ws_error",
-                    "request_id": request_id,
-                    "message": "turn already in progress for thread_id",
-                }
-            )
-            return
-
-        from app.core.trace_context import set_trace_id
-
-        set_trace_id(prepared.request_id)
-
-        async def runner() -> None:
-            if isinstance(command, CopilotTurnCommand):
-                await self._turn_executor.execute_copilot_turn(
-                    request_id=prepared.request_id,
-                    payload=prepared.payload,
-                    graph_context=command.graph_context,
-                    conversation_history=command.conversation_history,
-                    mode=command.mode,
-                )
-            else:
-                await self._turn_executor.run_standard_turn(prepared)
-
-        self._task_supervisor.create_task(
-            request_id,
-            runner(),
-            name=f"chat-ws:{request_id}",
-            thread_id=thread_key,
-            run_id=prepared.run_id,
-            persist_on_disconnect=prepared.persist_on_disconnect,
-        )
-
-    async def _handle_resume(self, frame: dict[str, Any]) -> None:
-        """Resume an interrupted graph turn for the given thread."""
-        request_id = str(frame.get("request_id") or "")
-        thread_id = str(frame.get("thread_id") or "")
-        raw_command = frame.get("command")
-        command: dict[str, Any] = cast(dict[str, Any], raw_command) if isinstance(raw_command, dict) else {}
-
-        if not request_id or not thread_id:
-            await self._send({"type": "ws_error", "message": "request_id and thread_id are required"})
-            return
-        if self._task_supervisor.has_request(request_id):
-            await self._send({"type": "ws_error", "message": "duplicate request_id"})
-            return
-        if self._task_supervisor.is_thread_active(thread_id):
-            await self._send(
-                {
-                    "type": "ws_error",
-                    "request_id": request_id,
-                    "message": "turn already in progress for thread_id",
-                }
-            )
-            return
-
-        from app.core.trace_context import set_trace_id
-
-        set_trace_id(request_id)
-
-        async def runner() -> None:
-            await self._turn_executor.run_resume_turn(request_id=request_id, thread_id=thread_id, command=command)
-
-        # Inherit run_id from the previous task entry for this thread (if persisted)
-        existing_entry = self._task_supervisor.get_by_thread(thread_id)
-        resume_run_id = existing_entry.run_id if existing_entry else None
-        resume_persist = existing_entry.persist_on_disconnect if existing_entry else False
-
-        self._task_supervisor.create_task(
-            request_id,
-            runner(),
-            name=f"chat-ws-resume:{request_id}",
-            thread_id=thread_id,
-            run_id=resume_run_id,
-            persist_on_disconnect=resume_persist,
-        )
-
-    async def _handle_stop(self, frame: dict[str, Any]) -> None:
-        """Cancel the running turn identified by request_id."""
-        request_id = str(frame.get("request_id") or "")
-        if not request_id:
-            return
-
-        await self._task_supervisor.stop_by_request_id(request_id)
-
-    @staticmethod
-    def _parse_uuid(value: Any) -> uuid_lib.UUID | None:
-        """Parse a value into a UUID, returning None on failure."""
-        if not value:
-            return None
-        try:
-            return uuid_lib.UUID(str(value))
-        except (ValueError, TypeError):
-            return None
-
-    async def _append_run_event(
-        self,
-        *,
-        run_id: uuid_lib.UUID,
-        event_type: str,
-        payload: dict[str, Any],
-        trace_id: uuid_lib.UUID | None = None,
-        observation_id: uuid_lib.UUID | None = None,
-        parent_observation_id: uuid_lib.UUID | None = None,
-    ) -> None:
-        """Persist a stream event to the durable run event log."""
-        async with async_session_factory() as db:
-            service = RunService(db)
-            await service.append_event(
-                run_id=run_id,
-                event_type=event_type,
-                payload=payload,
-                trace_id=trace_id,
-                observation_id=observation_id,
-                parent_observation_id=parent_observation_id,
-            )
-
-    async def _mark_run_status(
-        self,
-        *,
-        run_id: uuid_lib.UUID,
-        status: AgentRunStatus,
-        runtime_owner_id: str | None = None,
-        error_code: str | None = None,
-        error_message: str | None = None,
-        result_summary: dict[str, Any] | None = None,
-    ) -> None:
-        """Update the persisted status of a durable agent run."""
-        async with async_session_factory() as db:
-            service = RunService(db)
-            await service.mark_status(
-                run_id=run_id,
-                user_id=self.user_id,
-                status=status,
-                runtime_owner_id=runtime_owner_id,
-                error_code=error_code,
-                error_message=error_message,
-                result_summary=result_summary,
-            )
-
-    async def _touch_run_heartbeat(self, *, run_id: uuid_lib.UUID) -> None:
-        """Send a single heartbeat for a durable run to indicate liveness."""
-        async with async_session_factory() as db:
-            service = RunService(db)
-            await service.touch_run_heartbeat(
-                run_id=run_id,
-                runtime_owner_id=self._runtime_owner_id,
-            )
-
-    async def _run_persisted_run_heartbeat(self, run_id: uuid_lib.UUID) -> None:
-        """Periodically touch the heartbeat for a persisted run until cancelled."""
-        while True:
-            try:
-                await asyncio.sleep(settings.run_heartbeat_interval_seconds)
-                await self._touch_run_heartbeat(run_id=run_id)
-            except asyncio.CancelledError:
-                raise
-            except Exception as exc:
-                logger.warning(f"Persisted run heartbeat failed, will retry | run_id={run_id} | error={exc}")
-                await asyncio.sleep(5)  # brief backoff before retry
-
-    async def _mirror_run_stream_event(
-        self,
-        *,
-        run_id: uuid_lib.UUID,
-        event: dict[str, Any],
-        assistant_message_id: str | None,
-    ) -> None:
-        """Translate a WS stream event and persist it to the durable run log."""
-        event_type = str(event.get("type") or "")
-        raw_data = event.get("data")
-        data = raw_data if isinstance(raw_data, dict) else {}
-        timestamp = int(event.get("timestamp") or int(time.time() * 1000))
-        observation_id = self._parse_uuid(event.get("observation_id"))
-
-        payload: dict[str, Any] | None = None
-        if event_type == "status":
-            stage = data.get("stage")
-            if stage is not None:
-                payload = {"stage": stage, "message": data.get("message", "")}
-            else:
-                message = str(data.get("status") or "")
-                payload = {"message": message, "status": message}
-        elif event_type == "content" and assistant_message_id:
-            delta = data.get("delta") if "delta" in data else data.get("content")
-            if delta:
-                payload = {"message_id": assistant_message_id, "delta": str(delta)}
-        elif event_type in ("thought_step", "tool_call", "tool_result", "result"):
-            payload = data
-        elif event_type == "tool_start" and assistant_message_id:
-            tool_input = data.get("tool_input")
-            payload = {
-                "message_id": assistant_message_id,
-                "tool": {
-                    "id": str(observation_id or uuid_lib.uuid4()),
-                    "name": str(data.get("tool_name") or "tool"),
-                    "args": tool_input if isinstance(tool_input, dict) else {},
-                    "status": "running",
-                    "startTime": timestamp,
-                },
-            }
-        elif event_type == "tool_end" and assistant_message_id:
-            payload = {
-                "message_id": assistant_message_id,
-                "tool_id": str(observation_id) if observation_id else None,
-                "tool_name": data.get("tool_name"),
-                "tool_output": data.get("tool_output"),
-                "end_time": timestamp,
-            }
-        elif event_type == "file_event":
-            payload = {
-                "action": data.get("action"),
-                "path": data.get("path"),
-                "size": data.get("size"),
-                "timestamp": data.get("timestamp"),
-            }
-        elif event_type == "interrupt":
-            payload = {"interrupt": data}
-        elif event_type == "error":
-            payload = {"message": data.get("message"), "code": data.get("code")}
-        elif event_type == "done":
-            payload = {}
-
-        if payload is None:
-            return
-
-        await self._append_run_event(
-            run_id=run_id,
-            event_type="content_delta" if event_type == "content" else event_type,
-            payload=payload,
-            trace_id=self._parse_uuid(event.get("trace_id")),
-            observation_id=observation_id,
-            parent_observation_id=self._parse_uuid(event.get("parent_observation_id")),
-        )
-
-    async def _emit_event(
-        self,
-        event: dict[str, Any],
-        *,
-        request_id: str | None = None,
-        tolerate_disconnect: bool = False,
-        agent_run_id: uuid_lib.UUID | None = None,
-        assistant_message_id: str | None = None,
-    ) -> None:
-        """Send an event to the client and optionally mirror it to durable storage."""
-        outbound = dict(event)
-        if request_id is not None:
-            outbound["request_id"] = request_id
-        if agent_run_id is not None:
-            asyncio.create_task(
-                self._mirror_run_stream_event(
-                    run_id=agent_run_id,
-                    event=outbound,
-                    assistant_message_id=assistant_message_id,
-                ),
-                name=f"mirror-event:{agent_run_id}",
-            )
-        await self._send(outbound, tolerate_disconnect=tolerate_disconnect)
-
-    async def _run_chat_turn(self, request_id: str, payload: ChatRequest) -> None:
-        """Execute a standard (new-message) chat turn."""
-        await self._turn_executor.execute_standard_turn(request_id=request_id, payload=payload)
-
-    async def _run_resume_turn(self, request_id: str, thread_id: str, command: dict[str, Any]) -> None:
-        """Execute a resume turn to continue an interrupted graph."""
-        await self._turn_executor.execute_resume_turn(request_id=request_id, thread_id=thread_id, command=command)
-
-    async def _finalize_task(
-        self,
-        *,
-        request_id: str,
-        thread_id: str | None,
-        state: StreamState | None,
-        built_graph: Any,
-        artifact_collector: ArtifactCollector | None,
-        graph_id: str | None,
-        workspace_id: str | None,
-        graph_name: str | None,
-    ) -> None:
-        """Clean up after a turn: save results, write artifacts, and update run status."""
-        task_entry = await self._task_supervisor.finalize(request_id)
-        agent_run_id = task_entry.run_id if task_entry else None
-
-        if thread_id:
-            try:
-                await task_manager.unregister_task(thread_id)
-            except Exception as exc:
-                logger.warning(f"Failed to unregister task | thread_id={thread_id} | error={exc}")
-
-        if thread_id and state is not None:
-            try:
-                await save_run_result(
-                    thread_id,
-                    state,
-                    logger.bind(user_id=self.user_id, thread_id=thread_id),
-                    graph_id=graph_id,
-                    workspace_id=workspace_id,
-                    user_id=self.user_id,
-                    graph_name=graph_name,
-                )
-            except Exception as exc:
-                logger.warning(f"Failed to save run result | thread_id={thread_id} | error={exc}")
-
-        if built_graph is not None and hasattr(built_graph, "_cleanup_backend"):
-            try:
-                await built_graph._cleanup_backend()
-            except Exception as exc:
-                logger.warning(f"Failed to cleanup backend | thread_id={thread_id} | error={exc}")
-
-        if thread_id and artifact_collector is not None and state is not None:
-            try:
-                run_dir = artifact_collector.ensure_run_dir(self.user_id, thread_id, state.artifact_run_id)
-                if built_graph is not None and hasattr(built_graph, "_export_artifacts_to"):
-                    try:
-                        built_graph._export_artifacts_to(run_dir)
-                    except Exception as exc:
-                        logger.warning(f"Sandbox export failed | thread_id={thread_id} | error={exc}")
-                status = "completed"
-                if state.stopped:
-                    status = "stopped"
-                elif state.has_error:
-                    status = "failed"
-                elif state.interrupted:
-                    status = "interrupted"
-                artifact_collector.write_manifest(
-                    run_dir,
-                    {
-                        "run_id": state.artifact_run_id,
-                        "thread_id": thread_id,
-                        "user_id": self.user_id,
-                        "agent_type": "langgraph",
-                        "graph_id": graph_id,
-                        "status": status,
-                    },
-                )
-            except Exception as exc:
-                logger.warning(f"Failed to write artifact manifest | thread_id={thread_id} | error={exc}")
-
-        if thread_id and state is not None and not state.interrupted:
-            await _clear_interrupt_marker(thread_id, logger.bind(user_id=self.user_id, thread_id=thread_id))
-
-        if agent_run_id is not None:
-            result_summary = {
-                "thread_id": thread_id,
-                "graph_id": graph_id,
-                "workspace_id": workspace_id,
-                "graph_name": graph_name,
-                "artifact_run_id": state.artifact_run_id if state is not None else None,
-            }
-            try:
-                if state is None:
-                    await self._mark_run_status(
-                        run_id=agent_run_id,
-                        status=AgentRunStatus.FAILED,
-                        error_code="missing_state",
-                        error_message="Run finalized without stream state",
-                        result_summary=result_summary,
-                    )
-                elif state.interrupted:
-                    await self._mark_run_status(
-                        run_id=agent_run_id,
-                        status=AgentRunStatus.INTERRUPT_WAIT,
-                        result_summary=result_summary,
-                    )
-                elif state.stopped:
-                    await self._mark_run_status(
-                        run_id=agent_run_id,
-                        status=AgentRunStatus.CANCELLED,
-                        error_code="stopped",
-                        error_message="Stopped by user",
-                        result_summary=result_summary,
-                    )
-                elif state.has_error:
-                    await self._mark_run_status(
-                        run_id=agent_run_id,
-                        status=AgentRunStatus.FAILED,
-                        error_code="stream_error",
-                        error_message="Agent run failed",
-                        result_summary=result_summary,
-                    )
-                else:
-                    await self._mark_run_status(
-                        run_id=agent_run_id,
-                        status=AgentRunStatus.COMPLETED,
-                        result_summary=result_summary,
-                    )
-            except Exception as exc:
-                logger.warning(f"Failed to update persisted run status | run_id={agent_run_id} | error={exc}")
-
-    async def _send_stream_event(
-        self,
-        sse_str: str | None,
-        request_id: str,
-        *,
-        tolerate_disconnect: bool = False,
-        agent_run_id: uuid_lib.UUID | None = None,
-        assistant_message_id: str | None = None,
-    ) -> None:
-        """Parse an SSE-formatted string and emit it as a WebSocket event."""
-        event = self._parse_stream_event(sse_str)
-        if not event:
-            return
-        await self._emit_event(
-            event,
-            request_id=request_id,
-            tolerate_disconnect=tolerate_disconnect,
-            agent_run_id=agent_run_id,
-            assistant_message_id=assistant_message_id,
-        )
-
-    def _parse_stream_event(self, sse_str: str | None) -> dict[str, Any] | None:
-        """Extract the JSON payload from an SSE data line."""
-        if not sse_str:
-            return None
-
-        payload_str = ""
-        for line in sse_str.splitlines():
-            stripped = line.strip()
-            if stripped.startswith("data:"):
-                payload_str = stripped[len("data:") :].strip()
-                break
-
-        if not payload_str:
-            return None
-
-        try:
-            payload = json.loads(payload_str)
-        except json.JSONDecodeError:
-            logger.warning("Failed to decode SSE payload for WS bridge")
-            return None
-
-        if not isinstance(payload, dict):
-            return None
-
-        return cast(dict[str, Any], payload)
-
-    async def _send(self, event: dict[str, Any], *, tolerate_disconnect: bool = False) -> bool:
-        """Serialize and send a JSON event over the WebSocket.
-
-        Returns:
-            True if sent successfully, False if the socket is disconnected
-            and tolerate_disconnect is True.
-
-        Raises:
-            WebSocketDisconnect: If the socket is disconnected and
-                tolerate_disconnect is False.
-        """
-        if not self._socket_connected:
-            if tolerate_disconnect:
-                return False
-            raise WebSocketDisconnect()
-        try:
-            async with self._send_lock:
-                await self.websocket.send_text(json.dumps(event))
-            return True
-        except WebSocketDisconnect:
-            self._socket_connected = False
-            if tolerate_disconnect:
-                return False
-            raise
-        except RuntimeError:
-            self._socket_connected = False
-            if tolerate_disconnect:
-                return False
-            raise WebSocketDisconnect()
-
-    def _is_thread_active(self, thread_id: str) -> bool:
-        """Check whether a turn is currently running for the given thread."""
-        return self._task_supervisor.is_thread_active(thread_id)
-
-    async def _cancel_all_tasks(self) -> None:
-        """Cancel all non-persistent tasks on disconnect."""
-        await self._task_supervisor.cancel_all()
diff --git a/backend/app/websocket/execution_subscription_handler.py b/backend/app/websocket/execution_subscription_handler.py
new file mode 100644
index 000000000..2c6edf806
--- /dev/null
+++ b/backend/app/websocket/execution_subscription_handler.py
@@ -0,0 +1,204 @@
+"""WebSocket handler for execution event subscriptions."""
+
+from __future__ import annotations
+
+import json
+import uuid
+
+from fastapi import WebSocket, WebSocketDisconnect
+
+from app.common.app_errors import AppError, InvalidRequestError, NotFoundError
+from app.core.database import AsyncSessionLocal
+from app.services.execution_service import ExecutionService
+from app.websocket.execution_subscription_manager import execution_subscription_manager
+
+
+def _ws_error_frame(error: AppError) -> dict[str, object]:
+    return {
+        "type": "ws_error",
+        "error": error.to_payload(),
+    }
+
+
+class ExecutionSubscriptionHandler:
+    """Handles subscribe/unsubscribe frames for execution event streams."""
+
+    async def handle_connection(self, websocket: WebSocket, user_id: str) -> None:
+        await websocket.accept()
+        try:
+            while True:
+                raw = await websocket.receive_text()
+                await self._handle_frame(websocket, user_id, raw)
+        except WebSocketDisconnect:
+            pass
+        finally:
+            execution_subscription_manager.disconnect(websocket)
+
+    async def _handle_frame(self, websocket: WebSocket, user_id: str, raw: str) -> None:
+        try:
+            frame = json.loads(raw)
+        except json.JSONDecodeError:
+            await websocket.send_text(
+                json.dumps(
+                    _ws_error_frame(
+                        InvalidRequestError(
+                            "无效的 websocket 帧",
+                            code="WEBSOCKET_INVALID_JSON",
+                            data={"detail": "The execution subscription frame is not valid JSON."},
+                        )
+                    )
+                )
+            )
+            return
+
+        frame_type = frame.get("type")
+        if frame_type == "ping":
+            await websocket.send_text(json.dumps({"type": "pong"}))
+            return
+
+        if frame_type == "unsubscribe":
+            execution_id = frame.get("execution_id")
+            if execution_id:
+                execution_subscription_manager.remove_subscription(websocket, str(execution_id))
+            return
+
+        if frame_type != "subscribe":
+            await websocket.send_text(
+                json.dumps(
+                    _ws_error_frame(
+                        InvalidRequestError(
+                            "未知的 websocket 帧类型",
+                            code="WEBSOCKET_UNKNOWN_FRAME_TYPE",
+                            data={"frame_type": frame_type},
+                        )
+                    )
+                )
+            )
+            return
+
+        execution_id_raw = frame.get("execution_id")
+        if not execution_id_raw:
+            await websocket.send_text(
+                json.dumps(
+                    _ws_error_frame(
+                        InvalidRequestError(
+                            "execution_id 是必填项",
+                            code="WEBSOCKET_EXECUTION_ID_REQUIRED",
+                            data=None,
+                        )
+                    )
+                )
+            )
+            return
+
+        try:
+            execution_id = uuid.UUID(str(execution_id_raw))
+        except ValueError:
+            await websocket.send_text(
+                json.dumps(
+                    _ws_error_frame(
+                        InvalidRequestError(
+                            "execution_id 无效",
+                            code="WEBSOCKET_INVALID_EXECUTION_ID",
+                            data={"execution_id": execution_id_raw},
+                        )
+                    )
+                )
+            )
+            return
+
+        try:
+            after_seq = int(frame.get("after_seq") or 0)
+        except (ValueError, TypeError):
+            await websocket.send_text(
+                json.dumps(
+                    _ws_error_frame(
+                        InvalidRequestError(
+                            "after_seq 无效",
+                            code="WEBSOCKET_INVALID_AFTER_SEQ",
+                            data={"after_seq": frame.get("after_seq")},
+                        )
+                    )
+                )
+            )
+            return
+
+        async with AsyncSessionLocal() as db:
+            service = ExecutionService(db)
+            execution = await service.get_execution(execution_id, user_id)
+            if execution is None:
+                await websocket.send_text(
+                    json.dumps(
+                        _ws_error_frame(
+                            NotFoundError(
+                                "执行不存在",
+                                code="EXECUTION_NOT_FOUND",
+                                data={"execution_id": str(execution_id)},
+                            )
+                        )
+                    )
+                )
+                return
+
+            snapshot = await service.get_snapshot(execution_id, user_id)
+            if snapshot is None:
+                await websocket.send_text(
+                    json.dumps(
+                        _ws_error_frame(
+                            NotFoundError(
+                                "执行快照不存在",
+                                code="EXECUTION_SNAPSHOT_NOT_FOUND",
+                                data={"execution_id": str(execution_id)},
+                            )
+                        )
+                    )
+                )
+                return
+
+            snapshot_last_seq = int(snapshot.last_seq or 0)
+            await websocket.send_text(
+                json.dumps(
+                    {
+                        "type": "snapshot",
+                        "execution_id": str(execution_id),
+                        "last_seq": snapshot_last_seq,
+                        "status": snapshot.projection.get("status"),
+                        "error": snapshot.projection.get("error"),
+                        "events": [],
+                    }
+                )
+            )
+
+            await execution_subscription_manager.add_subscription(websocket, str(execution_id))
+
+            catchup_after_seq = max(after_seq, snapshot_last_seq)
+            events = await service.list_events_after(execution_id, user_id, after_seq=catchup_after_seq, limit=1000)
+            replay_last_seq = snapshot_last_seq
+            for event in events:
+                seq = int(event.sequence_no)
+                replay_last_seq = max(replay_last_seq, seq)
+                await websocket.send_text(
+                    json.dumps(
+                        {
+                            "type": "event",
+                            "execution_id": str(execution_id),
+                            "seq": seq,
+                            "event_type": event.event_type,
+                            "payload": event.payload,
+                            "created_at": event.created_at.isoformat() if event.created_at else None,
+                        }
+                    )
+                )
+
+            await websocket.send_text(
+                json.dumps(
+                    {
+                        "type": "replay_done",
+                        "execution_id": str(execution_id),
+                        "last_seq": replay_last_seq,
+                    }
+                )
+            )
+
+
+execution_subscription_handler = ExecutionSubscriptionHandler()
diff --git a/backend/app/websocket/execution_subscription_manager.py b/backend/app/websocket/execution_subscription_manager.py
new file mode 100644
index 000000000..46e781044
--- /dev/null
+++ b/backend/app/websocket/execution_subscription_manager.py
@@ -0,0 +1,69 @@
+"""In-memory execution subscription manager."""
+
+from __future__ import annotations
+
+import json
+from collections import defaultdict
+from typing import Any
+
+from fastapi import WebSocket
+
+
+class ExecutionSubscriptionManager:
+    """Tracks which WebSocket connections are subscribed to which execution IDs."""
+
+    def __init__(self) -> None:
+        self._exec_connections: dict[str, set[WebSocket]] = defaultdict(set)
+        self._connection_execs: dict[WebSocket, set[str]] = defaultdict(set)
+
+    async def add_subscription(self, websocket: WebSocket, execution_id: str) -> None:
+        self._exec_connections[execution_id].add(websocket)
+        self._connection_execs[websocket].add(execution_id)
+
+    def remove_subscription(self, websocket: WebSocket, execution_id: str) -> None:
+        execs = self._connection_execs.get(websocket)
+        if execs:
+            execs.discard(execution_id)
+            if not execs:
+                self._connection_execs.pop(websocket, None)
+
+        connections = self._exec_connections.get(execution_id)
+        if connections:
+            connections.discard(websocket)
+            if not connections:
+                self._exec_connections.pop(execution_id, None)
+
+    def disconnect(self, websocket: WebSocket) -> None:
+        exec_ids = list(self._connection_execs.get(websocket, set()))
+        for exec_id in exec_ids:
+            self.remove_subscription(websocket, exec_id)
+
+    def remove_execution(self, execution_id: str) -> None:
+        """Remove all subscriptions for a completed execution, freeing memory."""
+        connections = list(self._exec_connections.get(execution_id, set()))
+        for websocket in connections:
+            execs = self._connection_execs.get(websocket)
+            if execs:
+                execs.discard(execution_id)
+                if not execs:
+                    self._connection_execs.pop(websocket, None)
+        self._exec_connections.pop(execution_id, None)
+
+    async def broadcast_event(self, execution_id: str, message: dict[str, Any]) -> int:
+        connections = list(self._exec_connections.get(execution_id, set()))
+        success_count = 0
+        disconnected: list[WebSocket] = []
+        for connection in connections:
+            try:
+                await connection.send_text(json.dumps(message, default=str))
+                success_count += 1
+            except Exception:
+                disconnected.append(connection)
+
+        for connection in disconnected:
+            self.disconnect(connection)
+
+        return success_count
+
+
+execution_subscription_manager = ExecutionSubscriptionManager()
diff --git a/backend/app/websocket/notification_manager.py b/backend/app/websocket/notification_manager.py
index 108040d3e..9f2a2ff0d 100644
--- a/backend/app/websocket/notification_manager.py
+++ b/backend/app/websocket/notification_manager.py
@@ -16,6 +16,9 @@ class NotificationType(str, Enum):
     INVITATION_ACCEPTED = "invitation_accepted"
     INVITATION_REJECTED = "invitation_rejected"
     INVITATION_CANCELLED = "invitation_cancelled"
+    TASK_ACTIVITY_ADDED = "task_activity_added"
+    TASK_UPDATED = "task_updated"
+    EXECUTION_STATUS_CHANGED = "execution_status_changed"
     PING = "ping"
     PONG = "pong"
     CONNECTED = "connected"
diff --git a/backend/app/websocket/run_subscription_handler.py b/backend/app/websocket/run_subscription_handler.py
deleted file mode 100644
index 446ce4c68..000000000
--- a/backend/app/websocket/run_subscription_handler.py
+++ /dev/null
@@ -1,130 +0,0 @@
-"""WebSocket handler for durable run subscriptions."""
-
-from __future__ import annotations
-
-import json
-import uuid
-
-from fastapi import WebSocket, WebSocketDisconnect
-
-from app.core.database import AsyncSessionLocal
-from app.services.run_service import RunService
-from app.websocket.run_subscription_manager import run_subscription_manager
-
-
-class RunSubscriptionHandler:
-    """Handles subscribe/unsubscribe frames for durable run event streams."""
-
-    async def handle_connection(self, websocket: WebSocket, user_id: str) -> None:
-        """Accept the WebSocket and process frames until disconnect."""
-        await websocket.accept()
-        try:
-            while True:
-                raw = await websocket.receive_text()
-                await self._handle_frame(websocket, user_id, raw)
-        except WebSocketDisconnect:
-            pass
-        finally:
-            run_subscription_manager.disconnect(websocket)
-
-    async def _handle_frame(self, websocket: WebSocket, user_id: str, raw: str) -> None:
-        """Parse a raw JSON frame and handle subscribe, unsubscribe, or ping."""
-        try:
-            frame = json.loads(raw)
-        except json.JSONDecodeError:
-            await websocket.send_text(json.dumps({"type": "ws_error", "message": "invalid json frame"}))
-            return
-
-        frame_type = frame.get("type")
-        if frame_type == "ping":
-            await websocket.send_text(json.dumps({"type": "pong"}))
-            return
-
-        if frame_type == "unsubscribe":
-            run_id = frame.get("run_id")
-            if run_id:
-                run_subscription_manager.remove_subscription(websocket, str(run_id))
-            return
-
-        if frame_type != "subscribe":
-            await websocket.send_text(json.dumps({"type": "ws_error", "message": f"unknown frame type: {frame_type}"}))
-            return
-
-        run_id_raw = frame.get("run_id")
-        if not run_id_raw:
-            await websocket.send_text(json.dumps({"type": "ws_error", "message": "run_id is required"}))
-            return
-
-        try:
-            run_id = uuid.UUID(str(run_id_raw))
-        except ValueError:
-            await websocket.send_text(json.dumps({"type": "ws_error", "message": "invalid run_id"}))
-            return
-
-        try:
-            after_seq = int(frame.get("after_seq") or 0)
-        except (ValueError, TypeError):
-            await websocket.send_text(json.dumps({"type": "ws_error", "message": "invalid after_seq"}))
-            return
-
-        async with AsyncSessionLocal() as db:
-            service = RunService(db)
-            run = await service.get_run(run_id, user_id)
-            if run is None:
-                await websocket.send_text(json.dumps({"type": "ws_error", "message": "run not found"}))
-                return
-
-            snapshot = await service.get_snapshot(run_id, user_id)
-            if snapshot is None:
-                await websocket.send_text(json.dumps({"type": "ws_error", "message": "snapshot not found"}))
-                return
-
-            snapshot_last_seq = int(snapshot.last_seq or 0)
-            await websocket.send_text(
-                json.dumps(
-                    {
-                        "type": "snapshot",
-                        "run_id": str(run_id),
-                        "last_seq": snapshot_last_seq,
-                        "data": snapshot.projection,
-                    }
-                )
-            )
-
-            await run_subscription_manager.add_subscription(websocket, str(run_id))
-
-            catchup_after_seq = max(after_seq, snapshot_last_seq)
-            events = await service.list_events_after(run_id, user_id, after_seq=catchup_after_seq, limit=1000)
-            replay_last_seq = snapshot_last_seq
-            for event in events:
-                replay_last_seq = max(replay_last_seq, int(event.seq))
-                await websocket.send_text(
-                    json.dumps(
-                        {
-                            "type": "event",
-                            "run_id": str(run_id),
-                            "seq": event.seq,
-                            "event_type": event.event_type,
-                            "data": event.payload,
-                            "trace_id": str(event.trace_id) if event.trace_id else None,
-                            "observation_id": str(event.observation_id) if event.observation_id else None,
-                            "parent_observation_id": (
-                                str(event.parent_observation_id) if event.parent_observation_id else None
-                            ),
-                            "created_at": event.created_at.isoformat() if event.created_at else None,
-                        }
-                    )
-                )
-
-            await websocket.send_text(
-                json.dumps(
-                    {
-                        "type": "replay_done",
-                        "run_id": str(run_id),
-                        "last_seq": replay_last_seq,
-                    }
-                )
-            )
-
-
-run_subscription_handler = RunSubscriptionHandler()
diff --git a/backend/app/websocket/run_subscription_manager.py b/backend/app/websocket/run_subscription_manager.py
deleted file mode 100644
index c08484f42..000000000
--- a/backend/app/websocket/run_subscription_manager.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""In-memory run subscription manager."""
-
-from __future__ import annotations
-
-import json
-from collections import defaultdict
-from typing import Any
-
-from fastapi import WebSocket
-
-
-class RunSubscriptionManager:
-    """Tracks which WebSocket connections are subscribed to which run IDs.
-
-    Maintains bidirectional mappings between connections and run IDs for
-    efficient fan-out and cleanup.
-    """
-
-    def __init__(self) -> None:
-        self._run_connections: dict[str, set[WebSocket]] = defaultdict(set)
-        self._connection_runs: dict[WebSocket, set[str]] = defaultdict(set)
-
-    async def add_subscription(self, websocket: WebSocket, run_id: str) -> None:
-        """Subscribe a connection to events for the given run."""
-        self._run_connections[run_id].add(websocket)
-        self._connection_runs[websocket].add(run_id)
-
-    def remove_subscription(self, websocket: WebSocket, run_id: str) -> None:
-        """Unsubscribe a connection from a specific run."""
-        runs = self._connection_runs.get(websocket)
-        if runs:
-            runs.discard(run_id)
-            if not runs:
-                self._connection_runs.pop(websocket, None)
-
-        connections = self._run_connections.get(run_id)
-        if connections:
-            connections.discard(websocket)
-            if not connections:
-                self._run_connections.pop(run_id, None)
-
-    def disconnect(self, websocket: WebSocket) -> None:
-        """Remove all subscriptions for a disconnected WebSocket."""
-        run_ids = list(self._connection_runs.get(websocket, set()))
-        for run_id in run_ids:
-            self.remove_subscription(websocket, run_id)
-
-    async def broadcast_event(self, run_id: str, message: dict[str, Any]) -> int:
-        """Send an event to all connections subscribed to a run.
-
-        Returns:
-            The number of connections that received the message successfully.
-        """
-        connections = list(self._run_connections.get(run_id, set()))
-        success_count = 0
-        disconnected: list[WebSocket] = []
-        for connection in connections:
-            try:
-                await connection.send_text(json.dumps(message, default=str))
-                success_count += 1
-            except Exception:
-                disconnected.append(connection)
-
-        for connection in disconnected:
-            self.disconnect(connection)
-
-        return success_count
-
-
-run_subscription_manager = RunSubscriptionManager()
diff --git a/backend/env.example b/backend/env.example
index 1280743a6..99bfb6563 100644
--- a/backend/env.example
+++ b/backend/env.example
@@ -30,7 +30,7 @@ WORKERS=4                  # 工作进程数（生产环境建议 4 或更多）
 SECRET_KEY=your-secret-key-change-in-production-CHANGE-THIS-IN-PRODUCTION
 
 # JWT 算法
-ALGORITHM=HS256
+JWT_ALGORITHM=HS256
 
 # Token 过期时间
 ACCESS_TOKEN_EXPIRE_MINUTES=4320
@@ -113,9 +113,6 @@ LANGFUSE_HOST=https://cloud.langfuse.com
 CREDENTIAL_ENCRYPTION_KEY=
 
 
-# Rich CLI 显示配置
-RICH_CLI_ENABLED=false
-
 # -----------------------------------------------------------------------------
 # 本地开发端口配置（可选）
 # -----------------------------------------------------------------------------
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index d947899be..36c6ed80f 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -37,6 +37,8 @@ dependencies = [
     # Observability
     "langfuse>=3.11.1",
     "loguru>=0.7.3",
+    "opentelemetry-api>=1.25.0",
+    "opentelemetry-sdk>=1.25.0",
     # Auth & Security
     "python-jose[cryptography]>=3.3.0",
     "passlib[bcrypt]>=1.7.4",
@@ -61,12 +63,6 @@ dependencies = [
     "aiosmtplib>=3.0.0",
     # Caching
     "redis>=5.0.0",
-    # Web scraping & automation
-    "beautifulsoup4>=4.14.2",
-    "selenium>=4.38.0",
-    "mitmproxy>=11.1.3",
-    # Security analysis
-    "angr>=9.2.182",
     # System & Docker
     "psutil>=7.1.3",
     "docker>=7.1.0",
@@ -106,6 +102,7 @@ dev = [
     "pre-commit>=4.0.0",
     "types-PyYAML>=6.0.0",
     "types-redis>=4.0.0",
+    "pyright>=1.1.409",
 ]
 
 [tool.ruff]
diff --git a/backend/tests/api/test_artifacts.py b/backend/tests/api/test_artifacts.py
deleted file mode 100644
index 926c3c9ec..000000000
--- a/backend/tests/api/test_artifacts.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.api.v1.artifacts import router
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-
-
-async def mock_get_current_user():
-    user = MagicMock(spec=User)
-    user.id = "user-123"
-    return user
-
-
-async def mock_get_db():
-    yield AsyncMock()
-
-
-@pytest.fixture
-def client():
-    test_app = FastAPI()
-    test_app.include_router(router)
-
-    from app.common.dependencies import get_current_user
-
-    test_app.dependency_overrides[get_current_user] = mock_get_current_user
-    test_app.dependency_overrides[get_db] = mock_get_db
-
-    with TestClient(test_app) as c:
-        yield c
-
-
-@patch("app.services.sandbox_manager._sandbox_pool")
-@patch("app.services.sandbox_manager.SandboxManagerService")
-def test_live_read_file_returns_raw_content_for_ui(mock_service_cls, mock_pool, client: TestClient) -> None:
-    record = MagicMock()
-    record.id = "sandbox-1"
-
-    mock_service = mock_service_cls.return_value
-    mock_service.get_user_sandbox_record = AsyncMock(return_value=record)
-
-    adapter = MagicMock()
-    adapter.is_started.return_value = True
-    adapter.read.return_value = "     1\talpha\n     2\tbeta"
-    adapter.raw_read.return_value = "alpha\nbeta"
-
-    mock_pool.get = AsyncMock(return_value=adapter)
-    mock_pool.release = AsyncMock(return_value=None)
-
-    response = client.get("/v1/artifacts/thread-1/live/skills/demo/SKILL.md")
-
-    assert response.status_code == 200
-    assert response.text == "alpha\nbeta"
-    adapter.raw_read.assert_called_once_with("skills/demo/SKILL.md")
-    adapter.read.assert_not_called()
-    mock_pool.release.assert_awaited_once_with("sandbox-1")
diff --git a/backend/tests/api/test_sandboxes.py b/backend/tests/api/test_sandboxes.py
deleted file mode 100644
index e53ffd5a3..000000000
--- a/backend/tests/api/test_sandboxes.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""
-Tests for Admin Sandbox API
-"""
-
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.api.v1.sandboxes import router
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-
-# Create a minimal app for testing
-app = FastAPI()
-app.include_router(router)
-
-
-# Mock dependencies
-async def mock_get_current_user():
-    user = MagicMock(spec=User)
-    user.id = "admin-user"
-    user.is_super_user = True
-    return user
-
-
-async def mock_get_db():
-    yield AsyncMock()
-
-
-@pytest.fixture
-def client():
-    # Create a fresh app for each test to avoid pollution
-    test_app = FastAPI()
-    test_app.include_router(router)
-
-    # Import the exact dependency function object to override
-    from app.common.dependencies import get_current_user
-
-    # helper to override
-    test_app.dependency_overrides[get_current_user] = mock_get_current_user
-    test_app.dependency_overrides[get_db] = mock_get_db
-
-    with TestClient(test_app) as c:
-        yield c
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_list_sandboxes(mock_service_cls, client):
-    # Setup
-    mock_db = AsyncMock()
-    # update override for this specific test
-    client.app.dependency_overrides[get_db] = lambda: mock_db
-
-    from datetime import datetime
-
-    # Mock DB execution
-    sandbox_item = MagicMock()
-    sandbox_item.id = "sandbox-1"
-    sandbox_item.user_id = "user-1"
-    sandbox_item.status = "running"
-    sandbox_item.image = "img"
-    sandbox_item.created_at = datetime(2023, 1, 1)
-    sandbox_item.updated_at = datetime(2023, 1, 1)
-    sandbox_item.idle_timeout = 300
-    sandbox_item.runtime = "runc"
-    sandbox_item.container_id = "cid"
-    sandbox_item.last_active_at = None
-    sandbox_item.error_message = None
-    sandbox_item.cpu_limit = 1.0
-    sandbox_item.memory_limit = 512
-
-    sandbox_item.user.name = "Test User"
-    sandbox_item.user.email = "test@example.com"
-
-    # scalars().all() returns list
-    # scalar_one() returns int
-    mock_count_result = MagicMock()
-    mock_count_result.scalar_one.return_value = 1
-
-    mock_list_result = MagicMock()
-    mock_list_result.scalars.return_value.all.return_value = [sandbox_item]
-
-    mock_db.execute.side_effect = [mock_count_result, mock_list_result]
-
-    # Run
-    response = client.get("/v1/sandboxes")
-
-    # Verify
-    assert response.status_code == 200
-    data = response.json()
-    assert data["total"] == 1
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_stop_sandbox(mock_service_cls, client):
-    # Setup
-    mock_service = mock_service_cls.return_value
-    mock_service.stop_sandbox = AsyncMock(return_value=True)
-
-    # Run
-    response = client.post("/v1/sandboxes/sb-1/stop")
-
-    # Verify
-    assert response.status_code == 200
-    assert response.json()["success"] is True
-    mock_service.stop_sandbox.assert_called_once_with("sb-1")
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_stop_sandbox_not_found(mock_service_cls, client):
-    # Setup
-    mock_service = mock_service_cls.return_value
-    mock_service.stop_sandbox = AsyncMock(return_value=False)
-
-    # Run
-    response = client.post("/v1/sandboxes/sb-unknown/stop")
-
-    # Verify
-    assert response.status_code == 404
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_rebuild_sandbox(mock_service_cls, client):
-    mock_service = mock_service_cls.return_value
-    mock_service.rebuild_sandbox = AsyncMock(return_value=True)
-    response = client.post("/v1/sandboxes/sb-1/rebuild")
-    assert response.status_code == 200
-    mock_service.rebuild_sandbox.assert_called_once_with("sb-1")
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_rebuild_sandbox_not_found(mock_service_cls, client):
-    mock_service = mock_service_cls.return_value
-    mock_service.rebuild_sandbox = AsyncMock(return_value=False)
-    response = client.post("/v1/sandboxes/sb-unknown/rebuild")
-    assert response.status_code == 404
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_update_sandbox(mock_service_cls, client):
-    mock_service = mock_service_cls.return_value
-    mock_service.update_sandbox_config = AsyncMock(return_value=True)
-    response = client.patch("/v1/sandboxes/sb-1", json={"image": "python:3.11-slim"})
-    assert response.status_code == 200
-    mock_service.update_sandbox_config.assert_called_once_with("sb-1", image="python:3.11-slim")
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_update_sandbox_not_found(mock_service_cls, client):
-    mock_service = mock_service_cls.return_value
-    mock_service.update_sandbox_config = AsyncMock(return_value=False)
-    response = client.patch("/v1/sandboxes/sb-unknown", json={"image": "python:3.11-slim"})
-    assert response.status_code == 404
-
-
-@patch("app.api.v1.sandboxes.SandboxManagerService")
-def test_delete_sandbox(mock_service_cls, client):
-    # Setup
-    mock_service = mock_service_cls.return_value
-    mock_service.delete_sandbox = AsyncMock(return_value=True)
-
-    # Run
-    response = client.delete("/v1/sandboxes/sb-1")
-
-    # Verify
-    assert response.status_code == 200
-    mock_service.delete_sandbox.assert_called_once_with("sb-1")
diff --git a/backend/tests/backends/__init__.py b/backend/tests/backends/__init__.py
deleted file mode 100644
index 09d41c4f4..000000000
--- a/backend/tests/backends/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Backend tests package
diff --git a/backend/tests/backends/test_file_tracking_proxy.py b/backend/tests/backends/test_file_tracking_proxy.py
deleted file mode 100644
index 17155072d..000000000
--- a/backend/tests/backends/test_file_tracking_proxy.py
+++ /dev/null
@@ -1,111 +0,0 @@
-from unittest.mock import MagicMock
-
-from deepagents.backends.protocol import EditResult, FileUploadResponse, WriteResult
-
-from app.core.agent.backends.file_tracking_proxy import FileTrackingProxy
-from app.utils.file_event_emitter import FileEventEmitter
-
-
-def _make_mock_backend():
-    backend = MagicMock()
-    backend.id = "test-sandbox"
-    backend.is_started.return_value = True
-    return backend
-
-
-def test_write_success_emits_event():
-    backend = _make_mock_backend()
-    backend.write.return_value = WriteResult(path="/app/hello.py", files_update=None)
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    result = proxy.write("/app/hello.py", "print('hi')")
-    assert result.path == "/app/hello.py"
-    events = emitter.drain()
-    assert len(events) == 1
-    assert events[0].action == "write"
-    assert events[0].path == "/app/hello.py"
-    assert events[0].size == len("print('hi')".encode("utf-8"))
-
-
-def test_write_error_does_not_emit():
-    backend = _make_mock_backend()
-    backend.write.return_value = WriteResult(error="File exists")
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    result = proxy.write("/app/hello.py", "x")
-    assert result.error
-    assert emitter.drain() == []
-
-
-def test_edit_success_emits_event():
-    backend = _make_mock_backend()
-    backend.edit.return_value = EditResult(path="/app/hello.py", files_update=None, occurrences=1)
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    result = proxy.edit("/app/hello.py", "old", "new")
-    assert result.path == "/app/hello.py"
-    events = emitter.drain()
-    assert len(events) == 1
-    assert events[0].action == "edit"
-
-
-def test_write_overwrite_emits_write():
-    backend = _make_mock_backend()
-    backend.write_overwrite.return_value = WriteResult(path="/app/a.py", files_update=None)
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    proxy.write_overwrite("/app/a.py", "content")
-    events = emitter.drain()
-    assert events[0].action == "write"
-
-
-def test_upload_files_emits_per_file():
-    backend = _make_mock_backend()
-    backend.upload_files.return_value = [
-        FileUploadResponse(path="/app/a.py", error=None),
-        FileUploadResponse(path="/app/b.py", error="fail"),
-    ]
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    proxy.upload_files([("/app/a.py", b"aa"), ("/app/b.py", b"bb")])
-    events = emitter.drain()
-    assert len(events) == 1
-    assert events[0].path == "/app/a.py"
-
-
-def test_read_delegates_without_emit():
-    backend = _make_mock_backend()
-    backend.read.return_value = "file content"
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    result = proxy.read("/app/hello.py")
-    assert result == "file content"
-    assert emitter.drain() == []
-    backend.read.assert_called_once_with("/app/hello.py")
-
-
-def test_raw_read_delegates_without_emit():
-    backend = _make_mock_backend()
-    backend.raw_read.return_value = "raw file content"
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    result = proxy.raw_read("/app/hello.py")
-    assert result == "raw file content"
-    assert emitter.drain() == []
-    backend.raw_read.assert_called_once_with("/app/hello.py")
-
-
-def test_getattr_fallback():
-    backend = _make_mock_backend()
-    backend.some_new_method.return_value = "ok"
-    emitter = FileEventEmitter()
-    proxy = FileTrackingProxy(backend, emitter)
-
-    assert proxy.some_new_method() == "ok"
diff --git a/backend/tests/backends/test_pydantic_adapter.py b/backend/tests/backends/test_pydantic_adapter.py
deleted file mode 100644
index fb34fb973..000000000
--- a/backend/tests/backends/test_pydantic_adapter.py
+++ /dev/null
@@ -1,452 +0,0 @@
-"""Tests for PydanticSandboxAdapter and RuntimeConfig.
-
-These tests verify the new features added to pydantic_adapter.py:
-- RuntimeConfig data class
-- BUILTIN_RUNTIMES predefined configurations
-- _resolve_runtime() method
-- Extended constructor parameters (runtime, session_id, idle_timeout, volumes)
-"""
-
-import pytest
-
-from app.core.agent.backends.pydantic_adapter import (
-    BUILTIN_RUNTIMES,
-    PydanticSandboxAdapter,
-    RuntimeConfig,
-    get_builtin_runtime,
-    list_builtin_runtimes,
-)
-from app.core.agent.backends.runtime_config import resolve_runtime
-
-
-class TestRuntimeConfig:
-    """Tests for RuntimeConfig dataclass."""
-
-    def test_create_with_defaults(self):
-        """Test creating RuntimeConfig with default values."""
-        config = RuntimeConfig(name="test")
-        assert config.name == "test"
-        assert config.base_image == "python:3.12-slim"
-        assert config.packages == []
-        assert config.setup_commands == []
-        assert config.env_vars == {}
-
-    def test_create_with_all_parameters(self):
-        """Test creating RuntimeConfig with all parameters."""
-        config = RuntimeConfig(
-            name="custom-ml",
-            base_image="python:3.11-slim",
-            packages=["torch", "numpy"],
-            setup_commands=["pip install --upgrade pip"],
-            env_vars={"CUDA_VISIBLE_DEVICES": "0"},
-        )
-        assert config.name == "custom-ml"
-        assert config.base_image == "python:3.11-slim"
-        assert config.packages == ["torch", "numpy"]
-        assert config.setup_commands == ["pip install --upgrade pip"]
-        assert config.env_vars == {"CUDA_VISIBLE_DEVICES": "0"}
-
-    def test_to_pydantic_runtime(self):
-        """Test conversion to pydantic-ai-backend RuntimeConfig."""
-        config = RuntimeConfig(
-            name="test",
-            base_image="python:3.12",
-            packages=["requests"],
-        )
-        # to_pydantic_runtime returns self if pydantic RuntimeConfig is not available
-        result = config.to_pydantic_runtime()
-        # Should either return the same config or a PydanticRuntimeConfig
-        assert hasattr(result, "name")
-        assert result.name == "test"
-
-
-class TestBuiltinRuntimes:
-    """Tests for BUILTIN_RUNTIMES and related functions."""
-
-    def test_builtin_runtimes_exist(self):
-        """Test that BUILTIN_RUNTIMES dictionary is populated."""
-        assert len(BUILTIN_RUNTIMES) > 0
-        assert "python-minimal" in BUILTIN_RUNTIMES
-        assert "python-datascience" in BUILTIN_RUNTIMES
-        assert "python-web" in BUILTIN_RUNTIMES
-
-    def test_python_minimal_runtime(self):
-        """Test python-minimal runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["python-minimal"]
-        assert runtime.name == "python-minimal"
-        assert runtime.base_image == "python:3.12-slim"
-        assert runtime.packages == []
-
-    def test_python_datascience_runtime(self):
-        """Test python-datascience runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["python-datascience"]
-        assert runtime.name == "python-datascience"
-        assert "pandas" in runtime.packages
-        assert "numpy" in runtime.packages
-        assert "matplotlib" in runtime.packages
-        assert "scikit-learn" in runtime.packages
-
-    def test_python_web_runtime(self):
-        """Test python-web runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["python-web"]
-        assert runtime.name == "python-web"
-        assert "fastapi" in runtime.packages
-        assert "uvicorn" in runtime.packages
-        assert "httpx" in runtime.packages
-
-    def test_python_ml_runtime(self):
-        """Test python-ml runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["python-ml"]
-        assert runtime.name == "python-ml"
-        assert "torch" in runtime.packages
-        assert "transformers" in runtime.packages
-
-    def test_node_minimal_runtime(self):
-        """Test node-minimal runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["node-minimal"]
-        assert runtime.name == "node-minimal"
-        assert runtime.base_image == "node:20-slim"
-        assert runtime.packages == []
-
-    def test_node_react_runtime(self):
-        """Test node-react runtime configuration."""
-        runtime = BUILTIN_RUNTIMES["node-react"]
-        assert runtime.name == "node-react"
-        assert runtime.base_image == "node:20-slim"
-        assert "react" in runtime.packages
-        assert "typescript" in runtime.packages
-
-    def test_get_builtin_runtime_exists(self):
-        """Test get_builtin_runtime with existing runtime."""
-        runtime = get_builtin_runtime("python-datascience")
-        assert runtime is not None
-        assert runtime.name == "python-datascience"
-
-    def test_get_builtin_runtime_not_exists(self):
-        """Test get_builtin_runtime with non-existing runtime."""
-        runtime = get_builtin_runtime("non-existent")
-        assert runtime is None
-
-    def test_list_builtin_runtimes(self):
-        """Test list_builtin_runtimes function."""
-        runtimes = list_builtin_runtimes()
-        assert isinstance(runtimes, list)
-        assert "python-minimal" in runtimes
-        assert "python-datascience" in runtimes
-        assert "python-web" in runtimes
-        assert "python-ml" in runtimes
-        assert "node-minimal" in runtimes
-        assert "node-react" in runtimes
-
-
-class TestResolveRuntime:
-    """Tests for resolve_runtime function."""
-
-    def test_resolve_none_runtime(self):
-        """Test resolving None runtime uses default image."""
-        image, config = resolve_runtime(
-            "python:3.12-slim",
-            None,
-        )
-        assert image == "python:3.12-slim"
-        assert config is None
-
-    def test_resolve_builtin_runtime_string(self):
-        """Test resolving builtin runtime by name."""
-        image, config = resolve_runtime(
-            "default:image",
-            "python-datascience",
-        )
-        assert image == "python:3.12-slim"
-        assert config is not None
-        assert config.name == "python-datascience"
-        assert "pandas" in config.packages
-
-    def test_resolve_image_string_with_colon(self):
-        """Test resolving image string (contains ':')."""
-        image, config = resolve_runtime(
-            "default:image",
-            "custom/image:v1.0",
-        )
-        assert image == "custom/image:v1.0"
-        assert config is None
-
-    def test_resolve_image_string_with_slash(self):
-        """Test resolving image string (contains '/')."""
-        image, config = resolve_runtime(
-            "default:image",
-            "docker.io/library/python",
-        )
-        assert image == "docker.io/library/python"
-        assert config is None
-
-    def test_resolve_custom_runtime_config(self):
-        """Test resolving custom RuntimeConfig instance."""
-        custom_config = RuntimeConfig(
-            name="custom",
-            base_image="python:3.11",
-            packages=["custom-package"],
-        )
-        image, config = resolve_runtime(
-            "default:image",
-            custom_config,
-        )
-        assert image == "python:3.11"
-        assert config is not None
-        assert config.name == "custom"
-        assert "custom-package" in config.packages
-
-    def test_resolve_unknown_string_as_image(self):
-        """Test resolving unknown string (not builtin, no special chars)."""
-        image, config = resolve_runtime(
-            "default:image",
-            "unknown-runtime",
-        )
-        # Should treat as image name (with warning logged)
-        assert image == "unknown-runtime"
-        assert config is None
-
-
-class TestPydanticSandboxAdapterInit:
-    """Tests for PydanticSandboxAdapter initialization (without Docker).
-
-    These tests verify constructor parameter handling without actually
-    creating Docker containers.
-    """
-
-    def test_import_error_without_backend(self):
-        """Test ImportError is raised when pydantic-ai-backend is not available."""
-        pytest.skip("pydantic-ai-backend[docker] is a required dependency; skipping missing-dependency branch test")
-
-
-class TestPydanticSandboxAdapterProperties:
-    """Tests for PydanticSandboxAdapter instance properties.
-
-    These tests use mocking to avoid creating actual Docker containers.
-    """
-
-    @pytest.fixture
-    def mock_docker_sandbox(self, monkeypatch):
-        """Mock DockerSandbox to avoid creating actual containers."""
-        from unittest.mock import MagicMock
-
-        mock_sandbox = MagicMock()
-        mock_sandbox.start = MagicMock()
-        mock_sandbox.stop = MagicMock()
-        monkeypatch.setattr(
-            "app.core.agent.backends.pydantic_adapter.DockerSandbox",
-            MagicMock(return_value=mock_sandbox),
-        )
-        return mock_sandbox
-
-    def test_adapter_stores_runtime_config(self, mock_docker_sandbox):
-        """Test that adapter stores runtime configuration."""
-        adapter = PydanticSandboxAdapter(runtime="python-datascience")
-        config = adapter.get_runtime_config()
-        assert config is not None
-        assert config.name == "python-datascience"
-
-    def test_adapter_stores_session_id(self, mock_docker_sandbox):
-        """Test that adapter stores session_id."""
-        adapter = PydanticSandboxAdapter(session_id="test-session-123")
-        assert adapter.session_id == "test-session-123"
-        assert adapter.id == "test-session-123"
-
-    def test_adapter_stores_idle_timeout(self, mock_docker_sandbox):
-        """Test that adapter stores idle_timeout."""
-        adapter = PydanticSandboxAdapter(idle_timeout=1800)
-        assert adapter.idle_timeout == 1800
-
-    def test_adapter_stores_volumes(self, mock_docker_sandbox):
-        """Test that adapter stores volumes."""
-        volumes = {"/host/data": "/container/data"}
-        adapter = PydanticSandboxAdapter(volumes=volumes)
-        assert adapter.volumes == volumes
-
-    def test_adapter_image_from_runtime(self, mock_docker_sandbox):
-        """Test that adapter uses image from runtime config."""
-        adapter = PydanticSandboxAdapter(runtime="node-minimal")
-        assert adapter.image == "node:20-slim"
-
-
-class TestPydanticSandboxAdapterFileOps:
-    """Tests for PydanticSandboxAdapter file operations.
-
-    These tests verify that read/write/edit methods properly delegate
-    to the upstream DockerSandbox methods.
-    """
-
-    @pytest.fixture
-    def adapter_with_mock(self, monkeypatch):
-        """Create adapter with mocked DockerSandbox."""
-        from unittest.mock import MagicMock
-
-        mock_sandbox = MagicMock()
-        mock_sandbox.start = MagicMock()
-        mock_sandbox.stop = MagicMock()
-
-        # Mock execute for file existence check (file doesn't exist by default)
-        mock_sandbox.execute = MagicMock(return_value=MagicMock(output="", exit_code=1))
-
-        # Patch DockerSandbox constructor
-        monkeypatch.setattr(
-            "app.core.agent.backends.pydantic_adapter.DockerSandbox",
-            MagicMock(return_value=mock_sandbox),
-        )
-
-        adapter = PydanticSandboxAdapter()
-        return adapter, mock_sandbox
-
-    def test_read_delegates_to_sandbox(self, adapter_with_mock):
-        """Test that read() delegates to self._sandbox.read()."""
-        adapter, mock_sandbox = adapter_with_mock
-        mock_sandbox.read = lambda path, offset, limit: "line1\nline2\nline3"
-
-        result = adapter.read("/workspace/test.txt", offset=0, limit=10)
-
-        # Should return formatted content with line numbers
-        assert "line1" in result
-        assert "line2" in result
-
-    def test_raw_read_returns_unformatted_content(self, adapter_with_mock):
-        """Test that raw_read() returns original text without line numbers."""
-        adapter, mock_sandbox = adapter_with_mock
-        mock_sandbox.read = lambda path, offset, limit: "line1\nline2\nline3"
-
-        result = adapter.raw_read("/workspace/test.txt", offset=0, limit=10)
-
-        assert result == "line1\nline2\nline3"
-
-    def test_read_handles_error_from_sandbox(self, adapter_with_mock):
-        """Test that read() handles errors from upstream."""
-        adapter, mock_sandbox = adapter_with_mock
-        mock_sandbox.read = lambda path, offset, limit: "[Error: File not found]"
-
-        result = adapter.read("/workspace/nonexistent.txt")
-
-        assert "Error" in result
-
-    def test_write_delegates_to_sandbox(self, adapter_with_mock):
-        """Test that write() delegates to self._sandbox.write()."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_write_result = MagicMock(error=None, path="/workspace/test.txt")
-        mock_sandbox.write = MagicMock(return_value=mock_write_result)
-
-        result = adapter.write("/workspace/test.txt", "content")
-
-        mock_sandbox.write.assert_called_once_with("/workspace/test.txt", "content")
-        assert result.path == "/workspace/test.txt"
-        assert result.error is None
-
-    def test_write_prevents_overwrite_existing(self, adapter_with_mock):
-        """Test that write() prevents overwriting existing files."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        # Simulate file exists (exit_code=0)
-        mock_sandbox.execute = MagicMock(return_value=MagicMock(output="", exit_code=0))
-
-        result = adapter.write("/workspace/existing.txt", "new content")
-
-        assert result.error is not None
-        assert "already exists" in result.error
-
-    def test_write_overwrite_delegates_to_sandbox(self, adapter_with_mock):
-        """Test that write_overwrite() delegates to self._sandbox.write()."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_write_result = MagicMock(error=None, path="/workspace/test.txt")
-        mock_sandbox.write = MagicMock(return_value=mock_write_result)
-
-        result = adapter.write_overwrite("/workspace/test.txt", "new content")
-
-        mock_sandbox.write.assert_called_once_with("/workspace/test.txt", "new content")
-        assert result.path == "/workspace/test.txt"
-        assert result.error is None
-
-    def test_edit_delegates_to_sandbox(self, adapter_with_mock):
-        """Test that edit() delegates to self._sandbox.edit()."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_edit_result = MagicMock(error=None, path="/workspace/test.txt", occurrences=2)
-        mock_sandbox.edit = MagicMock(return_value=mock_edit_result)
-
-        result = adapter.edit("/workspace/test.txt", "old", "new", replace_all=True)
-
-        mock_sandbox.edit.assert_called_once_with("/workspace/test.txt", "old", "new", True)
-        assert result.path == "/workspace/test.txt"
-        assert result.occurrences == 2
-        assert result.error is None
-
-    def test_edit_handles_error_from_sandbox(self, adapter_with_mock):
-        """Test that edit() handles errors from upstream."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_edit_result = MagicMock(error="String not found")
-        mock_sandbox.edit = MagicMock(return_value=mock_edit_result)
-
-        result = adapter.edit("/workspace/test.txt", "not found", "new")
-
-        assert result.error == "String not found"
-
-    def test_write_handles_special_characters(self, adapter_with_mock):
-        """Test that write() handles special characters in content."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_write_result = MagicMock(error=None, path="/workspace/test.txt")
-        mock_sandbox.write = MagicMock(return_value=mock_write_result)
-
-        # Content with special characters that would break shell commands
-        special_content = "echo 'hello'\n$VAR\n`command`\n\"quotes\"\n!#$%&"
-
-        result = adapter.write("/workspace/test.txt", special_content)
-
-        # Should delegate to upstream without modification
-        mock_sandbox.write.assert_called_once_with("/workspace/test.txt", special_content)
-        assert result.error is None
-
-    def test_write_handles_large_content(self, adapter_with_mock):
-        """Test that write() handles large content (> 1MB)."""
-        from unittest.mock import MagicMock
-
-        adapter, mock_sandbox = adapter_with_mock
-        mock_write_result = MagicMock(error=None, path="/workspace/large.txt")
-        mock_sandbox.write = MagicMock(return_value=mock_write_result)
-
-        # Large content (1.5 MB) - would fail with base64+echo approach
-        large_content = "x" * (1024 * 1024 + 500000)  # 1.5 MB
-
-        result = adapter.write("/workspace/large.txt", large_content)
-
-        # Should delegate to upstream without size issues
-        mock_sandbox.write.assert_called_once()
-        assert result.error is None
-
-
-class TestSandboxFactoryDockerSandbox:
-    """Tests for create_docker_sandbox factory function."""
-
-    def test_import_create_docker_sandbox(self):
-        """Test that create_docker_sandbox can be imported."""
-        from app.core.tools.sandbox.sandbox_factory import create_docker_sandbox
-
-        assert callable(create_docker_sandbox)
-
-    def test_docker_in_sandbox_providers(self):
-        """Test that docker is in sandbox providers."""
-        from app.core.tools.sandbox.sandbox_factory import get_available_sandbox_types
-
-        types = get_available_sandbox_types()
-        assert "docker" in types
-
-    def test_docker_working_dir(self):
-        """Test that docker working dir is /workspace."""
-        from app.core.tools.sandbox.sandbox_factory import get_default_working_dir
-
-        assert get_default_working_dir("docker") == "/workspace"
diff --git a/backend/tests/core/__init__.py b/backend/tests/core/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/core/copilot/test_action_applier.py b/backend/tests/core/copilot/test_action_applier.py
deleted file mode 100644
index e5d5aa525..000000000
--- a/backend/tests/core/copilot/test_action_applier.py
+++ /dev/null
@@ -1,111 +0,0 @@
-"""
-Contract tests for apply_actions_to_graph_state.
-
-Uses shared fixtures from docs/schemas/copilot-apply-fixtures.json to ensure
-backend apply logic stays consistent with the contract (and with frontend ActionProcessor).
-"""
-
-import importlib.util
-import json
-from pathlib import Path
-
-import pytest
-
-# Import only action_applier to avoid pulling in langchain/copilot agent dependencies
-_action_applier_path = (
-    Path(__file__).resolve().parent.parent.parent.parent / "app" / "core" / "copilot" / "action_applier.py"
-)
-_spec = importlib.util.spec_from_file_location("action_applier", _action_applier_path)
-_action_applier = importlib.util.module_from_spec(_spec)
-_spec.loader.exec_module(_action_applier)
-apply_actions_to_graph_state = _action_applier.apply_actions_to_graph_state
-
-FIXTURES_PATH = (
-    Path(__file__).resolve().parent.parent.parent.parent.parent / "docs" / "schemas" / "copilot-apply-fixtures.json"
-)
-
-
-def _load_fixtures():
-    if not FIXTURES_PATH.exists():
-        return []
-    with open(FIXTURES_PATH, encoding="utf-8") as f:
-        return json.load(f)
-
-
-APPLY_FIXTURES = _load_fixtures()
-
-
-def _normalize_nodes(nodes):
-    """Sort nodes by id for stable comparison."""
-    return sorted(nodes, key=lambda n: n.get("id", ""))
-
-
-def _normalize_edges(edges):
-    """Sort edges by id for stable comparison."""
-    return sorted(edges, key=lambda e: e.get("id", ""))
-
-
-def _node_contract_match(got_node, want_node):
-    """Check that got_node matches contract: id, type, position, data.label, data.type, and config superset."""
-    if got_node.get("id") != want_node.get("id"):
-        return False
-    if got_node.get("type") != want_node.get("type"):
-        return False
-    if got_node.get("position") != want_node.get("position"):
-        return False
-    got_data = got_node.get("data") or {}
-    want_data = want_node.get("data") or {}
-    if got_data.get("label") != want_data.get("label"):
-        return False
-    if got_data.get("type") != want_data.get("type"):
-        return False
-    want_config = want_data.get("config") or {}
-    got_config = got_data.get("config") or {}
-    for k, v in want_config.items():
-        if got_config.get(k) != v:
-            return False
-    return True
-
-
-def _edge_contract_match(got_edge, want_edge):
-    """Check that got_edge matches contract: id, source, target."""
-    return (
-        got_edge.get("id") == want_edge.get("id")
-        and got_edge.get("source") == want_edge.get("source")
-        and got_edge.get("target") == want_edge.get("target")
-    )
-
-
-@pytest.mark.parametrize(
-    "case_index",
-    range(len(APPLY_FIXTURES)) if APPLY_FIXTURES else [0],
-    ids=[APPLY_FIXTURES[i]["name"] for i in range(len(APPLY_FIXTURES))] if APPLY_FIXTURES else ["no_fixtures"],
-)
-def test_apply_actions_contract(case_index):
-    """Each fixture case: apply actions and assert result matches expected (contract match)."""
-    if not APPLY_FIXTURES:
-        pytest.skip(f"Fixtures not found: {FIXTURES_PATH}")
-    data = APPLY_FIXTURES[case_index]
-    name = data.get("name", f"case_{case_index}")
-    initial_nodes = data["initial_nodes"]
-    initial_edges = data["initial_edges"]
-    actions = data["actions"]
-    expected_nodes = data["expected_nodes"]
-    expected_edges = data["expected_edges"]
-
-    got_nodes, got_edges = apply_actions_to_graph_state(
-        [n.copy() for n in initial_nodes],
-        [e.copy() for e in initial_edges],
-        actions,
-    )
-    got_nodes = _normalize_nodes(got_nodes)
-    got_edges = _normalize_edges(got_edges)
-    exp_nodes = _normalize_nodes(expected_nodes)
-    exp_edges = _normalize_edges(expected_edges)
-
-    assert len(got_nodes) == len(exp_nodes), f"{name}: node count mismatch"
-    assert len(got_edges) == len(exp_edges), f"{name}: edge count mismatch"
-    for i, (g, e) in enumerate(zip(got_nodes, exp_nodes)):
-        assert _node_contract_match(g, e), f"{name}: node[{i}] contract mismatch: got {g}"
-    for i, (g, e) in enumerate(zip(got_edges, exp_edges)):
-        assert _edge_contract_match(g, e), f"{name}: edge[{i}] contract mismatch: got {g}"
diff --git a/backend/tests/core/graph/__init__.py b/backend/tests/core/graph/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/core/graph/test_runtime_prompt_template.py b/backend/tests/core/graph/test_runtime_prompt_template.py
deleted file mode 100644
index a21e068bf..000000000
--- a/backend/tests/core/graph/test_runtime_prompt_template.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import sys
-import types
-import uuid
-from pathlib import Path
-
-from app.models.graph import AgentGraph
-
-
-def _import_runtime_renderer():
-    graph_package = "app.core.graph"
-    root = Path(__file__).resolve().parents[3]
-    stub = types.ModuleType(graph_package)
-    stub.__path__ = [str(root / "app" / "core" / "graph")]
-    tracker = {}
-    tracker[graph_package] = sys.modules.get(graph_package)
-    tracker[f"{graph_package}.runtime_prompt_template"] = sys.modules.get(f"{graph_package}.runtime_prompt_template")
-    sys.modules[graph_package] = stub
-    try:
-        from app.core.graph.runtime_prompt_template import (
-            build_runtime_prompt_context,
-            extract_runtime_template_variables,
-            get_prompt_text_from_config,
-            render_runtime_template,
-        )
-    finally:
-        for name, original in tracker.items():
-            if original is None:
-                sys.modules.pop(name, None)
-            else:
-                sys.modules[name] = original
-    return (
-        render_runtime_template,
-        get_prompt_text_from_config,
-        extract_runtime_template_variables,
-        build_runtime_prompt_context,
-    )
-
-
-(
-    render_runtime_template,
-    get_prompt_text_from_config,
-    extract_runtime_template_variables,
-    build_runtime_prompt_context,
-) = _import_runtime_renderer()
-
-
-def test_known_placeholders_are_replaced():
-    rendered = render_runtime_template(
-        "Thread {thread_id} repo {target_repo}",
-        {"thread_id": 42, "target_repo": "main"},
-    )
-    assert rendered == "Thread 42 repo main"
-
-
-def test_missing_placeholders_stay_literal():
-    rendered = render_runtime_template(
-        "Missing {nothing} still literal",
-        {},
-    )
-    assert rendered == "Missing {nothing} still literal"
-
-
-def test_non_string_values_converted_none_untouched():
-    rendered = render_runtime_template(
-        "Count {count} optional {optional}",
-        {"count": 7, "optional": None},
-    )
-    assert rendered == "Count 7 optional {optional}"
-
-
-def test_mustache_placeholders_remain_when_context_has_key():
-    rendered = render_runtime_template(
-        "{{mustache}}",
-        {"mustache": "X"},
-    )
-    assert rendered == "{{mustache}}"
-
-
-def test_unsupported_placeholder_shapes_ignored():
-    rendered = render_runtime_template(
-        "Shallow {user.id} {vars['name']} {vars[\"name\"]} {{mustache}}",
-        {"user": "irrelevant", "vars": {"name": "ignored"}},
-    )
-    assert rendered == "Shallow {user.id} {vars['name']} {vars[\"name\"]} {{mustache}}"
-
-
-def test_none_input_returns_none():
-    assert render_runtime_template(None, {"anything": "value"}) is None
-
-
-def test_get_prompt_text_from_config_prefers_supported_keys():
-    assert get_prompt_text_from_config({"systemPrompt": "A", "prompt": "B"}) == "A"
-    assert get_prompt_text_from_config({"system_prompt": "A", "prompt": "B"}) == "A"
-    assert get_prompt_text_from_config({"prompt": "B"}) == "B"
-    assert get_prompt_text_from_config({}) is None
-
-
-def test_extract_runtime_template_variables_only_returns_supported_shapes():
-    variables = extract_runtime_template_variables(
-        "T={thread_id} P={project} {{mustache}} {user.id} {vars['name']} {missing_key}"
-    )
-    assert variables == {"thread_id", "project", "missing_key"}
-
-
-def test_build_runtime_prompt_context_merges_built_ins_and_graph_context():
-    graph = AgentGraph(
-        id=uuid.uuid4(),
-        name="Prompt Graph",
-        user_id="owner-user",
-        workspace_id=uuid.uuid4(),
-        variables={"context": {"thread_id": "override-thread", "project": "alpha"}},
-    )
-
-    context = build_runtime_prompt_context(graph, user_id=uuid.uuid4(), thread_id="thread-123")
-
-    assert context["thread_id"] == "override-thread"
-    assert context["project"] == "alpha"
-    assert context["graph_id"] == str(graph.id)
-    assert context["workspace_id"] == str(graph.workspace_id)
-    assert context["graph_name"] == "Prompt Graph"
diff --git a/backend/tests/dynamic_engine/__init__.py b/backend/tests/dynamic_engine/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/dynamic_engine/mcp_server_test.py b/backend/tests/dynamic_engine/mcp_server_test.py
deleted file mode 100644
index 4ab5d1283..000000000
--- a/backend/tests/dynamic_engine/mcp_server_test.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""
-MCP Client Demo using official MCP SDK
-
-Simple demonstration of using MCP client to connect to server and call tools.
-"""
-
-import asyncio
-import json
-import sys
-from datetime import timedelta
-from pathlib import Path
-
-# Add backend to path
-backend_path = Path(__file__).parent.parent.parent
-sys.path.insert(0, str(backend_path))
-
-from mcp import ClientSession  # noqa: E402
-from mcp.client.sse import sse_client  # noqa: E402
-from mcp.client.stdio import stdio_client  # noqa: E402
-from mcp.client.streamable_http import streamablehttp_client  # noqa: E402
-
-
-async def demo_stdio():
-    """Demo: Connect to MCP server via stdio."""
-    print("\n=== Demo 1: STDIO Transport ===")
-
-    # Create stdio client
-    stdio_params = {
-        "command": "python",
-        "args": ["-m", "mcp.server"],  # Replace with your MCP server command
-    }
-
-    try:
-        async with stdio_client(**stdio_params) as streams:
-            async with ClientSession(streams[0], streams[1]) as session:
-                # Initialize session
-                await session.initialize()
-
-                # List available tools
-                tools = await session.list_tools()
-                print(f"Available tools ({len(tools.tools)}):")
-                for tool in tools.tools[:10]:
-                    print(f"  - {tool.name}: {tool.description}")
-
-                # Call a tool
-                if tools.tools:
-                    result = await session.call_tool(tools.tools[0].name, {})
-                    print(f"\nTool result: {result}")
-
-    except Exception as e:
-        print(f"Error: {e}")
-
-
-async def demo_sse(host: str = "http://localhost:8000/sse"):
-    """Demo: Connect to MCP server via SSE."""
-    print("\n=== Demo 2: SSE Transport ===")
-
-    try:
-        async with sse_client(host) as streams:
-            async with ClientSession(streams[0], streams[1]) as session:
-                # Initialize session
-                await session.initialize()
-
-                # List available tools
-                tools = await session.list_tools()
-                print(f"Available tools ({len(tools.tools)}):")
-                for tool in tools.tools[:10]:
-                    print(f"  - {tool.name}: {tool.description}")
-
-                while True:
-                    tool_name = input("Enter tool name: ")
-                    input_json = input("Enter kwargs: ")
-                    kwargs = {}
-                    try:
-                        kwargs = json.loads(input_json)
-                    except Exception:
-                        try:
-                            kwargs = eval(input_json)
-                        except Exception as e:
-                            print(f"Error: {e}")
-                            continue
-                    result = await session.call_tool(tool_name, arguments=kwargs)
-                    print(f"\nTool result: {result}")
-
-    except Exception as e:
-        print(f"Error: {e}")
-
-
-async def demo_streamable_http():
-    """Demo: Connect to MCP server via Streamable HTTP."""
-    print("\n=== Demo 3: Streamable HTTP Transport ===")
-
-    try:
-        async with streamablehttp_client("http://localhost:8000/mcp") as streams:
-            async with ClientSession(streams[0], streams[1], read_timeout_seconds=timedelta(seconds=30)) as session:
-                # Initialize session
-                await session.initialize()
-
-                # List available tools
-                tools = await session.list_tools()
-                print(f"Available tools ({len(tools.tools)}):")
-                for tool in tools.tools[:10]:
-                    print(f"  - {tool.name}")
-
-                # Call a tool
-                result = await session.call_tool(
-                    "execute_shell_command", {"command": "echo", "args": ["Hello from MCP!"]}
-                )
-                print(f"\nTool result: {result}")
-
-    except Exception as e:
-        print(f"Error: {e}")
-
-
-async def demo_list_resources():
-    """Demo: List resources from MCP server."""
-    print("\n=== Demo 4: List Resources ===")
-
-    try:
-        async with streamablehttp_client("http://localhost:8000/mcp") as streams:
-            async with ClientSession(streams[0], streams[1]) as session:
-                await session.initialize()
-
-                # List resources
-                resources = await session.list_resources()
-                print(f"Available resources ({len(resources.resources)}):")
-                for resource in resources.resources[:5]:
-                    print(f"  - {resource.uri}: {resource.name}")
-
-    except Exception as e:
-        print(f"Error: {e}")
-
-
-async def demo_list_prompts():
-    """Demo: List prompts from MCP server."""
-    print("\n=== Demo 5: List Prompts ===")
-
-    try:
-        async with streamablehttp_client("http://localhost:8000/mcp") as streams:
-            async with ClientSession(streams[0], streams[1]) as session:
-                await session.initialize()
-
-                # List prompts
-                prompts = await session.list_prompts()
-                print(f"Available prompts ({len(prompts.prompts)}):")
-                for prompt in prompts.prompts[:5]:
-                    print(f"  - {prompt.name}: {prompt.description}")
-
-    except Exception as e:
-        print(f"Error: {e}")
-
-
-async def main():
-    # Demo 2: SSE (requires MCP server on localhost:8000)
-    await demo_sse(host="http://localhost:9100/sse")
-
-
-if __name__ == "__main__":
-    asyncio.run(main())
diff --git a/backend/tests/services/__init__.py b/backend/tests/services/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/services/test_graph_service_runtime_prompt_cache.py b/backend/tests/services/test_graph_service_runtime_prompt_cache.py
deleted file mode 100644
index 83ec60b13..000000000
--- a/backend/tests/services/test_graph_service_runtime_prompt_cache.py
+++ /dev/null
@@ -1,130 +0,0 @@
-import importlib
-import sys
-import types
-import uuid
-from datetime import datetime, timezone
-
-from app.models.graph import AgentGraph
-
-
-def _import_with_optional_dependency_stubs(module_name: str):
-    module_names = ("langchain_google_genai", "pydantic_ai_backends")
-    previous_modules = {name: sys.modules.get(name) for name in module_names}
-    modules_before_import = set(sys.modules)
-
-    for name in module_names:
-        sys.modules.pop(name, None)
-
-    try:
-        genai_stub = types.ModuleType("langchain_google_genai")
-
-        class _ChatGoogleGenerativeAI:
-            def __init__(self, *args, **kwargs):
-                self.args = args
-                self.kwargs = kwargs
-
-        genai_stub.ChatGoogleGenerativeAI = _ChatGoogleGenerativeAI
-        sys.modules["langchain_google_genai"] = genai_stub
-
-        backends_stub = types.ModuleType("pydantic_ai_backends")
-
-        class _DockerSandbox:
-            def __init__(self, *args, **kwargs):
-                self.args = args
-                self.kwargs = kwargs
-
-        class _RuntimeConfig:
-            def __init__(self, *args, **kwargs):
-                self.args = args
-                self.kwargs = kwargs
-
-        backends_stub.DockerSandbox = _DockerSandbox
-        backends_stub.RuntimeConfig = _RuntimeConfig
-        sys.modules["pydantic_ai_backends"] = backends_stub
-
-        imported_module = importlib.import_module(module_name)
-        return imported_module
-    finally:
-        new_modules = set(sys.modules) - modules_before_import
-        for name in new_modules:
-            if name.startswith("app."):
-                sys.modules.pop(name, None)
-        for name, previous in previous_modules.items():
-            if previous is None:
-                sys.modules.pop(name, None)
-            else:
-                sys.modules[name] = previous
-
-
-_graph_service = _import_with_optional_dependency_stubs("app.services.graph_service")
-_build_runtime_aware_compile_cache_key = _graph_service._build_runtime_aware_compile_cache_key
-
-
-def _make_graph(*, graph_id: uuid.UUID, context: dict) -> AgentGraph:
-    graph = AgentGraph(
-        id=graph_id,
-        name="Runtime Cache Graph",
-        user_id="owner-user",
-        variables={"context": context},
-    )
-    graph.updated_at = datetime(2026, 1, 1, tzinfo=timezone.utc)
-    return graph
-
-
-def test_cache_key_changes_when_thread_id_changes() -> None:
-    graph = _make_graph(graph_id=uuid.uuid4(), context={})
-
-    key1 = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-1")
-    key2 = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-2")
-
-    assert key1 != key2
-
-
-def test_cache_key_changes_when_graph_context_override_changes() -> None:
-    graph_id = uuid.uuid4()
-    graph1 = _make_graph(graph_id=graph_id, context={"thread_id": "override-1"})
-    graph2 = _make_graph(graph_id=graph_id, context={"thread_id": "override-2"})
-
-    key1 = _build_runtime_aware_compile_cache_key(graph1, user_id="user-1", thread_id="thread-raw")
-    key2 = _build_runtime_aware_compile_cache_key(graph2, user_id="user-1", thread_id="thread-raw")
-
-    assert key1 != key2
-
-
-def test_cache_key_stable_for_equivalent_context_ordering() -> None:
-    graph_id = uuid.uuid4()
-    graph1 = _make_graph(
-        graph_id=graph_id,
-        context={
-            "project": "x",
-            "meta": {"alpha": 1, "beta": 2},
-        },
-    )
-    graph2 = _make_graph(
-        graph_id=graph_id,
-        context={
-            "meta": {"beta": 2, "alpha": 1},
-            "project": "x",
-        },
-    )
-
-    key1 = _build_runtime_aware_compile_cache_key(graph1, user_id="user-1", thread_id="thread-raw")
-    key2 = _build_runtime_aware_compile_cache_key(graph2, user_id="user-1", thread_id="thread-raw")
-
-    assert key1 == key2
-
-
-def test_cache_key_repeated_execution_safe_for_runtime_context_changes() -> None:
-    graph = _make_graph(graph_id=uuid.uuid4(), context={})
-
-    first_key = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-raw")
-    repeated_same_key = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-raw")
-    assert repeated_same_key == first_key
-
-    graph.variables = {"context": {"project": "alpha"}}
-    changed_context_key = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-raw")
-    assert changed_context_key != first_key
-
-    graph.variables = {"context": {"project": "beta"}}
-    changed_context_key_again = _build_runtime_aware_compile_cache_key(graph, user_id="user-1", thread_id="thread-raw")
-    assert changed_context_key_again != changed_context_key
diff --git a/backend/tests/services/test_sandbox_manager.py b/backend/tests/services/test_sandbox_manager.py
deleted file mode 100644
index 756509b6b..000000000
--- a/backend/tests/services/test_sandbox_manager.py
+++ /dev/null
@@ -1,146 +0,0 @@
-"""
-Tests for SandboxManagerService
-"""
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from sqlalchemy.orm import configure_mappers
-
-# Import models to ensure mappers are registered
-from app.services.sandbox_manager import SandboxManagerService
-
-# Ensure mappers are configured
-configure_mappers()
-
-
-@pytest.mark.asyncio
-async def test_create_sandbox_record():
-    # Setup mock db
-    mock_db_session = AsyncMock()
-    mock_db_session.add = MagicMock()
-    mock_db_session.commit = AsyncMock()
-    mock_db_session.refresh = AsyncMock()
-
-    # Mock execute result for get_user_sandbox_record (returning None)
-    mock_result = MagicMock()
-    mock_result.scalar_one_or_none.return_value = None
-    mock_db_session.execute.return_value = mock_result
-
-    service = SandboxManagerService(mock_db_session)
-    user_id = "test_user_1"
-
-    # Run
-    # We mock UserSandbox constructor to avoid mapper issues if they persist
-    # But usually importing AuthUser should fix it.
-
-    sandbox = await service.create_sandbox_record(user_id)
-
-    # Verify
-    assert sandbox.user_id == user_id
-    assert sandbox.status == "pending"
-    mock_db_session.add.assert_called_once()
-    mock_db_session.commit.assert_awaited_once()
-
-
-@pytest.mark.asyncio
-async def test_ensure_sandbox_running_new():
-    # Setup mocks
-    mock_db_session = AsyncMock()
-    mock_result = MagicMock()
-    # Return a mock record
-    mock_record = MagicMock()
-    mock_record.id = "sandbox-123"
-    mock_record.image = "python:3.12-slim"
-    mock_record.idle_timeout = 3600
-    mock_record.status = "pending"
-    mock_result.scalar_one_or_none.return_value = mock_record
-    mock_db_session.execute.return_value = mock_result
-
-    with (
-        patch("app.services.sandbox_manager._sandbox_pool") as mock_pool,
-        patch("app.services.sandbox_manager.PydanticSandboxAdapter") as mock_adapter_cls,
-        patch("os.makedirs") as mock_makedirs,
-    ):
-        # Configure mocks
-        mock_pool.get = AsyncMock(return_value=None)
-        mock_pool.put = AsyncMock()
-
-        mock_adapter_instance = MagicMock()
-        mock_adapter_instance.is_started.return_value = True
-        mock_adapter_cls.return_value = mock_adapter_instance
-
-        service = SandboxManagerService(mock_db_session)
-        user_id = "user-123"
-
-        # Run
-        adapter = await service.ensure_sandbox_running(user_id)
-
-        # Validations
-        assert adapter is not None
-        mock_adapter_cls.assert_called_once()
-        mock_pool.put.assert_called_once()
-
-        # Verify volume creation
-        expected_dir = f"/tmp/sandboxes/{user_id}"
-        mock_makedirs.assert_called_once_with(expected_dir, exist_ok=True)
-
-        # Verify adapter called with volumes and auto_remove=False for user sandbox
-        call_args = mock_adapter_cls.call_args
-        assert call_args.kwargs["volumes"] == {expected_dir: "/workspace"}
-        assert call_args.kwargs.get("auto_remove") is False
-
-        # DB updates should happen
-        assert mock_db_session.execute.call_count >= 1
-
-
-@pytest.mark.asyncio
-async def test_stop_sandbox():
-    # Setup mocks
-    mock_db_session = AsyncMock()
-    mock_result = MagicMock()
-    # Configure rowcount for the update result
-    mock_result.rowcount = 1
-    mock_db_session.execute.return_value = mock_result
-    mock_db_session.commit = AsyncMock()
-
-    with patch("app.services.sandbox_manager._sandbox_pool") as mock_pool:
-        mock_pool.stop = AsyncMock()
-
-        service = SandboxManagerService(mock_db_session)
-        sandbox_id = str(uuid.uuid4())
-
-        # Run
-        success = await service.stop_sandbox(sandbox_id)
-
-        # Validations: stop_sandbox only stops container, does not remove from pool
-        assert success is True
-        mock_pool.stop.assert_called_once_with(sandbox_id)
-        mock_db_session.execute.assert_called()
-        mock_db_session.commit.assert_awaited()
-
-
-@pytest.mark.asyncio
-async def test_cleanup_idle_sandboxes():
-    # Setup mocks
-    mock_db_session = AsyncMock()
-    mock_db_session.execute = AsyncMock()
-    mock_db_session.commit = AsyncMock()
-
-    with patch("app.services.sandbox_manager._sandbox_pool") as mock_pool:
-        # Mock cleanup returning list of IDs
-        evicted_ids = ["sandbox-1", "sandbox-2"]
-        mock_pool.cleanup_idle = AsyncMock(return_value=evicted_ids)
-
-        service = SandboxManagerService(mock_db_session)
-
-        # Run
-        count = await service.cleanup_idle_sandboxes()
-
-        # Verify
-        assert count == 2
-        mock_pool.cleanup_idle.assert_called_once()
-        # Verify DB update called
-        mock_db_session.execute.assert_called_once()
-        mock_db_session.commit.assert_awaited_once()
diff --git a/backend/tests/test_api/__init__.py b/backend/tests/test_api/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_api/test_chat_commands_chat_run.py b/backend/tests/test_api/test_chat_commands_chat_run.py
deleted file mode 100644
index 52423c3e7..000000000
--- a/backend/tests/test_api/test_chat_commands_chat_run.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from app.websocket.chat_commands import ChatRunTurnCommand, build_command_from_parsed_frame
-from app.websocket.chat_protocol import parse_client_frame
-
-
-def test_chat_extension_produces_chat_run_turn_command():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-1",
-            "thread_id": "t-1",
-            "input": {"message": "hello"},
-            "extension": {"kind": "chat", "run_id": "run-xyz"},
-            "metadata": {},
-        }
-    )
-    command = build_command_from_parsed_frame(parsed)
-    assert isinstance(command, ChatRunTurnCommand)
-    assert command.run_id == "run-xyz"
-    assert command.message == "hello"
-
-
-def test_no_extension_still_produces_standard_command():
-    from app.websocket.chat_commands import StandardChatTurnCommand
-
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-2",
-            "input": {"message": "hi"},
-            "extension": None,
-            "metadata": {},
-        }
-    )
-    command = build_command_from_parsed_frame(parsed)
-    assert isinstance(command, StandardChatTurnCommand)
-    assert not isinstance(command, ChatRunTurnCommand)
-
-
-def test_skill_creator_extension_still_produces_skill_creator_command():
-    from app.websocket.chat_commands import SkillCreatorTurnCommand
-
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-3",
-            "input": {"message": "create skill"},
-            "extension": {"kind": "skill_creator", "run_id": "run-sc", "edit_skill_id": "sk-1"},
-            "metadata": {},
-        }
-    )
-    command = build_command_from_parsed_frame(parsed)
-    assert isinstance(command, SkillCreatorTurnCommand)
-    assert not isinstance(command, ChatRunTurnCommand)
-    assert command.run_id == "run-sc"
-    assert command.edit_skill_id == "sk-1"
diff --git a/backend/tests/test_api/test_chat_commands_copilot.py b/backend/tests/test_api/test_chat_commands_copilot.py
deleted file mode 100644
index b78da28c9..000000000
--- a/backend/tests/test_api/test_chat_commands_copilot.py
+++ /dev/null
@@ -1,62 +0,0 @@
-"""Tests for copilot command dispatch."""
-
-from app.websocket.chat_commands import (
-    ChatRunTurnCommand,
-    CopilotTurnCommand,
-    SkillCreatorTurnCommand,
-    build_command_from_parsed_frame,
-)
-from app.websocket.chat_protocol import ParsedChatInput, ParsedChatStartFrame, ParsedCopilotExtension
-
-
-def test_copilot_extension_produces_copilot_turn_command():
-    frame = ParsedChatStartFrame(
-        request_id="req-1",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="Build RAG", files=[], provider_name=None, model_name=None),
-        extension=ParsedCopilotExtension(
-            kind="copilot",
-            run_id="run-123",
-            graph_context={"nodes": [], "edges": []},
-            conversation_history=[{"role": "user", "content": "hi"}],
-            mode="deepagents",
-        ),
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert isinstance(cmd, CopilotTurnCommand)
-    assert cmd.run_id == "run-123"
-    assert cmd.graph_context == {"nodes": [], "edges": []}
-    assert cmd.conversation_history == [{"role": "user", "content": "hi"}]
-    assert cmd.mode == "deepagents"
-    assert cmd.message == "Build RAG"
-
-
-def test_no_extension_still_standard():
-    frame = ParsedChatStartFrame(
-        request_id="req-2",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="hello", files=[], provider_name=None, model_name=None),
-        extension=None,
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert not isinstance(cmd, CopilotTurnCommand)
-    assert not isinstance(cmd, SkillCreatorTurnCommand)
-
-
-def test_chat_extension_still_chat_run():
-    from app.websocket.chat_protocol import ParsedChatExtension
-
-    frame = ParsedChatStartFrame(
-        request_id="req-3",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="hello", files=[], provider_name=None, model_name=None),
-        extension=ParsedChatExtension(kind="chat", run_id="r1"),
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert isinstance(cmd, ChatRunTurnCommand)
diff --git a/backend/tests/test_api/test_chat_protocol.py b/backend/tests/test_api/test_chat_protocol.py
deleted file mode 100644
index 396af48f1..000000000
--- a/backend/tests/test_api/test_chat_protocol.py
+++ /dev/null
@@ -1,153 +0,0 @@
-import uuid
-
-import pytest
-
-from app.websocket.chat_protocol import (
-    ChatProtocolError,
-    ParsedChatStartFrame,
-    parse_client_frame,
-)
-
-
-def test_parse_standard_chat_start_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-1",
-            "thread_id": None,
-            "graph_id": None,
-            "input": {"message": "hello", "files": []},
-            "extension": None,
-            "metadata": {},
-        }
-    )
-
-    assert isinstance(parsed, ParsedChatStartFrame)
-    assert parsed.request_id == "req-1"
-    assert parsed.input.message == "hello"
-    assert parsed.extension is None
-
-
-def test_parse_skill_creator_extension_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-2",
-            "input": {"message": "build a skill", "files": []},
-            "extension": {
-                "kind": "skill_creator",
-                "run_id": "123e4567-e89b-12d3-a456-426614174000",
-                "edit_skill_id": "skill-42",
-            },
-            "metadata": {},
-        }
-    )
-
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "skill_creator"
-    assert parsed.extension.edit_skill_id == "skill-42"
-
-
-def test_parse_chat_start_frame_coerces_graph_id_to_uuid():
-    graph_id = uuid.uuid4()
-
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-graph",
-            "thread_id": None,
-            "graph_id": str(graph_id),
-            "input": {"message": "hello", "files": []},
-            "extension": None,
-            "metadata": {},
-        }
-    )
-
-    assert isinstance(parsed, ParsedChatStartFrame)
-    assert parsed.graph_id == graph_id
-
-
-def test_reserved_metadata_control_keys_are_rejected():
-    try:
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-3",
-                "input": {"message": "hello"},
-                "extension": None,
-                "metadata": {"mode": "apk-vulnerability"},
-            }
-        )
-    except ChatProtocolError as exc:
-        assert exc.message == "reserved metadata keys are not allowed"
-        assert exc.request_id == "req-3"
-    else:
-        raise AssertionError("expected ChatProtocolError")
-
-
-def test_metadata_files_key_is_rejected_for_typed_chat_start():
-    with pytest.raises(ChatProtocolError) as exc:
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-files",
-                "input": {"message": "hello", "files": []},
-                "extension": None,
-                "metadata": {
-                    "files": [{"filename": "notes.md", "path": "/tmp/notes.md"}],
-                },
-            }
-        )
-
-    assert exc.value.message == "reserved metadata keys are not allowed"
-    assert exc.value.request_id == "req-files"
-
-
-def test_parse_ping_frame_passes_through():
-    parsed = parse_client_frame({"type": "ping"})
-    assert isinstance(parsed, dict)
-    assert parsed.get("type") == "ping"
-
-
-def test_parse_chat_resume_and_stop_return_dicts():
-    assert parse_client_frame({"type": "chat.resume", "request_id": "req-r"}).get("type") == "chat.resume"
-    assert parse_client_frame({"type": "chat.stop", "request_id": "req-s"}).get("type") == "chat.stop"
-
-
-def test_legacy_chat_frame_is_rejected_as_unknown():
-    with pytest.raises(ChatProtocolError) as exc:
-        parse_client_frame(
-            {
-                "type": "chat",
-                "request_id": "req-old",
-                "message": "hello",
-                "metadata": {"mode": "skill_creator"},
-            }
-        )
-
-    assert "unknown frame type" in exc.value.message
-
-
-def test_malformed_chat_start_missing_input_raises():
-    with pytest.raises(ChatProtocolError) as exc:
-        parse_client_frame({"type": "chat.start", "request_id": "req-bad"})
-
-    assert "input" in exc.value.message.lower()
-    assert exc.value.request_id == "req-bad"
-
-
-def test_invalid_graph_id_raises_protocol_error():
-    with pytest.raises(ChatProtocolError) as exc:
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-graph-bad",
-                "graph_id": "not-a-uuid",
-                "input": {"message": "hello", "files": []},
-                "extension": None,
-                "metadata": {},
-            }
-        )
-
-    assert exc.value.message == "chat.start frame graph_id must be a valid UUID"
-    assert exc.value.request_id == "req-graph-bad"
diff --git a/backend/tests/test_api/test_chat_protocol_chat_extension.py b/backend/tests/test_api/test_chat_protocol_chat_extension.py
deleted file mode 100644
index c04d97963..000000000
--- a/backend/tests/test_api/test_chat_protocol_chat_extension.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from app.websocket.chat_protocol import (
-    ParsedChatStartFrame,
-    parse_client_frame,
-)
-
-
-def test_parse_chat_extension_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-chat-1",
-            "thread_id": "t-1",
-            "graph_id": None,
-            "input": {"message": "hello"},
-            "extension": {"kind": "chat", "run_id": "run-abc"},
-            "metadata": {},
-        }
-    )
-    assert isinstance(parsed, ParsedChatStartFrame)
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "chat"
-    assert parsed.extension.run_id == "run-abc"
-
-
-def test_parse_chat_extension_with_no_run_id():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-chat-2",
-            "input": {"message": "hi"},
-            "extension": {"kind": "chat"},
-            "metadata": {},
-        }
-    )
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "chat"
-    assert parsed.extension.run_id is None
-
-
-def test_unsupported_extension_kind_still_rejected():
-    import pytest
-
-    from app.websocket.chat_protocol import ChatProtocolError
-
-    with pytest.raises(ChatProtocolError, match="unsupported extension kind"):
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-bad",
-                "input": {"message": "hi"},
-                "extension": {"kind": "unknown_future_kind"},
-                "metadata": {},
-            }
-        )
diff --git a/backend/tests/test_api/test_chat_protocol_copilot_extension.py b/backend/tests/test_api/test_chat_protocol_copilot_extension.py
deleted file mode 100644
index df71a1800..000000000
--- a/backend/tests/test_api/test_chat_protocol_copilot_extension.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""Tests for copilot extension parsing in chat protocol."""
-
-import pytest
-
-from app.websocket.chat_protocol import ChatProtocolError, parse_client_frame
-
-
-def _make_copilot_frame(*, graph_context=None, mode=None, run_id=None, conversation_history=None):
-    return {
-        "type": "chat.start",
-        "request_id": "req-1",
-        "graph_id": "00000000-0000-0000-0000-000000000001",
-        "input": {"message": "Build a RAG pipeline"},
-        "extension": {
-            "kind": "copilot",
-            "run_id": run_id,
-            "graph_context": graph_context if graph_context is not None else {"nodes": [], "edges": []},
-            "conversation_history": conversation_history or [],
-            "mode": mode or "deepagents",
-        },
-    }
-
-
-def test_parse_copilot_extension_frame():
-    result = parse_client_frame(_make_copilot_frame(run_id="run-abc"))
-    assert result.extension.kind == "copilot"
-    assert result.extension.run_id == "run-abc"
-    assert result.extension.graph_context == {"nodes": [], "edges": []}
-    assert result.extension.mode == "deepagents"
-    assert result.extension.conversation_history == []
-
-
-def test_parse_copilot_extension_defaults():
-    """mode defaults to deepagents, conversation_history defaults to []."""
-    frame = {
-        "type": "chat.start",
-        "request_id": "req-2",
-        "input": {"message": "test"},
-        "extension": {"kind": "copilot", "graph_context": {"nodes": []}},
-    }
-    result = parse_client_frame(frame)
-    assert result.extension.kind == "copilot"
-    assert result.extension.mode == "deepagents"
-    assert result.extension.conversation_history == []
-    assert result.extension.run_id is None
-
-
-def test_parse_copilot_extension_missing_graph_context():
-    """graph_context is required — missing it should raise."""
-    frame = {
-        "type": "chat.start",
-        "request_id": "req-3",
-        "input": {"message": "test"},
-        "extension": {"kind": "copilot"},
-    }
-    with pytest.raises(ChatProtocolError, match="graph_context"):
-        parse_client_frame(frame)
-
-
-def test_existing_extensions_still_work():
-    """Regression: skill_creator and chat extensions unchanged."""
-    sc_frame = {
-        "type": "chat.start",
-        "request_id": "req-4",
-        "input": {"message": "test"},
-        "extension": {"kind": "skill_creator", "run_id": "r1", "edit_skill_id": "s1"},
-    }
-    result = parse_client_frame(sc_frame)
-    assert result.extension.kind == "skill_creator"
-
-    chat_frame = {
-        "type": "chat.start",
-        "request_id": "req-5",
-        "input": {"message": "test"},
-        "extension": {"kind": "chat", "run_id": "r2"},
-    }
-    result = parse_client_frame(chat_frame)
-    assert result.extension.kind == "chat"
diff --git a/backend/tests/test_api/test_chat_ws_handler.py b/backend/tests/test_api/test_chat_ws_handler.py
deleted file mode 100644
index 149b7bdcc..000000000
--- a/backend/tests/test_api/test_chat_ws_handler.py
+++ /dev/null
@@ -1,561 +0,0 @@
-"""Tests for ChatWsHandler — focuses on critical frame-output paths."""
-
-import asyncio
-import json
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from app.websocket.chat_ws_handler import ChatTaskEntry, ChatWsHandler
-
-# ---------------------------------------------------------------------------
-# Helpers
-# ---------------------------------------------------------------------------
-
-
-class MockWebSocket:
-    """Minimal WebSocket stub that records sent frames."""
-
-    def __init__(self):
-        self.sent: list[dict] = []
-        self.closed = False
-
-    async def send_text(self, data: str) -> None:
-        self.sent.append(json.loads(data))
-
-    async def close(self, code: int = 1000) -> None:
-        self.closed = True
-
-    def frames_of_type(self, type_: str) -> list[dict]:
-        return [f for f in self.sent if f.get("type") == type_]
-
-
-def make_handler(ws: MockWebSocket | None = None) -> tuple[ChatWsHandler, MockWebSocket]:
-    if ws is None:
-        ws = MockWebSocket()
-    handler = ChatWsHandler(user_id="user-123", websocket=ws)
-    return handler, ws
-
-
-# ---------------------------------------------------------------------------
-# Ping/pong
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_ping_returns_pong() -> None:
-    handler, ws = make_handler()
-    await handler._handle_frame(json.dumps({"type": "ping"}))
-    assert ws.frames_of_type("pong"), "expected a pong frame"
-
-
-@pytest.mark.asyncio
-async def test_typed_resume_routes_to_resume_handler() -> None:
-    handler, _ = make_handler()
-    with patch.object(handler, "_handle_resume", new_callable=AsyncMock) as mock_resume:
-        await handler._handle_frame(
-            json.dumps(
-                {
-                    "type": "chat.resume",
-                    "request_id": "req-resume",
-                    "thread_id": "thread-typed",
-                    "command": {},
-                }
-            )
-        )
-    mock_resume.assert_awaited_once()
-
-
-@pytest.mark.asyncio
-async def test_typed_stop_routes_to_stop_handler() -> None:
-    handler, _ = make_handler()
-    with patch.object(handler, "_handle_stop", new_callable=AsyncMock) as mock_stop:
-        await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "req-stop"}))
-    mock_stop.assert_awaited_once()
-
-
-@pytest.mark.asyncio
-async def test_malformed_chat_start_returns_protocol_error() -> None:
-    handler, ws = make_handler()
-    await handler._handle_frame(json.dumps({"type": "chat.start", "request_id": "req-bad"}))
-
-    errors = ws.frames_of_type("ws_error")
-    assert errors, "malformed chat.start should send ws_error"
-    error = errors[0]
-    assert "input" in error.get("message", "").lower()
-    assert error.get("request_id") == "req-bad"
-
-
-@pytest.mark.asyncio
-async def test_protocol_error_does_not_register_task() -> None:
-    handler, ws = make_handler()
-
-    with patch.object(handler._task_supervisor, "register", wraps=handler._task_supervisor.register) as mock_register:
-        await handler._handle_frame(json.dumps({"type": "chat.start", "request_id": "req-bad"}))
-
-    errors = ws.frames_of_type("ws_error")
-    assert errors, "malformed frame must emit ws_error"
-    mock_register.assert_not_called()
-
-
-# ---------------------------------------------------------------------------
-# Duplicate request guard
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_duplicate_request_id_sends_ws_error() -> None:
-    handler, ws = make_handler()
-    # Pre-populate _tasks with a fake entry for the same request_id
-    fake_task = MagicMock(spec=asyncio.Task)
-    handler._tasks["req-1"] = ChatTaskEntry(thread_id=None, task=fake_task)
-
-    frame = json.dumps(
-        {
-            "type": "chat.start",
-            "request_id": "req-1",
-            "input": {"message": "hello"},
-            "metadata": {},
-        }
-    )
-    await handler._handle_frame(frame)
-
-    errors = ws.frames_of_type("ws_error")
-    assert errors, "expected ws_error for duplicate request_id"
-    assert "duplicate" in errors[0].get("message", "")
-
-
-@pytest.mark.asyncio
-async def test_direct_task_insertion_keeps_thread_active_guard() -> None:
-    handler, ws = make_handler()
-    fake_task = MagicMock(spec=asyncio.Task)
-    handler._tasks["req-existing"] = ChatTaskEntry(thread_id="thread-1", task=fake_task)
-
-    await handler._handle_frame(
-        json.dumps(
-            {
-                "type": "chat.start",
-                "request_id": "req-next",
-                "thread_id": "thread-1",
-                "input": {"message": "hello"},
-                "metadata": {},
-            }
-        )
-    )
-
-    assert ws.frames_of_type("ws_error") == [
-        {
-            "type": "ws_error",
-            "request_id": "req-next",
-            "message": "turn already in progress for thread_id",
-        }
-    ]
-
-
-@pytest.mark.asyncio
-async def test_legacy_chat_frame_is_rejected_before_task_creation() -> None:
-    handler, ws = make_handler()
-
-    legacy_frame = json.dumps(
-        {
-            "type": "chat",
-            "request_id": "req-legacy",
-            "message": "build me a skill",
-            "metadata": {
-                "mode": "skill_creator",
-                "run_id": str(uuid.uuid4()),
-                "edit_skill_id": "legacy-skill",
-            },
-        }
-    )
-
-    await handler._handle_frame(legacy_frame)
-
-    assert ws.frames_of_type("ws_error") == [
-        {
-            "type": "ws_error",
-            "request_id": "req-legacy",
-            "message": "legacy metadata control fields are no longer supported",
-        }
-    ]
-    assert "req-legacy" not in handler._tasks
-
-
-# ---------------------------------------------------------------------------
-# Command parsing edge cases
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_non_object_json_frame_returns_ws_error() -> None:
-    handler, ws = make_handler()
-
-    await handler._handle_frame(json.dumps(["unexpected", "array"]))
-
-    errors = ws.frames_of_type("ws_error")
-    assert errors, "non-object JSON should emit ws_error instead of crashing"
-    assert "object" in errors[0].get("message", "").lower()
-
-
-@pytest.mark.asyncio
-async def test_chat_start_with_invalid_extension_data_is_rejected() -> None:
-    handler, ws = make_handler()
-
-    await handler._handle_frame(
-        json.dumps(
-            {
-                "type": "chat.start",
-                "request_id": "req-invalid",
-                "input": {"message": "hello"},
-                "extension": {"kind": "unknown"},
-                "metadata": {},
-            }
-        )
-    )
-
-    assert ws.frames_of_type("ws_error") == [
-        {
-            "type": "ws_error",
-            "request_id": "req-invalid",
-            "message": "unsupported extension kind: unknown",
-        }
-    ]
-    assert "req-invalid" not in handler._tasks
-
-
-@pytest.mark.asyncio
-async def test_typed_skill_creator_extension_propagates_run_metadata() -> None:
-    handler, ws = make_handler()
-    captured_payload = None
-    run_id = uuid.uuid4()
-
-    async def fake_run_chat_turn(*, request_id: str, payload) -> None:
-        nonlocal captured_payload
-        assert request_id == "req-skill"
-        captured_payload = payload
-
-    frame = json.dumps(
-        {
-            "type": "chat.start",
-            "request_id": "req-skill",
-            "thread_id": None,
-            "input": {"message": "build a skill", "files": []},
-            "extension": {
-                "kind": "skill_creator",
-                "run_id": str(run_id),
-                "edit_skill_id": "skill-42",
-            },
-            "metadata": {},
-        }
-    )
-
-    with patch.object(handler, "_run_chat_turn", side_effect=fake_run_chat_turn) as mock_run_chat_turn:
-        await handler._handle_frame(frame)
-        entry = handler._tasks["req-skill"]
-        await entry.task
-
-    mock_run_chat_turn.assert_awaited_once()
-    assert captured_payload is not None
-    assert captured_payload.metadata["edit_skill_id"] == "skill-42"
-    assert handler._tasks["req-skill"].run_id == run_id
-    assert ws.sent == []
-
-
-@pytest.mark.asyncio
-async def test_input_files_are_forwarded_into_metadata() -> None:
-    handler, ws = make_handler()
-    captured_payload = None
-
-    async def fake_run_chat_turn(*, request_id: str, payload) -> None:
-        nonlocal captured_payload
-        assert request_id == "req-files"
-        captured_payload = payload
-
-    files = [
-        {"filename": "notes.md", "path": "/tmp/notes.md", "size": 10},
-        {"filename": "plan.txt", "path": "/data/plan.txt", "size": 42},
-    ]
-    frame = json.dumps(
-        {
-            "type": "chat.start",
-            "request_id": "req-files",
-            "thread_id": None,
-            "input": {"message": "see attached", "files": files},
-            "extension": None,
-            "metadata": {"foo": "bar"},
-        }
-    )
-
-    with patch.object(handler, "_run_chat_turn", side_effect=fake_run_chat_turn) as mock_run_chat_turn:
-        await handler._handle_frame(frame)
-        entry = handler._tasks["req-files"]
-        await entry.task
-
-    mock_run_chat_turn.assert_awaited_once()
-    assert captured_payload is not None
-    assert captured_payload.metadata["files"] == files
-    assert captured_payload.metadata["foo"] == "bar"
-    assert ws.sent == []
-
-
-# ---------------------------------------------------------------------------
-# _handle_stop: no-op for unknown request, cancels for known request
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_handle_stop_noop_for_unknown_request() -> None:
-    handler, ws = make_handler()
-    # Should not raise
-    await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "unknown-req"}))
-    assert ws.sent == [], "stop for unknown request should send nothing"
-
-
-@pytest.mark.asyncio
-async def test_stop_by_request_id_cancels_turn_before_thread_assignment() -> None:
-    handler, _ = make_handler()
-    entered = asyncio.Event()
-    cancelled = asyncio.Event()
-
-    async def fake_run_standard_turn(_command) -> None:
-        entered.set()
-        try:
-            await asyncio.sleep(60)
-        except asyncio.CancelledError:
-            cancelled.set()
-            raise
-
-    with patch.object(handler._turn_executor, "run_standard_turn", side_effect=fake_run_standard_turn):
-        await handler._handle_frame(
-            json.dumps(
-                {
-                    "type": "chat.start",
-                    "request_id": "req-stop-early",
-                    "input": {"message": "hello"},
-                    "extension": None,
-                    "metadata": {},
-                }
-            )
-        )
-        await entered.wait()
-        await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "req-stop-early"}))
-        await asyncio.sleep(0)
-
-    assert cancelled.is_set()
-
-
-@pytest.mark.asyncio
-async def test_handle_stop_cancels_known_task() -> None:
-    handler, ws = make_handler()
-    cancelled = False
-
-    async def slow():
-        nonlocal cancelled
-        try:
-            await asyncio.sleep(10)
-        except asyncio.CancelledError:
-            cancelled = True
-            raise
-
-    task = asyncio.create_task(slow())
-    await asyncio.sleep(0)
-    handler._tasks["req-stop"] = ChatTaskEntry(thread_id="thread-1", task=task)
-
-    with patch("app.websocket.chat_ws_handler.task_manager") as mock_tm:
-        mock_tm.stop_task = AsyncMock()
-        await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "req-stop"}))
-        mock_tm.stop_task.assert_awaited_once_with("thread-1")
-
-    # Give event loop a tick to propagate cancellation
-    with pytest.raises(asyncio.CancelledError):
-        await task
-    assert cancelled
-
-
-# ---------------------------------------------------------------------------
-# _cancel_all_tasks: called on disconnect, cancels everything
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_cancel_all_tasks_on_disconnect() -> None:
-    """run() must call _cancel_all_tasks when WebSocketDisconnect is raised."""
-    from fastapi import WebSocketDisconnect
-
-    handler, ws = make_handler()
-
-    done_flag = asyncio.Event()
-
-    async def long_running():
-        try:
-            await asyncio.sleep(60)
-        except asyncio.CancelledError:
-            done_flag.set()
-            raise
-
-    task = asyncio.create_task(long_running())
-    await asyncio.sleep(0)
-    handler._tasks["req-dc"] = ChatTaskEntry(thread_id=None, task=task)
-
-    # Simulate disconnect: receive_text raises WebSocketDisconnect
-    ws_mock = MagicMock()
-    ws_mock.receive_text = AsyncMock(side_effect=WebSocketDisconnect(code=1001))
-    handler.websocket = ws_mock
-
-    with patch("app.websocket.chat_ws_handler.task_manager") as mock_tm:
-        mock_tm.stop_task = AsyncMock()
-        await handler.run()
-
-    # Wait briefly for the task to be cancelled
-    await asyncio.sleep(0.05)
-    assert done_flag.is_set(), "long-running task should have been cancelled on disconnect"
-
-
-# ---------------------------------------------------------------------------
-# _run_chat_turn: done frame sent even when thread_id is None (early failure)
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_done_frame_sent_on_early_error_no_thread_id() -> None:
-    """
-    If get_or_create_conversation raises before thread_id is assigned,
-    the handler must still send a done frame (not just an error frame).
-    """
-    handler, ws = make_handler()
-
-    from app.schemas.chat import ChatRequest
-
-    payload = ChatRequest(message="hello", thread_id=None, graph_id=None, metadata={})
-
-    with (
-        patch("app.websocket.chat_ws_handler.AsyncSessionLocal") as mock_session_cls,
-        patch("app.websocket.chat_ws_handler.get_or_create_conversation", side_effect=RuntimeError("db down")),
-        patch("app.websocket.chat_ws_handler._finalize_task_noop", create=True),
-        patch("app.websocket.chat_ws_handler.task_manager"),
-    ):
-        # Make AsyncSessionLocal return an async context manager
-        mock_cm = AsyncMock()
-        mock_cm.__aenter__ = AsyncMock(return_value=MagicMock())
-        mock_cm.__aexit__ = AsyncMock(return_value=False)
-        mock_session_cls.return_value = mock_cm
-
-        await handler._run_chat_turn(request_id="req-early", payload=payload)
-
-    sent_types = [f["type"] for f in ws.sent]
-    assert "error" in sent_types, "error frame must be sent"
-    assert "done" in sent_types, "done frame must be sent even when thread_id is None"
-
-    # done must come after error
-    assert sent_types.index("done") > sent_types.index("error")
-
-
-# ---------------------------------------------------------------------------
-# CancelledError: done frame sent before re-raising
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_cancelled_error_sends_done_frame() -> None:
-    """
-    When the turn task is cancelled mid-stream, a done frame must be sent
-    before asyncio.CancelledError propagates.
-    """
-    handler, ws = make_handler()
-
-    from app.schemas.chat import ChatRequest
-
-    payload = ChatRequest(message="hello", thread_id=None, graph_id=None, metadata={})
-
-    async def raise_cancelled(*args, **kwargs):
-        raise asyncio.CancelledError()
-
-    with (
-        patch("app.websocket.chat_ws_handler.AsyncSessionLocal") as mock_session_cls,
-        patch("app.websocket.chat_ws_handler.get_or_create_conversation", side_effect=raise_cancelled),
-        patch("app.websocket.chat_ws_handler.task_manager"),
-    ):
-        mock_cm = AsyncMock()
-        mock_cm.__aenter__ = AsyncMock(return_value=MagicMock())
-        mock_cm.__aexit__ = AsyncMock(return_value=False)
-        mock_session_cls.return_value = mock_cm
-
-        with pytest.raises(asyncio.CancelledError):
-            await handler._run_chat_turn(request_id="req-cancel", payload=payload)
-
-    sent_types = [f["type"] for f in ws.sent]
-    assert "done" in sent_types, "done frame must be sent on CancelledError"
-
-
-# ---------------------------------------------------------------------------
-# Accepted ack: emitted after task registration and before first status frame
-# ---------------------------------------------------------------------------
-
-
-@pytest.mark.asyncio
-async def test_run_chat_turn_emits_accepted_before_status() -> None:
-    handler, ws = make_handler()
-
-    from app.schemas.chat import ChatRequest
-
-    payload = ChatRequest(message="hello", thread_id=None, graph_id=None, metadata={})
-
-    class FakeGraph:
-        async def astream_events(self, *_args, **_kwargs):
-            if False:
-                yield None
-
-    class FakeGraphService:
-        def __init__(self, _db):
-            pass
-
-        async def create_default_deep_agents_graph(self, **_kwargs):
-            return FakeGraph()
-
-    async def fake_safe_get_state(*_args, **_kwargs):
-        return MagicMock(tasks=[], values={})
-
-    with (
-        patch("app.websocket.chat_ws_handler.AsyncSessionLocal") as mock_session_cls,
-        patch("app.websocket.chat_ws_handler.get_or_create_conversation", AsyncMock(return_value=("thread-ack", True))),
-        patch("app.websocket.chat_ws_handler.save_user_message", AsyncMock()),
-        patch(
-            "app.websocket.chat_ws_handler.get_user_config",
-            AsyncMock(
-                return_value=(
-                    {"configurable": {"thread_id": "thread-ack"}},
-                    {},
-                    {
-                        "llm_model": "gpt-test",
-                        "api_key": "test",
-                        "base_url": "http://example.invalid",
-                        "max_tokens": 1024,
-                    },
-                )
-            ),
-        ),
-        patch("app.websocket.chat_ws_handler.GraphService", FakeGraphService),
-        patch("app.websocket.chat_ws_handler.safe_get_state", side_effect=fake_safe_get_state),
-        patch("app.websocket.chat_ws_handler.task_manager") as mock_tm,
-        patch.object(handler, "_finalize_task", AsyncMock()),
-        patch("app.websocket.chat_ws_handler.ArtifactCollector") as mock_artifacts,
-    ):
-        mock_cm = AsyncMock()
-        mock_cm.__aenter__ = AsyncMock(return_value=MagicMock())
-        mock_cm.__aexit__ = AsyncMock(return_value=False)
-        mock_session_cls.return_value = mock_cm
-        mock_tm.register_task = AsyncMock()
-        mock_tm.is_stopped = AsyncMock(return_value=False)
-        mock_artifacts.return_value.ensure_run_dir = MagicMock()
-
-        await handler._run_chat_turn(request_id="req-accepted", payload=payload)
-
-    sent_types = [f["type"] for f in ws.sent]
-    assert "accepted" in sent_types, "accepted ack must be emitted once the turn is registered"
-    assert "status" in sent_types, "connected status must still be emitted"
-    assert sent_types.index("accepted") < sent_types.index("status")
-
-    accepted_frame = ws.frames_of_type("accepted")[0]
-    assert accepted_frame["request_id"] == "req-accepted"
-    assert accepted_frame["thread_id"] == "thread-ack"
diff --git a/backend/tests/test_api/test_copilot_event_mirroring.py b/backend/tests/test_api/test_copilot_event_mirroring.py
deleted file mode 100644
index 6b1d04764..000000000
--- a/backend/tests/test_api/test_copilot_event_mirroring.py
+++ /dev/null
@@ -1,175 +0,0 @@
-"""Tests for copilot event mirroring logic.
-
-Verifies that copilot-specific event types are correctly translated into
-payloads that the copilot reducer can process. This tests the translation
-logic used by _mirror_run_stream_event in chat_ws_handler.py.
-"""
-
-from __future__ import annotations
-
-from typing import Any
-
-from app.services.run_reducers.copilot import apply_copilot_event, make_initial_projection
-
-
-def _mirror_event_to_payload(
-    event_type: str,
-    data: dict[str, Any],
-    assistant_message_id: str = "msg-1",
-) -> tuple[str, dict[str, Any] | None]:
-    """
-    Reproduce the event-type → payload translation from _mirror_run_stream_event.
-
-    Returns (stored_event_type, payload) — None payload means event is dropped.
-    """
-    payload: dict[str, Any] | None = None
-
-    if event_type == "status":
-        stage = data.get("stage")
-        if stage is not None:
-            payload = {"stage": stage, "message": data.get("message", "")}
-        else:
-            message = str(data.get("status") or "")
-            payload = {"message": message, "status": message}
-    elif event_type == "content" and assistant_message_id:
-        delta = data.get("delta") if "delta" in data else data.get("content")
-        if delta:
-            payload = {"message_id": assistant_message_id, "delta": str(delta)}
-    elif event_type in ("thought_step", "tool_call", "tool_result", "result"):
-        payload = data
-    elif event_type == "error":
-        payload = {"message": data.get("message"), "code": data.get("code")}
-    elif event_type == "done":
-        payload = {}
-
-    stored_type = "content_delta" if event_type == "content" else event_type
-    return stored_type, payload
-
-
-# --- Mirror translation tests ---
-
-
-def test_copilot_status_with_stage():
-    """Copilot status events preserve the 'stage' field."""
-    event_type, payload = _mirror_event_to_payload(
-        "status",
-        {"type": "status", "stage": "thinking", "message": "Analyzing..."},
-    )
-    assert event_type == "status"
-    assert payload == {"stage": "thinking", "message": "Analyzing..."}
-
-
-def test_chat_status_without_stage():
-    """Chat status events (no stage) still work."""
-    event_type, payload = _mirror_event_to_payload(
-        "status",
-        {"status": "processing"},
-    )
-    assert event_type == "status"
-    assert payload == {"message": "processing", "status": "processing"}
-
-
-def test_copilot_content_uses_content_key():
-    """Copilot content events use 'content' key instead of 'delta'."""
-    event_type, payload = _mirror_event_to_payload(
-        "content",
-        {"type": "content", "content": "Hello"},
-    )
-    assert event_type == "content_delta"
-    assert payload is not None
-    assert payload["delta"] == "Hello"
-
-
-def test_chat_content_uses_delta_key():
-    """Chat content events with 'delta' still work."""
-    event_type, payload = _mirror_event_to_payload(
-        "content",
-        {"delta": "chunk"},
-    )
-    assert event_type == "content_delta"
-    assert payload is not None
-    assert payload["delta"] == "chunk"
-
-
-def test_thought_step_passthrough():
-    data = {"type": "thought_step", "step": "Considering graph"}
-    event_type, payload = _mirror_event_to_payload("thought_step", data)
-    assert event_type == "thought_step"
-    assert payload is data  # pass-through, not copied
-
-
-def test_tool_call_passthrough():
-    data = {"type": "tool_call", "tool": "search", "input": {"q": "test"}}
-    event_type, payload = _mirror_event_to_payload("tool_call", data)
-    assert event_type == "tool_call"
-    assert payload["tool"] == "search"
-    assert payload["input"] == {"q": "test"}
-
-
-def test_tool_result_passthrough():
-    action = {"type": "add_node", "payload": {"name": "n1"}}
-    data = {"type": "tool_result", "action": action}
-    event_type, payload = _mirror_event_to_payload("tool_result", data)
-    assert event_type == "tool_result"
-    assert payload["action"] == action
-
-
-def test_result_passthrough():
-    actions = [{"type": "add_node", "payload": {}}]
-    data = {"type": "result", "message": "Done!", "actions": actions}
-    event_type, payload = _mirror_event_to_payload("result", data)
-    assert event_type == "result"
-    assert payload["message"] == "Done!"
-    assert payload["actions"] == actions
-
-
-def test_unknown_event_type_dropped():
-    """Unknown event types produce None payload and are dropped."""
-    _, payload = _mirror_event_to_payload("unknown_copilot_event", {"foo": "bar"})
-    assert payload is None
-
-
-# --- End-to-end: mirror → reducer integration ---
-
-
-def test_copilot_event_flow_mirror_to_reducer():
-    """Full pipeline: copilot events → mirror translation → reducer produces correct projection."""
-    events = [
-        ("status", {"type": "status", "stage": "thinking", "message": "Thinking..."}),
-        ("content", {"type": "content", "content": "Here is "}),
-        ("content", {"type": "content", "content": "the answer."}),
-        ("thought_step", {"type": "thought_step", "step": "Analyzed requirements"}),
-        ("tool_call", {"type": "tool_call", "tool": "add_node", "input": {"name": "n1"}}),
-        ("tool_result", {"type": "tool_result", "action": {"type": "add_node", "payload": {"name": "n1"}}}),
-        (
-            "result",
-            {"type": "result", "message": "Built your pipeline.", "actions": [{"type": "add_node", "payload": {}}]},
-        ),
-        ("done", {}),
-    ]
-
-    projection = make_initial_projection({"graph_id": "g1", "mode": "deepagents"}, "running")
-
-    for raw_type, data in events:
-        stored_type, payload = _mirror_event_to_payload(raw_type, data)
-        if payload is None:
-            continue
-        projection = apply_copilot_event(
-            projection,
-            event_type=stored_type,
-            payload=payload,
-            status="running" if raw_type != "done" else "completed",
-        )
-
-    assert projection["stage"] == "thinking"
-    assert projection["content"] == "Here is the answer."
-    assert len(projection["thought_steps"]) == 1
-    assert projection["thought_steps"][0] == "Analyzed requirements"
-    assert len(projection["tool_calls"]) == 1
-    assert projection["tool_calls"][0]["tool"] == "add_node"
-    assert len(projection["tool_results"]) == 1
-    assert projection["result_message"] == "Built your pipeline."
-    assert len(projection["result_actions"]) == 1
-    assert projection["status"] == "completed"
-    assert projection["graph_id"] == "g1"
-    assert projection["mode"] == "deepagents"
diff --git a/backend/tests/test_api/test_copilot_history_from_runs.py b/backend/tests/test_api/test_copilot_history_from_runs.py
deleted file mode 100644
index 73c51f542..000000000
--- a/backend/tests/test_api/test_copilot_history_from_runs.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""Tests for copilot history built from agent_run snapshots."""
-
-import uuid
-from datetime import datetime, timezone
-from unittest.mock import MagicMock
-
-
-def _make_run(*, graph_id: str, title: str, status: str = "completed") -> MagicMock:
-    run = MagicMock()
-    run.id = uuid.uuid4()
-    run.graph_id = uuid.UUID(graph_id)
-    run.title = title
-    run.status = status
-    run.created_at = datetime(2026, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
-    run.updated_at = datetime(2026, 1, 1, 0, 1, 0, tzinfo=timezone.utc)
-    return run
-
-
-def _make_snapshot(
-    *,
-    result_message: str,
-    result_actions: list | None = None,
-    thought_steps: list | None = None,
-    tool_calls: list | None = None,
-) -> MagicMock:
-    snap = MagicMock()
-    snap.projection = {
-        "result_message": result_message,
-        "result_actions": result_actions or [],
-        "content": "",
-        "thought_steps": thought_steps or [],
-        "tool_calls": tool_calls or [],
-    }
-    return snap
-
-
-def test_build_history_messages_from_runs():
-    """History messages are assembled from run title + snapshot projection."""
-    graph_id = str(uuid.uuid4())
-    # DB returns newest-first; reversed() produces oldest-first for the response
-    runs = [
-        _make_run(graph_id=graph_id, title="Build RAG"),  # newest
-        _make_run(graph_id=graph_id, title="Hello"),  # oldest
-    ]
-    snapshots = {
-        runs[0].id: _make_snapshot(
-            result_message="Here is your RAG pipeline.", result_actions=[{"type": "add_node", "payload": {}}]
-        ),
-        runs[1].id: _make_snapshot(result_message="Hi! How can I help?"),
-    }
-
-    messages = []
-    for run in reversed(list(runs)):  # oldest first
-        snap = snapshots.get(run.id)
-        if not snap or not snap.projection:
-            continue
-        p = snap.projection
-        messages.append(
-            {
-                "role": "user",
-                "content": run.title or "",
-                "created_at": run.created_at.isoformat(),
-            }
-        )
-        messages.append(
-            {
-                "role": "assistant",
-                "content": p.get("result_message") or p.get("content", ""),
-                "created_at": run.updated_at.isoformat(),
-                "actions": p.get("result_actions", []),
-                "thought_steps": p.get("thought_steps", []),
-                "tool_calls": p.get("tool_calls", []),
-            }
-        )
-
-    assert len(messages) == 4
-    assert messages[0]["role"] == "user"
-    assert messages[0]["content"] == "Hello"
-    assert messages[1]["role"] == "assistant"
-    assert messages[1]["content"] == "Hi! How can I help?"
-    assert messages[2]["content"] == "Build RAG"
-    assert messages[3]["actions"] == [{"type": "add_node", "payload": {}}]
-
-
-def test_build_history_filters_by_graph_id():
-    """Only runs matching the requested graph_id are included."""
-    target_gid = str(uuid.uuid4())
-    other_gid = str(uuid.uuid4())
-    runs = [
-        _make_run(graph_id=target_gid, title="Match"),
-        _make_run(graph_id=other_gid, title="NoMatch"),
-    ]
-    filtered = [r for r in runs if str(r.graph_id) == target_gid]
-    assert len(filtered) == 1
-    assert filtered[0].title == "Match"
-
-
-def test_build_history_skips_runs_without_snapshot():
-    """Runs that have no snapshot are silently skipped."""
-    graph_id = str(uuid.uuid4())
-    runs = [_make_run(graph_id=graph_id, title="NoSnap")]
-
-    messages = []
-    for run in reversed(list(runs)):
-        snapshot = None  # simulate missing snapshot
-        if not snapshot:
-            continue
-        # would append messages here, but we skip
-    assert len(messages) == 0
diff --git a/backend/tests/test_api/test_runs_api.py b/backend/tests/test_api/test_runs_api.py
deleted file mode 100644
index 6d846190c..000000000
--- a/backend/tests/test_api/test_runs_api.py
+++ /dev/null
@@ -1,153 +0,0 @@
-from __future__ import annotations
-
-import uuid
-from datetime import UTC, datetime
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.api.v1.runs import router
-from app.core.database import get_db
-from app.models.agent_run import AgentRunStatus
-from app.models.auth import AuthUser as User
-
-
-async def mock_get_current_user():
-    user = MagicMock(spec=User)
-    user.id = "user-123"
-    return user
-
-
-async def mock_get_db():
-    yield AsyncMock()
-
-
-@pytest.fixture
-def client():
-    test_app = FastAPI()
-    test_app.include_router(router)
-
-    from app.common.dependencies import get_current_user
-
-    test_app.dependency_overrides[get_current_user] = mock_get_current_user
-    test_app.dependency_overrides[get_db] = mock_get_db
-
-    with TestClient(test_app) as c:
-        yield c
-
-
-def make_run(*, agent_name: str = "skill_creator", run_type: str = "generic_agent") -> MagicMock:
-    now = datetime.now(UTC)
-    run = MagicMock()
-    run.id = uuid.uuid4()
-    run.status = AgentRunStatus.RUNNING
-    run.run_type = run_type
-    run.agent_name = agent_name
-    run.source = "run_center"
-    run.thread_id = "thread-123"
-    run.graph_id = uuid.uuid4()
-    run.title = "Build a skill"
-    run.started_at = now
-    run.finished_at = None
-    run.last_seq = 5
-    run.error_code = None
-    run.error_message = None
-    run.last_heartbeat_at = now
-    run.updated_at = now
-    return run
-
-
-@patch("app.api.v1.runs.RunService")
-def test_list_runs_forwards_agent_filters_and_returns_agent_fields(mock_service_cls, client: TestClient) -> None:
-    mock_service = mock_service_cls.return_value
-    mock_service.list_recent_runs = AsyncMock(return_value=[make_run()])
-
-    response = client.get(
-        "/v1/runs",
-        params={
-            "run_type": "generic_agent",
-            "agent_name": "skill_creator",
-            "status": "running",
-            "search": "skill",
-            "limit": 25,
-        },
-    )
-
-    assert response.status_code == 200
-    body = response.json()
-    assert body["data"]["items"][0]["agent_name"] == "skill_creator"
-    assert body["data"]["items"][0]["agent_display_name"] == "Skill Creator"
-    mock_service.list_recent_runs.assert_awaited_once_with(
-        user_id="user-123",
-        run_type="generic_agent",
-        agent_name="skill_creator",
-        status="running",
-        search="skill",
-        limit=25,
-    )
-
-
-@patch("app.api.v1.runs.RunService")
-def test_list_agents_returns_registered_agent_definitions(mock_service_cls, client: TestClient) -> None:
-    mock_service = mock_service_cls.return_value
-    mock_service.list_agents = AsyncMock(
-        return_value=[
-            MagicMock(agent_name="skill_creator", display_name="Skill Creator"),
-        ]
-    )
-
-    response = client.get("/v1/runs/agents")
-
-    assert response.status_code == 200
-    assert response.json()["data"]["items"] == [
-        {"agent_name": "skill_creator", "display_name": "Skill Creator"},
-    ]
-
-
-@patch("app.api.v1.runs.RunService")
-def test_create_run_uses_generic_agent_endpoint(mock_service_cls, client: TestClient) -> None:
-    mock_service = mock_service_cls.return_value
-    created_run = make_run()
-    mock_service.create_run = AsyncMock(return_value=created_run)
-
-    response = client.post(
-        "/v1/runs",
-        json={
-            "agent_name": "skill_creator",
-            "graph_id": str(created_run.graph_id),
-            "message": "Build a reusable skill",
-            "thread_id": "thread-123",
-            "input": {"edit_skill_id": "skill-1"},
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json()["data"]["run_id"] == str(created_run.id)
-    mock_service.create_run.assert_awaited_once()
-
-
-@patch("app.api.v1.runs.RunService")
-def test_find_active_run_uses_generic_agent_name_filter(mock_service_cls, client: TestClient) -> None:
-    active_run = make_run()
-    mock_service = mock_service_cls.return_value
-    mock_service.find_latest_active_run = AsyncMock(return_value=active_run)
-
-    response = client.get(
-        "/v1/runs/active",
-        params={
-            "agent_name": "skill_creator",
-            "graph_id": str(active_run.graph_id),
-            "thread_id": "thread-123",
-        },
-    )
-
-    assert response.status_code == 200
-    assert response.json()["data"]["run_id"] == str(active_run.id)
-    mock_service.find_latest_active_run.assert_awaited_once_with(
-        user_id="user-123",
-        agent_name="skill_creator",
-        graph_id=active_run.graph_id,
-        thread_id="thread-123",
-    )
diff --git a/backend/tests/test_api/test_skill_creator.py b/backend/tests/test_api/test_skill_creator.py
deleted file mode 100644
index bf032300e..000000000
--- a/backend/tests/test_api/test_skill_creator.py
+++ /dev/null
@@ -1,66 +0,0 @@
-"""Integration smoke tests for the Skill Creator feature."""
-
-import json
-import tempfile
-from pathlib import Path
-
-import pytest
-
-from app.core.tools.builtin.preview_skill import preview_skill_in_sandbox
-from app.schemas.chat import ChatRequest
-
-
-class TestSkillCreatorIntegration:
-    """Verify key components of the Skill Creator feature work together."""
-
-    def test_chat_request_accepts_skill_creator_metadata(self):
-        req = ChatRequest(message="Create a network scan skill", metadata={"mode": "skill_creator"})
-        assert req.metadata["mode"] == "skill_creator"
-
-    def test_chat_request_skill_creator_with_edit_metadata(self):
-        req = ChatRequest(
-            message="Update this skill",
-            metadata={"mode": "skill_creator", "edit_skill_id": "abc-123"},
-        )
-        assert req.metadata["mode"] == "skill_creator"
-        assert req.metadata["edit_skill_id"] == "abc-123"
-
-    def test_preview_skill_end_to_end(self):
-        """Simulate: agent creates skill files in sandbox -> preview_skill reads them."""
-        with tempfile.TemporaryDirectory() as sandbox_root:
-            skill_dir = Path(sandbox_root) / "thread-123" / "skills" / "test-scan"
-            skill_dir.mkdir(parents=True)
-
-            # Simulate agent writing SKILL.md
-            (skill_dir / "SKILL.md").write_text(
-                "---\nname: test-scan\ndescription: A network scanning skill\n---\n"
-                "# Test Scan Skill\n\nThis skill performs network scanning."
-            )
-
-            # Simulate agent writing a script
-            scripts_dir = skill_dir / "scripts"
-            scripts_dir.mkdir()
-            (scripts_dir / "scan.py").write_text("import subprocess\ndef run_scan(target): pass")
-
-            # Call preview_skill (same as agent would)
-            result_json = preview_skill_in_sandbox("test-scan", sandbox_root)
-            result = json.loads(result_json)
-
-            assert result["skill_name"] == "test-scan"
-            assert result["validation"]["valid"] is True
-            assert len(result["files"]) == 2
-
-            # Verify files match what would be sent to POST /v1/skills
-            paths = {f["path"] for f in result["files"]}
-            assert "SKILL.md" in paths
-            assert "scripts/scan.py" in paths
-
-    def test_graph_service_has_skill_creator_method(self):
-        """Verify GraphService has the create_skill_creator_graph method."""
-        try:
-            from app.services.graph_service import GraphService
-        except ImportError as exc:
-            pytest.skip(f"GraphService import requires optional deps: {exc}")
-
-        assert hasattr(GraphService, "create_skill_creator_graph")
-        assert callable(getattr(GraphService, "create_skill_creator_graph"))
diff --git a/backend/tests/test_common/__init__.py b/backend/tests/test_common/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_common/test_pagination.py b/backend/tests/test_common/test_pagination.py
deleted file mode 100644
index ae17358ce..000000000
--- a/backend/tests/test_common/test_pagination.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import pytest
-from pydantic import ValidationError
-
-from app.common.pagination import ConversationMessagesPaginationParams, PaginationParams
-
-
-def test_conversation_messages_pagination_allows_page_size_200():
-    params = ConversationMessagesPaginationParams(page=1, page_size=200)
-
-    assert params.page == 1
-    assert params.page_size == 200
-    assert params.offset == 0
-    assert params.limit == 200
-
-
-def test_common_pagination_still_rejects_page_size_200():
-    with pytest.raises(ValidationError):
-        PaginationParams(page=1, page_size=200)
diff --git a/backend/tests/test_common/test_permissions.py b/backend/tests/test_common/test_permissions.py
deleted file mode 100644
index bde912f8c..000000000
--- a/backend/tests/test_common/test_permissions.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""Tests for common permissions checking."""
-
-from app.common.permissions import _scope_satisfies, check_token_permission
-
-
-def test_global_token_satisfies():
-    assert check_token_permission(["skills:read"], "skills:read", "skill", "123", None, None) is True
-    assert check_token_permission(["skills:admin"], "skills:execute", "skill", "123", None, None) is True
-
-
-def test_scope_hierarchy():
-    assert check_token_permission(["skills:execute"], "skills:read", "skill", "1", None, None) is True
-    assert check_token_permission(["skills:read"], "skills:execute", "skill", "1", None, None) is False
-
-
-def test_resource_binding():
-    # Matches bound resource
-    assert check_token_permission(["skills:execute"], "skills:execute", "skill", "1", "skill", "1") is True
-    # Fails different resource ID
-    assert check_token_permission(["skills:execute"], "skills:execute", "skill", "2", "skill", "1") is False
-    # Fails different resource type binding
-    assert check_token_permission(["graphs:execute"], "graphs:execute", "graph", "1", "skill", "1") is False
-
-
-def test_scope_satisfies_same_scope():
-    assert _scope_satisfies("skills:read", "skills:read") is True
-    assert _scope_satisfies("graphs:execute", "graphs:execute") is True
-
-
-def test_scope_satisfies_higher_covers_lower():
-    """admin > publish > execute > write > read for skills."""
-    assert _scope_satisfies("skills:admin", "skills:read") is True
-    assert _scope_satisfies("skills:admin", "skills:publish") is True
-    assert _scope_satisfies("skills:publish", "skills:execute") is True
-    assert _scope_satisfies("skills:write", "skills:read") is True
-
-
-def test_scope_satisfies_lower_does_not_cover_higher():
-    assert _scope_satisfies("skills:read", "skills:write") is False
-    assert _scope_satisfies("skills:execute", "skills:publish") is False
-    assert _scope_satisfies("skills:publish", "skills:admin") is False
-
-
-def test_scope_satisfies_cross_resource_fails():
-    """skills:admin should NOT satisfy graphs:read."""
-    assert _scope_satisfies("skills:admin", "graphs:read") is False
-    assert _scope_satisfies("graphs:execute", "tools:execute") is False
-
-
-def test_scope_satisfies_malformed_scope():
-    assert _scope_satisfies("invalid", "skills:read") is False
-    assert _scope_satisfies("skills:read", "invalid") is False
-    assert _scope_satisfies("", "") is False
-
-
-def test_empty_scopes_list():
-    assert check_token_permission([], "skills:read", "skill", "1", None, None) is False
-
-
-def test_multiple_scopes_any_match():
-    """If any scope in the list satisfies, permission is granted."""
-    assert check_token_permission(["tools:read", "skills:execute"], "skills:read", "skill", "1", None, None) is True
-
-
-def test_graphs_hierarchy():
-    assert _scope_satisfies("graphs:execute", "graphs:read") is True
-    assert _scope_satisfies("graphs:read", "graphs:execute") is False
-
-
-def test_tools_hierarchy():
-    assert _scope_satisfies("tools:execute", "tools:read") is True
-    assert _scope_satisfies("tools:read", "tools:execute") is False
-
-
-def test_resource_binding_with_uuid_strings():
-    """resource_id comparison uses str() so UUIDs and strings should match."""
-    uid = "550e8400-e29b-41d4-a716-446655440000"
-    assert check_token_permission(["skills:execute"], "skills:execute", "skill", uid, "skill", uid) is True
diff --git a/backend/tests/test_model_providers_api.py b/backend/tests/test_model_providers_api.py
deleted file mode 100644
index 74e4e1644..000000000
--- a/backend/tests/test_model_providers_api.py
+++ /dev/null
@@ -1,166 +0,0 @@
-"""
-Tests for model_providers API — PATCH defaults, auth, 404 handling.
-"""
-
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.api.v1.model_providers import router
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-async def mock_get_current_user():
-    user = MagicMock(spec=User)
-    user.id = "user-123"
-    return user
-
-
-async def mock_get_db():
-    yield AsyncMock()
-
-
-@pytest.fixture
-def client():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_current_user] = mock_get_current_user
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app) as c:
-        yield c
-
-
-def _make_provider(name: str = "anthropic") -> dict:
-    return {
-        "provider_name": name,
-        "display_name": "Anthropic",
-        "supported_model_types": ["chat"],
-        "credential_schema": {},
-        "config_schemas": {},
-        "model_count": 3,
-        "default_parameters": {"temperature": 0.7},
-        "is_template": False,
-        "provider_type": "system",
-        "template_name": None,
-        "is_enabled": True,
-    }
-
-
-# ---------------------------------------------------------------------------
-# GET / — list providers
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.model_providers.ModelProviderService")
-def test_list_providers_returns_200(mock_cls, client: TestClient):
-    mock_svc = mock_cls.return_value
-    mock_svc.get_all_providers = AsyncMock(return_value=[_make_provider()])
-
-    resp = client.get("/v1/model-providers")
-
-    assert resp.status_code == 200
-    data = resp.json()["data"]
-    assert len(data) == 1
-    assert data[0]["provider_name"] == "anthropic"
-    assert data[0]["default_parameters"] == {"temperature": 0.7}
-
-
-# ---------------------------------------------------------------------------
-# GET /{name} — get single provider
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.model_providers.ModelProviderService")
-def test_get_provider_returns_200(mock_cls, client: TestClient):
-    mock_svc = mock_cls.return_value
-    mock_svc.get_provider = AsyncMock(return_value=_make_provider())
-
-    resp = client.get("/v1/model-providers/anthropic")
-
-    assert resp.status_code == 200
-    assert resp.json()["data"]["provider_name"] == "anthropic"
-
-
-@patch("app.api.v1.model_providers.ModelProviderService")
-def test_get_provider_not_found_returns_404(mock_cls, client: TestClient):
-    mock_svc = mock_cls.return_value
-    mock_svc.get_provider = AsyncMock(return_value=None)
-
-    resp = client.get("/v1/model-providers/nonexistent")
-
-    assert resp.status_code == 404
-
-
-# ---------------------------------------------------------------------------
-# PATCH /{name}/defaults — update default parameters
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.model_providers.ModelProviderService")
-def test_patch_defaults_returns_updated_provider(mock_cls, client: TestClient):
-    updated = _make_provider()
-    updated["default_parameters"] = {"temperature": 0.9, "max_tokens": 4096}
-
-    mock_svc = mock_cls.return_value
-    mock_svc.update_provider_defaults = AsyncMock(return_value=updated)
-
-    resp = client.patch(
-        "/v1/model-providers/anthropic/defaults",
-        json={"default_parameters": {"temperature": 0.9, "max_tokens": 4096}},
-    )
-
-    assert resp.status_code == 200
-    data = resp.json()["data"]
-    assert data["default_parameters"]["temperature"] == 0.9
-    assert data["default_parameters"]["max_tokens"] == 4096
-    mock_svc.update_provider_defaults.assert_called_once_with("anthropic", {"temperature": 0.9, "max_tokens": 4096})
-
-
-@patch("app.api.v1.model_providers.ModelProviderService")
-def test_patch_defaults_provider_not_found_returns_404(mock_cls, client: TestClient):
-    from app.common.exceptions import NotFoundException
-
-    mock_svc = mock_cls.return_value
-    mock_svc.update_provider_defaults = AsyncMock(side_effect=NotFoundException("Provider not found: nonexistent"))
-
-    resp = client.patch(
-        "/v1/model-providers/nonexistent/defaults",
-        json={"default_parameters": {"temperature": 0.5}},
-    )
-
-    assert resp.status_code == 404
-
-
-# ---------------------------------------------------------------------------
-# Auth — no token returns 401
-# ---------------------------------------------------------------------------
-
-
-def test_list_providers_without_auth_returns_401():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    # No dependency override — real auth dependency will reject missing token
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app, raise_server_exceptions=False) as c:
-        resp = c.get("/v1/model-providers")
-    assert resp.status_code == 401
-
-
-def test_patch_defaults_without_auth_returns_401():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app, raise_server_exceptions=False) as c:
-        resp = c.patch(
-            "/v1/model-providers/anthropic/defaults",
-            json={"default_parameters": {}},
-        )
-    assert resp.status_code == 401
diff --git a/backend/tests/test_models_api.py b/backend/tests/test_models_api.py
deleted file mode 100644
index 85e950e56..000000000
--- a/backend/tests/test_models_api.py
+++ /dev/null
@@ -1,180 +0,0 @@
-"""
-Tests for models API — PATCH instances/{id}, GET overview, unavailable_reason.
-"""
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from app.api.v1.models import router
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-async def mock_get_current_user():
-    user = MagicMock(spec=User)
-    user.id = "user-123"
-    return user
-
-
-async def mock_get_db():
-    yield AsyncMock()
-
-
-@pytest.fixture
-def client():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_current_user] = mock_get_current_user
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app) as c:
-        yield c
-
-
-def _make_instance(instance_id: str | None = None) -> dict:
-    return {
-        "id": instance_id or str(uuid.uuid4()),
-        "provider_name": "anthropic",
-        "model_name": "claude-3-5-sonnet",
-        "model_type": "chat",
-        "model_parameters": {"temperature": 0.7},
-    }
-
-
-def _make_overview() -> dict:
-    return {
-        "total_providers": 3,
-        "healthy_providers": 2,
-        "unhealthy_providers": 0,
-        "unconfigured_providers": 1,
-        "total_models": 10,
-        "available_models": 8,
-        "recent_credential_failure": None,
-    }
-
-
-# ---------------------------------------------------------------------------
-# GET /overview
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.models.ModelService")
-def test_get_overview_returns_200(mock_cls, client: TestClient):
-    mock_svc = mock_cls.return_value
-    mock_svc.get_overview = AsyncMock(return_value=_make_overview())
-
-    resp = client.get("/v1/models/overview")
-
-    assert resp.status_code == 200
-    data = resp.json()["data"]
-    assert data["total_providers"] == 3
-    assert data["healthy_providers"] == 2
-
-
-# ---------------------------------------------------------------------------
-# GET / — list models with unavailable_reason
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.models.ModelService")
-def test_list_models_includes_unavailable_reason(mock_cls, client: TestClient):
-    models = [
-        {
-            "provider_name": "anthropic",
-            "provider_display_name": "Anthropic",
-            "name": "claude-3-5-sonnet",
-            "display_name": "Claude 3.5 Sonnet",
-            "description": "",
-            "is_available": False,
-            "unavailable_reason": "no_credentials",
-        }
-    ]
-    mock_svc = mock_cls.return_value
-    mock_svc.get_available_models = AsyncMock(return_value=models)
-
-    resp = client.get("/v1/models?model_type=chat")
-
-    assert resp.status_code == 200
-    item = resp.json()["data"][0]
-    assert item["is_available"] is False
-    assert item["unavailable_reason"] == "no_credentials"
-
-
-# ---------------------------------------------------------------------------
-# PATCH /instances/{id} — update model instance
-# ---------------------------------------------------------------------------
-
-
-@patch("app.api.v1.models.ModelService")
-def test_patch_instance_updates_parameters(mock_cls, client: TestClient):
-    instance_id = str(uuid.uuid4())
-    updated = _make_instance(instance_id)
-    updated["model_parameters"] = {"temperature": 0.9}
-
-    mock_svc = mock_cls.return_value
-    mock_svc.update_model_instance = AsyncMock(return_value=updated)
-
-    resp = client.patch(
-        f"/v1/models/instances/{instance_id}",
-        json={"model_parameters": {"temperature": 0.9}},
-    )
-
-    assert resp.status_code == 200
-    data = resp.json()["data"]
-    assert data["model_parameters"]["temperature"] == 0.9
-    mock_svc.update_model_instance.assert_called_once()
-
-
-@patch("app.api.v1.models.ModelService")
-def test_patch_instance_not_found_returns_404(mock_cls, client: TestClient):
-    from app.common.exceptions import NotFoundException
-
-    mock_svc = mock_cls.return_value
-    mock_svc.update_model_instance = AsyncMock(side_effect=NotFoundException("Model instance not found"))
-
-    resp = client.patch(
-        f"/v1/models/instances/{uuid.uuid4()}",
-        json={"model_parameters": {}},
-    )
-
-    assert resp.status_code == 404
-
-
-# ---------------------------------------------------------------------------
-# Auth — no token returns 401
-# ---------------------------------------------------------------------------
-
-
-def test_list_models_without_auth_returns_401():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app, raise_server_exceptions=False) as c:
-        resp = c.get("/v1/models")
-    assert resp.status_code == 401
-
-
-def test_get_overview_without_auth_returns_401():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app, raise_server_exceptions=False) as c:
-        resp = c.get("/v1/models/overview")
-    assert resp.status_code == 401
-
-
-def test_patch_instance_without_auth_returns_401():
-    test_app = FastAPI()
-    test_app.include_router(router)
-    test_app.dependency_overrides[get_db] = mock_get_db
-    with TestClient(test_app, raise_server_exceptions=False) as c:
-        resp = c.patch(f"/v1/models/instances/{uuid.uuid4()}", json={})
-    assert resp.status_code == 401
diff --git a/backend/tests/test_schemas/__init__.py b/backend/tests/test_schemas/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_schemas/test_chat.py b/backend/tests/test_schemas/test_chat.py
deleted file mode 100644
index 1dd58784b..000000000
--- a/backend/tests/test_schemas/test_chat.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""Unit tests for ChatRequest schema — generic chat-only fields."""
-
-from __future__ import annotations
-
-import uuid
-
-import pytest
-from pydantic import ValidationError
-
-from app.schemas.chat import ChatRequest
-
-# ---------------------------------------------------------------------------
-# Baseline: existing fields still work
-# ---------------------------------------------------------------------------
-
-
-class TestChatRequestBaseline:
-    """Ensure the existing ChatRequest contract is unbroken."""
-
-    def test_minimal_request(self):
-        """Only the required `message` field is needed."""
-        req = ChatRequest(message="hello")
-        assert req.message == "hello"
-        assert req.thread_id is None
-        assert req.graph_id is None
-        assert req.metadata == {}
-
-    def test_all_existing_fields(self):
-        gid = uuid.uuid4()
-        req = ChatRequest(
-            message="hi",
-            thread_id="t-1",
-            graph_id=gid,
-            provider_name="openai",
-            model_name="gpt-4o",
-            metadata={"key": "value"},
-        )
-        assert req.thread_id == "t-1"
-        assert req.graph_id == gid
-        assert req.provider_name == "openai"
-        assert req.model_name == "gpt-4o"
-        assert req.metadata == {"key": "value"}
-
-
-# ---------------------------------------------------------------------------
-# Metadata handling
-# ---------------------------------------------------------------------------
-
-
-class TestChatRequestMetadata:
-    """Ensure metadata remains flexible but scoped to generic chat context."""
-
-    def test_metadata_defaults_to_empty_dict(self):
-        req = ChatRequest(message="hello")
-        assert req.metadata == {}
-
-    def test_metadata_is_copied(self):
-        meta = {"foo": "bar"}
-        req = ChatRequest(message="hello", metadata=meta)
-        assert req.metadata == {"foo": "bar"}
-        meta["foo"] = "baz"
-        assert req.metadata == {"foo": "bar"}
-
-    def test_metadata_accepts_files_list(self):
-        files = [
-            {"filename": "notes.md", "path": "/tmp/notes.md", "size": 12},
-            {"filename": "plan.txt", "path": "/tmp/plan.txt", "size": 8},
-        ]
-        req = ChatRequest(message="hi", metadata={"files": files})
-        assert req.metadata["files"] == files
-
-
-# ---------------------------------------------------------------------------
-# Extra field rejection
-# ---------------------------------------------------------------------------
-
-
-class TestChatRequestExtraFields:
-    """ChatRequest should stay generic and forbid transport-only fields."""
-
-    def test_mode_field_is_rejected(self):
-        with pytest.raises(ValidationError):
-            ChatRequest(message="hello", mode="skill_creator")  # type: ignore[arg-type]
-
-    def test_edit_skill_id_field_is_rejected(self):
-        with pytest.raises(ValidationError):
-            ChatRequest(message="hello", edit_skill_id="skill-1")  # type: ignore[arg-type]
diff --git a/backend/tests/test_services/__init__.py b/backend/tests/test_services/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_services/test_agent_registry.py b/backend/tests/test_services/test_agent_registry.py
deleted file mode 100644
index 38712c56d..000000000
--- a/backend/tests/test_services/test_agent_registry.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from app.services.agent_registry import agent_registry
-
-
-def test_agent_registry_exposes_skill_creator_definition() -> None:
-    definition = agent_registry.get("skill_creator")
-
-    assert definition.agent_name == "skill_creator"
-    assert definition.display_name == "Skill Creator"
-    assert definition.run_type == "skill_creator"
-    assert callable(definition.reducer)
-    assert callable(definition.make_initial_projection)
-
-
-def test_agent_registry_lists_registered_agents() -> None:
-    definitions = agent_registry.list_definitions()
-
-    assert any(definition.agent_name == "skill_creator" for definition in definitions)
diff --git a/backend/tests/test_services/test_chat_run_reducer.py b/backend/tests/test_services/test_chat_run_reducer.py
deleted file mode 100644
index 47eb023be..000000000
--- a/backend/tests/test_services/test_chat_run_reducer.py
+++ /dev/null
@@ -1,276 +0,0 @@
-"""Tests for the Chat run reducer and agent registration."""
-
-from app.services.agent_registry import agent_registry
-
-
-def test_chat_definition_registered() -> None:
-    definition = agent_registry.get("chat")
-    assert definition.agent_name == "chat"
-    assert definition.display_name == "Chat"
-    assert definition.run_type == "chat_turn"
-
-
-def test_chat_initial_projection() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection(
-        {"graph_id": "graph-1", "thread_id": "thread-1"},
-        status="queued",
-    )
-    assert projection["run_type"] == "chat_turn"
-    assert projection["status"] == "queued"
-    assert projection["graph_id"] == "graph-1"
-    assert projection["thread_id"] == "thread-1"
-    assert projection["user_message"] is None
-    assert projection["assistant_message"] is None
-    assert projection["file_tree"] == {}
-    assert projection["preview_data"] is None
-    assert projection["node_execution_log"] == []
-    assert projection["interrupt"] is None
-
-
-def test_chat_reducer_user_message_added() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="user_message_added",
-        payload={"message": {"id": "msg-user-1", "role": "user", "content": "Hello"}},
-        status="running",
-    )
-
-    assert next_projection["user_message"] == {
-        "id": "msg-user-1",
-        "role": "user",
-        "content": "Hello",
-    }
-
-
-def test_chat_reducer_assistant_message_started() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="assistant_message_started",
-        payload={"message": {"id": "msg-ai-1", "role": "assistant", "content": ""}},
-        status="running",
-    )
-
-    assert next_projection["assistant_message"] == {
-        "id": "msg-ai-1",
-        "role": "assistant",
-        "content": "",
-    }
-
-
-def test_chat_reducer_content_delta() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    projection = definition.reducer(
-        projection,
-        event_type="assistant_message_started",
-        payload={"message": {"id": "msg-ai-1", "role": "assistant", "content": ""}},
-        status="running",
-    )
-    projection = definition.reducer(
-        projection,
-        event_type="content_delta",
-        payload={"message_id": "msg-ai-1", "delta": "Hello"},
-        status="running",
-    )
-    next_projection = definition.reducer(
-        projection,
-        event_type="content_delta",
-        payload={"message_id": "msg-ai-1", "delta": " world"},
-        status="running",
-    )
-
-    assert next_projection["assistant_message"]["content"] == "Hello world"
-
-
-def test_chat_reducer_tool_start() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    projection = definition.reducer(
-        projection,
-        event_type="assistant_message_started",
-        payload={"message": {"id": "msg-ai-1", "role": "assistant", "content": ""}},
-        status="running",
-    )
-    next_projection = definition.reducer(
-        projection,
-        event_type="tool_start",
-        payload={
-            "message_id": "msg-ai-1",
-            "tool": {"id": "tool-1", "name": "some_tool", "status": "running"},
-        },
-        status="running",
-    )
-
-    assert next_projection["assistant_message"]["tool_calls"] == [
-        {"id": "tool-1", "name": "some_tool", "status": "running"}
-    ]
-
-
-def test_chat_reducer_tool_end_updates_tool_and_captures_preview() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    projection = definition.reducer(
-        projection,
-        event_type="assistant_message_started",
-        payload={"message": {"id": "msg-ai-1", "role": "assistant", "content": ""}},
-        status="running",
-    )
-    projection = definition.reducer(
-        projection,
-        event_type="tool_start",
-        payload={
-            "message_id": "msg-ai-1",
-            "tool": {"id": "tool-1", "name": "preview_skill", "status": "running"},
-        },
-        status="running",
-    )
-    next_projection = definition.reducer(
-        projection,
-        event_type="tool_end",
-        payload={
-            "message_id": "msg-ai-1",
-            "tool_id": "tool-1",
-            "tool_name": "preview_skill",
-            "tool_output": {"name": "my-skill"},
-        },
-        status="running",
-    )
-
-    tool = next_projection["assistant_message"]["tool_calls"][0]
-    assert tool["status"] == "completed"
-    assert tool["result"] == {"name": "my-skill"}
-    assert next_projection["preview_data"] == {"name": "my-skill"}
-
-
-def test_chat_reducer_file_event_create_and_delete() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    projection = definition.reducer(
-        projection,
-        event_type="file_event",
-        payload={"path": "/foo/bar.py", "action": "create", "size": 42, "timestamp": 1000},
-        status="running",
-    )
-    assert "/foo/bar.py" in projection["file_tree"]
-    assert projection["file_tree"]["/foo/bar.py"]["action"] == "create"
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="file_event",
-        payload={"path": "/foo/bar.py", "action": "delete"},
-        status="running",
-    )
-    assert "/foo/bar.py" not in next_projection["file_tree"]
-
-
-def test_chat_reducer_node_start_and_end() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    projection = definition.reducer(
-        projection,
-        event_type="node_start",
-        payload={"node_id": "node-1", "node_name": "my_node", "start_time": 100},
-        status="running",
-    )
-    assert len(projection["node_execution_log"]) == 1
-    assert projection["node_execution_log"][0]["node_id"] == "node-1"
-    assert projection["node_execution_log"][0]["status"] == "running"
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="node_end",
-        payload={"node_id": "node-1", "node_name": "my_node", "end_time": 200},
-        status="running",
-    )
-    assert len(next_projection["node_execution_log"]) == 1
-    assert next_projection["node_execution_log"][0]["status"] == "completed"
-    assert next_projection["node_execution_log"][0]["end_time"] == 200
-
-
-def test_chat_reducer_interrupt() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="interrupt",
-        payload={"interrupt": {"type": "human_approval", "message": "Approve?"}},
-        status="interrupted",
-    )
-
-    assert next_projection["interrupt"] == {"type": "human_approval", "message": "Approve?"}
-    assert next_projection["status"] == "interrupted"
-
-
-def test_chat_reducer_error() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="error",
-        payload={"message": "Something went wrong"},
-        status="failed",
-    )
-
-    assert next_projection["meta"]["error"] == "Something went wrong"
-    assert next_projection["status"] == "failed"
-
-
-def test_chat_reducer_done() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="done",
-        payload={},
-        status="completed",
-    )
-
-    assert next_projection["meta"]["completed"] is True
-    assert next_projection["status"] == "completed"
-
-
-def test_chat_reducer_status_message() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="status",
-        payload={"message": "Processing your request..."},
-        status="running",
-    )
-
-    assert next_projection["meta"]["status_message"] == "Processing your request..."
-
-
-def test_chat_reducer_run_initialized() -> None:
-    definition = agent_registry.get("chat")
-
-    next_projection = definition.reducer(
-        None,
-        event_type="run_initialized",
-        payload={"graph_id": "graph-99", "thread_id": "thread-77"},
-        status="queued",
-    )
-
-    assert next_projection["run_type"] == "chat_turn"
-    assert next_projection["status"] == "queued"
-    assert next_projection["graph_id"] == "graph-99"
-    assert next_projection["thread_id"] == "thread-77"
-    assert next_projection["user_message"] is None
-    assert next_projection["assistant_message"] is None
diff --git a/backend/tests/test_services/test_copilot_run_reducer.py b/backend/tests/test_services/test_copilot_run_reducer.py
deleted file mode 100644
index 1c5f62ecc..000000000
--- a/backend/tests/test_services/test_copilot_run_reducer.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""Tests for copilot run projection reducer."""
-
-from app.services.run_reducers.copilot import apply_copilot_event, make_initial_projection
-
-
-def _base():
-    return make_initial_projection({"graph_id": "g1", "mode": "deepagents"}, "queued")
-
-
-def test_copilot_definition_registered():
-    from app.services.agent_registry import agent_registry
-
-    defn = agent_registry.get("copilot")
-    assert defn.agent_name == "copilot"
-    assert defn.run_type == "copilot_turn"
-
-
-def test_copilot_initial_projection():
-    p = _base()
-    assert p["run_type"] == "copilot_turn"
-    assert p["status"] == "queued"
-    assert p["graph_id"] == "g1"
-    assert p["mode"] == "deepagents"
-    assert p["content"] == ""
-    assert p["thought_steps"] == []
-
-
-def test_copilot_reducer_run_initialized():
-    p = apply_copilot_event(
-        None, event_type="run_initialized", payload={"graph_id": "g2", "mode": "standard"}, status="running"
-    )
-    assert p["graph_id"] == "g2"
-    assert p["mode"] == "standard"
-
-
-def test_copilot_reducer_status():
-    p = apply_copilot_event(
-        _base(), event_type="status", payload={"stage": "thinking", "message": "Thinking..."}, status="running"
-    )
-    assert p["stage"] == "thinking"
-
-
-def test_copilot_reducer_content_delta():
-    p = apply_copilot_event(_base(), event_type="content_delta", payload={"delta": "Hello "}, status="running")
-    p = apply_copilot_event(p, event_type="content_delta", payload={"delta": "world"}, status="running")
-    assert p["content"] == "Hello world"
-
-
-def test_copilot_reducer_thought_step():
-    p = apply_copilot_event(
-        _base(), event_type="thought_step", payload={"step": {"index": 1, "content": "Analyzing"}}, status="running"
-    )
-    assert len(p["thought_steps"]) == 1
-    assert p["thought_steps"][0]["content"] == "Analyzing"
-
-
-def test_copilot_reducer_tool_call():
-    p = apply_copilot_event(
-        _base(), event_type="tool_call", payload={"tool": "create_node", "input": {"type": "agent"}}, status="running"
-    )
-    assert len(p["tool_calls"]) == 1
-    assert p["tool_calls"][0]["tool"] == "create_node"
-
-
-def test_copilot_reducer_tool_result():
-    action = {"type": "CREATE_NODE", "payload": {"id": "n1"}, "reasoning": "Need agent"}
-    p = apply_copilot_event(_base(), event_type="tool_result", payload={"action": action}, status="running")
-    assert len(p["tool_results"]) == 1
-    assert p["tool_results"][0]["type"] == "CREATE_NODE"
-
-
-def test_copilot_reducer_result():
-    actions = [{"type": "CREATE_NODE", "payload": {"id": "n1"}, "reasoning": "test"}]
-    p = apply_copilot_event(
-        _base(), event_type="result", payload={"message": "Done!", "actions": actions}, status="running"
-    )
-    assert p["result_message"] == "Done!"
-    assert len(p["result_actions"]) == 1
-
-
-def test_copilot_reducer_error():
-    p = apply_copilot_event(
-        _base(), event_type="error", payload={"message": "LLM failed", "code": "AGENT_ERROR"}, status="failed"
-    )
-    assert p["status"] == "failed"
-    assert p["error"] == "LLM failed"
-
-
-def test_copilot_reducer_done():
-    p = apply_copilot_event(_base(), event_type="done", payload={}, status="completed")
-    assert p["status"] == "completed"
-
-
-def test_copilot_reducer_done_preserves_failed():
-    p = apply_copilot_event(_base(), event_type="error", payload={"message": "err"}, status="failed")
-    p = apply_copilot_event(p, event_type="done", payload={}, status="failed")
-    assert p["status"] == "failed"
diff --git a/backend/tests/test_services/test_platform_token_service.py b/backend/tests/test_services/test_platform_token_service.py
deleted file mode 100644
index d593ba8fc..000000000
--- a/backend/tests/test_services/test_platform_token_service.py
+++ /dev/null
@@ -1,257 +0,0 @@
-"""Unit tests for PlatformTokenService."""
-
-from __future__ import annotations
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-
-def _mock_db():
-    db = AsyncMock()
-    db.commit = AsyncMock()
-    db.flush = AsyncMock()
-    db.refresh = AsyncMock()
-    db.add = MagicMock()
-    return db
-
-
-class TestPlatformTokenServiceCreate:
-    """Test token creation logic."""
-
-    @pytest.mark.asyncio
-    async def test_create_returns_raw_token_starting_with_sk(self):
-        """Created token should start with 'sk_' prefix."""
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            record, raw_token = await service.create_token(
-                user_id="user-1",
-                name="test",
-                scopes=["skills:read"],
-            )
-            assert raw_token.startswith("sk_")
-            assert len(raw_token) > 12
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_when_limit_exceeded(self):
-        """Should raise BadRequestException when user has 50 active tokens."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=50)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="50"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["skills:read"],
-                )
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_invalid_scope(self):
-        """Should raise BadRequestException when passing invalid scope."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="Invalid scopes"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["invalid:scope"],
-                )
-
-
-class TestPlatformTokenServiceRevoke:
-    """Test token revocation logic."""
-
-    @pytest.mark.asyncio
-    async def test_revoke_sets_inactive(self):
-        """Revoke should set is_active to False."""
-        db = _mock_db()
-        token = MagicMock()
-        token.id = uuid.uuid4()
-        token.user_id = "user-1"
-        token.is_active = True
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.get = AsyncMock(return_value=token)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            await service.revoke_token(token_id=token.id, user_id="user-1")
-            assert token.is_active is False
-
-    @pytest.mark.asyncio
-    async def test_revoke_wrong_user_denied(self):
-        """Should raise ForbiddenException when revoking another user's token."""
-        from app.common.exceptions import ForbiddenException
-
-        db = _mock_db()
-        token = MagicMock()
-        token.id = uuid.uuid4()
-        token.user_id = "user-1"
-        token.is_active = True
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.get = AsyncMock(return_value=token)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(ForbiddenException):
-                await service.revoke_token(token_id=token.id, user_id="user-2")
-
-
-class TestPlatformTokenServiceList:
-    """Test token listing with resource filtering."""
-
-    @pytest.mark.asyncio
-    async def test_list_tokens_delegates_to_repo(self):
-        """list_tokens should pass resource filters to repository."""
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            mock_tokens = [MagicMock(), MagicMock()]
-            MockRepo.return_value.list_by_user_and_resource = AsyncMock(return_value=mock_tokens)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            rid = uuid.uuid4()
-            result = await service.list_tokens(
-                user_id="user-1",
-                resource_type="skill",
-                resource_id=rid,
-            )
-            assert result == mock_tokens
-            MockRepo.return_value.list_by_user_and_resource.assert_called_once_with("user-1", "skill", rid)
-
-    @pytest.mark.asyncio
-    async def test_list_tokens_no_filters(self):
-        """list_tokens with no filters passes None values."""
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.list_by_user_and_resource = AsyncMock(return_value=[])
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            result = await service.list_tokens(user_id="user-1")
-            assert result == []
-            MockRepo.return_value.list_by_user_and_resource.assert_called_once_with("user-1", None, None)
-
-
-class TestPlatformTokenServiceRevokeByResource:
-    """Test bulk revocation by resource."""
-
-    @pytest.mark.asyncio
-    async def test_revoke_by_resource_delegates_to_repo(self):
-        """revoke_by_resource should delegate to repo.deactivate_by_resource."""
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.deactivate_by_resource = AsyncMock(return_value=3)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            count = await service.revoke_by_resource("skill", "skill-123")
-            assert count == 3
-            MockRepo.return_value.deactivate_by_resource.assert_called_once_with("skill", "skill-123")
-
-
-class TestPlatformTokenServiceValidation:
-    """Test resource_type/resource_id pair and resource_type validation."""
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_resource_type_without_resource_id(self):
-        """Should reject when resource_type is set but resource_id is None."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="must both be provided"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["skills:read"],
-                    resource_type="skill",
-                    resource_id=None,
-                )
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_resource_id_without_resource_type(self):
-        """Should reject when resource_id is set but resource_type is None."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="must both be provided"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["skills:read"],
-                    resource_type=None,
-                    resource_id=uuid.uuid4(),
-                )
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_invalid_resource_type(self):
-        """Should reject unknown resource_type."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="Invalid resource_type"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["skills:read"],
-                    resource_type="unknown",
-                    resource_id=uuid.uuid4(),
-                )
-
-    @pytest.mark.asyncio
-    async def test_create_accepts_valid_resource_binding(self):
-        """Should succeed with valid resource_type + resource_id pair."""
-        db = _mock_db()
-        skill_id = uuid.uuid4()
-        with (
-            patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo,
-            patch("app.repositories.skill.SkillRepository.get", new_callable=AsyncMock) as mock_get,
-            patch("app.common.skill_permissions.check_skill_access", new_callable=AsyncMock) as mock_check,
-        ):
-            MockRepo.return_value.count_active_by_user = AsyncMock(return_value=0)
-            mock_skill = MagicMock()
-            mock_skill.id = skill_id
-            mock_skill.owner_id = "user-1"
-            mock_get.return_value = mock_skill
-            mock_check.return_value = None
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            record, raw_token = await service.create_token(
-                user_id="user-1",
-                name="test",
-                scopes=["skills:execute"],
-                resource_type="skill",
-                resource_id=skill_id,
-            )
-            assert raw_token.startswith("sk_")
diff --git a/backend/tests/test_services/test_run_reducers.py b/backend/tests/test_services/test_run_reducers.py
deleted file mode 100644
index b8e3cfde3..000000000
--- a/backend/tests/test_services/test_run_reducers.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from app.services.agent_registry import agent_registry
-
-
-def test_skill_creator_definition_builds_initial_projection() -> None:
-    definition = agent_registry.get("skill_creator")
-
-    projection = definition.make_initial_projection(
-        {
-            "graph_id": "graph-123",
-            "thread_id": "thread-456",
-            "edit_skill_id": "skill-789",
-        },
-        status="queued",
-    )
-
-    assert projection["run_type"] == "skill_creator"
-    assert projection["status"] == "queued"
-    assert projection["graph_id"] == "graph-123"
-    assert projection["thread_id"] == "thread-456"
-    assert projection["edit_skill_id"] == "skill-789"
-
-
-def test_skill_creator_definition_reducer_updates_preview_payload() -> None:
-    definition = agent_registry.get("skill_creator")
-    projection = definition.make_initial_projection({}, status="running")
-
-    next_projection = definition.reducer(
-        projection,
-        event_type="tool_end",
-        payload={
-            "message_id": "msg-ai-1",
-            "tool_name": "preview_skill",
-            "tool_output": {"name": "network-scan"},
-        },
-        status="running",
-    )
-
-    assert next_projection["preview_data"] == {"name": "network-scan"}
diff --git a/backend/tests/test_services/test_skill_permissions.py b/backend/tests/test_services/test_skill_permissions.py
deleted file mode 100644
index 018f8c5c9..000000000
--- a/backend/tests/test_services/test_skill_permissions.py
+++ /dev/null
@@ -1,99 +0,0 @@
-"""Tests for check_skill_access unified permission check."""
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from app.common.exceptions import ForbiddenException
-from app.common.skill_permissions import check_skill_access
-from app.models.skill_collaborator import CollaboratorRole
-
-
-def _make_skill(owner_id="owner-1", is_public=False):
-    skill = MagicMock()
-    skill.id = uuid.uuid4()
-    skill.owner_id = owner_id
-    skill.is_public = is_public
-    return skill
-
-
-@pytest.mark.asyncio
-async def test_superuser_always_passes():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    await check_skill_access(db, skill, "super-1", CollaboratorRole.admin, is_superuser=True)
-
-
-@pytest.mark.asyncio
-async def test_owner_always_passes():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    await check_skill_access(db, skill, "owner-1", CollaboratorRole.admin)
-
-
-@pytest.mark.asyncio
-async def test_collaborator_with_sufficient_role():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    mock_collab = MagicMock()
-    mock_collab.role = CollaboratorRole.editor
-    with patch("app.common.skill_permissions._get_collaborator", return_value=mock_collab):
-        await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_collaborator_with_insufficient_role():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    mock_collab = MagicMock()
-    mock_collab.role = CollaboratorRole.viewer
-    with patch("app.common.skill_permissions._get_collaborator", return_value=mock_collab):
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_public_skill_viewer_access():
-    skill = _make_skill(owner_id="other", is_public=True)
-    db = AsyncMock()
-    with patch("app.common.skill_permissions._get_collaborator", return_value=None):
-        await check_skill_access(db, skill, "user-1", CollaboratorRole.viewer)
-
-
-@pytest.mark.asyncio
-async def test_public_skill_editor_access_denied():
-    skill = _make_skill(owner_id="other", is_public=True)
-    db = AsyncMock()
-    with patch("app.common.skill_permissions._get_collaborator", return_value=None):
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_token_scope_check_passes():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    await check_skill_access(
-        db,
-        skill,
-        "owner-1",
-        CollaboratorRole.viewer,
-        token_scopes=["skills:read"],
-        required_scope="skills:read",
-    )
-
-
-@pytest.mark.asyncio
-async def test_token_scope_check_fails():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    with pytest.raises(ForbiddenException):
-        await check_skill_access(
-            db,
-            skill,
-            "owner-1",
-            CollaboratorRole.viewer,
-            token_scopes=["skills:read"],
-            required_scope="skills:write",
-        )
diff --git a/backend/tests/test_services/test_skill_version_service.py b/backend/tests/test_services/test_skill_version_service.py
deleted file mode 100644
index c9e2aeca3..000000000
--- a/backend/tests/test_services/test_skill_version_service.py
+++ /dev/null
@@ -1,92 +0,0 @@
-"""Unit tests for SkillVersionService."""
-
-from __future__ import annotations
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from app.services.skill_version_service import SkillVersionService
-
-
-def _mock_skill(owner_id="user-1", name="test-skill", content="body"):
-    s = MagicMock()
-    s.id = uuid.uuid4()
-    s.owner_id = owner_id
-    s.name = name
-    s.description = "desc"
-    s.content = content
-    s.tags = ["a"]
-    s.meta_data = {}
-    s.allowed_tools = []
-    s.compatibility = None
-    s.license = None
-    s.is_public = False
-    s.files = []
-    return s
-
-
-def _mock_db():
-    db = AsyncMock()
-    db.commit = AsyncMock()
-    db.flush = AsyncMock()
-    db.refresh = AsyncMock()
-    db.add = MagicMock()
-    return db
-
-
-class TestSkillVersionServicePublish:
-    """Test version publishing logic."""
-
-    @pytest.mark.asyncio
-    async def test_publish_validates_semver_format(self):
-        """Invalid semver should raise BadRequestException."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        skill = _mock_skill()
-        with patch.object(SkillVersionService, "__init__", lambda self, db: None):
-            service = SkillVersionService.__new__(SkillVersionService)
-            service.db = db
-            service.skill_repo = MagicMock()
-            service.skill_repo.get_with_files = AsyncMock(return_value=skill)
-            service.repo = MagicMock()
-            service.file_repo = MagicMock()
-            service.skill_file_repo = MagicMock()
-
-            with patch("app.services.skill_version_service.check_skill_access", new_callable=AsyncMock):
-                with pytest.raises(BadRequestException, match="Invalid version"):
-                    await service.publish_version(
-                        skill_id=skill.id,
-                        current_user_id="user-1",
-                        version_str="invalid",
-                        release_notes="",
-                    )
-
-    @pytest.mark.asyncio
-    async def test_publish_rejects_lower_version(self):
-        """New version must be greater than existing highest."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        skill = _mock_skill()
-
-        with patch.object(SkillVersionService, "__init__", lambda self, db: None):
-            service = SkillVersionService.__new__(SkillVersionService)
-            service.db = db
-            service.skill_repo = MagicMock()
-            service.skill_repo.get_with_files = AsyncMock(return_value=skill)
-            service.repo = MagicMock()
-            service.repo.get_highest_version_str = AsyncMock(return_value="2.0.0")
-            service.file_repo = MagicMock()
-            service.skill_file_repo = MagicMock()
-
-            with patch("app.services.skill_version_service.check_skill_access", new_callable=AsyncMock):
-                with pytest.raises(BadRequestException, match="greater"):
-                    await service.publish_version(
-                        skill_id=skill.id,
-                        current_user_id="user-1",
-                        version_str="1.0.0",
-                        release_notes="",
-                    )
diff --git a/backend/tests/test_tools/__init__.py b/backend/tests/test_tools/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_tools/test_preview_skill.py b/backend/tests/test_tools/test_preview_skill.py
deleted file mode 100644
index 964e9291d..000000000
--- a/backend/tests/test_tools/test_preview_skill.py
+++ /dev/null
@@ -1,304 +0,0 @@
-"""Tests for preview_skill_in_sandbox builtin tool."""
-
-import json
-from pathlib import Path
-
-import pytest
-
-from app.core.tools.builtin.preview_skill import preview_skill_in_sandbox
-
-
-@pytest.fixture
-def sandbox_root(tmp_path: Path) -> str:
-    """Create a temporary sandbox root directory."""
-    return str(tmp_path)
-
-
-def _make_skill(sandbox_root: str, skill_name: str, files: dict[str, str], skills_subdir: str = "skills") -> Path:
-    """Helper to create a skill directory with given files.
-
-    Args:
-        sandbox_root: Root of the sandbox.
-        skill_name: Name of the skill directory.
-        files: Mapping of relative file path -> content.
-        skills_subdir: Subdirectory under sandbox_root for skills.
-
-    Returns:
-        Path to the created skill directory.
-    """
-    skill_dir = Path(sandbox_root) / skills_subdir / skill_name
-    for rel_path, content in files.items():
-        file_path = skill_dir / rel_path
-        file_path.parent.mkdir(parents=True, exist_ok=True)
-        file_path.write_text(content, encoding="utf-8")
-    return skill_dir
-
-
-# ---------------------------------------------------------------------------
-# Happy path
-# ---------------------------------------------------------------------------
-
-
-def test_valid_skill_returns_correct_structure(sandbox_root: str):
-    """A well-formed skill with SKILL.md should pass validation."""
-    skill_md = (
-        "---\nname: hello-world\ndescription: A simple greeting skill\n---\n\n# Hello World\nThis skill says hello.\n"
-    )
-    _make_skill(
-        sandbox_root,
-        "hello-world",
-        {
-            "SKILL.md": skill_md,
-            "main.py": "print('hello')\n",
-        },
-    )
-
-    result_str = preview_skill_in_sandbox("hello-world", sandbox_root)
-    result = json.loads(result_str)
-
-    assert result["skill_name"] == "hello-world"
-    assert result["validation"]["valid"] is True
-    assert result["validation"]["errors"] == []
-
-    # Check files are included
-    file_paths = [f["path"] for f in result["files"]]
-    assert "SKILL.md" in file_paths
-    assert "main.py" in file_paths
-
-    # Check file metadata
-    skill_md_file = next(f for f in result["files"] if f["path"] == "SKILL.md")
-    assert skill_md_file["file_type"] == "markdown"
-    assert skill_md_file["size"] > 0
-    assert "Hello World" in skill_md_file["content"]
-
-    main_py_file = next(f for f in result["files"] if f["path"] == "main.py")
-    assert main_py_file["file_type"] == "python"
-
-
-def test_valid_skill_with_nested_files(sandbox_root: str):
-    """Nested subdirectory files should be included with relative paths."""
-    skill_md = "---\nname: nested-skill\ndescription: Skill with nested files\n---\n\nBody text.\n"
-    _make_skill(
-        sandbox_root,
-        "nested-skill",
-        {
-            "SKILL.md": skill_md,
-            "src/utils.py": "def helper(): pass\n",
-            "src/data/config.json": '{"key": "value"}\n',
-        },
-    )
-
-    result = json.loads(preview_skill_in_sandbox("nested-skill", sandbox_root))
-
-    assert result["validation"]["valid"] is True
-    paths = sorted(f["path"] for f in result["files"])
-    assert "SKILL.md" in paths
-    assert "src/utils.py" in paths
-    assert "src/data/config.json" in paths
-
-    json_file = next(f for f in result["files"] if f["path"] == "src/data/config.json")
-    assert json_file["file_type"] == "json"
-
-
-def test_custom_skills_subdir(sandbox_root: str):
-    """Should respect a custom skills_subdir parameter."""
-    skill_md = "---\nname: custom-dir\ndescription: test\n---\nBody.\n"
-    _make_skill(sandbox_root, "custom-dir", {"SKILL.md": skill_md}, skills_subdir="my_skills")
-
-    result = json.loads(preview_skill_in_sandbox("custom-dir", sandbox_root, skills_subdir="my_skills"))
-    assert result["validation"]["valid"] is True
-    assert result["skill_name"] == "custom-dir"
-
-
-def test_default_lookup_finds_thread_scoped_skill_dir(sandbox_root: str):
-    """Default lookup should find a skill under <thread_id>/skills when unambiguous."""
-    skill_md = "---\nname: thread-dir\ndescription: test\n---\nBody.\n"
-    _make_skill(sandbox_root, "thread-dir", {"SKILL.md": skill_md}, skills_subdir="thread-123/skills")
-
-    result = json.loads(preview_skill_in_sandbox("thread-dir", sandbox_root))
-
-    assert result["validation"]["valid"] is True
-    assert result["skill_name"] == "thread-dir"
-
-
-# ---------------------------------------------------------------------------
-# File type detection
-# ---------------------------------------------------------------------------
-
-
-def test_file_type_detection(sandbox_root: str):
-    """Various file extensions should map to correct file_type values."""
-    skill_md = "---\nname: types-test\ndescription: test types\n---\nBody.\n"
-    _make_skill(
-        sandbox_root,
-        "types-test",
-        {
-            "SKILL.md": skill_md,
-            "script.py": "pass",
-            "config.yaml": "key: val",
-            "config.yml": "key: val",
-            "data.json": "{}",
-            "readme.txt": "hello",
-            "run.sh": "#!/bin/bash",
-            "style.css": "body {}",
-            "page.html": "<html></html>",
-            "app.js": "console.log(1)",
-            "app.ts": "const x = 1",
-            "unknown.xyz": "stuff",
-        },
-    )
-
-    result = json.loads(preview_skill_in_sandbox("types-test", sandbox_root))
-    type_map = {f["path"]: f["file_type"] for f in result["files"]}
-
-    assert type_map["script.py"] == "python"
-    assert type_map["config.yaml"] == "yaml"
-    assert type_map["config.yml"] == "yaml"
-    assert type_map["data.json"] == "json"
-    assert type_map["readme.txt"] == "text"
-    assert type_map["run.sh"] == "shell"
-    assert type_map["style.css"] == "css"
-    assert type_map["page.html"] == "html"
-    assert type_map["app.js"] == "javascript"
-    assert type_map["app.ts"] == "typescript"
-    assert type_map["unknown.xyz"] == "other"
-
-
-# ---------------------------------------------------------------------------
-# Error cases
-# ---------------------------------------------------------------------------
-
-
-def test_skill_directory_not_found(sandbox_root: str):
-    """Missing skill directory should produce valid=False with error."""
-    result = json.loads(preview_skill_in_sandbox("nonexistent", sandbox_root))
-
-    assert result["skill_name"] == "nonexistent"
-    assert result["validation"]["valid"] is False
-    assert any("not found" in e.lower() for e in result["validation"]["errors"])
-    assert result["files"] == []
-
-
-def test_missing_skill_md(sandbox_root: str):
-    """A skill directory without SKILL.md should produce valid=False."""
-    _make_skill(
-        sandbox_root,
-        "no-readme",
-        {
-            "main.py": "print('hi')\n",
-        },
-    )
-
-    result = json.loads(preview_skill_in_sandbox("no-readme", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("SKILL.md" in e for e in result["validation"]["errors"])
-    # Other files should still be listed
-    assert len(result["files"]) == 1
-
-
-def test_bad_yaml_frontmatter(sandbox_root: str):
-    """Invalid YAML frontmatter should produce valid=False."""
-    bad_skill_md = "---\nname: [invalid yaml\n---\nBody.\n"
-    _make_skill(sandbox_root, "bad-yaml", {"SKILL.md": bad_skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("bad-yaml", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("frontmatter" in e.lower() or "name" in e.lower() for e in result["validation"]["errors"])
-
-
-def test_missing_name_in_frontmatter(sandbox_root: str):
-    """Frontmatter without 'name' should produce a validation error."""
-    skill_md = "---\ndescription: no name here\n---\nBody.\n"
-    _make_skill(sandbox_root, "no-name", {"SKILL.md": skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("no-name", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("name" in e.lower() for e in result["validation"]["errors"])
-
-
-def test_missing_description_in_frontmatter(sandbox_root: str):
-    """Frontmatter without 'description' should produce a validation error."""
-    skill_md = "---\nname: no-desc\n---\nBody.\n"
-    _make_skill(sandbox_root, "no-desc", {"SKILL.md": skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("no-desc", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("description" in e.lower() for e in result["validation"]["errors"])
-
-
-def test_invalid_skill_name_format(sandbox_root: str):
-    """Skill name that violates naming rules should produce validation error."""
-    skill_md = "---\nname: Invalid_Name!\ndescription: bad name\n---\nBody.\n"
-    _make_skill(sandbox_root, "bad-name", {"SKILL.md": skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("bad-name", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("name" in e.lower() for e in result["validation"]["errors"])
-
-
-def test_description_too_long(sandbox_root: str):
-    """Description exceeding max length should produce validation error."""
-    long_desc = "x" * 1025
-    skill_md = f"---\nname: long-desc\ndescription: {long_desc}\n---\nBody.\n"
-    _make_skill(sandbox_root, "long-desc", {"SKILL.md": skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("long-desc", sandbox_root))
-
-    assert result["validation"]["valid"] is False
-    assert any("description" in e.lower() for e in result["validation"]["errors"])
-
-
-# ---------------------------------------------------------------------------
-# Warnings
-# ---------------------------------------------------------------------------
-
-
-def test_empty_body_produces_warning(sandbox_root: str):
-    """SKILL.md with empty body (no content after frontmatter) should warn."""
-    skill_md = "---\nname: empty-body\ndescription: has no body\n---\n"
-    _make_skill(sandbox_root, "empty-body", {"SKILL.md": skill_md})
-
-    result = json.loads(preview_skill_in_sandbox("empty-body", sandbox_root))
-
-    # Still valid, but warning present
-    assert result["validation"]["valid"] is True
-    assert any("body" in w.lower() or "empty" in w.lower() for w in result["validation"]["warnings"])
-
-
-# ---------------------------------------------------------------------------
-# Edge cases
-# ---------------------------------------------------------------------------
-
-
-def test_system_files_are_excluded(sandbox_root: str):
-    """System files like .DS_Store should be excluded from file list."""
-    skill_md = "---\nname: sys-files\ndescription: test system files\n---\nBody.\n"
-    _make_skill(
-        sandbox_root,
-        "sys-files",
-        {
-            "SKILL.md": skill_md,
-            ".DS_Store": "binary garbage",
-            "__pycache__/module.pyc": "bytecode",
-        },
-    )
-
-    result = json.loads(preview_skill_in_sandbox("sys-files", sandbox_root))
-    file_paths = [f["path"] for f in result["files"]]
-
-    assert ".DS_Store" not in file_paths
-    # __pycache__ files should also be filtered
-    assert not any("__pycache__" in p for p in file_paths)
-
-
-def test_returns_valid_json_string(sandbox_root: str):
-    """The function should always return a valid JSON string."""
-    # Even for missing skill
-    result_str = preview_skill_in_sandbox("missing", sandbox_root)
-    assert isinstance(result_str, str)
-    json.loads(result_str)  # Should not raise
diff --git a/backend/tests/test_utils/__init__.py b/backend/tests/test_utils/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/tests/test_utils/test_file_event_emitter.py b/backend/tests/test_utils/test_file_event_emitter.py
deleted file mode 100644
index 8ba7c895c..000000000
--- a/backend/tests/test_utils/test_file_event_emitter.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from app.utils.file_event_emitter import FileEventEmitter
-
-
-def test_emit_and_drain():
-    emitter = FileEventEmitter()
-    emitter.emit("write", "/app/hello.py", size=42)
-    emitter.emit("edit", "/app/hello.py")
-    events = emitter.drain()
-    assert len(events) == 2
-    assert events[0].action == "write"
-    assert events[0].path == "/app/hello.py"
-    assert events[0].size == 42
-    assert events[1].action == "edit"
-    assert events[1].size is None
-
-
-def test_drain_empties_queue():
-    emitter = FileEventEmitter()
-    emitter.emit("write", "/app/a.py")
-    emitter.drain()
-    assert emitter.drain() == []
-
-
-def test_drain_no_loss_under_interleave():
-    """Simulate emit during drain - popleft loop should not lose events."""
-    emitter = FileEventEmitter()
-    emitter.emit("write", "/app/a.py")
-    emitter.emit("write", "/app/b.py")
-    events = emitter.drain()
-    assert len(events) == 2
-    emitter.emit("write", "/app/c.py")
-    events2 = emitter.drain()
-    assert len(events2) == 1
-    assert events2[0].path == "/app/c.py"
-
-
-def test_file_event_has_timestamp():
-    emitter = FileEventEmitter()
-    emitter.emit("write", "/app/a.py")
-    events = emitter.drain()
-    assert events[0].timestamp > 0
diff --git a/backend/uv.lock b/backend/uv.lock
index 32f34e043..1b58ddf2a 100644
--- a/backend/uv.lock
+++ b/backend/uv.lock
@@ -71,28 +71,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5d/28/a8a9fc6957b2cee8902414e41816b5ab5536ecf43c3b1843c10e82c559b2/aiohttp-3.13.2-cp313-cp313-win_amd64.whl", hash = "sha256:a88d13e7ca367394908f8a276b89d04a3652044612b9a408a0bb22a5ed976a1a", size = 452192, upload-time = "2025-10-28T20:57:34.166Z" },
 ]
 
-[[package]]
-name = "aioquic"
-version = "1.2.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "certifi" },
-    { name = "cryptography" },
-    { name = "pylsqpack" },
-    { name = "pyopenssl" },
-    { name = "service-identity" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4b/1a/bf10b2c57c06c7452b685368cb1ac90565a6e686e84ec6f84465fb8f78f4/aioquic-1.2.0.tar.gz", hash = "sha256:f91263bb3f71948c5c8915b4d50ee370004f20a416f67fab3dcc90556c7e7199", size = 179891, upload-time = "2024-07-06T23:27:09.301Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/19/03/1c385739e504c70ab2a66a4bc0e7cd95cee084b374dcd4dc97896378400b/aioquic-1.2.0-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3e23964dfb04526ade6e66f5b7cd0c830421b8138303ab60ba6e204015e7cb0b", size = 1753473, upload-time = "2024-07-06T23:26:20.809Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6a/1f/4d1c40714db65be828e1a1e2cce7f8f4b252be67d89f2942f86a1951826c/aioquic-1.2.0-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:84d733332927b76218a3b246216104116f766f5a9b2308ec306cd017b3049660", size = 2083563, upload-time = "2024-07-06T23:26:24.254Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/15/48/56a8c9083d1deea4ccaf1cbf5a91a396b838b4a0f8650f4e9f45c7879a38/aioquic-1.2.0-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2466499759b31ea4f1d17f4aeb1f8d4297169e05e3c1216d618c9757f4dd740d", size = 2555697, upload-time = "2024-07-06T23:26:26.16Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0f/93/fa4c981a8a8a903648d4cd6e12c0fca7f44e3ef4ba15a8b99a26af05b868/aioquic-1.2.0-cp38-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cd75015462ca5070a888110dc201f35a9f4c7459f9201b77adc3c06013611bb8", size = 2149089, upload-time = "2024-07-06T23:26:28.277Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b0/0f/4a280923313b831892caaa45348abea89e7dd2e4422a86699bb0e506b1dd/aioquic-1.2.0-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:43ae3b11d43400a620ca0b4b4885d12b76a599c2cbddba755f74bebfa65fe587", size = 2205221, upload-time = "2024-07-06T23:26:30.682Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d2/6b/a6a1d1762ce06f13b68f524bb9c5f4d6ca7cda9b072d7e744626b89b77be/aioquic-1.2.0-cp38-abi3-win32.whl", hash = "sha256:910d8c91da86bba003d491d15deaeac3087d1b9d690b9edc1375905d8867b742", size = 1214037, upload-time = "2024-07-06T23:26:32.651Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/dd/aa/e8a8a75c93dee0ab229df3c2d17f63cd44d0ad5ee8540e2ec42779ce3a39/aioquic-1.2.0-cp38-abi3-win_amd64.whl", hash = "sha256:e3dcfb941004333d477225a6689b55fc7f905af5ee6a556eb5083be0354e653a", size = 1530339, upload-time = "2024-07-06T23:26:34.753Z" },
-]
-
 [[package]]
 name = "aiosignal"
 version = "1.4.0"
@@ -129,54 +107,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ba/88/6237e97e3385b57b5f1528647addea5cc03d4d65d5979ab24327d41fb00d/alembic-1.17.2-py3-none-any.whl", hash = "sha256:f483dd1fe93f6c5d49217055e4d15b905b425b6af906746abb35b69c1996c4e6", size = 248554, upload-time = "2025-11-14T20:35:05.699Z" },
 ]
 
-[[package]]
-name = "angr"
-version = "9.2.191"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "archinfo" },
-    { name = "cachetools" },
-    { name = "capstone" },
-    { name = "cffi" },
-    { name = "claripy" },
-    { name = "cle" },
-    { name = "colorama", marker = "sys_platform == 'win32'" },
-    { name = "cxxheaderparser" },
-    { name = "gitpython" },
-    { name = "msgspec" },
-    { name = "mulpyplexer" },
-    { name = "networkx" },
-    { name = "protobuf" },
-    { name = "psutil" },
-    { name = "pycparser" },
-    { name = "pydemumble" },
-    { name = "pyformlang" },
-    { name = "pypcode" },
-    { name = "pyvex" },
-    { name = "rich" },
-    { name = "sortedcontainers" },
-    { name = "sympy" },
-    { name = "typing-extensions" },
-    { name = "unique-log-filter" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/72/bd/9ed2df50022dd815386d150b1ae2a35279bd445aa56c79768fc1c0f84872/angr-9.2.191.tar.gz", hash = "sha256:64105292abbfe39bec53f3165231e955d84e19fad48d1aec45c0d0194786469a", size = 3353580, upload-time = "2025-12-30T17:44:24.144Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ab/70/a06ce0887923c1bc2461f6840bbb4a571ac3f9297d45f622a0cf45d39a4c/angr-9.2.191-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e4df766688bbdacdd053ccae6faf577033af750e4b5b5027f8a90bb08310a084", size = 5989071, upload-time = "2025-12-30T17:42:57.589Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6b/56/17cd22f6bc110b125c0e4bbc7cd04b0bafa607de2a49883bf34233814d51/angr-9.2.191-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:362b8f76c3f7bcd09b0359132065f469af78123c8c92b5866a3db3446dabc707", size = 5819341, upload-time = "2025-12-30T17:42:59.391Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/66/b3/7c5f2cc85eb05b862035d8edb6426acd1fb8426f0b4c7e5793c924e0e669/angr-9.2.191-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:03d21f0e5f25629eae63910a62029d9075165f3b4ae46cda459d245aa12e6e30", size = 6185672, upload-time = "2025-12-30T17:43:01.386Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/23/bf/0a2fffced77260ca321af7509fc8379c239c8a621c1bcd21a26a67cdf183/angr-9.2.191-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:3ff7b42213650cc4d81a15c435279bfbf7276ada401c1c1056e3fe602d629f27", size = 6011388, upload-time = "2025-12-30T17:43:03.27Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/44/e0/8af0259222bd4d545867991be8ba4a3d4f00ab942bb5687494b29e4db247/angr-9.2.191-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:dee437c32cdd8bac3f34f71afa97c5b7b36d92dd4757a342b6569fa0555bbe6b", size = 6992468, upload-time = "2025-12-30T17:43:05.146Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/17/ba/7be963318e037f32572fcd33ed9b1cbe504c6bdb0b10e7e8ae983f2b4ec2/angr-9.2.191-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ec21fe4de896cca191e083b40c442ebe96075b24e0eaf58a1d53d8b1a5e8021f", size = 7177599, upload-time = "2025-12-30T17:43:07.11Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5f/79/324dc9e2d27b37c54cbff7fd671d33e1b0803fbe78ae1907849bd05a8aa7/angr-9.2.191-cp312-cp312-win_amd64.whl", hash = "sha256:81aa44fd30ccc8f00a20c1f8d695236372ac8c5a1dd5b745653f0909f8a345bc", size = 5789378, upload-time = "2025-12-30T17:43:08.57Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/74/fa/baabac8ada517e16fa70e7384e6d99cbfb5919cf3dca7c109d98d0a4f090/angr-9.2.191-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:3c2ccc3ea148851c18eda4546dada965abea40bd703a9a68fae4002808d81f0a", size = 5989143, upload-time = "2025-12-30T17:43:10.235Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6b/1f/00ec8f2ebb6b2134ef697bf63c5488657922a395e0dff49553d530dbce3b/angr-9.2.191-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:07d01dff30f0f9bd7cfc55e8460ec7936e977b7f01e567aae69f3c82842074ec", size = 5819108, upload-time = "2025-12-30T17:43:11.707Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/63/49/f5ad08fb8b203f9185c5b65572510aacb133ae38f4ff56cfa45f43ada3b1/angr-9.2.191-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d91335e18c9d873a7334195b32cfd08cbc3a089d1f5b38ee3ba0f19bf3c29f11", size = 6185183, upload-time = "2025-12-30T17:43:13.24Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/84/cb/eb474e665a74a38c0769cd5028ec6ce555655fdbd239f67e12ed6cf5f61d/angr-9.2.191-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:c27e349e6f2cb521264f5e7bc9e01ac7a2e313b2ee0174c5fc8f0af3ffd88e70", size = 6011554, upload-time = "2025-12-30T17:43:15.085Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/39/da/a5102669a633ded0951ef38a9571e4758c468d36d615fbb8566327d29e65/angr-9.2.191-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:322732ede7c289f656fb5d69282b37f3aead8e91b326e9aabe0f1f7acddf1e15", size = 6991995, upload-time = "2025-12-30T17:43:17.013Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d2/4f/9ff9737f70cb386acfd3a7876c3b3b9c7a74bbe581dfc9e301fb5070f06c/angr-9.2.191-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:26c4c8af3ee5a9bf59a8e498891c234b04e0627b7723be39c8e3dcf6d829adb4", size = 7177527, upload-time = "2025-12-30T17:43:18.966Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/55/de/2b8e0ad0511eaae3dfcd16bcdff7a644f41a3fbdf3ce913ec2193cc691b3/angr-9.2.191-cp313-cp313-win_amd64.whl", hash = "sha256:e590eace461015f01c063dbaa3d780e979a3c47ca1077d7b8b5fd57802466ec6", size = 5789129, upload-time = "2025-12-30T17:43:20.766Z" },
-]
-
 [[package]]
 name = "annotated-doc"
 version = "0.0.4"
@@ -227,63 +157,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7f/9c/36c5c37947ebfb8c7f22e0eb6e4d188ee2d53aa3880f3f2744fb894f0cb1/anyio-4.12.0-py3-none-any.whl", hash = "sha256:dad2376a628f98eeca4881fc56cd06affd18f659b17a747d3ff0307ced94b1bb", size = 113362, upload-time = "2025-11-28T23:36:57.897Z" },
 ]
 
-[[package]]
-name = "archinfo"
-version = "9.2.191"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/a4/51fa73732b12b5ca88876fd5eeb9bdad95b1bc6d6047f45c2b2a22c46acd/archinfo-9.2.191.tar.gz", hash = "sha256:926d7cd036deb7630250fdaa6ba1b151b9ca18b08ac15b35e9429b7fe13b9eee", size = 39899, upload-time = "2025-12-30T17:44:27.16Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/70/0a/03817b0729c458986fd92566fa9200a8376e4c6e460845652f8f1e1cc312/archinfo-9.2.191-py3-none-any.whl", hash = "sha256:7e11a73f0f39b94db4e6ad35dedfc4e7c1b51f12accc88cd82b9acf1f0c05044", size = 48977, upload-time = "2025-12-30T17:43:29.367Z" },
-]
-
-[[package]]
-name = "argon2-cffi"
-version = "23.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "argon2-cffi-bindings" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/31/fa/57ec2c6d16ecd2ba0cf15f3c7d1c3c2e7b5fcb83555ff56d7ab10888ec8f/argon2_cffi-23.1.0.tar.gz", hash = "sha256:879c3e79a2729ce768ebb7d36d4609e3a78a4ca2ec3a9f12286ca057e3d0db08", size = 42798, upload-time = "2023-08-15T14:13:12.711Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a4/6a/e8a041599e78b6b3752da48000b14c8d1e8a04ded09c88c714ba047f34f5/argon2_cffi-23.1.0-py3-none-any.whl", hash = "sha256:c670642b78ba29641818ab2e68bd4e6a78ba53b7eff7b4c3815ae16abf91c7ea", size = 15124, upload-time = "2023-08-15T14:13:10.752Z" },
-]
-
-[[package]]
-name = "argon2-cffi-bindings"
-version = "25.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "cffi" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5c/2d/db8af0df73c1cf454f71b2bbe5e356b8c1f8041c979f505b3d3186e520a9/argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d", size = 1783441, upload-time = "2025-07-30T10:02:05.147Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1d/57/96b8b9f93166147826da5f90376e784a10582dd39a393c99bb62cfcf52f0/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500", size = 54121, upload-time = "2025-07-30T10:01:50.815Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0a/08/a9bebdb2e0e602dde230bdde8021b29f71f7841bd54801bcfd514acb5dcf/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44", size = 29177, upload-time = "2025-07-30T10:01:51.681Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b6/02/d297943bcacf05e4f2a94ab6f462831dc20158614e5d067c35d4e63b9acb/argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0", size = 31090, upload-time = "2025-07-30T10:01:53.184Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c1/93/44365f3d75053e53893ec6d733e4a5e3147502663554b4d864587c7828a7/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6", size = 81246, upload-time = "2025-07-30T10:01:54.145Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/09/52/94108adfdd6e2ddf58be64f959a0b9c7d4ef2fa71086c38356d22dc501ea/argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a", size = 87126, upload-time = "2025-07-30T10:01:55.074Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/72/70/7a2993a12b0ffa2a9271259b79cc616e2389ed1a4d93842fac5a1f923ffd/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d", size = 80343, upload-time = "2025-07-30T10:01:56.007Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/78/9a/4e5157d893ffc712b74dbd868c7f62365618266982b64accab26bab01edc/argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99", size = 86777, upload-time = "2025-07-30T10:01:56.943Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/74/cd/15777dfde1c29d96de7f18edf4cc94c385646852e7c7b0320aa91ccca583/argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2", size = 27180, upload-time = "2025-07-30T10:01:57.759Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e2/c6/a759ece8f1829d1f162261226fbfd2c6832b3ff7657384045286d2afa384/argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98", size = 31715, upload-time = "2025-07-30T10:01:58.56Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/42/b9/f8d6fa329ab25128b7e98fd83a3cb34d9db5b059a9847eddb840a0af45dd/argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94", size = 27149, upload-time = "2025-07-30T10:01:59.329Z" },
-]
-
-[[package]]
-name = "arpy"
-version = "1.1.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d2/15/09fbfc0d43b66a3845098377249539aa44edcd541e17eabe2e11b4e3855e/arpy-1.1.1.tar.gz", hash = "sha256:3ec36309d2234648ef8dcd2118fe7d81c30195087e0353473546583f3434e776", size = 6774, upload-time = "2013-06-30T21:31:27.411Z" }
-
-[[package]]
-name = "asgiref"
-version = "3.8.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/29/38/b3395cc9ad1b56d2ddac9970bc8f4141312dbaec28bc7c218b0dfafd0f42/asgiref-3.8.1.tar.gz", hash = "sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590", size = 35186, upload-time = "2024-03-22T14:39:36.863Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/39/e3/893e8757be2612e6c266d9bb58ad2e3651524b5b40cf56761e985a28b13e/asgiref-3.8.1-py3-none-any.whl", hash = "sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47", size = 23828, upload-time = "2024-03-22T14:39:34.521Z" },
-]
-
 [[package]]
 name = "asyncpg"
 version = "0.31.0"
@@ -413,61 +286,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" },
 ]
 
-[[package]]
-name = "bitarray"
-version = "3.8.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/95/06/92fdc84448d324ab8434b78e65caf4fb4c6c90b4f8ad9bdd4c8021bfaf1e/bitarray-3.8.0.tar.gz", hash = "sha256:3eae38daffd77c9621ae80c16932eea3fb3a4af141fb7cc724d4ad93eff9210d", size = 151991, upload-time = "2025-11-02T21:41:15.117Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/82/a0/0c41d893eda756315491adfdbf9bc928aee3d377a7f97a8834d453aa5de1/bitarray-3.8.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f2fcbe9b3a5996b417e030aa33a562e7e20dfc86271e53d7e841fc5df16268b8", size = 148575, upload-time = "2025-11-02T21:39:25.718Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0e/30/12ab2f4a4429bd844b419c37877caba93d676d18be71354fbbeb21d9f4cc/bitarray-3.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cd761d158f67e288fd0ebe00c3b158095ce80a4bc7c32b60c7121224003ba70d", size = 145454, upload-time = "2025-11-02T21:39:26.695Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/26/58/314b3e3f219533464e120f0c51ac5123e7b1c1b91f725a4073fb70c5a858/bitarray-3.8.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c394a3f055b49f92626f83c1a0b6d6cd2c628f1ccd72481c3e3c6aa4695f3b20", size = 332949, upload-time = "2025-11-02T21:39:27.801Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/ce/ca8c706bd8341c7a22dd92d2a528af71f7e5f4726085d93f81fd768cb03b/bitarray-3.8.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:969fd67de8c42affdb47b38b80f1eaa79ac0ef17d65407cdd931db1675315af1", size = 360599, upload-time = "2025-11-02T21:39:28.964Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ef/dc/aa181df85f933052d962804906b282acb433cb9318b08ec2aceb4ee34faf/bitarray-3.8.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:99d25aff3745c54e61ab340b98400c52ebec04290a62078155e0d7eb30380220", size = 371972, upload-time = "2025-11-02T21:39:30.228Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ff/d9/b805bfa158c7bcf4df0ac19b1be581b47e1ddb792c11023aed80a7058e78/bitarray-3.8.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e645b4c365d6f1f9e0799380ad6395268f3c3b898244a650aaeb8d9d27b74c35", size = 340303, upload-time = "2025-11-02T21:39:31.342Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1f/42/5308cc97ea929e30727292617a3a88293470166851e13c9e3f16f395da55/bitarray-3.8.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2fa23fdb3beab313950bbb49674e8a161e61449332d3997089fe3944953f1b77", size = 330494, upload-time = "2025-11-02T21:39:32.769Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4c/89/64f1596cb80433323efdbc8dcd0d6e57c40dfbe6ea3341623f34ec397edd/bitarray-3.8.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:165052a0e61c880f7093808a0c524ce1b3555bfa114c0dfb5c809cd07918a60d", size = 358123, upload-time = "2025-11-02T21:39:34.331Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/27/fd/f3d49c5443b57087f888b5e118c8dd78bb7c8e8cfeeed250f8e92128a05f/bitarray-3.8.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:337c8cd46a4c6568d367ed676cbf2d7de16f890bb31dbb54c44c1d6bb6d4a1de", size = 356046, upload-time = "2025-11-02T21:39:35.449Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/aa/db/1fd0b402bd2b47142e958b6930dbb9445235d03fa703c9a24caa6e576ae2/bitarray-3.8.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:21ca6a47bf20db9e7ad74ca04b3d479e4d76109b68333eb23535553d2705339e", size = 336872, upload-time = "2025-11-02T21:39:36.891Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/73/680b47718f1313b4538af479c4732eaca0aeda34d93fc5b869f87932d57d/bitarray-3.8.0-cp312-cp312-win32.whl", hash = "sha256:178c5a4c7fdfb5cd79e372ae7f675390e670f3732e5bc68d327e01a5b3ff8d55", size = 143025, upload-time = "2025-11-02T21:39:38.303Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f8/11/7792587c19c79a8283e8838f44709fa4338a8f7d2a3091dfd81c07ae89c7/bitarray-3.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:75a3b6e9c695a6570ea488db75b84bb592ff70a944957efa1c655867c575018b", size = 149969, upload-time = "2025-11-02T21:39:39.715Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/00/9df64b5d8a84e8e9ec392f6f9ce93f50626a5b301cb6c6b3fe3406454d66/bitarray-3.8.0-cp312-cp312-win_arm64.whl", hash = "sha256:5591daf81313096909d973fb2612fccd87528fdfdd39f6478bdce54543178954", size = 146907, upload-time = "2025-11-02T21:39:40.815Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/3e/35/480364d4baf1e34c79076750914664373f561c58abb5c31c35b3fae613ff/bitarray-3.8.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:18214bac86341f1cc413772e66447d6cca10981e2880b70ecaf4e826c04f95e9", size = 148582, upload-time = "2025-11-02T21:39:42.268Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5e/a8/718b95524c803937f4edbaaf6480f39c80f6ed189d61357b345e8361ffb6/bitarray-3.8.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:01c5f0dc080b0ebb432f7a68ee1e88a76bd34f6d89c9568fcec65fb16ed71f0e", size = 145433, upload-time = "2025-11-02T21:39:43.552Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/03/66/4a10f30dc9e2e01e3b4ecd44a511219f98e63c86b0e0f704c90fac24059b/bitarray-3.8.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:86685fa04067f7175f9718489ae755f6acde03593a1a9ca89305554af40e14fd", size = 332986, upload-time = "2025-11-02T21:39:44.656Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/53/25/4c08774d847f80a1166e4c704b4e0f1c417c0afe6306eae0bc5e70d35faa/bitarray-3.8.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56896ceeffe25946c4010320629e2d858ca763cd8ded273c81672a5edbcb1e0a", size = 360634, upload-time = "2025-11-02T21:39:45.798Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a5/8f/bf8ad26169ebd0b2746d5c7564db734453ca467f8aab87e9d43b0a794383/bitarray-3.8.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:9858dcbc23ba7eaadcd319786b982278a1a2b2020720b19db43e309579ff76fb", size = 371992, upload-time = "2025-11-02T21:39:46.968Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a9/16/ce166754e7c9d10650e02914552fa637cf3b2591f7ed16632bbf6b783312/bitarray-3.8.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:aa7dec53c25f1949513457ef8b0ea1fb40e76c672cc4d2daa8ad3c8d6b73491a", size = 340315, upload-time = "2025-11-02T21:39:48.182Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/de/2a/fbba3a106ddd260e84b9a624f730257c32ba51a8a029565248dfedfdf6f2/bitarray-3.8.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:15a2eff91f54d2b1f573cca8ca6fb58763ce8fea80e7899ab028f3987ef71cd5", size = 330473, upload-time = "2025-11-02T21:39:49.705Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/68/97/56cf3c70196e7307ad32318a9d6ed969dbdc6a4534bbe429112fa7dfe42e/bitarray-3.8.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b1572ee0eb1967e71787af636bb7d1eb9c6735d5337762c450650e7f51844594", size = 358129, upload-time = "2025-11-02T21:39:51.189Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fd/be/afd391a5c0896d3339613321b2f94af853f29afc8bd3fbc327431244c642/bitarray-3.8.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:5bfac7f236ba1a4d402644bdce47fb9db02a7cf3214a1f637d3a88390f9e5428", size = 356005, upload-time = "2025-11-02T21:39:52.355Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ae/08/a8e1a371babba29bad3378bb3a2cdca2b012170711e7fe1f22031a6b7b95/bitarray-3.8.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:f0a55cf02d2cdd739b40ce10c09bbdd520e141217696add7a48b56e67bdfdfe6", size = 336862, upload-time = "2025-11-02T21:39:54.345Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ee/8a/6dc1d0fdc06991c8dc3b1fcfe1ae49fbaced42064cd1b5f24278e73fe05f/bitarray-3.8.0-cp313-cp313-win32.whl", hash = "sha256:a2ba92f59e30ce915e9e79af37649432e3a212ddddf416d4d686b1b4825bcdb2", size = 143018, upload-time = "2025-11-02T21:39:56.361Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2e/72/76e13f5cd23b8b9071747909663ce3b02da24a5e7e22c35146338625db35/bitarray-3.8.0-cp313-cp313-win_amd64.whl", hash = "sha256:1c8f2a5d8006db5a555e06f9437e76bf52537d3dfd130cb8ae2b30866aca32c9", size = 149977, upload-time = "2025-11-02T21:39:57.718Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/01/37/60f336c32336cc3ec03b0c61076f16ea2f05d5371c8a56e802161d218b77/bitarray-3.8.0-cp313-cp313-win_arm64.whl", hash = "sha256:50ddbe3a7b4b6ab96812f5a4d570f401a2cdb95642fd04c062f98939610bbeee", size = 146930, upload-time = "2025-11-02T21:39:59.308Z" },
-]
-
-[[package]]
-name = "bitstring"
-version = "4.3.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "bitarray" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/15/a8/a80c890db75d5bdd5314b5de02c4144c7de94fd0cefcae51acaeb14c6a3f/bitstring-4.3.1.tar.gz", hash = "sha256:a08bc09d3857216d4c0f412a1611056f1cc2b64fd254fb1e8a0afba7cfa1a95a", size = 251426, upload-time = "2025-03-22T09:39:06.978Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/75/2d/174566b533755ddf8efb32a5503af61c756a983de379f8ad3aed6a982d38/bitstring-4.3.1-py3-none-any.whl", hash = "sha256:69d1587f0ac18dc7d93fc7e80d5f447161a33e57027e726dc18a0a8bacf1711a", size = 71930, upload-time = "2025-03-22T09:39:05.163Z" },
-]
-
-[[package]]
-name = "blinker"
-version = "1.9.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/21/28/9b3f50ce0e048515135495f198351908d99540d69bfdc8c1d15b73dc55ce/blinker-1.9.0.tar.gz", hash = "sha256:b4ce2265a7abece45e7cc896e98dbebe6cead56bcf805a3d23136d145f5445bf", size = 22460, upload-time = "2024-11-08T17:25:47.436Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/10/cb/f2ad4230dc2eb1a74edf38f1a38b9b52277f75bef262d8908e60d957e13c/blinker-1.9.0-py3-none-any.whl", hash = "sha256:ba0efaa9080b619ff2f3459d1d500c57bddea4a6b424b60a91141db6fd2f08bc", size = 8458, upload-time = "2024-11-08T17:25:46.184Z" },
-]
-
 [[package]]
 name = "bracex"
 version = "2.6"
@@ -477,44 +295,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9d/2a/9186535ce58db529927f6cf5990a849aa9e052eea3e2cfefe20b9e1802da/bracex-2.6-py3-none-any.whl", hash = "sha256:0b0049264e7340b3ec782b5cb99beb325f36c3782a32e36e876452fd49a09952", size = 11508, upload-time = "2025-06-22T19:12:29.781Z" },
 ]
 
-[[package]]
-name = "brotli"
-version = "1.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2f/c2/f9e977608bdf958650638c3f1e28f85a1b075f075ebbe77db8555463787b/Brotli-1.1.0.tar.gz", hash = "sha256:81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724", size = 7372270, upload-time = "2023-09-07T14:05:41.643Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5c/d0/5373ae13b93fe00095a58efcbce837fd470ca39f703a235d2a999baadfbc/Brotli-1.1.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:32d95b80260d79926f5fab3c41701dbb818fde1c9da590e77e571eefd14abe28", size = 815693, upload-time = "2024-10-18T12:32:23.824Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8e/48/f6e1cdf86751300c288c1459724bfa6917a80e30dbfc326f92cea5d3683a/Brotli-1.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b760c65308ff1e462f65d69c12e4ae085cff3b332d894637f6273a12a482d09f", size = 422489, upload-time = "2024-10-18T12:32:25.641Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/06/88/564958cedce636d0f1bed313381dfc4b4e3d3f6015a63dae6146e1b8c65c/Brotli-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:316cc9b17edf613ac76b1f1f305d2a748f1b976b033b049a6ecdfd5612c70409", size = 873081, upload-time = "2023-09-07T14:03:57.967Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/79/b7026a8bb65da9a6bb7d14329fd2bd48d2b7f86d7329d5cc8ddc6a90526f/Brotli-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:caf9ee9a5775f3111642d33b86237b05808dafcd6268faa492250e9b78046eb2", size = 446244, upload-time = "2023-09-07T14:03:59.319Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e5/18/c18c32ecea41b6c0004e15606e274006366fe19436b6adccc1ae7b2e50c2/Brotli-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:70051525001750221daa10907c77830bc889cb6d865cc0b813d9db7fefc21451", size = 2906505, upload-time = "2023-09-07T14:04:01.327Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/08/c8/69ec0496b1ada7569b62d85893d928e865df29b90736558d6c98c2031208/Brotli-1.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f4bf76817c14aa98cc6697ac02f3972cb8c3da93e9ef16b9c66573a68014f91", size = 2944152, upload-time = "2023-09-07T14:04:03.033Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ab/fb/0517cea182219d6768113a38167ef6d4eb157a033178cc938033a552ed6d/Brotli-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0c5516f0aed654134a2fc936325cc2e642f8a0e096d075209672eb321cff408", size = 2919252, upload-time = "2023-09-07T14:04:04.675Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c7/53/73a3431662e33ae61a5c80b1b9d2d18f58dfa910ae8dd696e57d39f1a2f5/Brotli-1.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6c3020404e0b5eefd7c9485ccf8393cfb75ec38ce75586e046573c9dc29967a0", size = 2845955, upload-time = "2023-09-07T14:04:06.585Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/55/ac/bd280708d9c5ebdbf9de01459e625a3e3803cce0784f47d633562cf40e83/Brotli-1.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:4ed11165dd45ce798d99a136808a794a748d5dc38511303239d4e2363c0695dc", size = 2914304, upload-time = "2023-09-07T14:04:08.668Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/76/58/5c391b41ecfc4527d2cc3350719b02e87cb424ef8ba2023fb662f9bf743c/Brotli-1.1.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:4093c631e96fdd49e0377a9c167bfd75b6d0bad2ace734c6eb20b348bc3ea180", size = 2814452, upload-time = "2023-09-07T14:04:10.736Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c7/4e/91b8256dfe99c407f174924b65a01f5305e303f486cc7a2e8a5d43c8bec3/Brotli-1.1.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e4c4629ddad63006efa0ef968c8e4751c5868ff0b1c5c40f76524e894c50248", size = 2938751, upload-time = "2023-09-07T14:04:12.875Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5a/a6/e2a39a5d3b412938362bbbeba5af904092bf3f95b867b4a3eb856104074e/Brotli-1.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:861bf317735688269936f755fa136a99d1ed526883859f86e41a5d43c61d8966", size = 2933757, upload-time = "2023-09-07T14:04:14.551Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/13/f0/358354786280a509482e0e77c1a5459e439766597d280f28cb097642fc26/Brotli-1.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:87a3044c3a35055527ac75e419dfa9f4f3667a1e887ee80360589eb8c90aabb9", size = 2936146, upload-time = "2024-10-18T12:32:27.257Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/80/f7/daf538c1060d3a88266b80ecc1d1c98b79553b3f117a485653f17070ea2a/Brotli-1.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:c5529b34c1c9d937168297f2c1fde7ebe9ebdd5e121297ff9c043bdb2ae3d6fb", size = 2848055, upload-time = "2024-10-18T12:32:29.376Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ad/cf/0eaa0585c4077d3c2d1edf322d8e97aabf317941d3a72d7b3ad8bce004b0/Brotli-1.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ca63e1890ede90b2e4454f9a65135a4d387a4585ff8282bb72964fab893f2111", size = 3035102, upload-time = "2024-10-18T12:32:31.371Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d8/63/1c1585b2aa554fe6dbce30f0c18bdbc877fa9a1bf5ff17677d9cca0ac122/Brotli-1.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e79e6520141d792237c70bcd7a3b122d00f2613769ae0cb61c52e89fd3443839", size = 2930029, upload-time = "2024-10-18T12:32:33.293Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5f/3b/4e3fd1893eb3bbfef8e5a80d4508bec17a57bb92d586c85c12d28666bb13/Brotli-1.1.0-cp312-cp312-win32.whl", hash = "sha256:5f4d5ea15c9382135076d2fb28dde923352fe02951e66935a9efaac8f10e81b0", size = 333276, upload-time = "2023-09-07T14:04:16.49Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/3d/d5/942051b45a9e883b5b6e98c041698b1eb2012d25e5948c58d6bf85b1bb43/Brotli-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:906bc3a79de8c4ae5b86d3d75a8b77e44404b0f4261714306e3ad248d8ab0951", size = 357255, upload-time = "2023-09-07T14:04:17.83Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0a/9f/fb37bb8ffc52a8da37b1c03c459a8cd55df7a57bdccd8831d500e994a0ca/Brotli-1.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8bf32b98b75c13ec7cf774164172683d6e7891088f6316e54425fde1efc276d5", size = 815681, upload-time = "2024-10-18T12:32:34.942Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/06/b3/dbd332a988586fefb0aa49c779f59f47cae76855c2d00f450364bb574cac/Brotli-1.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7bc37c4d6b87fb1017ea28c9508b36bbcb0c3d18b4260fcdf08b200c74a6aee8", size = 422475, upload-time = "2024-10-18T12:32:36.485Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/bb/80/6aaddc2f63dbcf2d93c2d204e49c11a9ec93a8c7c63261e2b4bd35198283/Brotli-1.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0ef38c7a7014ffac184db9e04debe495d317cc9c6fb10071f7fefd93100a4f", size = 2906173, upload-time = "2024-10-18T12:32:37.978Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/1d/e6ca79c96ff5b641df6097d299347507d39a9604bde8915e76bf026d6c77/Brotli-1.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91d7cc2a76b5567591d12c01f019dd7afce6ba8cba6571187e21e2fc418ae648", size = 2943803, upload-time = "2024-10-18T12:32:39.606Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ac/a3/d98d2472e0130b7dd3acdbb7f390d478123dbf62b7d32bda5c830a96116d/Brotli-1.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a93dde851926f4f2678e704fadeb39e16c35d8baebd5252c9fd94ce8ce68c4a0", size = 2918946, upload-time = "2024-10-18T12:32:41.679Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c4/a5/c69e6d272aee3e1423ed005d8915a7eaa0384c7de503da987f2d224d0721/Brotli-1.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f0db75f47be8b8abc8d9e31bc7aad0547ca26f24a54e6fd10231d623f183d089", size = 2845707, upload-time = "2024-10-18T12:32:43.478Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/9f/4149d38b52725afa39067350696c09526de0125ebfbaab5acc5af28b42ea/Brotli-1.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6967ced6730aed543b8673008b5a391c3b1076d834ca438bbd70635c73775368", size = 2936231, upload-time = "2024-10-18T12:32:45.224Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5a/5a/145de884285611838a16bebfdb060c231c52b8f84dfbe52b852a15780386/Brotli-1.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7eedaa5d036d9336c95915035fb57422054014ebdeb6f3b42eac809928e40d0c", size = 2848157, upload-time = "2024-10-18T12:32:46.894Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/50/ae/408b6bfb8525dadebd3b3dd5b19d631da4f7d46420321db44cd99dcf2f2c/Brotli-1.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d487f5432bf35b60ed625d7e1b448e2dc855422e87469e3f450aa5552b0eb284", size = 3035122, upload-time = "2024-10-18T12:32:48.844Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/af/85/a94e5cfaa0ca449d8f91c3d6f78313ebf919a0dbd55a100c711c6e9655bc/Brotli-1.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:832436e59afb93e1836081a20f324cb185836c617659b07b129141a8426973c7", size = 2930206, upload-time = "2024-10-18T12:32:51.198Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c2/f0/a61d9262cd01351df22e57ad7c34f66794709acab13f34be2675f45bf89d/Brotli-1.1.0-cp313-cp313-win32.whl", hash = "sha256:43395e90523f9c23a3d5bdf004733246fba087f2948f87ab28015f12359ca6a0", size = 333804, upload-time = "2024-10-18T12:32:52.661Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7e/c1/ec214e9c94000d1c1974ec67ced1c970c148aa6b8d8373066123fc3dbf06/Brotli-1.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:9011560a466d2eb3f5a6e4929cf4a09be405c64154e12df0dd72713f6500e32b", size = 358517, upload-time = "2024-10-18T12:32:54.066Z" },
-]
-
 [[package]]
 name = "cachetools"
 version = "6.2.4"
@@ -524,35 +304,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2c/fc/1d7b80d0eb7b714984ce40efc78859c022cd930e402f599d8ca9e39c78a4/cachetools-6.2.4-py3-none-any.whl", hash = "sha256:69a7a52634fed8b8bf6e24a050fb60bff1c9bd8f6d24572b99c32d4e71e62a51", size = 11551, upload-time = "2025-12-15T18:24:52.332Z" },
 ]
 
-[[package]]
-name = "capstone"
-version = "5.0.3"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/27/45/d811f0f3b345c8882b9179f7e310f222ba6af45f0cc729028cbf35c6ce03/capstone-5.0.3.tar.gz", hash = "sha256:1f15616c0528f5268f2dc0a81708483e605ce71961b02a01a791230b51fe862d", size = 2943858, upload-time = "2024-08-20T15:20:08.044Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/cc/40/503cdbc0b38c5b8b5bcad47ae507b70cecbb18365a82470a46f425788061/capstone-5.0.3-py3-none-macosx_10_9_universal2.whl", hash = "sha256:5dc6b5f4d85a2ba2330473529d7b4faccd71470b489fd19a539c20b74f3c9924", size = 2176874, upload-time = "2024-08-20T15:19:44.511Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/60/3f/89f13db42cd24af1c80831b6ac978a8a42ad860a35cc461ec009c281e8f3/capstone-5.0.3-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:5917b00ddb0b3a665bcb7a623ee08bcaf4ddec783c5d2ca69f72278d6de38d2c", size = 1180331, upload-time = "2024-08-20T15:19:46.149Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/36/79/ddc8a36238791e58ec31a13c10887447b56819d934ab00d6e1371a2e94f1/capstone-5.0.3-py3-none-macosx_11_0_arm64.whl", hash = "sha256:76658b66a5f0275c942cd4daf35dca7520387689f588f127020c9130d76c4ddf", size = 1192365, upload-time = "2024-08-20T15:19:47.535Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/22/bc/39d69c65b7d58157d0c3acad9b929a3f0852c84e44b0e25b6fb89a9e1a7d/capstone-5.0.3-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:237fef7e20906bad09286554c7f8a5a744adeec4d658c5e33938bf9241b5f076", size = 2829855, upload-time = "2024-08-20T15:19:49.353Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/24/f4/ae2d072d39664b7c32da9c8877f7d204692565f7c844da10e70c47730191/capstone-5.0.3-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a6b7f3ec2346a60475d9d043b437ace5e6688fc9c4d45387476104bd2c231040", size = 2921407, upload-time = "2024-08-20T15:19:51.186Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7f/1b/1b200d7a32de3b2bf61ee0316385aa566d698d20af99d8e2e00e5ec4b144/capstone-5.0.3-py3-none-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f25e23052d5fa5b6709f7111d7f1250131fb5dac878b8249a4637e6ab953129", size = 2941774, upload-time = "2024-08-20T15:19:53.736Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d8/82/dd45915b0de636ef949b9d56bd529ae52987d74db1c2d2b7feb4dee322f6/capstone-5.0.3-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:aebb35f0cfb808aac24d2e3c745be43bcedbb863ecb0192d720faa8002983544", size = 2840714, upload-time = "2024-08-20T15:19:59.593Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6b/e0/d3b617dd552a802760d63e29392c217266505f531c799f4b4cf3e9906eef/capstone-5.0.3-py3-none-musllinux_1_2_i686.whl", hash = "sha256:8d45fdf4ae11197234eedbd81742bd4650924f9bb3abee0b238ea63dad8001cc", size = 2937106, upload-time = "2024-08-20T15:20:02.066Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/00/88/3459e1124a7c1bdc02fa2870ffeecdd0fa2be2b4b3382732cd3e3b2e92f2/capstone-5.0.3-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:63e8544d7500b889a5feb6f7c9a939723663107dd3360ad18f36a3f6985cfd26", size = 2895850, upload-time = "2024-08-20T15:20:04.166Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/35/29/f751bb52b73b0a2e6414ad4e9271fa0cba966e747c1f3351a9c46e9f1ca7/capstone-5.0.3-py3-none-win_amd64.whl", hash = "sha256:21d00dce9dc204a22126fe6f45a8894d03a6607182bc86f14fc9bd1d1d3897ed", size = 1270430, upload-time = "2024-08-20T15:20:06.092Z" },
-]
-
-[[package]]
-name = "cart"
-version = "1.2.3"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "pycryptodome" },
-]
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/de/38/9180e61177d57840a6431784f26a291dc01d8fa32f3a58087919e27c95cd/cart-1.2.3-py2.py3-none-any.whl", hash = "sha256:32a1f16a5b521e077a540b98942e74d3ae04fba58be3c658f7b7c14dcef1a53f", size = 10449, upload-time = "2025-02-10T17:14:42.402Z" },
-]
-
 [[package]]
 name = "certifi"
 version = "2025.11.12"
@@ -656,42 +407,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0a/4c/925909008ed5a988ccbb72dcc897407e5d6d3bd72410d69e051fc0c14647/charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f", size = 53402, upload-time = "2025-10-14T04:42:31.76Z" },
 ]
 
-[[package]]
-name = "claripy"
-version = "9.2.191"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "cachetools" },
-    { name = "typing-extensions" },
-    { name = "z3-solver" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fd/e3/0eb13ac36149adf962a8e87f96a2e6aaa73a26486375c84d0755361adf4e/claripy-9.2.191.tar.gz", hash = "sha256:34151964784e884f6f1474be62e7e263f9952bb5b55fc53c6174cd1a0d551252", size = 147144, upload-time = "2025-12-30T17:44:28.253Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6c/00/d8e47b281dc75c0ac6e1cfbe32913e4d3bbd617f494dd080be2502a5bbbf/claripy-9.2.191-py3-none-any.whl", hash = "sha256:159d98d761c900f605e4491ac92681161347fe7b2c901d75da7db9d5d2246d63", size = 141513, upload-time = "2025-12-30T17:43:30.493Z" },
-]
-
-[[package]]
-name = "cle"
-version = "9.2.191"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "archinfo" },
-    { name = "arpy" },
-    { name = "cart" },
-    { name = "minidump" },
-    { name = "pefile" },
-    { name = "pyelftools" },
-    { name = "pyvex" },
-    { name = "pyxbe" },
-    { name = "pyxdia" },
-    { name = "sortedcontainers" },
-    { name = "uefi-firmware" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b9/08/114d1375d30da242fb37d07cd9bbd7845219ce68f68f9bd9045122981bed/cle-9.2.191.tar.gz", hash = "sha256:f0cf9b46b663292c944f8a0bc9d61cc88b0c31a52381d839f11ea16dec0195ee", size = 199791, upload-time = "2025-12-30T17:44:29.553Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1f/b2/0469ca9b121f71d64e43b1dcb348099dcc71f6061ab87f22314f02b00cf2/cle-9.2.191-py3-none-any.whl", hash = "sha256:d82a46a102b162b803e0a07fd00ea725335f03c2773b4b4ba6c6f5c8f4832751", size = 204019, upload-time = "2025-12-30T17:43:31.745Z" },
-]
-
 [[package]]
 name = "click"
 version = "8.3.1"
@@ -805,15 +520,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c9/ad/51f212198681ea7b0deaaf8846ee10af99fba4e894f67b353524eab2bbe5/cryptography-44.0.3-cp39-abi3-win_amd64.whl", hash = "sha256:5d186f32e52e66994dce4f766884bcb9c68b8da62d61d9d215bfe5fb56d21334", size = 3210375, upload-time = "2025-05-02T19:35:35.369Z" },
 ]
 
-[[package]]
-name = "cxxheaderparser"
-version = "1.6.2"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/71/88/bcb6400315da0df5f18197a285863d7da99bfec02a46c91df95a225df18f/cxxheaderparser-1.6.2.tar.gz", hash = "sha256:4574f09908609a7bf5d93841fae6e677b803e9708f564ae599382c1f0e18c7ed", size = 52562, upload-time = "2025-12-16T05:02:14.048Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/98/3b/ef8c9839b958b853f9a081de7a2a8c48c4f73b00269cf1048e009727c032/cxxheaderparser-1.6.2-py3-none-any.whl", hash = "sha256:92aae2b45cb96e4bb5b4be392cca73afef439f06d612c5da3a9cab6d7a13e4ae", size = 58935, upload-time = "2025-12-16T05:02:12.433Z" },
-]
-
 [[package]]
 name = "cyclopts"
 version = "4.4.3"
@@ -1117,22 +823,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" },
 ]
 
-[[package]]
-name = "flask"
-version = "3.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "blinker" },
-    { name = "click" },
-    { name = "itsdangerous" },
-    { name = "jinja2" },
-    { name = "werkzeug" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/89/50/dff6380f1c7f84135484e176e0cac8690af72fa90e932ad2a0a60e28c69b/flask-3.1.0.tar.gz", hash = "sha256:5f873c5184c897c8d9d1b05df1e3d01b14910ce69607a117bd3277098a5836ac", size = 680824, upload-time = "2024-11-13T18:24:38.127Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/af/47/93213ee66ef8fae3b93b3e29206f6b251e65c97bd91d8e1c5596ef15af0a/flask-3.1.0-py3-none-any.whl", hash = "sha256:d667207822eb83f1c4b50949b1623c8fc8d51f2341d65f72e1a1815397551136", size = 102979, upload-time = "2024-11-13T18:24:36.135Z" },
-]
-
 [[package]]
 name = "frozenlist"
 version = "1.8.0"
@@ -1190,39 +880,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/9a/e35b4a917281c0b8419d4207f4334c8e8c5dbf4f3f5f9ada73958d937dcc/frozenlist-1.8.0-py3-none-any.whl", hash = "sha256:0c18a16eab41e82c295618a77502e17b195883241c563b00f0aa5106fc4eaa0d", size = 13409, upload-time = "2025-10-06T05:38:16.721Z" },
 ]
 
-[[package]]
-name = "future"
-version = "1.0.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a7/b2/4140c69c6a66432916b26158687e821ba631a4c9273c474343badf84d3ba/future-1.0.0.tar.gz", hash = "sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05", size = 1228490, upload-time = "2024-02-21T11:52:38.461Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/da/71/ae30dadffc90b9006d77af76b393cb9dfbfc9629f339fc1574a1c52e6806/future-1.0.0-py3-none-any.whl", hash = "sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216", size = 491326, upload-time = "2024-02-21T11:52:35.956Z" },
-]
-
-[[package]]
-name = "gitdb"
-version = "4.0.12"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "smmap" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/72/94/63b0fc47eb32792c7ba1fe1b694daec9a63620db1e313033d18140c2320a/gitdb-4.0.12.tar.gz", hash = "sha256:5ef71f855d191a3326fcfbc0d5da835f26b13fbcba60c32c21091c349ffdb571", size = 394684, upload-time = "2025-01-02T07:20:46.413Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a0/61/5c78b91c3143ed5c14207f463aecfc8f9dbb5092fb2869baf37c273b2705/gitdb-4.0.12-py3-none-any.whl", hash = "sha256:67073e15955400952c6565cc3e707c554a4eea2e428946f7a4c162fab9bd9bcf", size = 62794, upload-time = "2025-01-02T07:20:43.624Z" },
-]
-
-[[package]]
-name = "gitpython"
-version = "3.1.45"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "gitdb" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/c8/dd58967d119baab745caec2f9d853297cec1989ec1d63f677d3880632b88/gitpython-3.1.45.tar.gz", hash = "sha256:85b0ee964ceddf211c41b9f27a49086010a190fd8132a24e21f362a4b36a791c", size = 215076, upload-time = "2025-07-24T03:45:54.871Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/01/61/d4b89fec821f72385526e1b9d9a3a0385dda4a72b206d28049e2c7cd39b8/gitpython-3.1.45-py3-none-any.whl", hash = "sha256:8908cb2e02fb3b93b7eb0f2827125cb699869470432cc885f019b8fd0fccff77", size = 208168, upload-time = "2025-07-24T03:45:52.517Z" },
-]
-
 [[package]]
 name = "google-auth"
 version = "2.45.0"
@@ -1464,15 +1121,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
 ]
 
-[[package]]
-name = "itsdangerous"
-version = "2.2.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9c/cb/8ac0172223afbccb63986cc25049b154ecfb5e85932587206f42317be31d/itsdangerous-2.2.0.tar.gz", hash = "sha256:e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173", size = 54410, upload-time = "2024-04-16T21:28:15.614Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/04/96/92447566d16df59b2a776c0fb82dbc4d9e07cd95062562af01e408583fc4/itsdangerous-2.2.0-py3-none-any.whl", hash = "sha256:c6242fc49e35958c8b15141343aa660db5fc54d4f13a1db01a3f5891b98700ef", size = 16234, upload-time = "2024-04-16T21:28:14.499Z" },
-]
-
 [[package]]
 name = "jaraco-classes"
 version = "3.4.0"
@@ -1579,10 +1227,8 @@ dependencies = [
     { name = "aiohttp" },
     { name = "aiosmtplib" },
     { name = "alembic" },
-    { name = "angr" },
     { name = "asyncpg" },
     { name = "bcrypt" },
-    { name = "beautifulsoup4" },
     { name = "deepagents" },
     { name = "docker" },
     { name = "email-validator" },
@@ -1602,7 +1248,8 @@ dependencies = [
     { name = "loguru" },
     { name = "markdownify" },
     { name = "mcp" },
-    { name = "mitmproxy" },
+    { name = "opentelemetry-api" },
+    { name = "opentelemetry-sdk" },
     { name = "orjson" },
     { name = "passlib", extra = ["bcrypt"] },
     { name = "psutil" },
@@ -1618,7 +1265,6 @@ dependencies = [
     { name = "redis" },
     { name = "requests" },
     { name = "rich" },
-    { name = "selenium" },
     { name = "semver" },
     { name = "sqlalchemy" },
     { name = "sse-starlette" },
@@ -1645,6 +1291,7 @@ dev = [
 dev = [
     { name = "mypy" },
     { name = "pre-commit" },
+    { name = "pyright" },
     { name = "pytest" },
     { name = "pytest-asyncio" },
     { name = "ruff" },
@@ -1658,10 +1305,8 @@ requires-dist = [
     { name = "aiohttp", specifier = ">=3.13.2" },
     { name = "aiosmtplib", specifier = ">=3.0.0" },
     { name = "alembic", specifier = ">=1.14.0" },
-    { name = "angr", specifier = ">=9.2.182" },
     { name = "asyncpg", specifier = ">=0.30.0" },
     { name = "bcrypt", specifier = ">=5.0.0" },
-    { name = "beautifulsoup4", specifier = ">=4.14.2" },
     { name = "deepagents", specifier = ">=0.4.0" },
     { name = "docker", specifier = ">=7.1.0" },
     { name = "email-validator", specifier = ">=2.0.0" },
@@ -1682,8 +1327,9 @@ requires-dist = [
     { name = "loguru", specifier = ">=0.7.3" },
     { name = "markdownify", specifier = ">=0.11.6" },
     { name = "mcp", specifier = ">=1.20.0" },
-    { name = "mitmproxy", specifier = ">=11.1.3" },
     { name = "mypy", marker = "extra == 'dev'", specifier = ">=1.13.0" },
+    { name = "opentelemetry-api", specifier = ">=1.25.0" },
+    { name = "opentelemetry-sdk", specifier = ">=1.25.0" },
     { name = "orjson", specifier = ">=3.10.0" },
     { name = "passlib", extras = ["bcrypt"], specifier = ">=1.7.4" },
     { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=4.0.0" },
@@ -1704,7 +1350,6 @@ requires-dist = [
     { name = "requests", specifier = ">=2.32.5" },
     { name = "rich", specifier = ">=13.7.0" },
     { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.8.0" },
-    { name = "selenium", specifier = ">=4.38.0" },
     { name = "semver", specifier = ">=3.0.4" },
     { name = "sqlalchemy", specifier = ">=2.0.44" },
     { name = "sse-starlette", specifier = ">=2.0.0" },
@@ -1721,6 +1366,7 @@ provides-extras = ["dev"]
 dev = [
     { name = "mypy", specifier = ">=1.13.0" },
     { name = "pre-commit", specifier = ">=4.0.0" },
+    { name = "pyright", specifier = ">=1.1.409" },
     { name = "pytest", specifier = ">=8.0.0" },
     { name = "pytest-asyncio", specifier = ">=0.24.0" },
     { name = "ruff", specifier = ">=0.8.0" },
@@ -1791,15 +1437,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" },
 ]
 
-[[package]]
-name = "kaitaistruct"
-version = "0.10"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/54/04/dd60b9cb65d580ef6cb6eaee975ad1bdd22d46a3f51b07a1e0606710ea88/kaitaistruct-0.10.tar.gz", hash = "sha256:a044dee29173d6afbacf27bcac39daf89b654dd418cfa009ab82d9178a9ae52a", size = 7061, upload-time = "2022-07-09T00:34:06.729Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4e/bf/88ad23efc08708bda9a2647169828e3553bb2093a473801db61f75356395/kaitaistruct-0.10-py2.py3-none-any.whl", hash = "sha256:a97350919adbf37fda881f75e9365e2fb88d04832b7a4e57106ec70119efb235", size = 7013, upload-time = "2022-07-09T00:34:03.905Z" },
-]
-
 [[package]]
 name = "keyring"
 version = "25.7.0"
@@ -2018,18 +1655,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ed/d8/91a8b483b30e0708a8911df10b4ce04ebf2b4b8dde8d020c124aec77380a/langsmith-0.5.2-py3-none-any.whl", hash = "sha256:42f8b853a18dd4d5f7fa38c8ff29e38da065a727022da410d91b3e13819aacc1", size = 283311, upload-time = "2025-12-30T13:41:33.915Z" },
 ]
 
-[[package]]
-name = "ldap3"
-version = "2.9.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "pyasn1" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/43/ac/96bd5464e3edbc61595d0d69989f5d9969ae411866427b2500a8e5b812c0/ldap3-2.9.1.tar.gz", hash = "sha256:f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f", size = 398830, upload-time = "2021-07-18T06:34:21.786Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4e/f6/71d6ec9f18da0b2201287ce9db6afb1a1f637dedb3f0703409558981c723/ldap3-2.9.1-py2.py3-none-any.whl", hash = "sha256:5869596fc4948797020d3f03b7939da938778a0f9e2009f7a072ccf92b8e8d70", size = 432192, upload-time = "2021-07-18T06:34:12.905Z" },
-]
-
 [[package]]
 name = "librt"
 version = "0.7.5"
@@ -2215,96 +1840,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
 ]
 
-[[package]]
-name = "minidump"
-version = "0.0.24"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/26/4b/bc695b99dc7d77d28223765c3ee5a31d34fd2850c52eb683ccdd1206067d/minidump-0.0.24.tar.gz", hash = "sha256:f7ae09b944f3b17ccf5cecc66f9ff5a7a45b053474a13aeb012f4c9204470437", size = 60709, upload-time = "2024-08-15T14:54:22.728Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/da/8b/3a148750e6d65f4fe6e249f6d0d6c497eeadd867a63ed69cee3fa17e7c83/minidump-0.0.24-py3-none-any.whl", hash = "sha256:9c016e35c8fe37c82a01b0a266f5416a0b0138934d92affb436ac2e72372bec6", size = 78365, upload-time = "2024-08-15T14:54:21.124Z" },
-]
-
-[[package]]
-name = "mitmproxy"
-version = "11.1.3"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "aioquic" },
-    { name = "argon2-cffi" },
-    { name = "asgiref" },
-    { name = "brotli" },
-    { name = "certifi" },
-    { name = "cryptography" },
-    { name = "flask" },
-    { name = "h11" },
-    { name = "h2" },
-    { name = "hyperframe" },
-    { name = "kaitaistruct" },
-    { name = "ldap3" },
-    { name = "mitmproxy-rs" },
-    { name = "msgpack" },
-    { name = "passlib" },
-    { name = "publicsuffix2" },
-    { name = "pydivert", marker = "sys_platform == 'win32'" },
-    { name = "pyopenssl" },
-    { name = "pyparsing" },
-    { name = "pyperclip" },
-    { name = "ruamel-yaml" },
-    { name = "sortedcontainers" },
-    { name = "tornado" },
-    { name = "urwid" },
-    { name = "wsproto" },
-    { name = "zstandard" },
-]
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/14/07/0a8528ea8d4e08a7cf19bf41158d3fcd0baad3686059ae54ee2d647d81db/mitmproxy-11.1.3-py3-none-any.whl", hash = "sha256:2305880b46465d1a9bdcdac369655826f588d05f382b082249a3e532a0e52952", size = 1662554, upload-time = "2025-02-17T12:10:28.138Z" },
-]
-
-[[package]]
-name = "mitmproxy-linux"
-version = "0.11.5"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c1/81/aebf603418ad01c70d2944e45f646889693cedd89c2993a2c4e3dc975b07/mitmproxy_linux-0.11.5.tar.gz", hash = "sha256:ee3782fe4e7ccc6a899fa0ef5ad3e35a3ec358587304bd4d212188d2462c8f82", size = 1285776, upload-time = "2025-02-17T11:54:42.132Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/81/ed/f864f39e733f6ecaaddf894c0f295983a6b5b09055d00a659eb08001b0d1/mitmproxy_linux-0.11.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7ce0b91d7a510009d532e6abbebe59f027a011fa745b13faa5b4d9ebe92abf5", size = 962015, upload-time = "2025-02-17T11:54:24.592Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/05/0c/5cc04ac3b7bb21b464d1109745ddfbdefc478ca0501b6cb5f7a91edd8516/mitmproxy_linux-0.11.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e6a31faf244a9e3d44db02e3e3301aa2e699da67188820982a93028884f4cba8", size = 1040306, upload-time = "2025-02-17T11:54:26.199Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/25/f8/25d0483cd26fd6488c7fc16f0f8797ec19104863bff6bb3ee7dc56995b69/mitmproxy_linux-0.11.5-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:544be1db84575fc8ecc71fb566032cabe4a65a4891d5bd0dc688e3023b49a18a", size = 962015, upload-time = "2025-02-17T11:54:28.547Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/80/12/6a9f189f7aa0b8dfb1c2017b41f2fdb43d64b32e30d1f5fa7e6aeb69c218/mitmproxy_linux-0.11.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00a40d08a1522d5718e9ff87458a950f06f62e5374d154d851122c0eb41c5dc0", size = 1040306, upload-time = "2025-02-17T11:54:30.611Z" },
-]
-
-[[package]]
-name = "mitmproxy-macos"
-version = "0.11.5"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9d/e5/060bb75c98120f5a2fc0cde20f376cc947e5b8474cb2d8ebabade69fbf8f/mitmproxy_macos-0.11.5-py3-none-any.whl", hash = "sha256:8f7aaa646acc64ba4790a7f4d46cb9fbfd7cb0411b9b7a567db0404864bff28d", size = 2658276, upload-time = "2025-02-17T11:54:31.833Z" },
-]
-
-[[package]]
-name = "mitmproxy-rs"
-version = "0.11.5"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "mitmproxy-linux", marker = "sys_platform == 'linux'" },
-    { name = "mitmproxy-macos", marker = "sys_platform == 'darwin'" },
-    { name = "mitmproxy-windows", marker = "os_name == 'nt'" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/06/fc/a944a0efa89606efde1f8d8acfd763b69b8d13d5d84d8f8ea79939682204/mitmproxy_rs-0.11.5.tar.gz", hash = "sha256:05f0da03165c2ee2803f91e6648bc9409692f42d796cbaf3fec5a20754ca8c39", size = 1296760, upload-time = "2025-02-17T11:54:43.933Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/63/18/91a37552505b5e1baea555425f8ab30694cf6e16a34e2a528e0ae70ca6b1/mitmproxy_rs-0.11.5-cp310-abi3-macosx_10_12_x86_64.macosx_11_0_arm64.macosx_10_12_universal2.whl", hash = "sha256:2f668dc92573cc3c3ba8c75b166276d846ce7321daf37f4a68bd837538298c5c", size = 3811905, upload-time = "2025-02-17T11:54:34.21Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/97/a2/aa81e54a27572b4d9503e79e9999019fdf4c1e1f2a7b8a083a7fa01f7bd6/mitmproxy_rs-0.11.5-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:971241cb70bad87b55f12bc6e8d7dd3efd02a1acbe1730703e2cfeeb6edd3908", size = 1512445, upload-time = "2025-02-17T11:54:35.766Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/29/34/430966c7a5dc998dec4e9f73d5628b2ccadaf73c26697020ad87e5183e16/mitmproxy_rs-0.11.5-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a4ffe6d20b3a0edb47b40cd60e7b62709c29e8adf2573514cc0abd1442acf63", size = 1605733, upload-time = "2025-02-17T11:54:37Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/13/a7/43999d162b44b5848c0d663790027711927bded4b506a01f3f36d386d57f/mitmproxy_rs-0.11.5-cp310-abi3-win_amd64.whl", hash = "sha256:5353ad0c828aaa37ac53511f3960e39c0888848565f5faa3ea09e205ed8a7350", size = 1539652, upload-time = "2025-02-17T11:54:38.531Z" },
-]
-
-[[package]]
-name = "mitmproxy-windows"
-version = "0.11.5"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7f/4e/65804c55c0457e87c33e94b3c92421e4519337dd17a747795ef9c507da95/mitmproxy_windows-0.11.5-py3-none-any.whl", hash = "sha256:76035ddf3067b07a2200e286a9fdb3d447cd4a9755dca1d5cb06935947b52592", size = 480403, upload-time = "2025-02-17T11:54:40.204Z" },
-]
-
 [[package]]
 name = "more-itertools"
 version = "10.8.0"
@@ -2314,75 +1849,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a4/8e/469e5a4a2f5855992e425f3cb33804cc07bf18d48f2db061aec61ce50270/more_itertools-10.8.0-py3-none-any.whl", hash = "sha256:52d4362373dcf7c52546bc4af9a86ee7c4579df9a8dc268be0a2f949d376cc9b", size = 69667, upload-time = "2025-09-02T15:23:09.635Z" },
 ]
 
-[[package]]
-name = "mpmath"
-version = "1.3.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e0/47/dd32fa426cc72114383ac549964eecb20ecfd886d1e5ccf5340b55b02f57/mpmath-1.3.0.tar.gz", hash = "sha256:7a28eb2a9774d00c7bc92411c19a89209d5da7c4c9a9e227be8330a23a25b91f", size = 508106, upload-time = "2023-03-07T16:47:11.061Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/43/e3/7d92a15f894aa0c9c4b49b8ee9ac9850d6e63b03c9c32c0367a13ae62209/mpmath-1.3.0-py3-none-any.whl", hash = "sha256:a0b2b9fe80bbcd81a6647ff13108738cfb482d481d826cc0e02f5b35e5c88d2c", size = 536198, upload-time = "2023-03-07T16:47:09.197Z" },
-]
-
-[[package]]
-name = "msgpack"
-version = "1.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/cb/d0/7555686ae7ff5731205df1012ede15dd9d927f6227ea151e901c7406af4f/msgpack-1.1.0.tar.gz", hash = "sha256:dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e", size = 167260, upload-time = "2024-09-10T04:25:52.197Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e1/d6/716b7ca1dbde63290d2973d22bbef1b5032ca634c3ff4384a958ec3f093a/msgpack-1.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:d46cf9e3705ea9485687aa4001a76e44748b609d260af21c4ceea7f2212a501d", size = 152421, upload-time = "2024-09-10T04:25:49.63Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/70/da/5312b067f6773429cec2f8f08b021c06af416bba340c912c2ec778539ed6/msgpack-1.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5dbad74103df937e1325cc4bfeaf57713be0b4f15e1c2da43ccdd836393e2ea2", size = 85277, upload-time = "2024-09-10T04:24:48.562Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/28/51/da7f3ae4462e8bb98af0d5bdf2707f1b8c65a0d4f496e46b6afb06cbc286/msgpack-1.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:58dfc47f8b102da61e8949708b3eafc3504509a5728f8b4ddef84bd9e16ad420", size = 82222, upload-time = "2024-09-10T04:25:36.49Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/33/af/dc95c4b2a49cff17ce47611ca9ba218198806cad7796c0b01d1e332c86bb/msgpack-1.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4676e5be1b472909b2ee6356ff425ebedf5142427842aa06b4dfd5117d1ca8a2", size = 392971, upload-time = "2024-09-10T04:24:58.129Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f1/54/65af8de681fa8255402c80eda2a501ba467921d5a7a028c9c22a2c2eedb5/msgpack-1.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17fb65dd0bec285907f68b15734a993ad3fc94332b5bb21b0435846228de1f39", size = 401403, upload-time = "2024-09-10T04:25:40.428Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/97/8c/e333690777bd33919ab7024269dc3c41c76ef5137b211d776fbb404bfead/msgpack-1.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a51abd48c6d8ac89e0cfd4fe177c61481aca2d5e7ba42044fd218cfd8ea9899f", size = 385356, upload-time = "2024-09-10T04:25:31.406Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/57/52/406795ba478dc1c890559dd4e89280fa86506608a28ccf3a72fbf45df9f5/msgpack-1.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2137773500afa5494a61b1208619e3871f75f27b03bcfca7b3a7023284140247", size = 383028, upload-time = "2024-09-10T04:25:17.08Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e7/69/053b6549bf90a3acadcd8232eae03e2fefc87f066a5b9fbb37e2e608859f/msgpack-1.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:398b713459fea610861c8a7b62a6fec1882759f308ae0795b5413ff6a160cf3c", size = 391100, upload-time = "2024-09-10T04:25:08.993Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/23/f0/d4101d4da054f04274995ddc4086c2715d9b93111eb9ed49686c0f7ccc8a/msgpack-1.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:06f5fd2f6bb2a7914922d935d3b8bb4a7fff3a9a91cfce6d06c13bc42bec975b", size = 394254, upload-time = "2024-09-10T04:25:06.048Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1c/12/cf07458f35d0d775ff3a2dc5559fa2e1fcd06c46f1ef510e594ebefdca01/msgpack-1.1.0-cp312-cp312-win32.whl", hash = "sha256:ad33e8400e4ec17ba782f7b9cf868977d867ed784a1f5f2ab46e7ba53b6e1e1b", size = 69085, upload-time = "2024-09-10T04:25:01.494Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/73/80/2708a4641f7d553a63bc934a3eb7214806b5b39d200133ca7f7afb0a53e8/msgpack-1.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:115a7af8ee9e8cddc10f87636767857e7e3717b7a2e97379dc2054712693e90f", size = 75347, upload-time = "2024-09-10T04:25:33.106Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c8/b0/380f5f639543a4ac413e969109978feb1f3c66e931068f91ab6ab0f8be00/msgpack-1.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:071603e2f0771c45ad9bc65719291c568d4edf120b44eb36324dcb02a13bfddf", size = 151142, upload-time = "2024-09-10T04:24:59.656Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c8/ee/be57e9702400a6cb2606883d55b05784fada898dfc7fd12608ab1fdb054e/msgpack-1.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0f92a83b84e7c0749e3f12821949d79485971f087604178026085f60ce109330", size = 84523, upload-time = "2024-09-10T04:25:37.924Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7e/3a/2919f63acca3c119565449681ad08a2f84b2171ddfcff1dba6959db2cceb/msgpack-1.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4a1964df7b81285d00a84da4e70cb1383f2e665e0f1f2a7027e683956d04b734", size = 81556, upload-time = "2024-09-10T04:24:28.296Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7c/43/a11113d9e5c1498c145a8925768ea2d5fce7cbab15c99cda655aa09947ed/msgpack-1.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:59caf6a4ed0d164055ccff8fe31eddc0ebc07cf7326a2aaa0dbf7a4001cd823e", size = 392105, upload-time = "2024-09-10T04:25:20.153Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2d/7b/2c1d74ca6c94f70a1add74a8393a0138172207dc5de6fc6269483519d048/msgpack-1.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0907e1a7119b337971a689153665764adc34e89175f9a34793307d9def08e6ca", size = 399979, upload-time = "2024-09-10T04:25:41.75Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/82/8c/cf64ae518c7b8efc763ca1f1348a96f0e37150061e777a8ea5430b413a74/msgpack-1.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:65553c9b6da8166e819a6aa90ad15288599b340f91d18f60b2061f402b9a4915", size = 383816, upload-time = "2024-09-10T04:24:45.826Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/69/86/a847ef7a0f5ef3fa94ae20f52a4cacf596a4e4a010197fbcc27744eb9a83/msgpack-1.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7a946a8992941fea80ed4beae6bff74ffd7ee129a90b4dd5cf9c476a30e9708d", size = 380973, upload-time = "2024-09-10T04:25:04.689Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/aa/90/c74cf6e1126faa93185d3b830ee97246ecc4fe12cf9d2d31318ee4246994/msgpack-1.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:4b51405e36e075193bc051315dbf29168d6141ae2500ba8cd80a522964e31434", size = 387435, upload-time = "2024-09-10T04:24:17.879Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7a/40/631c238f1f338eb09f4acb0f34ab5862c4e9d7eda11c1b685471a4c5ea37/msgpack-1.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:b4c01941fd2ff87c2a934ee6055bda4ed353a7846b8d4f341c428109e9fcde8c", size = 399082, upload-time = "2024-09-10T04:25:18.398Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e9/1b/fa8a952be252a1555ed39f97c06778e3aeb9123aa4cccc0fd2acd0b4e315/msgpack-1.1.0-cp313-cp313-win32.whl", hash = "sha256:7c9a35ce2c2573bada929e0b7b3576de647b0defbd25f5139dcdaba0ae35a4cc", size = 69037, upload-time = "2024-09-10T04:24:52.798Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b6/bc/8bd826dd03e022153bfa1766dcdec4976d6c818865ed54223d71f07862b3/msgpack-1.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:bce7d9e614a04d0883af0b3d4d501171fbfca038f12c77fa838d9f198147a23f", size = 75140, upload-time = "2024-09-10T04:24:31.288Z" },
-]
-
-[[package]]
-name = "msgspec"
-version = "0.20.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/9c/bfbd12955a49180cbd234c5d29ec6f74fe641698f0cd9df154a854fc8a15/msgspec-0.20.0.tar.gz", hash = "sha256:692349e588fde322875f8d3025ac01689fead5901e7fb18d6870a44519d62a29", size = 317862, upload-time = "2025-11-24T03:56:28.934Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d9/6f/1e25eee957e58e3afb2a44b94fa95e06cebc4c236193ed0de3012fff1e19/msgspec-0.20.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2aba22e2e302e9231e85edc24f27ba1f524d43c223ef5765bd8624c7df9ec0a5", size = 196391, upload-time = "2025-11-24T03:55:32.677Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7f/ee/af51d090ada641d4b264992a486435ba3ef5b5634bc27e6eb002f71cef7d/msgspec-0.20.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:716284f898ab2547fedd72a93bb940375de9fbfe77538f05779632dc34afdfde", size = 188644, upload-time = "2025-11-24T03:55:33.934Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/49/d6/9709ee093b7742362c2934bfb1bbe791a1e09bed3ea5d8a18ce552fbfd73/msgspec-0.20.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:558ed73315efa51b1538fa8f1d3b22c8c5ff6d9a2a62eff87d25829b94fc5054", size = 218852, upload-time = "2025-11-24T03:55:35.575Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5c/a2/488517a43ccf5a4b6b6eca6dd4ede0bd82b043d1539dd6bb908a19f8efd3/msgspec-0.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:509ac1362a1d53aa66798c9b9fd76872d7faa30fcf89b2fba3bcbfd559d56eb0", size = 224937, upload-time = "2025-11-24T03:55:36.859Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d5/e8/49b832808aa23b85d4f090d1d2e48a4e3834871415031ed7c5fe48723156/msgspec-0.20.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1353c2c93423602e7dea1aa4c92f3391fdfc25ff40e0bacf81d34dbc68adb870", size = 222858, upload-time = "2025-11-24T03:55:38.187Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9f/56/1dc2fa53685dca9c3f243a6cbecd34e856858354e455b77f47ebd76cf5bf/msgspec-0.20.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cb33b5eb5adb3c33d749684471c6a165468395d7aa02d8867c15103b81e1da3e", size = 227248, upload-time = "2025-11-24T03:55:39.496Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5a/51/aba940212c23b32eedce752896205912c2668472ed5b205fc33da28a6509/msgspec-0.20.0-cp312-cp312-win_amd64.whl", hash = "sha256:fb1d934e435dd3a2b8cf4bbf47a8757100b4a1cfdc2afdf227541199885cdacb", size = 190024, upload-time = "2025-11-24T03:55:40.829Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/41/ad/3b9f259d94f183daa9764fef33fdc7010f7ecffc29af977044fa47440a83/msgspec-0.20.0-cp312-cp312-win_arm64.whl", hash = "sha256:00648b1e19cf01b2be45444ba9dc961bd4c056ffb15706651e64e5d6ec6197b7", size = 175390, upload-time = "2025-11-24T03:55:42.05Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8a/d1/b902d38b6e5ba3bdddbec469bba388d647f960aeed7b5b3623a8debe8a76/msgspec-0.20.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:9c1ff8db03be7598b50dd4b4a478d6fe93faae3bd54f4f17aa004d0e46c14c46", size = 196463, upload-time = "2025-11-24T03:55:43.405Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/57/b6/eff0305961a1d9447ec2b02f8c73c8946f22564d302a504185b730c9a761/msgspec-0.20.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f6532369ece217fd37c5ebcfd7e981f2615628c21121b7b2df9d3adcf2fd69b8", size = 188650, upload-time = "2025-11-24T03:55:44.761Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/99/93/f2ec1ae1de51d3fdee998a1ede6b2c089453a2ee82b5c1b361ed9095064a/msgspec-0.20.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f9a1697da2f85a751ac3cc6a97fceb8e937fc670947183fb2268edaf4016d1ee", size = 218834, upload-time = "2025-11-24T03:55:46.441Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/28/83/36557b04cfdc317ed8a525c4993b23e43a8fbcddaddd78619112ca07138c/msgspec-0.20.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7fac7e9c92eddcd24c19d9e5f6249760941485dff97802461ae7c995a2450111", size = 224917, upload-time = "2025-11-24T03:55:48.06Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8f/56/362037a1ed5be0b88aced59272442c4b40065c659700f4b195a7f4d0ac88/msgspec-0.20.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f953a66f2a3eb8d5ea64768445e2bb301d97609db052628c3e1bcb7d87192a9f", size = 222821, upload-time = "2025-11-24T03:55:49.388Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/92/75/fa2370ec341cedf663731ab7042e177b3742645c5dd4f64dc96bd9f18a6b/msgspec-0.20.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:247af0313ae64a066d3aea7ba98840f6681ccbf5c90ba9c7d17f3e39dbba679c", size = 227227, upload-time = "2025-11-24T03:55:51.125Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f1/25/5e8080fe0117f799b1b68008dc29a65862077296b92550632de015128579/msgspec-0.20.0-cp313-cp313-win_amd64.whl", hash = "sha256:67d5e4dfad52832017018d30a462604c80561aa62a9d548fc2bd4e430b66a352", size = 189966, upload-time = "2025-11-24T03:55:52.458Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/79/b6/63363422153937d40e1cb349c5081338401f8529a5a4e216865decd981bf/msgspec-0.20.0-cp313-cp313-win_arm64.whl", hash = "sha256:91a52578226708b63a9a13de287b1ec3ed1123e4a088b198143860c087770458", size = 175378, upload-time = "2025-11-24T03:55:53.721Z" },
-]
-
-[[package]]
-name = "mulpyplexer"
-version = "0.9"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d7/6f/f036d4fb9f5a511262345bb18215c70fa69a250aca2e5ffe1a9c7e4cb85c/mulpyplexer-0.09.tar.gz", hash = "sha256:144e9e9bf66d3988f60542c9d3d4c94857438f7908f60e53f4c1cb1622fbbd30", size = 2846, upload-time = "2021-01-11T21:10:21.68Z" }
-
 [[package]]
 name = "multidict"
 version = "6.7.0"
@@ -2482,15 +1948,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
 ]
 
-[[package]]
-name = "networkx"
-version = "3.6.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6a/51/63fe664f3908c97be9d2e4f1158eb633317598cfa6e1fc14af5383f17512/networkx-3.6.1.tar.gz", hash = "sha256:26b7c357accc0c8cde558ad486283728b65b6a95d85ee1cd66bafab4c8168509", size = 2517025, upload-time = "2025-12-08T17:02:39.908Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9e/c9/b2622292ea83fbb4ec318f5b9ab867d0a28ab43c5717bb85b0a5f6b3b0a4/networkx-3.6.1-py3-none-any.whl", hash = "sha256:d47fbf302e7d9cbbb9e2555a0d267983d2aa476bac30e90dfbe5669bd57f3762", size = 2068504, upload-time = "2025-12-08T17:02:38.159Z" },
-]
-
 [[package]]
 name = "nodeenv"
 version = "1.10.0"
@@ -2500,46 +1957,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/88/b2/d0896bdcdc8d28a7fc5717c305f1a861c26e18c05047949fb371034d98bd/nodeenv-1.10.0-py2.py3-none-any.whl", hash = "sha256:5bb13e3eed2923615535339b3c620e76779af4cb4c6a90deccc9e36b274d3827", size = 23438, upload-time = "2025-12-20T14:08:52.782Z" },
 ]
 
-[[package]]
-name = "numpy"
-version = "2.4.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a4/7a/6a3d14e205d292b738db449d0de649b373a59edb0d0b4493821d0a3e8718/numpy-2.4.0.tar.gz", hash = "sha256:6e504f7b16118198f138ef31ba24d985b124c2c469fe8467007cf30fd992f934", size = 20685720, upload-time = "2025-12-20T16:18:19.023Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8b/ff/f6400ffec95de41c74b8e73df32e3fff1830633193a7b1e409be7fb1bb8c/numpy-2.4.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2a8b6bb8369abefb8bd1801b054ad50e02b3275c8614dc6e5b0373c305291037", size = 16653117, upload-time = "2025-12-20T16:16:06.709Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fd/28/6c23e97450035072e8d830a3c411bf1abd1f42c611ff9d29e3d8f55c6252/numpy-2.4.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2e284ca13d5a8367e43734148622caf0b261b275673823593e3e3634a6490f83", size = 12369711, upload-time = "2025-12-20T16:16:08.758Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/bc/af/acbef97b630ab1bb45e6a7d01d1452e4251aa88ce680ac36e56c272120ec/numpy-2.4.0-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:49ff32b09f5aa0cd30a20c2b39db3e669c845589f2b7fc910365210887e39344", size = 5198355, upload-time = "2025-12-20T16:16:10.902Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c1/c8/4e0d436b66b826f2e53330adaa6311f5cac9871a5b5c31ad773b27f25a74/numpy-2.4.0-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:36cbfb13c152b1c7c184ddac43765db8ad672567e7bafff2cc755a09917ed2e6", size = 6545298, upload-time = "2025-12-20T16:16:12.607Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ef/27/e1f5d144ab54eac34875e79037011d511ac57b21b220063310cb96c80fbc/numpy-2.4.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:35ddc8f4914466e6fc954c76527aa91aa763682a4f6d73249ef20b418fe6effb", size = 14398387, upload-time = "2025-12-20T16:16:14.257Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/67/64/4cb909dd5ab09a9a5d086eff9586e69e827b88a5585517386879474f4cf7/numpy-2.4.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc578891de1db95b2a35001b695451767b580bb45753717498213c5ff3c41d63", size = 16363091, upload-time = "2025-12-20T16:16:17.32Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9d/9c/8efe24577523ec6809261859737cf117b0eb6fdb655abdfdc81b2e468ce4/numpy-2.4.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:98e81648e0b36e325ab67e46b5400a7a6d4a22b8a7c8e8bbfe20e7db7906bf95", size = 16176394, upload-time = "2025-12-20T16:16:19.524Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/61/f0/1687441ece7b47a62e45a1f82015352c240765c707928edd8aef875d5951/numpy-2.4.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:d57b5046c120561ba8fa8e4030fbb8b822f3063910fa901ffadf16e2b7128ad6", size = 18287378, upload-time = "2025-12-20T16:16:22.866Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d3/6f/f868765d44e6fc466467ed810ba9d8d6db1add7d4a748abfa2a4c99a3194/numpy-2.4.0-cp312-cp312-win32.whl", hash = "sha256:92190db305a6f48734d3982f2c60fa30d6b5ee9bff10f2887b930d7b40119f4c", size = 5955432, upload-time = "2025-12-20T16:16:25.06Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d4/b5/94c1e79fcbab38d1ca15e13777477b2914dd2d559b410f96949d6637b085/numpy-2.4.0-cp312-cp312-win_amd64.whl", hash = "sha256:680060061adb2d74ce352628cb798cfdec399068aa7f07ba9fb818b2b3305f98", size = 12306201, upload-time = "2025-12-20T16:16:26.979Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/70/09/c39dadf0b13bb0768cd29d6a3aaff1fb7c6905ac40e9aaeca26b1c086e06/numpy-2.4.0-cp312-cp312-win_arm64.whl", hash = "sha256:39699233bc72dd482da1415dcb06076e32f60eddc796a796c5fb6c5efce94667", size = 10308234, upload-time = "2025-12-20T16:16:29.417Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a7/0d/853fd96372eda07c824d24adf02e8bc92bb3731b43a9b2a39161c3667cc4/numpy-2.4.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a152d86a3ae00ba5f47b3acf3b827509fd0b6cb7d3259665e63dafbad22a75ea", size = 16649088, upload-time = "2025-12-20T16:16:31.421Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e3/37/cc636f1f2a9f585434e20a3e6e63422f70bfe4f7f6698e941db52ea1ac9a/numpy-2.4.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:39b19251dec4de8ff8496cd0806cbe27bf0684f765abb1f4809554de93785f2d", size = 12364065, upload-time = "2025-12-20T16:16:33.491Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ed/69/0b78f37ca3690969beee54103ce5f6021709134e8020767e93ba691a72f1/numpy-2.4.0-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:009bd0ea12d3c784b6639a8457537016ce5172109e585338e11334f6a7bb88ee", size = 5192640, upload-time = "2025-12-20T16:16:35.636Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1d/2a/08569f8252abf590294dbb09a430543ec8f8cc710383abfb3e75cc73aeda/numpy-2.4.0-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:5fe44e277225fd3dff6882d86d3d447205d43532c3627313d17e754fb3905a0e", size = 6541556, upload-time = "2025-12-20T16:16:37.276Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/93/e9/a949885a4e177493d61519377952186b6cbfdf1d6002764c664ba28349b5/numpy-2.4.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f935c4493eda9069851058fa0d9e39dbf6286be690066509305e52912714dbb2", size = 14396562, upload-time = "2025-12-20T16:16:38.953Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/99/98/9d4ad53b0e9ef901c2ef1d550d2136f5ac42d3fd2988390a6def32e23e48/numpy-2.4.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8cfa5f29a695cb7438965e6c3e8d06e0416060cf0d709c1b1c1653a939bf5c2a", size = 16351719, upload-time = "2025-12-20T16:16:41.503Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/28/de/5f3711a38341d6e8dd619f6353251a0cdd07f3d6d101a8fd46f4ef87f895/numpy-2.4.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ba0cb30acd3ef11c94dc27fbfba68940652492bc107075e7ffe23057f9425681", size = 16176053, upload-time = "2025-12-20T16:16:44.552Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2a/5b/2a3753dc43916501b4183532e7ace862e13211042bceafa253afb5c71272/numpy-2.4.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:60e8c196cd82cbbd4f130b5290007e13e6de3eca79f0d4d38014769d96a7c475", size = 18277859, upload-time = "2025-12-20T16:16:47.174Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2c/c5/a18bcdd07a941db3076ef489d036ab16d2bfc2eae0cf27e5a26e29189434/numpy-2.4.0-cp313-cp313-win32.whl", hash = "sha256:5f48cb3e88fbc294dc90e215d86fbaf1c852c63dbdb6c3a3e63f45c4b57f7344", size = 5953849, upload-time = "2025-12-20T16:16:49.554Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4f/f1/719010ff8061da6e8a26e1980cf090412d4f5f8060b31f0c45d77dd67a01/numpy-2.4.0-cp313-cp313-win_amd64.whl", hash = "sha256:a899699294f28f7be8992853c0c60741f16ff199205e2e6cdca155762cbaa59d", size = 12302840, upload-time = "2025-12-20T16:16:51.227Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f5/5a/b3d259083ed8b4d335270c76966cb6cf14a5d1b69e1a608994ac57a659e6/numpy-2.4.0-cp313-cp313-win_arm64.whl", hash = "sha256:9198f447e1dc5647d07c9a6bbe2063cc0132728cc7175b39dbc796da5b54920d", size = 10308509, upload-time = "2025-12-20T16:16:53.313Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/31/01/95edcffd1bb6c0633df4e808130545c4f07383ab629ac7e316fb44fff677/numpy-2.4.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:74623f2ab5cc3f7c886add4f735d1031a1d2be4a4ae63c0546cfd74e7a31ddf6", size = 12491815, upload-time = "2025-12-20T16:16:55.496Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/59/ea/5644b8baa92cc1c7163b4b4458c8679852733fa74ca49c942cfa82ded4e0/numpy-2.4.0-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:0804a8e4ab070d1d35496e65ffd3cf8114c136a2b81f61dfab0de4b218aacfd5", size = 5320321, upload-time = "2025-12-20T16:16:57.468Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/26/4e/e10938106d70bc21319bd6a86ae726da37edc802ce35a3a71ecdf1fdfe7f/numpy-2.4.0-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:02a2038eb27f9443a8b266a66911e926566b5a6ffd1a689b588f7f35b81e7dc3", size = 6641635, upload-time = "2025-12-20T16:16:59.379Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b3/8d/a8828e3eaf5c0b4ab116924df82f24ce3416fa38d0674d8f708ddc6c8aac/numpy-2.4.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1889b3a3f47a7b5bee16bc25a2145bd7cb91897f815ce3499db64c7458b6d91d", size = 14456053, upload-time = "2025-12-20T16:17:01.768Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/68/a1/17d97609d87d4520aa5ae2dcfb32305654550ac6a35effb946d303e594ce/numpy-2.4.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:85eef4cb5625c47ee6425c58a3502555e10f45ee973da878ac8248ad58c136f3", size = 16401702, upload-time = "2025-12-20T16:17:04.235Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/18/32/0f13c1b2d22bea1118356b8b963195446f3af124ed7a5adfa8fdecb1b6ca/numpy-2.4.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6dc8b7e2f4eb184b37655195f421836cfae6f58197b67e3ffc501f1333d993fa", size = 16242493, upload-time = "2025-12-20T16:17:06.856Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ae/23/48f21e3d309fbc137c068a1475358cbd3a901b3987dcfc97a029ab3068e2/numpy-2.4.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:44aba2f0cafd287871a495fb3163408b0bd25bbce135c6f621534a07f4f7875c", size = 18324222, upload-time = "2025-12-20T16:17:09.392Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ac/52/41f3d71296a3dcaa4f456aaa3c6fc8e745b43d0552b6bde56571bb4b4a0f/numpy-2.4.0-cp313-cp313t-win32.whl", hash = "sha256:20c115517513831860c573996e395707aa9fb691eb179200125c250e895fcd93", size = 6076216, upload-time = "2025-12-20T16:17:11.437Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/35/ff/46fbfe60ab0710d2a2b16995f708750307d30eccbb4c38371ea9e986866e/numpy-2.4.0-cp313-cp313t-win_amd64.whl", hash = "sha256:b48e35f4ab6f6a7597c46e301126ceba4c44cd3280e3750f85db48b082624fa4", size = 12444263, upload-time = "2025-12-20T16:17:13.182Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a3/e3/9189ab319c01d2ed556c932ccf55064c5d75bb5850d1df7a482ce0badead/numpy-2.4.0-cp313-cp313t-win_arm64.whl", hash = "sha256:4d1cfce39e511069b11e67cd0bd78ceff31443b7c9e5c04db73c7a19f572967c", size = 10378265, upload-time = "2025-12-20T16:17:15.211Z" },
-]
-
 [[package]]
 name = "openai"
 version = "2.14.0"
@@ -2746,18 +2163,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7d/64/bfa5f4a34d0f15c6aba1b73e73f7441a66d635bd03249d334a4796b7a924/ormsgpack-1.12.1-cp313-cp313-win_arm64.whl", hash = "sha256:cfa22c91cffc10a7fbd43729baff2de7d9c28cef2509085a704168ae31f02568", size = 109986, upload-time = "2025-12-14T07:57:26.569Z" },
 ]
 
-[[package]]
-name = "outcome"
-version = "1.3.0.post0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "attrs" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/98/df/77698abfac98571e65ffeb0c1fba8ffd692ab8458d617a0eed7d9a8d38f2/outcome-1.3.0.post0.tar.gz", hash = "sha256:9dcf02e65f2971b80047b377468e72a268e15c0af3cf1238e6ff14f7f91143b8" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/55/8b/5ab7257531a5d830fc8000c476e63c935488d74609b50f9384a643ec0a62/outcome-1.3.0.post0-py2.py3-none-any.whl", hash = "sha256:e771c5ce06d1415e356078d3bdd68523f284b4ce5419828922b6871e65eda82b" },
-]
-
 [[package]]
 name = "packaging"
 version = "25.0"
@@ -2808,15 +2213,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/70/875f4a23bfc4731703a5835487d0d2fb999031bd415e7d17c0ae615c18b7/pathvalidate-3.3.1-py3-none-any.whl", hash = "sha256:5263baab691f8e1af96092fa5137ee17df5bdfbd6cff1fcac4d6ef4bc2e1735f", size = 24305, upload-time = "2025-06-15T09:07:19.117Z" },
 ]
 
-[[package]]
-name = "pefile"
-version = "2024.8.26"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/03/4f/2750f7f6f025a1507cd3b7218691671eecfd0bbebebe8b39aa0fe1d360b8/pefile-2024.8.26.tar.gz", hash = "sha256:3ff6c5d8b43e8c37bb6e6dd5085658d658a7a0bdcd20b6a07b1fcfc1c4e9d632", size = 76008, upload-time = "2024-08-26T20:58:38.155Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/54/16/12b82f791c7f50ddec566873d5bdd245baa1491bac11d15ffb98aecc8f8b/pefile-2024.8.26-py3-none-any.whl", hash = "sha256:76f8b485dcd3b1bb8166f1128d395fa3d87af26360c2358fb75b80019b957c6f", size = 74766, upload-time = "2024-08-26T21:01:02.632Z" },
-]
-
 [[package]]
 name = "platformdirs"
 version = "4.5.1"
@@ -3052,15 +2448,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/80/2d/1bb683f64737bbb1f86c82b7359db1eb2be4e2c0c13b947f80efefa7d3e5/psycopg2_binary-2.9.11-cp313-cp313-win_amd64.whl", hash = "sha256:efff12b432179443f54e230fdf60de1f6cc726b6c832db8701227d089310e8aa", size = 2714215, upload-time = "2025-10-10T11:13:07.14Z" },
 ]
 
-[[package]]
-name = "publicsuffix2"
-version = "2.20191221"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5a/04/1759906c4c5b67b2903f546de234a824d4028ef24eb0b1122daa43376c20/publicsuffix2-2.20191221.tar.gz", hash = "sha256:00f8cc31aa8d0d5592a5ced19cccba7de428ebca985db26ac852d920ddd6fe7b", size = 99592, upload-time = "2019-12-21T11:30:44.863Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9d/16/053c2945c5e3aebeefb4ccd5c5e7639e38bc30ad1bdc7ce86c6d01707726/publicsuffix2-2.20191221-py2.py3-none-any.whl", hash = "sha256:786b5e36205b88758bd3518725ec8cfe7a8173f5269354641f581c6b80a99893", size = 89033, upload-time = "2019-12-21T11:30:41.744Z" },
-]
-
 [[package]]
 name = "py-key-value-aio"
 version = "0.3.0"
@@ -3132,36 +2519,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a0/e3/59cd50310fc9b59512193629e1984c1f95e5c8ae6e5d8c69532ccc65a7fe/pycparser-2.23-py3-none-any.whl", hash = "sha256:e5c6e8d3fbad53479cab09ac03729e0a9faf2bee3db8208a550daf5af81a5934", size = 118140, upload-time = "2025-09-09T13:23:46.651Z" },
 ]
 
-[[package]]
-name = "pycryptodome"
-version = "3.23.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8e/a6/8452177684d5e906854776276ddd34eca30d1b1e15aa1ee9cefc289a33f5/pycryptodome-3.23.0.tar.gz", hash = "sha256:447700a657182d60338bab09fdb27518f8856aecd80ae4c6bdddb67ff5da44ef", size = 4921276, upload-time = "2025-05-17T17:21:45.242Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/04/5d/bdb09489b63cd34a976cc9e2a8d938114f7a53a74d3dd4f125ffa49dce82/pycryptodome-3.23.0-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:0011f7f00cdb74879142011f95133274741778abba114ceca229adbf8e62c3e4", size = 2495152, upload-time = "2025-05-17T17:20:20.833Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a7/ce/7840250ed4cc0039c433cd41715536f926d6e86ce84e904068eb3244b6a6/pycryptodome-3.23.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:90460fc9e088ce095f9ee8356722d4f10f86e5be06e2354230a9880b9c549aae", size = 1639348, upload-time = "2025-05-17T17:20:23.171Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ee/f0/991da24c55c1f688d6a3b5a11940567353f74590734ee4a64294834ae472/pycryptodome-3.23.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4764e64b269fc83b00f682c47443c2e6e85b18273712b98aa43bcb77f8570477", size = 2184033, upload-time = "2025-05-17T17:20:25.424Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/54/16/0e11882deddf00f68b68dd4e8e442ddc30641f31afeb2bc25588124ac8de/pycryptodome-3.23.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb8f24adb74984aa0e5d07a2368ad95276cf38051fe2dc6605cbcf482e04f2a7", size = 2270142, upload-time = "2025-05-17T17:20:27.808Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d5/fc/4347fea23a3f95ffb931f383ff28b3f7b1fe868739182cb76718c0da86a1/pycryptodome-3.23.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d97618c9c6684a97ef7637ba43bdf6663a2e2e77efe0f863cce97a76af396446", size = 2309384, upload-time = "2025-05-17T17:20:30.765Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6e/d9/c5261780b69ce66d8cfab25d2797bd6e82ba0241804694cd48be41add5eb/pycryptodome-3.23.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9a53a4fe5cb075075d515797d6ce2f56772ea7e6a1e5e4b96cf78a14bac3d265", size = 2183237, upload-time = "2025-05-17T17:20:33.736Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5a/6f/3af2ffedd5cfa08c631f89452c6648c4d779e7772dfc388c77c920ca6bbf/pycryptodome-3.23.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:763d1d74f56f031788e5d307029caef067febf890cd1f8bf61183ae142f1a77b", size = 2343898, upload-time = "2025-05-17T17:20:36.086Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/dc/9060d807039ee5de6e2f260f72f3d70ac213993a804f5e67e0a73a56dd2f/pycryptodome-3.23.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:954af0e2bd7cea83ce72243b14e4fb518b18f0c1649b576d114973e2073b273d", size = 2269197, upload-time = "2025-05-17T17:20:38.414Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f9/34/e6c8ca177cb29dcc4967fef73f5de445912f93bd0343c9c33c8e5bf8cde8/pycryptodome-3.23.0-cp313-cp313t-win32.whl", hash = "sha256:257bb3572c63ad8ba40b89f6fc9d63a2a628e9f9708d31ee26560925ebe0210a", size = 1768600, upload-time = "2025-05-17T17:20:40.688Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e4/1d/89756b8d7ff623ad0160f4539da571d1f594d21ee6d68be130a6eccb39a4/pycryptodome-3.23.0-cp313-cp313t-win_amd64.whl", hash = "sha256:6501790c5b62a29fcb227bd6b62012181d886a767ce9ed03b303d1f22eb5c625", size = 1799740, upload-time = "2025-05-17T17:20:42.413Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5d/61/35a64f0feaea9fd07f0d91209e7be91726eb48c0f1bfc6720647194071e4/pycryptodome-3.23.0-cp313-cp313t-win_arm64.whl", hash = "sha256:9a77627a330ab23ca43b48b130e202582e91cc69619947840ea4d2d1be21eb39", size = 1703685, upload-time = "2025-05-17T17:20:44.388Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/db/6c/a1f71542c969912bb0e106f64f60a56cc1f0fabecf9396f45accbe63fa68/pycryptodome-3.23.0-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:187058ab80b3281b1de11c2e6842a357a1f71b42cb1e15bce373f3d238135c27", size = 2495627, upload-time = "2025-05-17T17:20:47.139Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6e/4e/a066527e079fc5002390c8acdd3aca431e6ea0a50ffd7201551175b47323/pycryptodome-3.23.0-cp37-abi3-macosx_10_9_x86_64.whl", hash = "sha256:cfb5cd445280c5b0a4e6187a7ce8de5a07b5f3f897f235caa11f1f435f182843", size = 1640362, upload-time = "2025-05-17T17:20:50.392Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/50/52/adaf4c8c100a8c49d2bd058e5b551f73dfd8cb89eb4911e25a0c469b6b4e/pycryptodome-3.23.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:67bd81fcbe34f43ad9422ee8fd4843c8e7198dd88dd3d40e6de42ee65fbe1490", size = 2182625, upload-time = "2025-05-17T17:20:52.866Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5f/e9/a09476d436d0ff1402ac3867d933c61805ec2326c6ea557aeeac3825604e/pycryptodome-3.23.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8987bd3307a39bc03df5c8e0e3d8be0c4c3518b7f044b0f4c15d1aa78f52575", size = 2268954, upload-time = "2025-05-17T17:20:55.027Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f9/c5/ffe6474e0c551d54cab931918127c46d70cab8f114e0c2b5a3c071c2f484/pycryptodome-3.23.0-cp37-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa0698f65e5b570426fc31b8162ed4603b0c2841cbb9088e2b01641e3065915b", size = 2308534, upload-time = "2025-05-17T17:20:57.279Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/18/28/e199677fc15ecf43010f2463fde4c1a53015d1fe95fb03bca2890836603a/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:53ecbafc2b55353edcebd64bf5da94a2a2cdf5090a6915bcca6eca6cc452585a", size = 2181853, upload-time = "2025-05-17T17:20:59.322Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ce/ea/4fdb09f2165ce1365c9eaefef36625583371ee514db58dc9b65d3a255c4c/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_i686.whl", hash = "sha256:156df9667ad9f2ad26255926524e1c136d6664b741547deb0a86a9acf5ea631f", size = 2342465, upload-time = "2025-05-17T17:21:03.83Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/22/82/6edc3fc42fe9284aead511394bac167693fb2b0e0395b28b8bedaa07ef04/pycryptodome-3.23.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:dea827b4d55ee390dc89b2afe5927d4308a8b538ae91d9c6f7a5090f397af1aa", size = 2267414, upload-time = "2025-05-17T17:21:06.72Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/59/fe/aae679b64363eb78326c7fdc9d06ec3de18bac68be4b612fc1fe8902693c/pycryptodome-3.23.0-cp37-abi3-win32.whl", hash = "sha256:507dbead45474b62b2bbe318eb1c4c8ee641077532067fec9c1aa82c31f84886", size = 1768484, upload-time = "2025-05-17T17:21:08.535Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/54/2f/e97a1b8294db0daaa87012c24a7bb714147c7ade7656973fd6c736b484ff/pycryptodome-3.23.0-cp37-abi3-win_amd64.whl", hash = "sha256:c75b52aacc6c0c260f204cbdd834f76edc9fb0d8e0da9fbf8352ef58202564e2", size = 1799636, upload-time = "2025-05-17T17:21:10.393Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/18/3d/f9441a0d798bf2b1e645adc3265e55706aead1255ccdad3856dbdcffec14/pycryptodome-3.23.0-cp37-abi3-win_arm64.whl", hash = "sha256:11eeeb6917903876f134b56ba11abe95c0b0fd5e3330def218083c7d98bbcb3c", size = 1703675, upload-time = "2025-05-17T17:21:13.146Z" },
-]
-
 [[package]]
 name = "pydantic"
 version = "2.12.5"
@@ -3272,33 +2629,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c1/60/5d4751ba3f4a40a6891f24eec885f51afd78d208498268c734e256fb13c4/pydantic_settings-2.12.0-py3-none-any.whl", hash = "sha256:fddb9fd99a5b18da837b29710391e945b1e30c135477f484084ee513adb93809", size = 51880, upload-time = "2025-11-10T14:25:45.546Z" },
 ]
 
-[[package]]
-name = "pydemumble"
-version = "0.0.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c6/a9/1a78b7b6ed256c7bfec610e20658a3c8ed726a4c1a4652f2a17059c3563c/pydemumble-0.0.1.tar.gz", hash = "sha256:715f34fa999add1ef9337d1aae32d3b4b2a2a8dea0ddf363fcb1dac10593ca43", size = 1298294, upload-time = "2025-02-15T05:19:10.803Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/69/62/d479f63a145e50fb42dfa1090d0f5a58b3af94d02990e84c09c7b8cc2e7c/pydemumble-0.0.1-cp312-abi3-macosx_10_14_x86_64.whl", hash = "sha256:2dc4848ad97afb897877ee537820b38f427e30fe0a3b8dac25fe5c7b44d60cf0", size = 150273, upload-time = "2025-02-15T05:18:52.897Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fa/3e/4acec3739eef2b05779d250cbb9420feb61d8a3a1945651826620c03be12/pydemumble-0.0.1-cp312-abi3-macosx_11_0_arm64.whl", hash = "sha256:f5c770fde6b5929b5b386fe99960e6c237d62860c0eea0267f179034716c3ca0", size = 143501, upload-time = "2025-02-15T05:18:53.946Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/97/23/2ca50587a14cff273f3c4bb42dd42c87efd921ed09974bd7c43fcd8e02bc/pydemumble-0.0.1-cp312-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94d7348778ed7a483cec06554b6367decb9c16da1a1b251e56faa21f2f34b4cc", size = 175584, upload-time = "2025-02-15T05:18:54.952Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6e/88/504c1bcd70bf970e387eaf789fd89637d01b333ba2c1b0975977fc7f0d64/pydemumble-0.0.1-cp312-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18c83eeab994eab54640d347564799dd651857d06b1cdaf60fb81d2215c55a20", size = 190161, upload-time = "2025-02-15T05:18:56.077Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/df/5c/c9f981ea7b10817ec3b71a9d1790deb2c90031ec800e974cf432701efe49/pydemumble-0.0.1-cp312-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24ff7fe892dd90e9a73e8a8e8225247820613b2ac9e6b6d5cf916f3a1d51cc1d", size = 181234, upload-time = "2025-02-15T05:18:57.211Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2c/ee/e249299975181286cfdbffcd070856e950451d1859aeb564a5ca28ac18a5/pydemumble-0.0.1-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:488c2ee1c743d0989bdc67c802c941900db77cc8150fb100f38eca2e3a462d5b", size = 588544, upload-time = "2025-02-15T05:18:58.351Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/81/bb/06c2a4861a3f7945d2918f6142bf688eaf4fa6424ddd46e792f00399fee6/pydemumble-0.0.1-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:20a3e1e672ab210139640658f4ef3b4e7abe48f4562fc14947b538b95ab3e1c2", size = 653900, upload-time = "2025-02-15T05:18:59.443Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e2/23/7edfc6c6f4fba5fa3f371cdc3ecd774ab98bc4efb8a688a89b802a553f13/pydemumble-0.0.1-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:76f8bd943d8eec3b65beb09e97fd3a5994a519700243e5ecaf6a6a3ebe3e3809", size = 607638, upload-time = "2025-02-15T05:19:00.684Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/28/a2/b4f22086fb6d479cd01410cd0a57c39748736315a7a6a753f2d6ab9e6b22/pydemumble-0.0.1-cp312-abi3-win32.whl", hash = "sha256:63b965b89401ededcf8fc879196586a6427f4d4ba2be32953170b1965f34b51b", size = 143771, upload-time = "2025-02-15T05:19:01.838Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6f/7c/d7dc551b63c79795cad5a3c35b0799437e0d34de8d93a3ffb3539bbc8930/pydemumble-0.0.1-cp312-abi3-win_amd64.whl", hash = "sha256:6dd17d309a9b7bd2eaf697e9b07d35d5c88ce30026d12cf6e58d8a9900a737c4", size = 171611, upload-time = "2025-02-15T05:19:02.881Z" },
-]
-
-[[package]]
-name = "pydivert"
-version = "2.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/cf/71/2da9bcf742df3ab23f75f10fedca074951dd13a84bda8dea3077f68ae9a6/pydivert-2.1.0.tar.gz", hash = "sha256:f0e150f4ff591b78e35f514e319561dadff7f24a82186a171dd4d465483de5b4", size = 91057, upload-time = "2017-10-20T21:36:58.165Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ca/8f/86d7931c62013a5a7ebf4e1642a87d4a6050c0f570e714f61b0df1984c62/pydivert-2.1.0-py2.py3-none-any.whl", hash = "sha256:382db488e3c37c03ec9ec94e061a0b24334d78dbaeebb7d4e4d32ce4355d9da1", size = 104718, upload-time = "2017-10-20T21:36:56.726Z" },
-]
-
 [[package]]
 name = "pydocket"
 version = "0.16.3"
@@ -3322,41 +2652,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2c/94/93b7f5981aa04f922e0d9ce7326a4587866ec7e39f7c180ffcf408e66ee8/pydocket-0.16.3-py3-none-any.whl", hash = "sha256:e2b50925356e7cd535286255195458ac7bba15f25293356651b36d223db5dd7c", size = 67087, upload-time = "2025-12-23T23:37:31.829Z" },
 ]
 
-[[package]]
-name = "pydot"
-version = "4.0.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "pyparsing" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/50/35/b17cb89ff865484c6a20ef46bf9d95a5f07328292578de0b295f4a6beec2/pydot-4.0.1.tar.gz", hash = "sha256:c2148f681c4a33e08bf0e26a9e5f8e4099a82e0e2a068098f32ce86577364ad5", size = 162594, upload-time = "2025-06-17T20:09:56.454Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/7e/32/a7125fb28c4261a627f999d5fb4afff25b523800faed2c30979949d6facd/pydot-4.0.1-py3-none-any.whl", hash = "sha256:869c0efadd2708c0be1f916eb669f3d664ca684bc57ffb7ecc08e70d5e93fee6", size = 37087, upload-time = "2025-06-17T20:09:55.25Z" },
-]
-
-[[package]]
-name = "pyelftools"
-version = "0.32"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b9/ab/33968940b2deb3d92f5b146bc6d4009a5f95d1d06c148ea2f9ee965071af/pyelftools-0.32.tar.gz", hash = "sha256:6de90ee7b8263e740c8715a925382d4099b354f29ac48ea40d840cf7aa14ace5", size = 15047199, upload-time = "2025-02-19T14:20:05.549Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/af/43/700932c4f0638c3421177144a2e86448c0d75dbaee2c7936bda3f9fd0878/pyelftools-0.32-py3-none-any.whl", hash = "sha256:013df952a006db5e138b1edf6d8a68ecc50630adbd0d83a2d41e7f846163d738", size = 188525, upload-time = "2025-02-19T14:19:59.919Z" },
-]
-
-[[package]]
-name = "pyformlang"
-version = "1.0.11"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "networkx" },
-    { name = "numpy" },
-    { name = "pydot" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/70/41/772000760174a909294ad496854b81a882e68458dda22f53b47e1e777f0d/pyformlang-1.0.11.tar.gz", hash = "sha256:e292ec8b9cfa64c26b592faf9b7cfc72c4f4b0eb0d533f045a46061e75c5ce99", size = 97188, upload-time = "2025-03-18T09:59:30.581Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6a/fe/e26ea3b233672c7a89642b0615e2c44905578a4889eb00b06a358d8ab8c5/pyformlang-1.0.11-py3-none-any.whl", hash = "sha256:a8d76481e4d76e4df1c00cd5c5fce61969635900ef521ad182a07a61ca1c070e", size = 128508, upload-time = "2025-03-18T09:59:28.897Z" },
-]
-
 [[package]]
 name = "pygments"
 version = "2.19.2"
@@ -3380,65 +2675,6 @@ crypto = [
     { name = "cryptography" },
 ]
 
-[[package]]
-name = "pylsqpack"
-version = "0.3.23"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9a/f3/2681d5d38cd789a62352e105619d353d3c245f463a376c1b9a735e3c47b3/pylsqpack-0.3.23.tar.gz", hash = "sha256:f55b126940d8b3157331f123d4428d703a698a6db65a6a7891f7ec1b90c86c56", size = 676891, upload-time = "2025-10-10T17:12:58.747Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ef/5d/44c5f05d4f72ac427210326a283f74541ad694d517a1c136631fdbcd8e4b/pylsqpack-0.3.23-cp310-abi3-macosx_10_9_x86_64.whl", hash = "sha256:978497811bb58cf7ae11c0e1d4cf9bdf6bccef77556d039ae1836b458cb235fc", size = 162519, upload-time = "2025-10-10T17:12:44.892Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/38/9a/3472903fd88dfa87ac683e7113e0ac9df47b70924db9410b275c6e16b25f/pylsqpack-0.3.23-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:8a9e25c5a98a0959c6511aaf7d1a6ac0d6146be349a8c3c09fec2e5250cb2901", size = 167819, upload-time = "2025-10-10T17:12:46.54Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a7/cf/43e7b04f6397be691a255589fbed25fb4b8d7b707ad8c118408553ff2a5b/pylsqpack-0.3.23-cp310-abi3-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3f7d78352e764732ac1a9ab109aa84e003996a7d64de7098cb20bdc007cf7613", size = 246484, upload-time = "2025-10-10T17:12:47.588Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ed/38/e44ba48404b61b4dd1e9902bef7e01afac5c31e57c5dceec2f0f4e522fcb/pylsqpack-0.3.23-cp310-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8ba86c384dcf8952cef190f8cc4d61cb2a8e4eeaf25093c6aa38b9b696ac82dc", size = 248586, upload-time = "2025-10-10T17:12:48.621Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1f/46/1f0eb601215bc7596e3003dde6a4c9ad457a4ab35405cdcc56c0727cdf49/pylsqpack-0.3.23-cp310-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:829a2466b80af9766cf0ad795b866796a4000cec441a0eb222357efd01ec6d42", size = 249520, upload-time = "2025-10-10T17:12:49.639Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b9/20/a91d4f90480baaa14aa940512bdfae3774b2524bbf71d3f16391b244b31e/pylsqpack-0.3.23-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b516d56078a16592596ea450ea20e9a54650af759754e2e807b7046be13c83ee", size = 246141, upload-time = "2025-10-10T17:12:51.165Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/28/bb/02c018e0fc174122d5bd0cfcbe858d40a4516d9245fca4a7a2dd5201deea/pylsqpack-0.3.23-cp310-abi3-musllinux_1_2_i686.whl", hash = "sha256:db03232c85855cb03226447e41539f8631d7d4e5483d48206e30d470a9cb07a1", size = 246064, upload-time = "2025-10-10T17:12:52.243Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/02/ca/082d31c1180ab856118634a3a26c7739cf38aee656702c1b39dc1acc26a0/pylsqpack-0.3.23-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:2d91d87672beb0beff6a866dbf35e8b45791d8dffcd5cfd9d8cc397001101fd5", size = 247847, upload-time = "2025-10-10T17:12:53.364Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6a/33/58e7ced97a04bfb1807143fc70dc7ff3b8abef4e39c5144235f0985e43cc/pylsqpack-0.3.23-cp310-abi3-win32.whl", hash = "sha256:4e5b0b5ec92be6e5e6eb1c52d45271c5c7f8f2a2cd8c672ab240ac2cd893cd26", size = 153227, upload-time = "2025-10-10T17:12:54.459Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/da/da/691477b89927643ea30f36511825e9551d7f36c887ce9bb9903fac31390d/pylsqpack-0.3.23-cp310-abi3-win_amd64.whl", hash = "sha256:498b374b16b51532997998c4cf4021161d2a611f5ea6b02ad95ca99815c54abf", size = 155779, upload-time = "2025-10-10T17:12:55.406Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e0/17/a8bc10443fd4261911dbb41331d39ce2ad28ba82a170eddecf23904b321c/pylsqpack-0.3.23-cp310-abi3-win_arm64.whl", hash = "sha256:2f9a2ef59588d32cd02847c6b9d7140440f67a0751da99f96a2ff4edadc85eae", size = 153188, upload-time = "2025-10-10T17:12:56.782Z" },
-]
-
-[[package]]
-name = "pyopenssl"
-version = "25.0.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "cryptography" },
-    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9f/26/e25b4a374b4639e0c235527bbe31c0524f26eda701d79456a7e1877f4cc5/pyopenssl-25.0.0.tar.gz", hash = "sha256:cd2cef799efa3936bb08e8ccb9433a575722b9dd986023f1cabc4ae64e9dac16", size = 179573, upload-time = "2025-01-12T17:22:48.897Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ca/d7/eb76863d2060dcbe7c7e6cccfd95ac02ea0b9acc37745a0d99ff6457aefb/pyOpenSSL-25.0.0-py3-none-any.whl", hash = "sha256:424c247065e46e76a37411b9ab1782541c23bb658bf003772c3405fbaa128e90", size = 56453, upload-time = "2025-01-12T17:22:43.44Z" },
-]
-
-[[package]]
-name = "pyparsing"
-version = "3.2.1"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8b/1a/3544f4f299a47911c2ab3710f534e52fea62a633c96806995da5d25be4b2/pyparsing-3.2.1.tar.gz", hash = "sha256:61980854fd66de3a90028d679a954d5f2623e83144b5afe5ee86f43d762e5f0a", size = 1067694, upload-time = "2024-12-31T20:59:46.157Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/1c/a7/c8a2d361bf89c0d9577c934ebb7421b25dc84bf3a8e3ac0a40aed9acc547/pyparsing-3.2.1-py3-none-any.whl", hash = "sha256:506ff4f4386c4cec0590ec19e6302d3aedb992fdc02c761e90416f158dacf8e1", size = 107716, upload-time = "2024-12-31T20:59:42.738Z" },
-]
-
-[[package]]
-name = "pypcode"
-version = "3.3.3"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f9/4c/7a57f97f569c24607a0490d9bf5e69ad2a29915ece5cb7f0891d4d6847d5/pypcode-3.3.3.tar.gz", hash = "sha256:378b8d3b1552c3251243b421114dd67ccb49660fe762c60fb19dede1279cf30c", size = 2159423, upload-time = "2025-10-13T21:34:36.64Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/39/92/3272987c85f92f6cd6b77b4b2b663c14bb0006aee04e8d55329d9dafdc09/pypcode-3.3.3-cp312-cp312-macosx_10_14_x86_64.whl", hash = "sha256:31be0e2524701546106f98a16faad85f85b89fcd98289ff41d9129f4280fe29d", size = 13805188, upload-time = "2025-10-13T21:33:56.879Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fd/cb/3c3b182808ad1667cdd9d2dd2994f2c662b8cfa68d206bb5218684377414/pypcode-3.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a60bbe863456f42a97b5b33d10ccb97ae2f725542d1fd871b9293000619532af", size = 13756473, upload-time = "2025-10-13T21:33:59.122Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ff/f6/235a8aeabed2bc8e74f4dd5d052c0548f7e2aabad47ad8916873e717c358/pypcode-3.3.3-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5241cd815a89229d6ccc26b3d525e38eb1b17df7f60c35f085428351ad199f8d", size = 13844193, upload-time = "2025-10-13T21:34:01.14Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0c/16/2fd2e676d0de49c9c8afcdcde747019e96cc9a9c50810a93cee69ae1c79a/pypcode-3.3.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c2af24d1741aff3e57821c58c90ffafe2d66d540284f126b5e46cec4826060f0", size = 13878012, upload-time = "2025-10-13T21:34:03.221Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c7/d9/b5deaab861c384f3b0702aab2c1a952921cf9ab4cbf7be5dab806bb476cd/pypcode-3.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:1346b59345c361f2fe782db8bef7c7478c57261ff760567096507285f7ff22d0", size = 13628994, upload-time = "2025-10-13T21:34:05.571Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/5e/45/4c5416a4703b3b56f43cb71a0fdf8216620cd486110f9b1c94a6b419c63a/pypcode-3.3.3-cp313-cp313-macosx_10_14_x86_64.whl", hash = "sha256:e7ce476461ce9224a3dd77ad05810322c1f161155e2c773207368a6ff4103708", size = 13805118, upload-time = "2025-10-13T21:34:07.69Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/dc/fb/1b6c995783c26b9fb70ad8feb05dcb82aa3f55252c85bb2499d5b3cf25a7/pypcode-3.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:245e36beb6487c9f4aed1fe20b6c40454d93f52d2f9e56ece79c66c569a50020", size = 13756412, upload-time = "2025-10-13T21:34:11.592Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/00/04/69a0557253fc9dcefdb88cb28e254c436dc66e5be0867e8cbf755daa6558/pypcode-3.3.3-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d977dcb6519fefe6c198b49a1c3b51ef1aac25c6829c51103104b13bd846f7d7", size = 13844125, upload-time = "2025-10-13T21:34:14.053Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/16/c4f618d51529418a7ceb8fd6f8b4a323cc9889afa5211d2b7177d4560e60/pypcode-3.3.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2cdfd0c89c24c13fe0f04f570adc3369c39a3c3c5696b86178f74f436a3f7500", size = 13877979, upload-time = "2025-10-13T21:34:16.178Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d0/68/3e3b7f076a4c7bf0b114a0393e7ad8d90ddfb4882f790d2009481e4be4e0/pypcode-3.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:ddcb34b31a904241dcafc22c674511b11455f56a05c11ab1ee3a5973ff0cfd77", size = 13628920, upload-time = "2025-10-13T21:34:18.562Z" },
-]
-
 [[package]]
 name = "pypdf"
 version = "6.6.0"
@@ -3455,12 +2691,16 @@ source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
 sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/30/23/2f0a3efc4d6a32f3b63cdff36cd398d9701d26cda58e3ab97ac79fb5e60d/pyperclip-1.9.0.tar.gz", hash = "sha256:b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310", size = 20961, upload-time = "2024-06-18T20:38:48.401Z" }
 
 [[package]]
-name = "pysocks"
-version = "1.7.1"
+name = "pyright"
+version = "1.1.409"
 source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/bd/11/293dd436aea955d45fc4e8a35b6ae7270f5b8e00b53cf6c024c83b657a11/PySocks-1.7.1.tar.gz", hash = "sha256:3f8804571ebe159c380ac6de37643bb4685970655d3bba243530d6558b799aa0", size = 284429, upload-time = "2019-09-20T02:07:35.714Z" }
+dependencies = [
+    { name = "nodeenv" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/51/4e/3aa27f74211522dba7e9cbc3e74de779c6d4b654c54e50a4840623be8014/pyright-1.1.409.tar.gz", hash = "sha256:986ee05beca9e077c165758ad123667c679e050059a2546aa02473930394bc93", size = 4430434, upload-time = "2026-04-23T11:02:03.799Z" }
 wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8d/59/b4572118e098ac8e46e399a1dd0f2d85403ce8bbaad9ec79373ed6badaf9/PySocks-1.7.1-py3-none-any.whl", hash = "sha256:2725bd0a9925919b9b51739eea5f9e2bae91e83288108a9ad338b2e3a4435ee5", size = 16725, upload-time = "2019-09-20T02:06:22.938Z" },
+    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/16/6b/330d8ebae582b30c2959a1ef4c3bc344ebde48c2ff0c3f113c4710735e11/pyright-1.1.409-py3-none-any.whl", hash = "sha256:aa3ea228cab90c845c7a60d28db7a844c04315356392aa09fafcee98c8c22fb3", size = 6438161, upload-time = "2026-04-23T11:02:01.309Z" },
 ]
 
 [[package]]
@@ -3564,32 +2804,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/aa/76/03af049af4dcee5d27442f71b6924f01f3efb5d2bd34f23fcd563f2cc5f5/python_multipart-0.0.21-py3-none-any.whl", hash = "sha256:cf7a6713e01c87aa35387f4774e812c4361150938d20d232800f75ffcf266090", size = 24541, upload-time = "2025-12-17T09:24:21.153Z" },
 ]
 
-[[package]]
-name = "pyvex"
-version = "9.2.191"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "bitstring" },
-    { name = "cffi", marker = "implementation_name == 'cpython'" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f8/01/de3b1f358184bda64dc5025ca28f5e4be26fa1a88c9fe404ced9e25c8b0d/pyvex-9.2.191.tar.gz", hash = "sha256:b98ddc16db5693f46155f13ba770f272615450b8e3e58ca24b45a5fb5ac4befd", size = 3649102, upload-time = "2025-12-30T17:44:30.636Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/05/ac/ae661cb67c19c462017bcdb355bc0356a2f1cd655586e257f6cdc53963c2/pyvex-9.2.191-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:efc09e4ce15586db59a8604c2c5285094ef8088bc235a731042a66e130503795", size = 1864470, upload-time = "2025-12-30T17:43:55.507Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c4/31/bac6717c87aa58a1b239b37dad27d94ce14df521c3d1497822c96126cb9e/pyvex-9.2.191-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a204ec025f727dff6687740eb542c7391b7d632bd79e98301a4d91a4223ee17a", size = 1587483, upload-time = "2025-12-30T17:43:56.85Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ce/66/f7d85588918edc13d3c5f07ccade62a2d140c53717d76793b01fbca3e9e9/pyvex-9.2.191-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ffd74f6944ed62409afd0ebafafbbda06e352f65175a8b803b49701bb7937815", size = 1783318, upload-time = "2025-12-30T17:43:58.598Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6d/93/b11bc5f61783a6693c4b0df97aee403740b426f17fde42cf264a2d2354a7/pyvex-9.2.191-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b3acc386970e655913f469e0883d81efaa2b60d4e042e48102c645d3429918ba", size = 1915136, upload-time = "2025-12-30T17:43:59.95Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/69/01/ba1651f7d0d9cc9f66bf99507d4b47af49563c1f73bc6de207e7fa71d58c/pyvex-9.2.191-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:46966273c3e808e6c06d78da62f1549c433a6b7c1968bf6a4a85d87052236468", size = 1800213, upload-time = "2025-12-30T17:44:01.367Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/93/a2/73252ea93502c304b2b4335ff9a9c8d98ebd3b8701610f381c35a698aee9/pyvex-9.2.191-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8b02ecd0aae6f93028d877e87fdb82654b549e2942e227db97eaf1f6e1fb00d0", size = 1946647, upload-time = "2025-12-30T17:44:03.006Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/10/c9/a3e0e652a5077fcbcb781362f4f0dc375951edd4483b839b5b6dca024d58/pyvex-9.2.191-cp312-cp312-win_amd64.whl", hash = "sha256:52f3e47be14bec4a15be38d3af8e62898ade7cd392b7f16b78b8018af9b01c41", size = 1363400, upload-time = "2025-12-30T17:44:04.471Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4d/c9/a1ba716ef9f2133fcfe77bd190c13abb8254ab757bdff7198ddc279c12e7/pyvex-9.2.191-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b0dec0aa852098dda20dc5888018b619bb55a9b20013ae3e10e8924e4f74503b", size = 1864470, upload-time = "2025-12-30T17:44:06.378Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/04/98/f2fc6834da2c9a2e3e1ab45f7e2ab53c4bb799822aab27c25f2188a0bfbd/pyvex-9.2.191-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b7f1381d2d74c5878364371600d3be900cd852f697a6d4839b5df5de511bc937", size = 1587481, upload-time = "2025-12-30T17:44:07.742Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/04/1d/4f95450cb4ca625103e43db874f5b633816ef811fbe60a0900761dc9a6b2/pyvex-9.2.191-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8ef8fc1ec814738d1371ceee5e05eec2e318a2135282b4468ac591b2c6d51412", size = 1783318, upload-time = "2025-12-30T17:44:09.485Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4f/d3/273e64b7db5ed3893502c9f432aaaaeda617930363ce28b7d134017e16a1/pyvex-9.2.191-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f0fbea242f96f0520b4d9b5c2231fd9ccbd90cc69be8ff0efba63c04c6c1c15", size = 1915137, upload-time = "2025-12-30T17:44:10.886Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d2/77/14110503262d2fcb1f29ce1227782d39fb8308f4ddabbe608444291cec1a/pyvex-9.2.191-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:441b7e329a6e298ac23058cf68c7d87ae698309510abc7d81a1ba98e2d81d9ce", size = 1800213, upload-time = "2025-12-30T17:44:12.661Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a7/af/174010241e939f19d606e4442566effe4655b19622e95fa9fe14b6438708/pyvex-9.2.191-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:32aa150c032f43e3ecdff97ed86e8fe92eaf12f59251d76c85b824c3c85c0a55", size = 1946648, upload-time = "2025-12-30T17:44:14.188Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/3a/6060b8f682da42e4b533876c7679c9d1bf3b40829d1b881c222a589e4da1/pyvex-9.2.191-cp313-cp313-win_amd64.whl", hash = "sha256:25958bdfddda731cefa2387bf4068e34493ca345d29da57ee96d9e4bc0a1954d", size = 1363401, upload-time = "2025-12-30T17:44:15.79Z" },
-]
-
 [[package]]
 name = "pywin32"
 version = "311"
@@ -3612,25 +2826,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/de/3d/8161f7711c017e01ac9f008dfddd9410dff3674334c233bde66e7ba65bbf/pywin32_ctypes-0.2.3-py3-none-any.whl", hash = "sha256:8a1513379d709975552d202d942d9837758905c8d01eb82b8bcc30918929e7b8", size = 30756, upload-time = "2024-08-14T10:15:33.187Z" },
 ]
 
-[[package]]
-name = "pyxbe"
-version = "1.0.3"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/df/cb/a090b3a16a6a3d3c0c91f6d9e187df3dae33ce1f5b19b91bbf218dea0a6d/pyxbe-1.0.3.tar.gz", hash = "sha256:ef38c9b07bffd9daecdd32640a3e6c99f62a621a8b8a4d54a0c2ccf9fb1b7cdb" }
-
-[[package]]
-name = "pyxdia"
-version = "0.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/17/d8/6e691bfb19edf50a3286349d5fd4200a569dfc2c900a083e3548a6a1c726/pyxdia-0.1.0.tar.gz", hash = "sha256:af95d1ce70407e7a0f72d02ba77d366c0dfb0ed58fb336f8725ac8f3493b7e68", size = 6043, upload-time = "2025-06-13T20:03:44.192Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/21/d8/fceba98b6faa81534faae2b87b52d669d22f61ea7c64968babe01fa839a8/pyxdia-0.1.0-py3-none-macosx_13_0_x86_64.whl", hash = "sha256:c5c2ca7041294a9e1ff81622b0305569b04c3d511992c84640052899fb039b00", size = 1641463, upload-time = "2025-06-13T20:03:35.701Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0e/2f/f563746306c448248b98303f2a991812d1180766cb220f4e601f0caec771/pyxdia-0.1.0-py3-none-macosx_14_0_arm64.whl", hash = "sha256:b40738dc999e560fa3283aa2aeb819c34cd9084c7b0949bc2e5e136c631cbbc0", size = 1625815, upload-time = "2025-06-13T20:03:37.489Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ff/d4/46ee9f0c1b0a29160fd7490cb2a5abf32bb64bb5d704404bd937c9498e43/pyxdia-0.1.0-py3-none-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:3809b60a4b95d2bf5a2babd8b50f67b362b10a371abc92a8cf3a86fc648857d8", size = 1383830, upload-time = "2025-06-13T20:03:39.283Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/84/81/638749bc9bba9b4be8a3c8dd6abba85b1cb527bc6507f591e8d7fd1cfd37/pyxdia-0.1.0-py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:28e385eda08eba48883c2c6fc29ea6da8d8536924133468b4b8281a8b24a176a", size = 2706942, upload-time = "2025-06-13T20:03:40.903Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2f/ea/34d31e0e4484d2acdd25a24d56a26be7855f9119244fd9ea16d00095b01e/pyxdia-0.1.0-py3-none-win_amd64.whl", hash = "sha256:5bd17cec300f53d0bb7926f64095e3806674c6a82f8c2a5c6be24aa6fc1384a1", size = 958051, upload-time = "2025-06-13T20:03:42.789Z" },
-]
-
 [[package]]
 name = "pyyaml"
 version = "6.0.3"
@@ -3901,46 +3096,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/64/8d/0133e4eb4beed9e425d9a98ed6e081a55d195481b7632472be1af08d2f6b/rsa-4.9.1-py3-none-any.whl", hash = "sha256:68635866661c6836b8d39430f97a996acbd61bfa49406748ea243539fe239762", size = 34696, upload-time = "2025-04-16T09:51:17.142Z" },
 ]
 
-[[package]]
-name = "ruamel-yaml"
-version = "0.18.10"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "ruamel-yaml-clib", marker = "python_full_version < '3.13' and platform_python_implementation == 'CPython'" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/46/f44d8be06b85bc7c4d8c95d658be2b68f27711f279bf9dd0612a5e4794f5/ruamel.yaml-0.18.10.tar.gz", hash = "sha256:20c86ab29ac2153f80a428e1254a8adf686d3383df04490514ca3b79a362db58", size = 143447, upload-time = "2025-01-06T14:08:51.334Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c2/36/dfc1ebc0081e6d39924a2cc53654497f967a084a436bb64402dfce4254d9/ruamel.yaml-0.18.10-py3-none-any.whl", hash = "sha256:30f22513ab2301b3d2b577adc121c6471f28734d3d9728581245f1e76468b4f1", size = 117729, upload-time = "2025-01-06T14:08:47.471Z" },
-]
-
-[[package]]
-name = "ruamel-yaml-clib"
-version = "0.2.15"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/97/60fda20e2fb54b83a61ae14648b0817c8f5d84a3821e40bfbdae1437026a/ruamel_yaml_clib-0.2.15.tar.gz", hash = "sha256:46e4cc8c43ef6a94885f72512094e482114a8a706d3c555a34ed4b0d20200600", size = 225794, upload-time = "2025-11-16T16:12:59.761Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/72/4b/5fde11a0722d676e469d3d6f78c6a17591b9c7e0072ca359801c4bd17eee/ruamel_yaml_clib-0.2.15-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:cb15a2e2a90c8475df45c0949793af1ff413acfb0a716b8b94e488ea95ce7cff", size = 149088, upload-time = "2025-11-16T16:13:22.836Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/85/82/4d08ac65ecf0ef3b046421985e66301a242804eb9a62c93ca3437dc94ee0/ruamel_yaml_clib-0.2.15-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:64da03cbe93c1e91af133f5bec37fd24d0d4ba2418eaf970d7166b0a26a148a2", size = 134553, upload-time = "2025-11-16T16:13:24.151Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b9/cb/22366d68b280e281a932403b76da7a988108287adff2bfa5ce881200107a/ruamel_yaml_clib-0.2.15-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:f6d3655e95a80325b84c4e14c080b2470fe4f33b6846f288379ce36154993fb1", size = 737468, upload-time = "2025-11-16T20:22:47.335Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/71/73/81230babf8c9e33770d43ed9056f603f6f5f9665aea4177a2c30ae48e3f3/ruamel_yaml_clib-0.2.15-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:71845d377c7a47afc6592aacfea738cc8a7e876d586dfba814501d8c53c1ba60", size = 753349, upload-time = "2025-11-16T16:13:26.269Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/61/62/150c841f24cda9e30f588ef396ed83f64cfdc13b92d2f925bb96df337ba9/ruamel_yaml_clib-0.2.15-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:11e5499db1ccbc7f4b41f0565e4f799d863ea720e01d3e99fa0b7b5fcd7802c9", size = 788211, upload-time = "2025-11-16T16:13:27.441Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/30/93/e79bd9cbecc3267499d9ead919bd61f7ddf55d793fb5ef2b1d7d92444f35/ruamel_yaml_clib-0.2.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4b293a37dc97e2b1e8a1aec62792d1e52027087c8eea4fc7b5abd2bdafdd6642", size = 743203, upload-time = "2025-11-16T16:13:28.671Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/8d/06/1eb640065c3a27ce92d76157f8efddb184bd484ed2639b712396a20d6dce/ruamel_yaml_clib-0.2.15-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:512571ad41bba04eac7268fe33f7f4742210ca26a81fe0c75357fa682636c690", size = 747292, upload-time = "2025-11-16T20:22:48.584Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a5/21/ee353e882350beab65fcc47a91b6bdc512cace4358ee327af2962892ff16/ruamel_yaml_clib-0.2.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e5e9f630c73a490b758bf14d859a39f375e6999aea5ddd2e2e9da89b9953486a", size = 771624, upload-time = "2025-11-16T16:13:29.853Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/57/34/cc1b94057aa867c963ecf9ea92ac59198ec2ee3a8d22a126af0b4d4be712/ruamel_yaml_clib-0.2.15-cp312-cp312-win32.whl", hash = "sha256:f4421ab780c37210a07d138e56dd4b51f8642187cdfb433eb687fe8c11de0144", size = 100342, upload-time = "2025-11-16T16:13:31.067Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b3/e5/8925a4208f131b218f9a7e459c0d6fcac8324ae35da269cb437894576366/ruamel_yaml_clib-0.2.15-cp312-cp312-win_amd64.whl", hash = "sha256:2b216904750889133d9222b7b873c199d48ecbb12912aca78970f84a5aa1a4bc", size = 119013, upload-time = "2025-11-16T16:13:32.164Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/17/5e/2f970ce4c573dc30c2f95825f2691c96d55560268ddc67603dc6ea2dd08e/ruamel_yaml_clib-0.2.15-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:4dcec721fddbb62e60c2801ba08c87010bd6b700054a09998c4d09c08147b8fb", size = 147450, upload-time = "2025-11-16T16:13:33.542Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d6/03/a1baa5b94f71383913f21b96172fb3a2eb5576a4637729adbf7cd9f797f8/ruamel_yaml_clib-0.2.15-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:65f48245279f9bb301d1276f9679b82e4c080a1ae25e679f682ac62446fac471", size = 133139, upload-time = "2025-11-16T16:13:34.587Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/dc/19/40d676802390f85784235a05788fd28940923382e3f8b943d25febbb98b7/ruamel_yaml_clib-0.2.15-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:46895c17ead5e22bea5e576f1db7e41cb273e8d062c04a6a49013d9f60996c25", size = 731474, upload-time = "2025-11-16T20:22:49.934Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ce/bb/6ef5abfa43b48dd55c30d53e997f8f978722f02add61efba31380d73e42e/ruamel_yaml_clib-0.2.15-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3eb199178b08956e5be6288ee0b05b2fb0b5c1f309725ad25d9c6ea7e27f962a", size = 748047, upload-time = "2025-11-16T16:13:35.633Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ff/5d/e4f84c9c448613e12bd62e90b23aa127ea4c46b697f3d760acc32cb94f25/ruamel_yaml_clib-0.2.15-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4d1032919280ebc04a80e4fb1e93f7a738129857eaec9448310e638c8bccefcf", size = 782129, upload-time = "2025-11-16T16:13:36.781Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/de/4b/e98086e88f76c00c88a6bcf15eae27a1454f661a9eb72b111e6bbb69024d/ruamel_yaml_clib-0.2.15-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ab0df0648d86a7ecbd9c632e8f8d6b21bb21b5fc9d9e095c796cacf32a728d2d", size = 736848, upload-time = "2025-11-16T16:13:37.952Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0c/5c/5964fcd1fd9acc53b7a3a5d9a05ea4f95ead9495d980003a557deb9769c7/ruamel_yaml_clib-0.2.15-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:331fb180858dd8534f0e61aa243b944f25e73a4dae9962bd44c46d1761126bbf", size = 741630, upload-time = "2025-11-16T20:22:51.718Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/07/1e/99660f5a30fceb58494598e7d15df883a07292346ef5696f0c0ae5dee8c6/ruamel_yaml_clib-0.2.15-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fd4c928ddf6bce586285daa6d90680b9c291cfd045fc40aad34e445d57b1bf51", size = 766619, upload-time = "2025-11-16T16:13:39.178Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/36/2f/fa0344a9327b58b54970e56a27b32416ffbcfe4dcc0700605516708579b2/ruamel_yaml_clib-0.2.15-cp313-cp313-win32.whl", hash = "sha256:bf0846d629e160223805db9fe8cc7aec16aaa11a07310c50c8c7164efa440aec", size = 100171, upload-time = "2025-11-16T16:13:40.456Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/06/c4/c124fbcef0684fcf3c9b72374c2a8c35c94464d8694c50f37eef27f5a145/ruamel_yaml_clib-0.2.15-cp313-cp313-win_amd64.whl", hash = "sha256:45702dfbea1420ba3450bb3dd9a80b33f0badd57539c6aac09f42584303e0db6", size = 118845, upload-time = "2025-11-16T16:13:41.481Z" },
-]
-
 [[package]]
 name = "ruff"
 version = "0.14.10"
@@ -3980,23 +3135,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b7/46/f5af3402b579fd5e11573ce652019a67074317e18c1935cc0b4ba9b35552/secretstorage-3.5.0-py3-none-any.whl", hash = "sha256:0ce65888c0725fcb2c5bc0fdb8e5438eece02c523557ea40ce0703c266248137", size = 15554, upload-time = "2025-11-23T19:02:51.545Z" },
 ]
 
-[[package]]
-name = "selenium"
-version = "4.39.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "certifi" },
-    { name = "trio" },
-    { name = "trio-websocket" },
-    { name = "typing-extensions" },
-    { name = "urllib3", extra = ["socks"] },
-    { name = "websocket-client" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/af/19/27c1bf9eb1f7025632d35a956b50746efb4b10aa87f961b263fa7081f4c5/selenium-4.39.0.tar.gz", hash = "sha256:12f3325f02d43b6c24030fc9602b34a3c6865abbb1db9406641d13d108aa1889", size = 928575, upload-time = "2025-12-06T23:12:34.896Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/58/d0/55a6b7c6f35aad4c8a54be0eb7a52c1ff29a59542fc3e655f0ecbb14456d/selenium-4.39.0-py3-none-any.whl", hash = "sha256:c85f65d5610642ca0f47dae9d5cc117cd9e831f74038bc09fe1af126288200f9", size = 9655249, upload-time = "2025-12-06T23:12:33.085Z" },
-]
-
 [[package]]
 name = "semver"
 version = "3.0.4"
@@ -4019,21 +3157,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/88/43/1c586f9f413765201234541857cb82fda076f4b0f7bad4a0ec248da39cf3/sentry_sdk-2.49.0-py2.py3-none-any.whl", hash = "sha256:6ea78499133874445a20fe9c826c9e960070abeb7ae0cdf930314ab16bb97aa0", size = 415693, upload-time = "2026-01-08T09:56:21.872Z" },
 ]
 
-[[package]]
-name = "service-identity"
-version = "24.2.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "attrs" },
-    { name = "cryptography" },
-    { name = "pyasn1" },
-    { name = "pyasn1-modules" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/07/a5/dfc752b979067947261dbbf2543470c58efe735c3c1301dd870ef27830ee/service_identity-24.2.0.tar.gz", hash = "sha256:b8683ba13f0d39c6cd5d625d2c5f65421d6d707b013b375c355751557cbe8e09", size = 39245, upload-time = "2024-10-26T07:21:57.736Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/08/2c/ca6dd598b384bc1ce581e24aaae0f2bed4ccac57749d5c3befbb5e742081/service_identity-24.2.0-py3-none-any.whl", hash = "sha256:6b047fbd8a84fd0bb0d55ebce4031e400562b9196e1e0d3e0fe2b8a59f6d4a85", size = 11364, upload-time = "2024-10-26T07:21:56.302Z" },
-]
-
 [[package]]
 name = "shellingham"
 version = "1.5.4"
@@ -4052,15 +3175,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" },
 ]
 
-[[package]]
-name = "smmap"
-version = "5.0.2"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/44/cd/a040c4b3119bbe532e5b0732286f805445375489fceaec1f48306068ee3b/smmap-5.0.2.tar.gz", hash = "sha256:26ea65a03958fa0c8a1c7e8c7a58fdc77221b8910f6be2131affade476898ad5", size = 22329, upload-time = "2025-01-02T07:14:40.909Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/04/be/d09147ad1ec7934636ad912901c5fd7667e1c858e19d355237db0d0cd5e4/smmap-5.0.2-py3-none-any.whl", hash = "sha256:b30115f0def7d7531d22a0fb6502488d879e75b260a9db4d0819cfb25403af5e", size = 24303, upload-time = "2025-01-02T07:14:38.724Z" },
-]
-
 [[package]]
 name = "sniffio"
 version = "1.3.1"
@@ -4141,18 +3255,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d9/52/1064f510b141bd54025f9b55105e26d1fa970b9be67ad766380a3c9b74b0/starlette-0.50.0-py3-none-any.whl", hash = "sha256:9e5391843ec9b6e472eed1365a78c8098cfceb7a74bfd4d6b1c0c0095efb3bca", size = 74033, upload-time = "2025-11-01T15:25:25.461Z" },
 ]
 
-[[package]]
-name = "sympy"
-version = "1.14.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "mpmath" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/83/d3/803453b36afefb7c2bb238361cd4ae6125a569b4db67cd9e79846ba2d68c/sympy-1.14.0.tar.gz", hash = "sha256:d3d3fe8df1e5a0b42f0e7bdf50541697dbe7d23746e894990c030e2b05e72517", size = 7793921, upload-time = "2025-04-27T18:05:01.611Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/a2/09/77d55d46fd61b4a135c444fc97158ef34a095e5681d0a6c10b75bf356191/sympy-1.14.0-py3-none-any.whl", hash = "sha256:e091cc3e99d2141a0ba2847328f5479b05d94a6635cb96148ccb3f34671bd8f5", size = 6299353, upload-time = "2025-04-27T18:04:59.103Z" },
-]
-
 [[package]]
 name = "tavily-python"
 version = "0.7.17"
@@ -4209,24 +3311,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/93/e0/6cc82a562bc6365785a3ff0af27a2a092d57c47d7a81d9e2295d8c36f011/tiktoken-0.12.0-cp313-cp313t-win_amd64.whl", hash = "sha256:dc2dd125a62cb2b3d858484d6c614d136b5b848976794edfb63688d539b8b93f", size = 878777, upload-time = "2025-10-06T20:22:18.036Z" },
 ]
 
-[[package]]
-name = "tornado"
-version = "6.4.2"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/59/45/a0daf161f7d6f36c3ea5fc0c2de619746cc3dd4c76402e9db545bd920f63/tornado-6.4.2.tar.gz", hash = "sha256:92bad5b4746e9879fd7bf1eb21dce4e3fc5128d71601f80005afa39237ad620b", size = 501135, upload-time = "2024-11-22T03:06:38.036Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/26/7e/71f604d8cea1b58f82ba3590290b66da1e72d840aeb37e0d5f7291bd30db/tornado-6.4.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e828cce1123e9e44ae2a50a9de3055497ab1d0aeb440c5ac23064d9e44880da1", size = 436299, upload-time = "2024-11-22T03:06:20.162Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/96/44/87543a3b99016d0bf54fdaab30d24bf0af2e848f1d13d34a3a5380aabe16/tornado-6.4.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:072ce12ada169c5b00b7d92a99ba089447ccc993ea2143c9ede887e0937aa803", size = 434253, upload-time = "2024-11-22T03:06:22.39Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/cb/fb/fdf679b4ce51bcb7210801ef4f11fdac96e9885daa402861751353beea6e/tornado-6.4.2-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a017d239bd1bb0919f72af256a970624241f070496635784d9bf0db640d3fec", size = 437602, upload-time = "2024-11-22T03:06:24.214Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4f/3b/e31aeffffc22b475a64dbeb273026a21b5b566f74dee48742817626c47dc/tornado-6.4.2-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c36e62ce8f63409301537222faffcef7dfc5284f27eec227389f2ad11b09d946", size = 436972, upload-time = "2024-11-22T03:06:25.559Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/22/55/b78a464de78051a30599ceb6983b01d8f732e6f69bf37b4ed07f642ac0fc/tornado-6.4.2-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bca9eb02196e789c9cb5c3c7c0f04fb447dc2adffd95265b2c7223a8a615ccbf", size = 437173, upload-time = "2024-11-22T03:06:27.584Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/79/5e/be4fb0d1684eb822c9a62fb18a3e44a06188f78aa466b2ad991d2ee31104/tornado-6.4.2-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:304463bd0772442ff4d0f5149c6f1c2135a1fae045adf070821c6cdc76980634", size = 437892, upload-time = "2024-11-22T03:06:28.933Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/f5/33/4f91fdd94ea36e1d796147003b490fe60a0215ac5737b6f9c65e160d4fe0/tornado-6.4.2-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:c82c46813ba483a385ab2a99caeaedf92585a1f90defb5693351fa7e4ea0bf73", size = 437334, upload-time = "2024-11-22T03:06:30.428Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2b/ae/c1b22d4524b0e10da2f29a176fb2890386f7bd1f63aacf186444873a88a0/tornado-6.4.2-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:932d195ca9015956fa502c6b56af9eb06106140d844a335590c1ec7f5277d10c", size = 437261, upload-time = "2024-11-22T03:06:32.458Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b5/25/36dbd49ab6d179bcfc4c6c093a51795a4f3bed380543a8242ac3517a1751/tornado-6.4.2-cp38-abi3-win32.whl", hash = "sha256:2876cef82e6c5978fde1e0d5b1f919d756968d5b4282418f3146b79b58556482", size = 438463, upload-time = "2024-11-22T03:06:34.71Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/61/cc/58b1adeb1bb46228442081e746fcdbc4540905c87e8add7c277540934edb/tornado-6.4.2-cp38-abi3-win_amd64.whl", hash = "sha256:908b71bf3ff37d81073356a5fadcc660eb10c1476ee6e2725588626ce7e5ca38", size = 438907, upload-time = "2024-11-22T03:06:36.71Z" },
-]
-
 [[package]]
 name = "tqdm"
 version = "4.67.1"
@@ -4239,37 +3323,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d0/30/dc54f88dd4a2b5dc8a0279bdd7270e735851848b762aeb1c1184ed1f6b14/tqdm-4.67.1-py3-none-any.whl", hash = "sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2", size = 78540, upload-time = "2024-11-24T20:12:19.698Z" },
 ]
 
-[[package]]
-name = "trio"
-version = "0.32.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "attrs" },
-    { name = "cffi", marker = "implementation_name != 'pypy' and os_name == 'nt'" },
-    { name = "idna" },
-    { name = "outcome" },
-    { name = "sniffio" },
-    { name = "sortedcontainers" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d8/ce/0041ddd9160aac0031bcf5ab786c7640d795c797e67c438e15cfedf815c8/trio-0.32.0.tar.gz", hash = "sha256:150f29ec923bcd51231e1d4c71c7006e65247d68759dd1c19af4ea815a25806b", size = 605323, upload-time = "2025-10-31T07:18:17.466Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/41/bf/945d527ff706233636c73880b22c7c953f3faeb9d6c7e2e85bfbfd0134a0/trio-0.32.0-py3-none-any.whl", hash = "sha256:4ab65984ef8370b79a76659ec87aa3a30c5c7c83ff250b4de88c29a8ab6123c5", size = 512030, upload-time = "2025-10-31T07:18:15.885Z" },
-]
-
-[[package]]
-name = "trio-websocket"
-version = "0.12.2"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "outcome" },
-    { name = "trio" },
-    { name = "wsproto" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d1/3c/8b4358e81f2f2cfe71b66a267f023a91db20a817b9425dd964873796980a/trio_websocket-0.12.2.tar.gz", hash = "sha256:22c72c436f3d1e264d0910a3951934798dcc5b00ae56fc4ee079d46c7cf20fae", size = 33549, upload-time = "2025-02-25T05:16:58.947Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c7/19/eb640a397bba49ba49ef9dbe2e7e5c04202ba045b6ce2ec36e9cadc51e04/trio_websocket-0.12.2-py3-none-any.whl", hash = "sha256:df605665f1db533f4a386c94525870851096a223adcb97f72a07e8b4beba45b6", size = 21221, upload-time = "2025-02-25T05:16:57.545Z" },
-]
-
 [[package]]
 name = "typer"
 version = "0.21.0"
@@ -4371,38 +3424,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c7/b0/003792df09decd6849a5e39c28b513c06e84436a54440380862b5aeff25d/tzdata-2025.3-py2.py3-none-any.whl", hash = "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1", size = 348521, upload-time = "2025-12-13T17:45:33.889Z" },
 ]
 
-[[package]]
-name = "uefi-firmware"
-version = "1.11"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "future" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/26/ca/139ef1b190af2280e3a149391ed43028c1d19283ad556aa090c49aab3f36/uefi_firmware-1.11.tar.gz", hash = "sha256:30e2a9d138ac1608bdfc1783a936931eb6f4292723919f1db2c1509ec18a6041" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/ea/20/1f56471e7f882f92b6b5be80674ddded92a39da483b648120eb61bd2e362/uefi_firmware-1.11-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:c927563154ce2e6ff522bda07c99ff3b4feba7167bf59fb516f755565a7523e7" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/72/28/137c6163823bb6f02a384c0a9dc0963dc70b0a89b077e2f3a2ed2f9f1f48/uefi_firmware-1.11-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fe45376980d1533e8faf80af1a19e8dcd1b8170a447e1fa39934f4fa91ea0a35" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/50/1e/a5e52142e0d50979ae6cb148348fa4c1d66eb06932dacade4057025a7d7e/uefi_firmware-1.11-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1cf627f257f14ed1bb63290c658e9adb772292927ad399ef70366801dc0cb9a5" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4f/58/37ba11ff39707b919b590dd7a8c0cae613bdc7171631963af16ef29b1f79/uefi_firmware-1.11-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4253b57873fc6127a50ca92797741a74b774d1aa3c994011bd196b21033ddc1" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e9/ab/b37ade211fc5ed704f685352fe0947cbeaf9165924fe2c0048120da4ccd4/uefi_firmware-1.11-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e71095839db1733d77e0001f906104e3084c6bc433dcc5ff8240a65a58d2945" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e6/a9/7ead995a7f5ffe77d21e3479e95ca857b7cc9c241271999cb780a2cfc950/uefi_firmware-1.11-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da64a6cedea68934dab6186b13a48df55027429490f3be02bc910803d040d733" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/49/e2/5d0c396fab59b6c16e41271b9c74820c0107163be967db0474226ffa31dd/uefi_firmware-1.11-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:07a891147c10a6112c6ae4d76efbd07e422ceb1b34e6aa1236d9beb21a6d48b6" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/e7/8c/32adad2dddd768ec0a44aa2174a44864e03e5eab68c59c047148b8e3b2d2/uefi_firmware-1.11-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:75b2de62978767e2263f3299f3ed2d5daaee47cfeb77496769c531e35c2c3393" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/59/98/04155a6f6eded9d184692533ec55fd711d9a2e5ae4a5ed416689f48beb11/uefi_firmware-1.11-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5a45d398edbb985952ee4dc1987f40aecf9af2b151a783eaa70ee0447e7a8052" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/20/61/6e63948588d4bf75e94e45b57205113322972d3b87c3b1ea0062e8e26f0f/uefi_firmware-1.11-cp312-cp312-win32.whl", hash = "sha256:cda1eec452581e6a1fdca9b62c9e4fe9ab6284ef16334fab47b9f3426bbeb841" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/d6/ea/8189bac9bf10dccc6690712aa5695bbd0b82bc5cd4f20defe5892912d364/uefi_firmware-1.11-cp312-cp312-win_amd64.whl", hash = "sha256:0d544e25dab9cefa23a9c2f43226f94d50f85b3b625fe47ce3df12b530e1a1fa" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/43/0e/778e3e72005711e6e886caa3f2a6e33dba4073f679df46c4204740761cc8/uefi_firmware-1.11-cp312-cp312-win_arm64.whl", hash = "sha256:25ddff80fc4d95199ad48e304f32566447acf7a593d0cd4d293629f2e3eabd45" },
-]
-
-[[package]]
-name = "unique-log-filter"
-version = "0.1.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/06/5e/942062197dc9679e5d4fa112c3eb782236800cf2c238b08f116cfbd45895/unique_log_filter-0.1.0.tar.gz", hash = "sha256:411ca5b30572293fc37cd93a651da2a56d4b3a4fdafe9fdfaac14eee54d6a8db", size = 996, upload-time = "2023-12-20T16:31:01.268Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c1/e7/c5c1ddac18fee72373b03d3b091d7a5f2ef5ff96bea4491f23cc78e8aecd/unique_log_filter-0.1.0-py3-none-any.whl", hash = "sha256:e0e7012b4d5911233e02d5ae849fd716c1b8af14dfed0e456af1d6dcdd6a1195", size = 1481, upload-time = "2023-12-20T16:31:00.006Z" },
-]
-
 [[package]]
 name = "urllib3"
 version = "2.6.2"
@@ -4412,24 +3433,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/6d/b9/4095b668ea3678bf6a0af005527f39de12fb026516fb3df17495a733b7f8/urllib3-2.6.2-py3-none-any.whl", hash = "sha256:ec21cddfe7724fc7cb4ba4bea7aa8e2ef36f607a4bab81aa6ce42a13dc3f03dd", size = 131182, upload-time = "2025-12-11T15:56:38.584Z" },
 ]
 
-[package.optional-dependencies]
-socks = [
-    { name = "pysocks" },
-]
-
-[[package]]
-name = "urwid"
-version = "2.6.16"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "typing-extensions" },
-    { name = "wcwidth" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/98/21/ad23c9e961b2d36d57c63686a6f86768dd945d406323fb58c84f09478530/urwid-2.6.16.tar.gz", hash = "sha256:93ad239939e44c385e64aa00027878b9e5c486d59e855ec8ab5b1e1adcdb32a2", size = 848179, upload-time = "2024-10-15T16:07:24.297Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/54/cb/271a4f5a1bf4208dbdc96d85b9eae744cf4e5e11ac73eda76dc98c8fd2d7/urwid-2.6.16-py3-none-any.whl", hash = "sha256:de14896c6df9eb759ed1fd93e0384a5279e51e0dde8f621e4083f7a8368c0797", size = 297196, upload-time = "2024-10-15T16:07:22.521Z" },
-]
-
 [[package]]
 name = "uuid-utils"
 version = "0.12.0"
@@ -4569,24 +3572,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/eb/d8/0d1d2e9d3fabcf5d6840362adcf05f8cf3cd06a73358140c3a97189238ae/wcmatch-10.1-py3-none-any.whl", hash = "sha256:5848ace7dbb0476e5e55ab63c6bbd529745089343427caa5537f230cc01beb8a", size = 39854, upload-time = "2025-06-22T19:14:00.978Z" },
 ]
 
-[[package]]
-name = "wcwidth"
-version = "0.2.14"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/24/30/6b0809f4510673dc723187aeaf24c7f5459922d01e2f794277a3dfb90345/wcwidth-0.2.14.tar.gz", hash = "sha256:4d478375d31bc5395a3c55c40ccdf3354688364cd61c4f6adacaa9215d0b3605", size = 102293, upload-time = "2025-09-22T16:29:53.023Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/af/b5/123f13c975e9f27ab9c0770f514345bd406d0e8d3b7a0723af9d43f710af/wcwidth-0.2.14-py2.py3-none-any.whl", hash = "sha256:a7bb560c8aee30f9957e5f9895805edd20602f2d7f720186dfd906e82b4982e1", size = 37286, upload-time = "2025-09-22T16:29:51.641Z" },
-]
-
-[[package]]
-name = "websocket-client"
-version = "1.9.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2c/41/aa4bf9664e4cda14c3b39865b12251e8e7d239f4cd0e3cc1b6c2ccde25c1/websocket_client-1.9.0.tar.gz", hash = "sha256:9e813624b6eb619999a97dc7958469217c3176312b3a16a4bd1bc7e08a46ec98", size = 70576, upload-time = "2025-10-07T21:16:36.495Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/34/db/b10e48aa8fff7407e67470363eac595018441cf32d5e1001567a7aeba5d2/websocket_client-1.9.0-py3-none-any.whl", hash = "sha256:af248a825037ef591efbf6ed20cc5faa03d3b47b9e5a2230a529eeee1c1fc3ef", size = 82616, upload-time = "2025-10-07T21:16:34.951Z" },
-]
-
 [[package]]
 name = "websockets"
 version = "15.0.1"
@@ -4618,18 +3603,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/fa/a8/5b41e0da817d64113292ab1f8247140aac61cbf6cfd085d6a0fa77f4984f/websockets-15.0.1-py3-none-any.whl", hash = "sha256:f7a866fbc1e97b5c617ee4116daaa09b722101d4a3c170c787450ba409f9736f", size = 169743, upload-time = "2025-03-05T20:03:39.41Z" },
 ]
 
-[[package]]
-name = "werkzeug"
-version = "3.1.4"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-dependencies = [
-    { name = "markupsafe" },
-]
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/45/ea/b0f8eeb287f8df9066e56e831c7824ac6bab645dd6c7a8f4b2d767944f9b/werkzeug-3.1.4.tar.gz", hash = "sha256:cd3cd98b1b92dc3b7b3995038826c68097dcb16f9baa63abe35f20eafeb9fe5e", size = 864687, upload-time = "2025-11-29T02:15:22.841Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/2f/f9/9e082990c2585c744734f85bec79b5dae5df9c974ffee58fe421652c8e91/werkzeug-3.1.4-py3-none-any.whl", hash = "sha256:2ad50fb9ed09cc3af22c54698351027ace879a0b60a3b5edf5730b2f7d876905", size = 224960, upload-time = "2025-11-29T02:15:21.13Z" },
-]
-
 [[package]]
 name = "win32-setctime"
 version = "1.2.0"
@@ -4795,20 +3768,6 @@ wheels = [
     { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/73/ae/b48f95715333080afb75a4504487cbe142cae1268afc482d06692d605ae6/yarl-1.22.0-py3-none-any.whl", hash = "sha256:1380560bdba02b6b6c90de54133c81c9f2a453dee9912fe58c1dcced1edb7cff", size = 46814, upload-time = "2025-10-06T14:12:53.872Z" },
 ]
 
-[[package]]
-name = "z3-solver"
-version = "4.13.0.0"
-source = { registry = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple" }
-sdist = { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/3a/fd/e3f5850fd04480a942aca9f9f7520d3fa5b57731335c221a11f55bb6d91a/z3-solver-4.13.0.0.tar.gz", hash = "sha256:52588e92aec7cb338fd6288ce93758ae01770f62ca0c80e8f4f2b2333feaf51b", size = 4848532, upload-time = "2024-03-07T19:20:07.192Z" }
-wheels = [
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/4e/5b/934de9f1f31b1d0f3a8da0ff2e3092136fbffe737eca52965818464af4c3/z3_solver-4.13.0.0-py2.py3-none-macosx_11_0_arm64.whl", hash = "sha256:bca7d59a699a440247537c2180c519d682c9df3520a16ce288fced61a70d253d", size = 27144281, upload-time = "2024-03-07T19:19:36.033Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/9c/20/f28dfa982bc820760117e5615d59d695d12a6fb31660f53a749be27cccca/z3_solver-4.13.0.0-py2.py3-none-macosx_11_0_x86_64.whl", hash = "sha256:4a4731fded91b32e1861e1c7c96e500da743bb9431246cac51f7c3ffc0f21b5d", size = 30107615, upload-time = "2024-03-07T19:19:45.679Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/0e/8c/9058d3998fdc2148f3e6d3497e949d5dfc77c66b1cc1cb461554c0bba954/z3_solver-4.13.0.0-py2.py3-none-manylinux2014_aarch64.whl", hash = "sha256:9d622022a3511c059915c56b2c231c84b5c1be1b82f457d7560dda3d916474fe", size = 55585725, upload-time = "2024-03-07T19:19:49.81Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/c6/79/0255fe0efee7ea9db8987ced14c70028a0007d4d4aaaed8965310bbd7bb1/z3_solver-4.13.0.0-py2.py3-none-manylinux2014_x86_64.whl", hash = "sha256:8c42de82b6e3ff7ee61287d03c7af8a99f9f6554cdd1204c6b9bca96ff1cb7fb", size = 57305826, upload-time = "2024-03-07T19:19:54.261Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/b9/27/ca09e1f4642b42a2972047f508bc4ecb0c5acf975c910eb0fdeaf9ec21d0/z3_solver-4.13.0.0-py2.py3-none-win32.whl", hash = "sha256:13468e1018c817b7f794898d3100f02541d15c13ab56c0785c5acdea32a066cf", size = 55429050, upload-time = "2024-03-07T19:19:58.867Z" },
-    { url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/packages/25/c0/dd978c813288f6860bcfb9e4d2d1d3b311a42a2237a4766e5a0adbcaa79b/z3_solver-4.13.0.0-py2.py3-none-win_amd64.whl", hash = "sha256:3555436cfe9a5fa2d1b432fb9a5e4460e487649c22e5e68a56f7d81594d043e9", size = 58378460, upload-time = "2024-03-07T19:20:03.281Z" },
-]
-
 [[package]]
 name = "zipp"
 version = "3.23.0"
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 20f4f7d7b..a85ddb47a 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -208,6 +208,18 @@ services:
         condition: service_healthy
 
 
+  # CLI Agent base image build service (used by CLIContainerService for executions)
+  # This service only builds the image; it does not run as a long-lived container.
+  # Per-execution containers are dynamically created by CLIContainerService.
+  cli-agent-image:
+    image: joysafeter/cli-agent:latest
+    build:
+      context: ..
+      dockerfile: deploy/docker/cli-agent.Dockerfile
+    profiles:
+      - build
+    command: ["echo", "Image built successfully"]
+
   # OpenClaw base image build service (used by backend to create per-user containers)
   # This service only builds the image; it does not run as a long-lived container.
   # Per-user OpenClaw instances are dynamically created by the backend's
diff --git a/deploy/docker/cli-agent.Dockerfile b/deploy/docker/cli-agent.Dockerfile
new file mode 100644
index 000000000..a8c1e80ff
--- /dev/null
+++ b/deploy/docker/cli-agent.Dockerfile
@@ -0,0 +1,47 @@
+# =============================================================================
+# CLI Agent Docker Image
+# =============================================================================
+# Pre-installs Claude Code CLI for autonomous agent execution.
+# Used by CLIContainerService to spin up per-execution containers.
+#
+# Build:
+#   docker build -f deploy/docker/cli-agent.Dockerfile -t joysafeter/cli-agent:latest .
+# =============================================================================
+
+FROM node:22-slim
+
+# System deps
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    git \
+    curl \
+    ca-certificates \
+    openssh-client \
+    jq \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Claude Code CLI globally
+RUN npm install -g @anthropic-ai/claude-code
+
+# Install Codex CLI
+RUN npm install -g @openai/codex
+
+# Install OpenClaw (if available via npm, otherwise skip)
+# RUN npm install -g openclaw@latest
+
+# Create non-root user
+RUN groupadd -r agent && useradd -r -g agent -m -d /home/agent -s /bin/bash agent
+
+# Workspace directory
+RUN mkdir -p /workspace && chown agent:agent /workspace
+
+# Default working directory
+WORKDIR /workspace
+
+# Switch to non-root user
+USER agent
+
+# Verify installation
+RUN claude --version || echo "Claude CLI installed"
+
+# Default entrypoint keeps container alive for docker exec
+CMD ["sleep", "infinity"]
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 561d1e679..6d048a8c8 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -1,337 +1,571 @@
 # Architecture
 
-## Overall Architecture
+## 1. Overall Architecture
 
-JoySafeter follows a layered architecture pattern with clear separation of concerns:
+JoySafeter follows a layered architecture with clear separation between API surface, orchestration, execution engines, event pipeline, and real-time delivery.
+
+```
+Layer 1     API Routes (app/api/v1/) + WebSocket Handlers (app/websocket/)
+Layer 1.5   DispatchService — API-facing facade
+Layer 2     ExecutionOrchestrator — creates Run + Execution, builds ExecutionContext
+Layer 2.5   EngineRegistry — singleton, maps runtime_kind to ExecutionEngine
+Layer 3     Execution Engines: CLIEngine / GraphEngine / CodeEngine / CopilotEngine
+Layer 3.5   ExecutionContext callbacks -> ExecutionEventBus
+Layer 4a    PersistenceSubscriber + StateTransitionSubscriber (Phase 1, shared DB tx)
+Layer 4b    WebSocketSubscriber + TaskSyncSubscriber (Phase 2, parallel fan-out)
+Layer 5     ExecutionSubscriptionManager -> WebSocket clients (/ws/executions)
+```
 
 ```mermaid
 flowchart TB
-    subgraph Row1[" "]
-        direction LR
+    subgraph L1["Layer 1 — API Surface"]
+        REST["/v1 REST Endpoints"]
+        WS_EXEC["WS /ws/executions"]
+        WS_NOTIF["WS /ws/notifications"]
+        WS_CLAW["WS /ws/openclaw/*"]
+    end
 
-        subgraph Frontend["Frontend Layer (Next.js + React)"]
-            direction TB
-            Canvas["DeepAgents Canvas<br/>ReactFlow"]
-            CodeEditor["Code Editor<br/>CodeMirror"]
-            Trace["Execution Trace<br/>SSE Stream"]
-            Workspace["Workspace Manager<br/>RBAC"]
-            Copilot["Copilot AI<br/>Graph Assistant"]
-        end
+    subgraph L15["Layer 1.5 — Facade"]
+        DISPATCH["DispatchService"]
+    end
 
-        subgraph API["API Layer (FastAPI)"]
-            direction TB
-            REST["REST APIs<br/>Auth/Graphs/Chat/Skills"]
-            WS["WebSocket<br/>Chat/Copilot/Runs"]
-            SSE["SSE Stream<br/>Real-time Events"]
-            CodeAPI["Code API<br/>Save/Run"]
-        end
+    subgraph L2["Layer 2 — Orchestration"]
+        ORCH["ExecutionOrchestrator"]
+    end
 
-        subgraph Services["Service Layer"]
-            direction TB
-            GraphSvc["GraphService"]
-            SkillSvc["SkillService"]
-            MemorySvc["MemoryService"]
-            McpSvc["McpClient<br/>Service"]
-            ToolSvc["ToolService"]
-        end
+    subgraph L25["Layer 2.5 — Registry"]
+        REG["EngineRegistry"]
+    end
 
-        subgraph Engine["Core Engine"]
-            direction TB
-            DeepBuilder["DeepAgents<br/>Builder"]
-            CodeExec["Code Executor<br/>Sandboxed exec()"]
-            Middleware["Middleware System<br/>Memory"]
-            SkillSys["Skill System<br/>Progressive Disclosure"]
-            MemorySys["Memory System<br/>Long/Short-term"]
-        end
+    subgraph L3["Layer 3 — Engines"]
+        CLI["CLIEngine<br/>sandbox"]
+        GRAPH["GraphEngine<br/>graph"]
+        CODE["CodeEngine<br/>code"]
+        COPILOT["CopilotEngine<br/>copilot"]
     end
 
-    subgraph Row2[" "]
-        direction LR
+    subgraph L35["Layer 3.5 — Event Bus"]
+        CTX["ExecutionContext.emit()"]
+        BUS["ExecutionEventBus"]
+    end
 
-        subgraph Runtime["Runtime Layer"]
-            direction TB
-            LangGraph["LangGraph Runtime<br/>StateGraph"]
-            Checkpoint["Checkpointer<br/>State Persistence"]
+    subgraph L4["Layer 4 — Subscribers"]
+        direction LR
+        subgraph Phase1["Phase 1 (shared tx, sequential)"]
+            PERSIST["PersistenceSubscriber"]
+            STATE["StateTransitionSubscriber"]
         end
-
-        subgraph Data["Data Layer"]
-            direction TB
-            PG["PostgreSQL<br/>Graphs/Skills/Memory"]
-            Redis["Redis<br/>Cache/Sessions"]
+        subgraph Phase2["Phase 2 (parallel fan-out)"]
+            WS_SUB["WebSocketSubscriber"]
+            TASK_SUB["TaskSyncSubscriber"]
         end
+    end
 
-        subgraph MCP["MCP Tool Ecosystem"]
-            direction TB
-            MCPServers["MCP Servers<br/>200+ Security Tools"]
-            Tools["Tool Registry<br/>Unified Management"]
-        end
+    subgraph L5["Layer 5 — Delivery"]
+        MGR["ExecutionSubscriptionManager"]
+        CLIENTS["WebSocket Clients"]
     end
 
-    Canvas --> REST
-    CodeEditor --> CodeAPI
-    Trace --> SSE
-    Workspace --> REST
-    Copilot --> WS
+    REST --> DISPATCH
+    DISPATCH --> ORCH
+    ORCH --> REG
+    REG --> CLI & GRAPH & CODE & COPILOT
+    CLI & GRAPH & CODE & COPILOT --> CTX
+    CTX --> BUS
+    BUS --> PERSIST & STATE
+    BUS --> WS_SUB & TASK_SUB
+    WS_SUB --> MGR --> CLIENTS
+    WS_EXEC --> MGR
+
+    style L1 fill:#f3e5f5
+    style L15 fill:#e1f5ff
+    style L2 fill:#fff3e0
+    style L25 fill:#fff3e0
+    style L3 fill:#e8f5e8
+    style L35 fill:#fff8e1
+    style L4 fill:#fce4ec
+    style L5 fill:#e0f2f1
+```
+
+---
+
+## 2. Core Modules
 
-    REST --> Services
-    WS --> Services
-    SSE --> Services
-    CodeAPI --> Services
+### 2.1 Contracts — Single Source of Truth for Value Domains
 
-    Services --> Engine
-    Engine --> Runtime
-    Runtime --> Data
-    Runtime --> MCP
+Three contract files in `core/contracts/` define every canonical value as `Literal` types + plain `set[str]` constants. All code references these definitions rather than scattering magic strings.
 
-    MCPServers --> Tools
+| Contract file | Defines |
+|---|---|
+| `agent.py` | `DefinitionKindLiteral`, `RuntimeKindLiteral`, `DEFINITION_RUNTIME_KIND` mapping, `infer_runtime_kind()` |
+| `execution.py` | `RunStatusLiteral`, `ExecutionStatusLiteral`, `TriggerSourceLiteral`, terminal/active sets |
+| `error.py` | `ErrorCode` (StrEnum, ~180 codes), `ErrorSource`, `UserAction`, canonical registry sets |
 
-    style Row1 fill:transparent,stroke:transparent
-    style Row2 fill:transparent,stroke:transparent
+### 2.2 Engine Protocol + Registry + Capabilities
 
-    style Frontend fill:#e1f5ff
-    style API fill:#f3e5f5
-    style Services fill:#fff3e0
-    style Engine fill:#e8f5e8
-    style Runtime fill:#fff8e1
-    style Data fill:#fce4ec
-    style MCP fill:#e0f2f1
+**Protocol** (`core/engine/protocol.py`):
 
+```python
+@runtime_checkable
+class ExecutionEngine(Protocol):
+    engine_kind: str
+    capabilities: EngineCapabilities
+
+    async def start(self, context: ExecutionContext, *, ...) -> None: ...
+    async def cancel(self, execution_id: UUID) -> None: ...
+    async def send_message(self, execution_id: UUID, message: str) -> None: ...
 ```
 
-### Core Modules
+**ExecutionContext** is injected into every engine. Engines never touch persistence or WebSocket directly — they call `context.emit()`, `context.update_status()`, and `context.complete()`.
 
-#### 1. Graph Build System — Two Paths
+**EngineCapabilities** declares what each engine supports:
 
-The system supports two graph building modes:
+| Engine | runtime_kind | cancel | msg_inject | debug_obs | artifacts | approval |
+|---|---|---|---|---|---|---|
+| CLIEngine | sandbox | Y | Y | N | Y | Y |
+| GraphEngine | graph | Y | N | Y | Y | Y |
+| CodeEngine | code | Y | N | Y | N | N |
+| CopilotEngine | copilot | Y | N | N | N | N |
 
-```mermaid
-flowchart LR
-    Service[GraphService] -->|graph_mode = code| CodeExec[Code Executor<br/>exec → StateGraph.compile]
-    Service -->|canvas mode| DeepBuilder[DeepAgents Builder<br/>Manager-Worker topology]
+**Registry** (`core/engine/registry.py`): A module-level singleton `engine_registry` maps `runtime_kind` strings to engine instances. All four engines register at import time in `core/engine/__init__.py`:
 
-    CodeExec --> LangGraph[LangGraph Runtime]
-    DeepBuilder --> LangGraph
+```python
+engine_registry.register("sandbox", CLIEngine())
+engine_registry.register("graph", GraphEngine())
+engine_registry.register("code", CodeEngine())
+engine_registry.register("copilot", CopilotEngine())
+```
 
-    style Service fill:#e1f5ff
-    style CodeExec fill:#fff3e0
-    style DeepBuilder fill:#e8f5e8
+**Adding a new engine** requires:
+1. Implement the `ExecutionEngine` protocol
+2. Register it in `core/engine/__init__.py`
+3. Add the new `runtime_kind` to `core/contracts/agent.py` (`RUNTIME_KINDS`, `DEFINITION_RUNTIME_KIND`)
+4. Add error codes to `core/contracts/error.py` if needed
+
+### 2.3 Two-Phase Event Bus
+
+`core/events/bus.py` — `ExecutionEventBus`
+
+All execution events flow through a two-phase publish pipeline:
+
+- **Phase 1 (PERSIST)**: Subscribers share the caller's DB session and run **sequentially**. The bus commits once after all Phase 1 subscribers complete. This guarantees that persistence and state transitions are atomic.
+  - `PersistenceSubscriber` — writes `ExecutionEvent` rows, assigns `seq` numbers
+  - `StateTransitionSubscriber` — validates and applies status changes via state machines
+
+- **Phase 2 (BROADCAST)**: Subscribers run **in parallel** via `asyncio.gather`. A failure in one does not affect others.
+  - `WebSocketSubscriber` — pushes events to `ExecutionSubscriptionManager` for real-time delivery
+  - `TaskSyncSubscriber` — syncs Task status based on Run terminal status
+
+**Envelope** (`core/events/envelope.py`): `ExecutionEventEnvelope` is the canonical shape all subscribers receive:
+
+```python
+@dataclass
+class ExecutionEventEnvelope:
+    execution_id: UUID
+    run_id: UUID
+    workspace_id: UUID
+    event_type: ExecutionEventType | str
+    payload: dict[str, Any]
+    seq: int = 0                          # filled by PersistenceSubscriber
+    trigger_source: str | None = None
+    thread_id: UUID | None = None
+    task_id: UUID | None = None
+    terminal_status: str | None = None    # completion-only
+    error: dict[str, Any] | None = None   # ErrorDescriptor via AppError.to_payload()
+    ...
 ```
 
-**Code Mode:**
-- User writes standard LangGraph Python code in the browser editor
-- Backend executes code in a sandboxed environment (restricted builtins, import whitelist, exec timeout)
-- Extracts `StateGraph` instance from executed code, compiles and runs it
-- Zero learning curve — LangGraph docs are the docs
+**Event types** (`core/events/event_types.py`): `ExecutionEventType` StrEnum — content events (`assistant_text`, `thinking`, `tool_use_start/end`, `error`, `artifact_created`, `approval_requested/resolved`), lifecycle events (`execution_started/completed/status_change`, `run_status_change`), and copilot events.
 
-**DeepAgents Canvas Mode:**
-- Visual drag-and-drop builder for multi-agent orchestration
-- Three node types: Agent, Code Agent, A2A Agent
-- Builds Manager-Worker star topology via `deepagents.create_deep_agent()`
+### 2.4 State Machines
 
-#### 2. DeepAgents Multi-Agent Orchestration
+`core/state_machines/` centralizes all status transition rules.
 
-DeepAgents implements a star topology with one Manager coordinating multiple Workers:
+**Engine** (`engine.py`): Generic `StateMachine` class with `validate(from, to)` and `is_terminal(status)`.
 
-```mermaid
-flowchart TB
-    Manager[Manager Agent<br/>useDeepAgents=True<br/>DeepAgent]
+**Definitions** (`definitions.py`): Transition tables for 6 entities:
 
-    Manager -->|task| Worker1[Worker 1<br/>CompiledSubAgent]
-    Manager -->|task| Worker2[Worker 2<br/>CompiledSubAgent]
-    Manager -->|task| Worker3[Worker 3<br/>CompiledSubAgent]
-    Manager -->|task| CodeAgent[CodeAgent<br/>CompiledSubAgent]
+| State Machine | Entity | Terminal States |
+|---|---|---|
+| `AGENT_SM` | Agent | (none — archived can revert) |
+| `VERSION_SM` | AgentVersion | (none — frozen can unfreeze) |
+| `RELEASE_SM` | AgentRelease | `retired` |
+| `RUN_SM` | AgentRun | `succeeded`, `failed`, `cancelled` |
+| `EXECUTION_SM` | Execution | `succeeded`, `failed`, `cancelled` |
+| `TASK_SM` | Task | (none — done/cancelled can reopen) |
 
-    subgraph Backend["Shared Docker Backend"]
-        Skills["/workspace/skills/<br/>Pre-loaded Skills"]
-    end
+**Transitions** (`transitions.py`): `transition_run()`, `transition_execution()`, `transition_task()` are the **only** functions that modify `.status` on domain entities. `sync_task_from_run()` auto-maps Run terminal status to Task status via `RUN_TO_TASK_SYNC`.
+
+### 2.5 Observation Layer
+
+`core/observation/` — OTel-backed tracing injected into `ExecutionContext`.
+
+| Module | Purpose |
+|---|---|
+| `collector.py` | `ObservationCollector` — main entry point, injected as `context.collector` |
+| `model.py` | Data models for observation spans |
+| `types.py` | Type definitions |
+| `otel/provider.py` | OTel TracerProvider setup |
+| `otel/span_wrapper.py` | Span wrapper with JoySafeter-specific attributes |
+| `otel/persistence_processor.py` | Exports spans to DB |
+| `otel/broadcast_processor.py` | Exports spans to WebSocket for real-time display |
+| `instrumentation/` | Engine-specific extractors: `cli_extractor.py`, `copilot_extractor.py`, `langchain_handler.py`, `file_tracker.py` |
+
+### 2.6 Ports & Adapters
+
+`core/ports/execution.py` defines Protocol interfaces that decouple `core/` from `services/`:
+
+- **`ExecutionEventPort`** — port for publishing execution events through the event bus. Implemented by `services/execution_event_adapter.py`, used by `core/agent/cli_backends/execution_runner.py`.
+- **`ExecutionReaderPort`** — port for reading execution data without direct ORM queries in `core/`. Implemented by `services/execution_reader_adapter.py`.
+
+`EventContext` dataclass carries run-level metadata so event publishing can construct complete envelopes without querying the DB on every event.
+
+### 2.7 Error System — AppError Hierarchy + ErrorDescriptor
+
+`common/app_errors.py` defines a unified exception hierarchy rooted at `AppError` (a `@dataclass(slots=True)` subclass of `Exception`).
+
+**Category classes** (no constructors, just `_default_source`):
+
+```
+AppError
+  ├── DomainError          (_default_source = "api")
+  ├── InfraError           (_default_source = "runtime")
+  ├── AuthError            (_default_source = "auth")
+  ├── ValidationError      (_default_source = "validation")
+  ├── PermissionDeniedError(_default_source = "permission")
+  ├── ConflictError        (_default_source = "api")
+  ├── RateLimitError       (_default_source = "api")
+  └── InternalError        (_default_source = "internal")
+```
+
+**Leaf classes** provide defaults and `**kw` pass-through:
 
-    Worker1 --> Backend
-    Worker2 --> Backend
-    Worker3 --> Backend
-    CodeAgent --> Backend
-
-    style Manager fill:#e1f5ff
-    style Worker1 fill:#fff4e1
-    style Worker2 fill:#fff4e1
-    style Worker3 fill:#fff4e1
-    style CodeAgent fill:#fff4e1
-    style Backend fill:#e8f5e8
 ```
+DomainError
+  ├── NotFoundError          (code=NOT_FOUND)
+  ├── InvalidRequestError    (code=BAD_REQUEST)
+  └── ModelConfigError       (code=MODEL_*)
+AuthError
+  └── AuthenticationError    (code=UNAUTHORIZED, user_action=relogin)
+PermissionDeniedError
+  └── AccessDeniedError      (code=FORBIDDEN)
+...
+```
+
+**ErrorDescriptor** — the canonical error payload shape, output by `AppError.to_payload()`:
+
+```json
+{
+  "code": "SKILL_NOT_FOUND",
+  "message": "Skill not found",
+  "data": {"skill_id": "..."},
+  "source": "api",
+  "retryable": false,
+  "user_action": null,
+  "detail": null
+}
+```
+
+This is the **single serialization chokepoint** — all transport paths (HTTP response body, WebSocket error frames, SSE error events, DB JSONB `error` columns) flow through `to_payload()`.
+
+**Error code registry**: `core/contracts/error.py` contains `ErrorCode` StrEnum with ~180 entries organized by domain (Generic, Auth, Agent, Run, Execution, Engine, Model, Sandbox, Skill, Tool/MCP, Task, etc.).
+
+### 2.8 Graph Build System
+
+Two paths for building agent graphs:
+
+| Path | definition_kind | Engine | Description |
+|---|---|---|---|
+| **Code Mode** | `code` | CodeEngine | User writes LangGraph Python in browser; backend exec()s in sandbox |
+| **DeepAgents Canvas** | `graph` | GraphEngine | Visual drag-and-drop builder; Manager-Worker star topology |
+| **CLI-backed** | `claude_code`, `codex`, `openclaw` | CLIEngine | Docker container + CLI agent runtime |
+| **Copilot** | (internal) | CopilotEngine | Graph analysis and action execution |
 
 **DeepAgents Build Pipeline:**
 
 ```
 build_deep_agents_graph()
-    ├── 1. resolve_all_configs()     — pure config extraction, no side effects
-    ├── 2. setup shared backend      — Docker sandbox if needed
-    ├── 3. preload_skills()          — batch preload with deduplication
-    ├── 4. ModelResolver.resolve()   — unified LLM resolution with cache
-    ├── 5. build workers             — agent_factory per node type
-    └── 6. create_deep_agent()       — compile and finalize
+  ├── 1. resolve_all_configs()    — pure config extraction, no side effects
+  ├── 2. setup shared backend     — Docker sandbox if needed
+  ├── 3. preload_skills()         — batch preload with deduplication
+  ├── 4. ModelResolver.resolve()  — unified LLM resolution with cache
+  ├── 5. build workers            — agent_factory per node type
+  └── 6. create_deep_agent()      — compile and finalize
 ```
 
-**Key Design Decisions:**
-- **No inheritance** — composition of dedicated resolvers (ModelResolver, ToolResolver, SkillsLoader)
-- **Config resolution is pure** — no side effects, each node resolved exactly once
-- **Model resolution is unified and cached** — same resolver for node models and memory models
-- **Star Topology**: Manager connects directly to all SubAgents (not chain)
-- **Shared Backend**: Docker backend shared across agents for skills and code execution
-
-#### 3. Code Executor Security
+### 2.9 Code Executor Security
 
 The code executor runs user LangGraph code with multiple security layers:
 
 | Layer | Protection |
-|-------|-----------|
-| **Builtins blacklist** | `open`, `eval`, `exec`, `compile`, `globals`, `locals`, `vars`, `dir` removed |
-| **Import blocklist** | `os`, `sys`, `subprocess`, `socket`, `io`, `pathlib`, etc. blocked |
-| **Import allowlist** | Only `langgraph`, `langchain`, `typing`, `json`, `pydantic`, etc. allowed |
-| **Exec timeout** | 10 second limit via `signal.alarm` |
-| **Invoke timeout** | 30 second limit via `asyncio.wait_for` |
-| **Permission checks** | Save requires member role, Run requires viewer role |
-| **Error sanitization** | Server file paths stripped from error messages |
+|---|---|
+| Builtins blacklist | `open`, `eval`, `exec`, `compile`, `globals`, `locals`, `vars`, `dir` removed |
+| Import blocklist | `os`, `sys`, `subprocess`, `socket`, `io`, `pathlib`, etc. blocked |
+| Import allowlist | Only `langgraph`, `langchain`, `typing`, `json`, `pydantic`, etc. allowed |
+| Exec timeout | 10-second limit via `signal.alarm` |
+| Invoke timeout | 30-second limit via `asyncio.wait_for` |
+| Permission checks | Save requires member role, Run requires viewer role |
+| Error sanitization | Server file paths stripped from error messages |
 
-#### 4. Skill System (Progressive Disclosure)
+### 2.10 Skill System
 
-The skill system implements progressive disclosure to reduce token consumption:
+Progressive disclosure to reduce token consumption:
 
-```mermaid
-sequenceDiagram
-    participant Node as Agent Node
-    participant Loader as SkillSandboxLoader
-    participant Backend as Docker Backend
+- **SkillService**: CRUD with permission control and versioning
+- **SkillsLoader**: Batch preloads skills to Docker backend with deduplication
+- **FilesystemMiddleware**: Agent reads `/workspace/skills/{skill_name}/SKILL.md` on demand
 
-    Node->>Loader: Preload skills (batch, deduplicated)
-    Loader->>Backend: Write skill files to /workspace/skills/
-    Backend-->>Loader: Skills loaded
+Skill exceptions inherit from the unified error tree:
 
-    Node->>Node: Agent sees skill summaries in system prompt
-    Node->>Backend: Agent reads /workspace/skills/{skill_name}/SKILL.md
-    Backend-->>Node: Agent receives full skill content on demand
+```
+DomainError → SkillLoadError, SkillNotFoundError (via NotFoundError)
+PermissionDeniedError → SkillPermissionDeniedError (via AccessDeniedError)
+InternalError → SkillFileWriteError (via InternalServiceError)
 ```
 
-**Components:**
-- **SkillService**: CRUD operations with permission control
-- **SkillsLoader**: Batch preloads skills to Docker backend with deduplication
-- **FilesystemMiddleware**: Agent reads skill files from `/workspace/skills/` via filesystem access
+### 2.11 Memory System
 
-#### 5. Memory System (Long/Short-term Memory)
+Long/short-term agent memory with middleware injection:
 
-```mermaid
-sequenceDiagram
-    participant User as User Input
-    participant Middleware as MemoryMiddleware
-    participant Manager as MemoryManager
-    participant DB as PostgreSQL
-    participant Agent as Agent
-
-    User->>Middleware: User message
-    Middleware->>Manager: Retrieve relevant memories
-    Manager->>DB: Query memories by user_id/topics
-    DB-->>Manager: Return memories
-    Manager-->>Middleware: Inject memories into context
-    Middleware->>Agent: Enhanced prompt with memories
-    Agent-->>Middleware: Agent response
-    Middleware->>Manager: Extract and persist new memories
-    Manager->>DB: Persist memory
-```
+- **MemoryManager**: Query and persist memories by user/topics
+- **MemoryMiddleware**: Injects relevant memories into agent context, extracts new memories from responses
+- **Memory types**: Fact, Procedure, Episodic, Semantic
 
-**Memory Types:**
-- **Fact**: Factual knowledge (target info, vulnerabilities)
-- **Procedure**: Procedural knowledge (successful attack paths)
-- **Episodic**: Session-specific experiences
-- **Semantic**: General security knowledge
+---
 
-### Core Workflows
+## 3. Core Workflows
 
-#### Graph Building Flow
+### 3.1 Execution Flow
 
 ```mermaid
 sequenceDiagram
-    participant Frontend as Frontend
+    participant FE as Frontend
     participant API as REST API
-    participant Service as GraphService
-    participant Builder as DeepAgentsBuilder / CodeExecutor
-    participant Runtime as LangGraph Runtime
-
-    Frontend->>API: Save graph (nodes/edges or code)
-    API->>Service: build graph
-    Service->>Service: Detect mode (code vs canvas)
-
-    alt Code Mode
-        Service->>Builder: execute_code(code)
-        Builder->>Runtime: StateGraph.compile()
-    else Canvas Mode (DeepAgents)
-        Service->>Builder: build_deep_agents_graph(nodes, edges)
-        Builder->>Runtime: create_deep_agent() → compile()
+    participant DS as DispatchService
+    participant EO as ExecutionOrchestrator
+    participant ER as EngineRegistry
+    participant ENG as ExecutionEngine
+    participant CTX as ExecutionContext
+    participant BUS as ExecutionEventBus
+    participant P1 as Phase 1 Subscribers
+    participant P2 as Phase 2 Subscribers
+    participant WS as /ws/executions
+
+    FE->>API: POST /runs or /executions
+    API->>DS: dispatch(agent_id, prompt, ...)
+    DS->>EO: create_and_start(...)
+    EO->>EO: Create AgentRun + Execution rows
+    EO->>ER: get(runtime_kind)
+    ER->>ENG: engine.start(context, ...)
+
+    loop Engine execution
+        ENG->>CTX: context.emit(event_type, payload)
+        CTX->>BUS: publish(envelope, db)
+        BUS->>P1: PersistenceSubscriber.handle() [sequential, shared tx]
+        BUS->>P1: StateTransitionSubscriber.handle()
+        Note over BUS: COMMIT
+        BUS->>P2: WebSocketSubscriber.handle() [parallel]
+        BUS->>P2: TaskSyncSubscriber.handle() [parallel]
+        P2->>WS: push to subscribed clients
     end
 
-    Runtime-->>Service: CompiledStateGraph
-    Service-->>API: Compiled graph
-    API-->>Frontend: Ready
+    ENG->>CTX: context.complete(status, result, error)
+    CTX->>BUS: publish completion envelope
 ```
 
-#### Graph Execution Flow
+### 3.2 Error Flow
 
 ```mermaid
-sequenceDiagram
-    participant Frontend as Frontend
-    participant API as REST API
-    participant Service as GraphService
-    participant Runtime as LangGraph Runtime
-    participant SSE as SSE Stream
-
-    Frontend->>API: POST /api/chat (SSE)
-    API->>Service: Load and compile graph
-    Service-->>Runtime: CompiledStateGraph
-    Service->>Runtime: ainvoke({"messages": [...]})
-
-    loop Each Node
-        Runtime->>Runtime: Execute node
-        Runtime->>SSE: Push event (node_start/node_end)
-        SSE-->>Frontend: Stream update
-    end
+flowchart LR
+    ENG["Engine raises<br/>or catches error"] --> APP["AppError<br/>(or normalize_app_error)"]
+    APP --> TP["to_payload()<br/>→ ErrorDescriptor"]
+    TP --> HTTP["HTTP JSON response"]
+    TP --> WSF["WS error frame"]
+    TP --> DB["DB JSONB<br/>execution.error"]
+    TP --> ENV["Envelope.error field"]
+
+    style APP fill:#fce4ec
+    style TP fill:#fff3e0
+```
+
+All errors are normalized to `AppError` (or subclass), serialized via the single `to_payload()` method, and consumed identically across all transports. The frontend `ApiError` class mirrors the `ErrorDescriptor` shape with typed `source: ErrorSource`, `retryable: boolean`, and `userAction?: UserAction`.
+
+---
+
+## 4. Data Flow
+
+### 4.1 WebSocket Endpoints
+
+| Path | Handler | Purpose |
+|---|---|---|
+| `/ws/executions` | `ExecutionSubscriptionHandler` | Execution event stream — subscribe, snapshot replay, live events |
+| `/ws/notifications` | `NotificationManager` | User-level push notifications |
+| `/ws/openclaw/dashboard` | `OpenClawHandler` | OpenClaw dashboard bridge |
+| `/ws/openclaw/bridge/{user_id}` | `OpenClawHandler` | OpenClaw device bridge |
+
+### 4.2 Trigger Sources
+
+AgentRun creation accepts canonical trigger sources defined in `core/contracts/execution.py`:
+
+`task` | `chat` | `api` | `scheduler` | `draft_test` | `draft_copilot` | `debug` | `copilot`
+
+### 4.3 Single Event Source
+
+All engines emit events through `ExecutionContext.emit()` into `execution_events` table. The `PersistenceSubscriber` assigns monotonically increasing `seq` numbers. WebSocket clients replay from persisted events on reconnect and receive live events from the same pipeline.
+
+### 4.4 Frontend → Backend Communication
+
+| Channel | Use |
+|---|---|
+| REST API (`/api/v1/*`) | CRUD operations: agents, versions, releases, tasks, threads, runs, executions, skills, tools, models, workspaces |
+| WebSocket `/ws/executions` | Real-time execution event streaming |
+| WebSocket `/ws/notifications` | User notifications |
+| Code API | Save and run user LangGraph code |
+
+### 4.5 Backend → Data Layer
+
+- **PostgreSQL**: Agent definitions, versions, releases, skills, memories, sessions, workspaces, runs, executions, execution_events, snapshots, traces
+- **Redis**: Session cache, rate limiting, temporary data
+
+---
+
+## 5. Backend File Structure
 
-    Runtime-->>Service: Final result
-    Service-->>SSE: End event
-    SSE-->>Frontend: Stream complete
+```
+app/
+├── api/v1/                        # REST route modules
+├── common/
+│   └── app_errors.py              # AppError hierarchy + to_payload() + normalize_app_error()
+├── core/
+│   ├── contracts/                 # Value domain registries (single source of truth)
+│   │   ├── agent.py               #   DefinitionKind, RuntimeKind, DEFINITION_RUNTIME_KIND
+│   │   ├── execution.py           #   RunStatus, ExecutionStatus, TriggerSource, terminal sets
+│   │   └── error.py               #   ErrorCode (StrEnum ~180), ErrorSource, UserAction
+│   ├── engine/                    # Execution engine abstraction
+│   │   ├── protocol.py            #   ExecutionEngine Protocol, ExecutionContext, EngineCapabilities
+│   │   ├── registry.py            #   EngineRegistry singleton
+│   │   ├── __init__.py            #   Registers 4 built-in engines at import time
+│   │   ├── cli_engine.py          #   CLIEngine (Docker + CLI agent runtime)
+│   │   ├── graph_engine.py        #   GraphEngine (LangGraph compiler)
+│   │   ├── code_engine.py         #   CodeEngine (in-process code agent)
+│   │   └── copilot_engine.py      #   CopilotEngine (graph analysis)
+│   ├── events/                    # Two-phase event bus
+│   │   ├── bus.py                 #   ExecutionEventBus (Phase 1 + Phase 2)
+│   │   ├── envelope.py            #   ExecutionEventEnvelope dataclass
+│   │   ├── event_types.py         #   ExecutionEventType StrEnum
+│   │   ├── subscriber.py          #   EventSubscriber Protocol + SubscriberPhase enum
+│   │   └── subscribers/           #   Built-in subscriber implementations
+│   │       ├── persistence.py     #     PersistenceSubscriber (Phase 1)
+│   │       ├── state_transition.py#     StateTransitionSubscriber (Phase 1)
+│   │       ├── websocket.py       #     WebSocketSubscriber (Phase 2)
+│   │       └── task_sync.py       #     TaskSyncSubscriber (Phase 2)
+│   ├── state_machines/            # Centralized status transition rules
+│   │   ├── definitions.py         #   Transition tables for 6 entities
+│   │   ├── engine.py              #   StateMachine class + InvalidTransition error
+│   │   └── transitions.py         #   transition_run(), transition_execution(), transition_task()
+│   ├── observation/               # OTel-backed tracing
+│   │   ├── collector.py           #   ObservationCollector (injected into ExecutionContext)
+│   │   ├── otel/                  #   TracerProvider, span wrappers, processors
+│   │   └── instrumentation/       #   Engine-specific extractors
+│   ├── ports/                     # Protocol interfaces for core/ <-> services/ decoupling
+│   │   └── execution.py           #   ExecutionEventPort, ExecutionReaderPort, EventContext
+│   ├── agent/                     # CLI agent backends (claude_code, codex, openclaw)
+│   ├── copilot/                   # Copilot service implementation
+│   ├── graph/                     # DeepAgents graph builder + code executor
+│   ├── skill/                     # Skill system (service, loader, exceptions)
+│   ├── model/                     # Model provider + credential management
+│   ├── tools/                     # Tool resolver + MCP integration
+│   └── a2a/                       # Agent-to-agent protocol support
+├── models/                        # SQLAlchemy ORM models
+├── repositories/                  # Data access layer
+├── schemas/                       # Pydantic request/response schemas
+├── services/                      # Service layer implementations
+│   ├── dispatch_service.py        #   API-facing facade (Layer 1.5)
+│   ├── execution_orchestrator.py  #   Run + Execution lifecycle (Layer 2)
+│   ├── execution_event_adapter.py #   ExecutionEventPort implementation
+│   ├── execution_reader_adapter.py#   ExecutionReaderPort implementation
+│   ├── runner_factory.py          #   Creates CLI execution runners
+│   ├── agent_service.py           #   Agent CRUD
+│   ├── agent_version_service.py   #   Version management
+│   ├── agent_release_service.py   #   Release lifecycle
+│   ├── agent_run_service.py       #   Run queries
+│   ├── copilot_service.py         #   Copilot streaming
+│   ├── skill_service.py           #   Skill CRUD + permissions
+│   ├── model_service.py           #   Model resolution (provider_name, model_name)
+│   ├── sandbox_manager.py         #   Sandbox pool management
+│   └── ...                        #   (40+ service modules)
+├── websocket/                     # WebSocket handlers
+│   ├── execution_subscription_handler.py  # /ws/executions handler
+│   ├── execution_subscription_manager.py  # Subscription registry + broadcast
+│   ├── notification_manager.py            # /ws/notifications
+│   ├── openclaw_handler.py                # /ws/openclaw/* handlers
+│   └── auth.py                            # WS authentication
+├── templates/                     # Email templates (Jinja2)
+└── utils/                         # Shared utilities
 ```
 
-### Data Flow
+---
 
-**Frontend ↔ Backend:**
-- **REST API**: Graph configuration, skill management, tool management, workspace operations
-- **WebSocket (`/ws/chat`)**: Shared chat protocol for Chat, Copilot, and Skill Creator turns; Copilot sends `extension: { kind: "copilot" }` through the same WS
-- **WebSocket (`/ws/runs`)**: Real-time run observation — event replay and status updates for active agent runs
-- **Code API**: Save and run user LangGraph code
-- **SSE Stream**: Real-time execution status, streaming output, node execution events
+## 6. Frontend Architecture
 
-**Backend Internal:**
-- **Code Mode**: `code_executor.execute_code()` → `StateGraph.compile()` → `ainvoke()`
-- **Canvas Mode**: `build_deep_agents_graph()` → `create_deep_agent()` → `compile()` → `ainvoke()`
-- **Copilot Turn**: `execute_copilot_turn()` → `CopilotService._get_copilot_stream()` → events persisted to `agent_run_events` via Run Center
-- **LangGraph Runtime → MCP Servers → Tools**: Tool invocation and execution
-- **Middleware → Agent → Model**: Request processing pipeline
+### 6.1 App Router Structure
 
-**Backend ↔ Data Layer:**
-- **PostgreSQL**: Graph configurations, skills, memories, sessions, workspaces, agent runs/events/snapshots (Run Center)
-- **Redis**: Cache, rate limiting, temporary data
+Next.js App Router with route groups:
 
-### Backend File Structure (Graph Module)
+```
+app/
+├── (auth)/                       # Auth pages (signin, signup, verify, reset-password)
+├── dashboard/                    # Dashboard
+├── agents/[agentId]/             # Agent detail: edit, versions, releases, tasks, threads
+├── executions/[executionId]/     # Execution detail + real-time trace
+├── tasks/                        # Task management
+├── skills/                       # Skill marketplace + creator
+├── tools/                        # Tool management
+├── memory/                       # Memory management
+├── openclaw/                     # OpenClaw dashboard
+└── settings/                     # Models, members, sandboxes, tokens
+```
+
+### 6.2 WebSocket Client Layer
 
 ```
-app/core/graph/
-├── __init__.py                    # Exports build_deep_agents_graph()
-├── deep_agents/
-│   ├── builder.py                 # Build orchestration (no inheritance)
-│   ├── config.py                  # Pure config extraction
-│   ├── model_resolver.py          # Unified LLM resolution with cache
-│   ├── agent_factory.py           # Creates agent/code_agent/a2a workers
-│   ├── skills_loader.py           # Batch skills preload with dedup
-│   ├── tool_resolver.py           # Tool name → instance resolution
-│   └── middleware.py              # Memory middleware
-├── node_secrets.py                # A2A secret hydration
-└── runtime_prompt_template.py     # Runtime prompt variable substitution
-
-app/core/code_executor.py          # Sandboxed exec() for Code mode
+BaseWsClient (abstract)
+├── lifecycle management (connect, disconnect, reconnect)
+├── authentication (ws-token)
+├── heartbeat + auto-reconnect with backoff
+│
+├── ExecutionWsClient     /ws/executions
+├── NotificationWsClient  /ws/notifications
+└── (OpenClaw clients)    /ws/openclaw/*
 ```
+
+`ExecutionSubscriptionManager` on the frontend subscribes to execution IDs and dispatches incoming events to the appropriate UI stores.
+
+### 6.3 State Management
+
+- **Zustand**: Client-side stores for UI state (execution trace, sidebar, editor)
+- **TanStack Query**: Server state with cache invalidation (agents, skills, models, etc.)
+
+### 6.4 Error Consumption
+
+The frontend `ApiError` class (`lib/api-client.ts`) mirrors the backend `ErrorDescriptor`:
+
+```typescript
+class ApiError extends Error {
+  code: string              // e.g., "SKILL_NOT_FOUND"
+  source: ErrorSource       // "api" | "engine" | "runtime" | ...
+  retryable: boolean        // drives retry button visibility
+  userAction?: UserAction   // "retry" | "relogin" | "configure_model" | ...
+}
+```
+
+The `source` and `userAction` fields drive UI behavior: `relogin` triggers auth redirect, `retry` shows a retry button, `configure_model` navigates to model settings.
+
+### 6.5 API Client
+
+Unified `apiFetch()` in `lib/api-client.ts` handles:
+- URL construction (`API_BASE + path`)
+- CSRF token injection
+- 401 auto-refresh with single-flight deduplication
+- Timeout via `AbortController`
+- Structured error extraction → `ApiError`
diff --git a/docs/ARCHITECTURE_CN.md b/docs/ARCHITECTURE_CN.md
index 177b8cb68..54a660003 100644
--- a/docs/ARCHITECTURE_CN.md
+++ b/docs/ARCHITECTURE_CN.md
@@ -1,268 +1,589 @@
 # 架构设计
 
-## 整体架构
+## 1. 整体架构
 
-JoySafeter 采用分层架构模式，各层职责清晰：
+JoySafeter 采用分层架构，API 表面、编排层、执行引擎、事件管道、实时推送各司其职。
+
+```
+Layer 1     API 路由 (app/api/v1/) + WebSocket 处理器 (app/websocket/)
+Layer 1.5   DispatchService — 面向 API 的门面
+Layer 2     ExecutionOrchestrator — 创建 Run + Execution，构建 ExecutionContext
+Layer 2.5   EngineRegistry — 单例，runtime_kind → ExecutionEngine
+Layer 3     执行引擎：CLIEngine / GraphEngine / CodeEngine / CopilotEngine
+Layer 3.5   ExecutionContext 回调 → ExecutionEventBus
+Layer 4a    PersistenceSubscriber + StateTransitionSubscriber（第 1 阶段，共享 DB 事务）
+Layer 4b    WebSocketSubscriber + TaskSyncSubscriber（第 2 阶段，并行扇出）
+Layer 5     ExecutionSubscriptionManager → WebSocket 客户端 (/ws/executions)
+```
 
 ```mermaid
 flowchart TB
-    subgraph Row1[" "]
-        direction LR
+    subgraph L1["Layer 1 — API 表面"]
+        REST["/v1 REST 端点"]
+        WS_EXEC["WS /ws/executions"]
+        WS_NOTIF["WS /ws/notifications"]
+        WS_CLAW["WS /ws/openclaw/*"]
+    end
 
-        subgraph Frontend["前端层 (Next.js + React)"]
-            direction TB
-            Canvas["DeepAgents 画布<br/>ReactFlow"]
-            CodeEditor["代码编辑器<br/>CodeMirror"]
-            Trace["执行追踪<br/>SSE Stream"]
-            Workspace["工作空间管理<br/>RBAC"]
-            Copilot["Copilot AI<br/>图构建助手"]
-        end
+    subgraph L15["Layer 1.5 — 门面"]
+        DISPATCH["DispatchService"]
+    end
 
-        subgraph API["API 层 (FastAPI)"]
-            direction TB
-            REST["REST APIs<br/>Auth/Graphs/Chat/Skills"]
-            WS["WebSocket<br/>Chat/Copilot/Runs"]
-            SSE["SSE Stream<br/>实时事件"]
-            CodeAPI["Code API<br/>保存/运行"]
-        end
+    subgraph L2["Layer 2 — 编排"]
+        ORCH["ExecutionOrchestrator"]
+    end
 
-        subgraph Services["服务层"]
-            direction TB
-            GraphSvc["GraphService"]
-            SkillSvc["SkillService"]
-            MemorySvc["MemoryService"]
-            McpSvc["McpClient<br/>Service"]
-            ToolSvc["ToolService"]
-        end
+    subgraph L25["Layer 2.5 — 注册表"]
+        REG["EngineRegistry"]
+    end
 
-        subgraph Engine["核心引擎"]
-            direction TB
-            DeepBuilder["DeepAgents<br/>构建器"]
-            CodeExec["代码执行器<br/>沙箱 exec()"]
-            Middleware["中间件系统<br/>Memory"]
-            SkillSys["技能系统<br/>渐进式加载"]
-            MemorySys["记忆系统<br/>长/短期记忆"]
-        end
+    subgraph L3["Layer 3 — 引擎"]
+        CLI["CLIEngine<br/>sandbox"]
+        GRAPH["GraphEngine<br/>graph"]
+        CODE["CodeEngine<br/>code"]
+        COPILOT["CopilotEngine<br/>copilot"]
     end
 
-    subgraph Row2[" "]
-        direction LR
+    subgraph L35["Layer 3.5 — 事件总线"]
+        CTX["ExecutionContext.emit()"]
+        BUS["ExecutionEventBus"]
+    end
 
-        subgraph Runtime["运行时层"]
-            direction TB
-            LangGraph["LangGraph Runtime<br/>StateGraph"]
-            Checkpoint["Checkpointer<br/>状态持久化"]
+    subgraph L4["Layer 4 — 订阅者"]
+        direction LR
+        subgraph Phase1["第 1 阶段（共享事务，顺序执行）"]
+            PERSIST["PersistenceSubscriber"]
+            STATE["StateTransitionSubscriber"]
         end
-
-        subgraph Data["数据层"]
-            direction TB
-            PG["PostgreSQL<br/>图/技能/记忆"]
-            Redis["Redis<br/>缓存/会话"]
+        subgraph Phase2["第 2 阶段（并行扇出）"]
+            WS_SUB["WebSocketSubscriber"]
+            TASK_SUB["TaskSyncSubscriber"]
         end
+    end
 
-        subgraph MCP["MCP 工具生态"]
-            direction TB
-            MCPServers["MCP Servers<br/>200+ 安全工具"]
-            Tools["工具注册表<br/>统一管理"]
-        end
+    subgraph L5["Layer 5 — 投递"]
+        MGR["ExecutionSubscriptionManager"]
+        CLIENTS["WebSocket 客户端"]
     end
 
-    Canvas --> REST
-    CodeEditor --> CodeAPI
-    Trace --> SSE
-    Workspace --> REST
-    Copilot --> WS
-
-    REST --> Services
-    WS --> Services
-    SSE --> Services
-    CodeAPI --> Services
-
-    Services --> Engine
-    Engine --> Runtime
-    Runtime --> Data
-    Runtime --> MCP
-
-    MCPServers --> Tools
-
-    style Row1 fill:transparent,stroke:transparent
-    style Row2 fill:transparent,stroke:transparent
-
-    style Frontend fill:#e1f5ff
-    style API fill:#f3e5f5
-    style Services fill:#fff3e0
-    style Engine fill:#e8f5e8
-    style Runtime fill:#fff8e1
-    style Data fill:#fce4ec
-    style MCP fill:#e0f2f1
+    REST --> DISPATCH
+    DISPATCH --> ORCH
+    ORCH --> REG
+    REG --> CLI & GRAPH & CODE & COPILOT
+    CLI & GRAPH & CODE & COPILOT --> CTX
+    CTX --> BUS
+    BUS --> PERSIST & STATE
+    BUS --> WS_SUB & TASK_SUB
+    WS_SUB --> MGR --> CLIENTS
+    WS_EXEC --> MGR
+
+    style L1 fill:#f3e5f5
+    style L15 fill:#e1f5ff
+    style L2 fill:#fff3e0
+    style L25 fill:#fff3e0
+    style L3 fill:#e8f5e8
+    style L35 fill:#fff8e1
+    style L4 fill:#fce4ec
+    style L5 fill:#e0f2f1
 ```
 
-### 核心模块
+---
 
-#### 1. 图构建系统 — 两条路径
+## 2. 核心模块
 
-系统支持两种图构建模式：
+### 2.1 契约（Contracts）— 值域唯一来源
 
-```mermaid
-flowchart LR
-    Service[GraphService] -->|graph_mode = code| CodeExec[代码执行器<br/>exec → StateGraph.compile]
-    Service -->|画布模式| DeepBuilder[DeepAgents 构建器<br/>Manager-Worker 拓扑]
+`core/contracts/` 下三个契约文件以 `Literal` 类型 + `set[str]` 常量定义所有规范化值。全部代码引用这些定义，不散布魔术字符串。
+
+| 契约文件 | 定义内容 |
+|---|---|
+| `agent.py` | `DefinitionKindLiteral`、`RuntimeKindLiteral`、`DEFINITION_RUNTIME_KIND` 映射、`infer_runtime_kind()` |
+| `execution.py` | `RunStatusLiteral`、`ExecutionStatusLiteral`、`TriggerSourceLiteral`、终态/活跃集合 |
+| `error.py` | `ErrorCode`（StrEnum，~180 码）、`ErrorSource`、`UserAction`、规范化注册集合 |
 
-    CodeExec --> LangGraph[LangGraph Runtime]
-    DeepBuilder --> LangGraph
+### 2.2 引擎协议 + 注册表 + 能力矩阵
 
-    style Service fill:#e1f5ff
-    style CodeExec fill:#fff3e0
-    style DeepBuilder fill:#e8f5e8
+**协议** (`core/engine/protocol.py`)：
+
+```python
+@runtime_checkable
+class ExecutionEngine(Protocol):
+    engine_kind: str
+    capabilities: EngineCapabilities
+
+    async def start(self, context: ExecutionContext, *, ...) -> None: ...
+    async def cancel(self, execution_id: UUID) -> None: ...
+    async def send_message(self, execution_id: UUID, message: str) -> None: ...
 ```
 
-**Code 模式：**
-- 用户在浏览器编辑器中编写标准 LangGraph Python 代码
-- 后端在沙箱环境中执行代码（受限 builtins、import 白名单、执行超时）
-- 从执行结果中提取 `StateGraph` 实例，编译并运行
-- 零学习成本 — LangGraph 官方文档就是使用文档
+**ExecutionContext** 在启动时注入每个引擎。引擎不直接接触持久化或 WebSocket —— 只调用 `context.emit()`、`context.update_status()` 和 `context.complete()`。
 
-**DeepAgents 画布模式：**
-- 可视化拖拽构建多智能体编排
-- 三种节点类型：Agent、Code Agent、A2A Agent
-- 通过 `deepagents.create_deep_agent()` 构建 Manager-Worker 星型拓扑
+**EngineCapabilities** 声明各引擎支持的能力：
 
-#### 2. DeepAgents 多智能体编排
+**Agent 运行时引擎**（用户面向的 Agent 执行环境）：
 
-DeepAgents 实现星型拓扑，一个 Manager 协调多个 Worker：
+| 引擎 | runtime_kind | cancel | msg_inject | debug_obs | artifacts | approval |
+|---|---|---|---|---|---|---|
+| CLIEngine | sandbox | Y | Y | N | Y | Y |
+| GraphEngine | graph | Y | N | Y | Y | Y |
+| CodeEngine | code | Y | N | Y | N | N |
 
-```mermaid
-flowchart TB
-    Manager[Manager Agent<br/>useDeepAgents=True<br/>DeepAgent]
+**内部平台引擎**（复用执行管道的平台工具，非用户面向的 Agent 运行时）：
 
-    Manager -->|task| Worker1[Worker 1<br/>CompiledSubAgent]
-    Manager -->|task| Worker2[Worker 2<br/>CompiledSubAgent]
-    Manager -->|task| Worker3[Worker 3<br/>CompiledSubAgent]
-    Manager -->|task| CodeAgent[CodeAgent<br/>CompiledSubAgent]
+| 引擎 | engine_kind | cancel | msg_inject | debug_obs | artifacts | approval |
+|---|---|---|---|---|---|---|
+| CopilotEngine | build_copilot | Y | N | N | N | N |
 
-    subgraph Backend["共享 Docker 后端"]
-        Skills["/workspace/skills/<br/>预加载技能"]
-    end
+> CopilotEngine 是 Graph Builder AI 助手，帮助用户在画布上设计 Agent 图。它不是 Agent 运行时——没有任何用户创建的 Agent 以 `build_copilot` 作为 `runtime_kind`。它复用执行管道（Run → Execution → EventBus → WebSocket）进行流式传输和持久化。
+
+**注册表** (`core/engine/registry.py`)：模块级单例 `engine_registry` 将引擎键映射到引擎实例。引擎在 `core/engine/__init__.py` 导入时自动注册：
+
+```python
+# Agent 运行时引擎（用户面向）
+engine_registry.register("sandbox", CLIEngine())
+engine_registry.register("graph", GraphEngine())
+engine_registry.register("code", CodeEngine())
+
+# 内部平台引擎（非用户面向的 Agent 运行时）
+engine_registry.register("build_copilot", CopilotEngine())
+engine_registry.register("copilot", CopilotEngine())  # 向后兼容已有 DB 记录
+```
+
+**添加新 Agent 运行时引擎**需要：
+1. 实现 `ExecutionEngine` 协议
+2. 在 `core/engine/__init__.py` 中注册
+3. 在 `core/contracts/agent.py` 中添加新的 `runtime_kind`（`RUNTIME_KINDS`、`DEFINITION_RUNTIME_KIND`）
+4. 如需新错误码，在 `core/contracts/error.py` 中添加
+
+**添加新内部平台引擎**只需：
+1. 实现 `ExecutionEngine` 协议
+2. 在 `core/engine/__init__.py` 中注册
+3. 在 `core/contracts/agent.py` 的 `INTERNAL_ENGINE_KINDS` 中添加
+
+### 2.3 两阶段事件总线
+
+`core/events/bus.py` — `ExecutionEventBus`
+
+所有执行事件通过两阶段发布管道流转：
+
+- **第 1 阶段（PERSIST）**：订阅者共享调用方的 DB 会话，**顺序执行**。所有第 1 阶段订阅者完成后总线统一提交。保证持久化和状态变迁的原子性。
+  - `PersistenceSubscriber` — 写入 `ExecutionEvent` 行，分配 `seq` 序号
+  - `StateTransitionSubscriber` — 通过状态机校验并执行状态变迁
+
+- **第 2 阶段（BROADCAST）**：订阅者通过 `asyncio.gather` **并行执行**。一个失败不影响其他。
+  - `WebSocketSubscriber` — 推送事件到 `ExecutionSubscriptionManager` 进行实时投递
+  - `TaskSyncSubscriber` — 根据 Run 终态同步 Task 状态
+
+**信封** (`core/events/envelope.py`)：`ExecutionEventEnvelope` 是所有订阅者接收的规范化数据结构：
+
+```python
+@dataclass
+class ExecutionEventEnvelope:
+    execution_id: UUID
+    run_id: UUID
+    workspace_id: UUID
+    event_type: ExecutionEventType | str
+    payload: dict[str, Any]
+    seq: int = 0                          # 由 PersistenceSubscriber 填充
+    trigger_source: str | None = None
+    thread_id: UUID | None = None
+    task_id: UUID | None = None
+    terminal_status: str | None = None    # 仅完成事件
+    error: dict[str, Any] | None = None   # ErrorDescriptor，通过 AppError.to_payload()
+    ...
+```
+
+**事件类型** (`core/events/event_types.py`)：`ExecutionEventType` StrEnum —— 内容事件（`assistant_text`、`thinking`、`tool_use_start/end`、`error`、`artifact_created`、`approval_requested/resolved`）、生命周期事件（`execution_started/completed/status_change`、`run_status_change`）和 Copilot 事件。
+
+### 2.4 状态机
+
+`core/state_machines/` 集中管理所有状态转换规则。
+
+**引擎** (`engine.py`)：通用 `StateMachine` 类，提供 `validate(from, to)` 和 `is_terminal(status)`。
+
+**定义** (`definitions.py`)：6 个实体的转换表：
+
+| 状态机 | 实体 | 终态 |
+|---|---|---|
+| `AGENT_SM` | Agent | (无 — archived 可恢复) |
+| `VERSION_SM` | AgentVersion | (无 — frozen 可解冻) |
+| `RELEASE_SM` | AgentRelease | `retired` |
+| `RUN_SM` | AgentRun | `succeeded`、`failed`、`cancelled` |
+| `EXECUTION_SM` | Execution | `succeeded`、`failed`、`cancelled` |
+| `TASK_SM` | Task | (无 — done/cancelled 可重新打开) |
+
+**转换函数** (`transitions.py`)：`transition_run()`、`transition_execution()`、`transition_task()` 是**唯一**修改领域实体 `.status` 的函数。`sync_task_from_run()` 通过 `RUN_TO_TASK_SYNC` 自动将 Run 终态映射为 Task 状态。
+
+### 2.5 观测层（Observation）
+
+`core/observation/` — 基于 OTel 的追踪，注入 `ExecutionContext`。
+
+| 模块 | 用途 |
+|---|---|
+| `collector.py` | `ObservationCollector` — 主入口，注入为 `context.collector` |
+| `model.py` | 观测 span 数据模型 |
+| `types.py` | 类型定义 |
+| `otel/provider.py` | OTel TracerProvider 设置 |
+| `otel/span_wrapper.py` | Span 包装器，附加 JoySafeter 专属属性 |
+| `otel/persistence_processor.py` | 将 span 导出到 DB |
+| `otel/broadcast_processor.py` | 将 span 导出到 WebSocket 实时展示 |
+| `instrumentation/` | 引擎专属提取器：`cli_extractor.py`、`copilot_extractor.py`、`langchain_handler.py`、`file_tracker.py` |
+
+### 2.6 端口与适配器（Ports & Adapters）
+
+`core/ports/execution.py` 定义 Protocol 接口，解耦 `core/` 和 `services/`：
+
+- **`ExecutionEventPort`** — 通过事件总线发布执行事件的端口。由 `services/execution_event_adapter.py` 实现，`core/agent/cli_backends/execution_runner.py` 使用。
+- **`ExecutionReaderPort`** — 在 `core/` 中读取执行数据，无需直接 ORM 查询。由 `services/execution_reader_adapter.py` 实现。
+
+`EventContext` 数据类携带 Run 级元数据，使事件发布无需每次查询 DB 即可构建完整信封。
+
+### 2.7 错误系统 — AppError 层次结构 + ErrorDescriptor
+
+`common/app_errors.py` 定义了以 `AppError`（`@dataclass(slots=True)` + `Exception` 子类）为根的统一异常层次。
+
+**分类类**（无构造函数，仅 `_default_source`）：
+
+```
+AppError
+  ├── DomainError          (_default_source = "api")
+  ├── InfraError           (_default_source = "runtime")
+  ├── AuthError            (_default_source = "auth")
+  ├── ValidationError      (_default_source = "validation")
+  ├── PermissionDeniedError(_default_source = "permission")
+  ├── ConflictError        (_default_source = "api")
+  ├── RateLimitError       (_default_source = "api")
+  └── InternalError        (_default_source = "internal")
+```
+
+**叶子类**提供默认值并使用 `**kw` 透传：
+
+```
+DomainError
+  ├── NotFoundError          (code=NOT_FOUND)
+  ├── InvalidRequestError    (code=BAD_REQUEST)
+  └── ModelConfigError       (code=MODEL_*)
+AuthError
+  └── AuthenticationError    (code=UNAUTHORIZED, user_action=relogin)
+PermissionDeniedError
+  └── AccessDeniedError      (code=FORBIDDEN)
+...
+```
 
-    Worker1 --> Backend
-    Worker2 --> Backend
-    Worker3 --> Backend
-    CodeAgent --> Backend
-
-    style Manager fill:#e1f5ff
-    style Worker1 fill:#fff4e1
-    style Worker2 fill:#fff4e1
-    style Worker3 fill:#fff4e1
-    style CodeAgent fill:#fff4e1
-    style Backend fill:#e8f5e8
+**ErrorDescriptor** — 规范化错误载荷，由 `AppError.to_payload()` 输出：
+
+```json
+{
+  "code": "SKILL_NOT_FOUND",
+  "message": "技能未找到",
+  "data": {"skill_id": "..."},
+  "source": "api",
+  "retryable": false,
+  "user_action": null,
+  "detail": null
+}
 ```
 
+这是**唯一的序列化出口** —— 所有传输路径（HTTP 响应体、WebSocket 错误帧、SSE 错误事件、DB JSONB `error` 列）均通过 `to_payload()` 流转。
+
+**错误码注册表**：`core/contracts/error.py` 包含 `ErrorCode` StrEnum，约 180 个条目，按领域分组（Generic、Auth、Agent、Run、Execution、Engine、Model、Sandbox、Skill、Tool/MCP、Task 等）。
+
+### 2.8 图构建系统
+
+两条路径构建 Agent 图：
+
+| 路径 | definition_kind | 引擎 | 说明 |
+|---|---|---|---|
+| **Code 模式** | `code` | CodeEngine | 用户在浏览器写 LangGraph Python；后端沙箱 exec() |
+| **DeepAgents 画布** | `graph` | GraphEngine | 可视化拖拽；Manager-Worker 星型拓扑 |
+| **CLI-backed** | `claude_code`、`codex`、`openclaw` | CLIEngine | Docker 容器 + CLI agent 运行时 |
+| **Copilot** | (内部) | CopilotEngine | 图分析与动作执行 |
+
 **DeepAgents 构建流水线：**
 
 ```
 build_deep_agents_graph()
-    ├── 1. resolve_all_configs()     — 纯配置提取，无副作用
-    ├── 2. 初始化共享后端              — 按需创建 Docker 沙箱
-    ├── 3. preload_skills()          — 批量预加载，自动去重
-    ├── 4. ModelResolver.resolve()   — 统一 LLM 解析，带缓存
-    ├── 5. 构建 Worker               — agent_factory 按节点类型创建
-    └── 6. create_deep_agent()       — 编译并最终化
+  ├── 1. resolve_all_configs()    — 纯配置提取，无副作用
+  ├── 2. 初始化共享后端             — 按需创建 Docker 沙箱
+  ├── 3. preload_skills()         — 批量预加载，自动去重
+  ├── 4. ModelResolver.resolve()  — 统一 LLM 解析，带缓存
+  ├── 5. 构建 Worker               — agent_factory 按节点类型创建
+  └── 6. create_deep_agent()      — 编译并最终化
 ```
 
-**关键设计决策：**
-- **无继承** — 使用专用解析器组合（ModelResolver、ToolResolver、SkillsLoader）
-- **配置解析是纯函数** — 无副作用，每个节点只解析一次
-- **模型解析统一且带缓存** — 节点模型和记忆模型共用同一个解析器
-- **星型拓扑**：Manager 直接连接所有 SubAgent（非链式）
-- **共享后端**：Docker 后端在所有 Agent 间共享，用于技能和代码执行
-
-#### 3. 代码执行器安全
+### 2.9 代码执行器安全
 
 代码执行器通过多层安全机制运行用户 LangGraph 代码：
 
 | 安全层 | 保护措施 |
-|--------|---------|
-| **Builtins 黑名单** | 移除 `open`、`eval`、`exec`、`compile`、`globals`、`locals`、`vars`、`dir` |
-| **Import 黑名单** | 封锁 `os`、`sys`、`subprocess`、`socket`、`io`、`pathlib` 等 |
-| **Import 白名单** | 仅允许 `langgraph`、`langchain`、`typing`、`json`、`pydantic` 等 |
-| **执行超时** | exec 10 秒限制（`signal.alarm`） |
-| **调用超时** | ainvoke 30 秒限制（`asyncio.wait_for`） |
-| **权限检查** | 保存需要 member 角色，运行需要 viewer 角色 |
-| **错误脱敏** | 从错误信息中移除服务器文件路径 |
+|---|---|
+| Builtins 黑名单 | 移除 `open`、`eval`、`exec`、`compile`、`globals`、`locals`、`vars`、`dir` |
+| Import 黑名单 | 封锁 `os`、`sys`、`subprocess`、`socket`、`io`、`pathlib` 等 |
+| Import 白名单 | 仅允许 `langgraph`、`langchain`、`typing`、`json`、`pydantic` 等 |
+| 执行超时 | exec 10 秒限制（`signal.alarm`） |
+| 调用超时 | ainvoke 30 秒限制（`asyncio.wait_for`） |
+| 权限检查 | 保存需要 member 角色，运行需要 viewer 角色 |
+| 错误脱敏 | 从错误信息中移除服务器文件路径 |
 
-#### 4. 技能系统（渐进式加载）
+### 2.10 技能系统
 
-```mermaid
-sequenceDiagram
-    participant Node as Agent 节点
-    participant Loader as SkillSandboxLoader
-    participant Backend as Docker 后端
+渐进式加载，减少 token 消耗：
 
-    Node->>Loader: 预加载技能（批量，去重）
-    Loader->>Backend: 写入技能文件到 /workspace/skills/
-    Backend-->>Loader: 技能加载完成
+- **SkillService**：CRUD + 权限控制 + 版本管理
+- **SkillsLoader**：批量预加载到 Docker 后端，自动去重
+- **FilesystemMiddleware**：Agent 按需读取 `/workspace/skills/{skill_name}/SKILL.md`
 
-    Node->>Node: Agent 在系统提示中看到技能摘要
-    Node->>Backend: Agent 按需读取 /workspace/skills/{skill_name}/SKILL.md
-    Backend-->>Node: Agent 获取完整技能内容
+技能异常继承自统一错误树：
+
+```
+DomainError → SkillLoadError、SkillNotFoundError（经 NotFoundError）
+PermissionDeniedError → SkillPermissionDeniedError（经 AccessDeniedError）
+InternalError → SkillFileWriteError（经 InternalServiceError）
 ```
 
-#### 5. 记忆系统（长/短期记忆）
+### 2.11 记忆系统
+
+长/短期 Agent 记忆，中间件注入：
+
+- **MemoryManager**：按用户/主题查询和持久化记忆
+- **MemoryMiddleware**：将相关记忆注入 Agent 上下文，从响应中提取新记忆
+- **记忆类型**：事实（Fact）、程序（Procedure）、情景（Episodic）、语义（Semantic）
+
+---
+
+## 3. 核心工作流
+
+### 3.1 执行流
 
 ```mermaid
 sequenceDiagram
-    participant User as 用户输入
-    participant Middleware as MemoryMiddleware
-    participant Manager as MemoryManager
-    participant DB as PostgreSQL
-    participant Agent as Agent
-
-    User->>Middleware: 用户消息
-    Middleware->>Manager: 检索相关记忆
-    Manager->>DB: 按 user_id/主题查询
-    DB-->>Manager: 返回记忆
-    Manager-->>Middleware: 注入记忆到上下文
-    Middleware->>Agent: 增强后的提示
-    Agent-->>Middleware: Agent 响应
-    Middleware->>Manager: 提取并持久化新记忆
-    Manager->>DB: 保存记忆
+    participant FE as 前端
+    participant API as REST API
+    participant DS as DispatchService
+    participant EO as ExecutionOrchestrator
+    participant ER as EngineRegistry
+    participant ENG as ExecutionEngine
+    participant CTX as ExecutionContext
+    participant BUS as ExecutionEventBus
+    participant P1 as 第 1 阶段订阅者
+    participant P2 as 第 2 阶段订阅者
+    participant WS as /ws/executions
+
+    FE->>API: POST /runs 或 /executions
+    API->>DS: dispatch(agent_id, prompt, ...)
+    DS->>EO: create_and_start(...)
+    EO->>EO: 创建 AgentRun + Execution 行
+    EO->>ER: get(runtime_kind)
+    ER->>ENG: engine.start(context, ...)
+
+    loop 引擎执行过程
+        ENG->>CTX: context.emit(event_type, payload)
+        CTX->>BUS: publish(envelope, db)
+        BUS->>P1: PersistenceSubscriber.handle()（顺序，共享事务）
+        BUS->>P1: StateTransitionSubscriber.handle()
+        Note over BUS: COMMIT
+        BUS->>P2: WebSocketSubscriber.handle()（并行）
+        BUS->>P2: TaskSyncSubscriber.handle()（并行）
+        P2->>WS: 推送给已订阅的客户端
+    end
+
+    ENG->>CTX: context.complete(status, result, error)
+    CTX->>BUS: 发布完成信封
+```
+
+### 3.2 错误流
+
+```mermaid
+flowchart LR
+    ENG["引擎抛出<br/>或捕获错误"] --> APP["AppError<br/>（或 normalize_app_error）"]
+    APP --> TP["to_payload()<br/>→ ErrorDescriptor"]
+    TP --> HTTP["HTTP JSON 响应"]
+    TP --> WSF["WS 错误帧"]
+    TP --> DB["DB JSONB<br/>execution.error"]
+    TP --> ENV["Envelope.error 字段"]
+
+    style APP fill:#fce4ec
+    style TP fill:#fff3e0
 ```
 
-### 数据流
+所有错误统一规范化为 `AppError`（或子类），通过唯一的 `to_payload()` 方法序列化，在所有传输路径中一致消费。前端 `ApiError` 类镜像 `ErrorDescriptor` 形状，提供类型化的 `source: ErrorSource`、`retryable: boolean` 和 `userAction?: UserAction`。
+
+---
+
+## 4. 数据流
+
+### 4.1 WebSocket 端点
+
+| 路径 | 处理器 | 用途 |
+|---|---|---|
+| `/ws/executions` | `ExecutionSubscriptionHandler` | 执行事件流 — 订阅、快照回放、实时事件 |
+| `/ws/notifications` | `NotificationManager` | 用户级推送通知 |
+| `/ws/openclaw/dashboard` | `OpenClawHandler` | OpenClaw 看板桥接 |
+| `/ws/openclaw/bridge/{user_id}` | `OpenClawHandler` | OpenClaw 设备桥接 |
+
+### 4.2 触发来源
 
-**前端 ↔ 后端：**
-- **REST API**：图配置、技能管理、工具管理、工作空间操作
-- **WebSocket (`/ws/chat`)**：共享聊天协议，用于 Chat、Copilot 和 Skill Creator 会话；Copilot 通过 `extension: { kind: "copilot" }` 复用同一 WS 连接
-- **WebSocket (`/ws/runs`)**：实时运行观测 — 活跃 agent run 的事件回放和状态更新
-- **Code API**：保存和运行用户 LangGraph 代码
-- **SSE Stream**：实时执行状态、流式输出、节点执行事件
+AgentRun 创建接受 `core/contracts/execution.py` 中定义的规范化触发来源：
 
-**后端内部：**
-- **Code 模式**：`code_executor.execute_code()` → `StateGraph.compile()` → `ainvoke()`
-- **画布模式**：`build_deep_agents_graph()` → `create_deep_agent()` → `compile()` → `ainvoke()`
-- **Copilot 回合**：`execute_copilot_turn()` → `CopilotService._get_copilot_stream()` → 事件通过 Run Center 持久化到 `agent_run_events`
-- **LangGraph Runtime → MCP Servers → Tools**：工具调用和执行
-- **Middleware → Agent → Model**：请求处理管道
+`task` | `chat` | `api` | `scheduler` | `draft_test` | `draft_copilot` | `debug` | `copilot`
 
-**后端 ↔ 数据层：**
-- **PostgreSQL**：图配置、技能、记忆、会话、工作空间、agent runs/events/snapshots（Run Center）
-- **Redis**：缓存、限流、临时数据
+### 4.3 单一事件源
 
-### 后端文件结构（图模块）
+所有引擎通过 `ExecutionContext.emit()` 将事件写入 `execution_events` 表。`PersistenceSubscriber` 分配单调递增的 `seq` 序号。WebSocket 客户端重连时从已持久化的事件回放，并从同一管道接收实时事件。
 
+### 4.4 前端 → 后端通信
+
+| 通道 | 用途 |
+|---|---|
+| REST API (`/api/v1/*`) | CRUD 操作：agents、versions、releases、tasks、threads、runs、executions、skills、tools、models、workspaces |
+| WebSocket `/ws/executions` | 实时执行事件流 |
+| WebSocket `/ws/notifications` | 用户通知 |
+| Code API | 保存和运行用户 LangGraph 代码 |
+
+### 4.5 后端 → 数据层
+
+- **PostgreSQL**：Agent 定义、版本、发布、技能、记忆、会话、工作空间、runs、executions、execution_events、snapshots、traces
+- **Redis**：会话缓存、限流、临时数据
+
+---
+
+## 5. 后端文件结构
+
+```
+app/
+├── api/v1/                        # REST 路由模块
+├── common/
+│   └── app_errors.py              # AppError 层次结构 + to_payload() + normalize_app_error()
+├── core/
+│   ├── contracts/                 # 值域注册表（唯一来源）
+│   │   ├── agent.py               #   DefinitionKind、RuntimeKind、DEFINITION_RUNTIME_KIND
+│   │   ├── execution.py           #   RunStatus、ExecutionStatus、TriggerSource、终态集合
+│   │   └── error.py               #   ErrorCode（StrEnum ~180）、ErrorSource、UserAction
+│   ├── engine/                    # 执行引擎抽象
+│   │   ├── protocol.py            #   ExecutionEngine Protocol、ExecutionContext、EngineCapabilities
+│   │   ├── registry.py            #   EngineRegistry 单例
+│   │   ├── __init__.py            #   导入时注册 4 个内建引擎
+│   │   ├── cli_engine.py          #   CLIEngine（Docker + CLI agent 运行时）
+│   │   ├── graph_engine.py        #   GraphEngine（LangGraph 编译器）
+│   │   ├── code_engine.py         #   CodeEngine（进程内代码 agent）
+│   │   └── copilot_engine.py      #   CopilotEngine（图分析）
+│   ├── events/                    # 两阶段事件总线
+│   │   ├── bus.py                 #   ExecutionEventBus（第 1 + 第 2 阶段）
+│   │   ├── envelope.py            #   ExecutionEventEnvelope 数据类
+│   │   ├── event_types.py         #   ExecutionEventType StrEnum
+│   │   ├── subscriber.py          #   EventSubscriber Protocol + SubscriberPhase 枚举
+│   │   └── subscribers/           #   内建订阅者实现
+│   │       ├── persistence.py     #     PersistenceSubscriber（第 1 阶段）
+│   │       ├── state_transition.py#     StateTransitionSubscriber（第 1 阶段）
+│   │       ├── websocket.py       #     WebSocketSubscriber（第 2 阶段）
+│   │       └── task_sync.py       #     TaskSyncSubscriber（第 2 阶段）
+│   ├── state_machines/            # 集中化状态转换规则
+│   │   ├── definitions.py         #   6 个实体的转换表
+│   │   ├── engine.py              #   StateMachine 类 + InvalidTransition 错误
+│   │   └── transitions.py         #   transition_run()、transition_execution()、transition_task()
+│   ├── observation/               # 基于 OTel 的追踪
+│   │   ├── collector.py           #   ObservationCollector（注入 ExecutionContext）
+│   │   ├── otel/                  #   TracerProvider、span 包装器、处理器
+│   │   └── instrumentation/       #   引擎专属提取器
+│   ├── ports/                     # Protocol 接口，解耦 core/ <-> services/
+│   │   └── execution.py           #   ExecutionEventPort、ExecutionReaderPort、EventContext
+│   ├── agent/                     # CLI agent 后端（claude_code、codex、openclaw）
+│   ├── copilot/                   # Copilot 服务实现
+│   ├── graph/                     # DeepAgents 图构建器 + 代码执行器
+│   ├── skill/                     # 技能系统（服务、加载器、异常）
+│   ├── model/                     # 模型提供商 + 凭据管理
+│   ├── tools/                     # 工具解析器 + MCP 集成
+│   └── a2a/                       # Agent-to-Agent 协议支持
+├── models/                        # SQLAlchemy ORM 模型
+├── repositories/                  # 数据访问层
+├── schemas/                       # Pydantic 请求/响应 Schema
+├── services/                      # 服务层实现
+│   ├── dispatch_service.py        #   面向 API 的门面（Layer 1.5）
+│   ├── execution_orchestrator.py  #   Run + Execution 生命周期（Layer 2）
+│   ├── execution_event_adapter.py #   ExecutionEventPort 实现
+│   ├── execution_reader_adapter.py#   ExecutionReaderPort 实现
+│   ├── runner_factory.py          #   创建 CLI 执行 runner
+│   ├── agent_service.py           #   Agent CRUD
+│   ├── agent_version_service.py   #   版本管理
+│   ├── agent_release_service.py   #   发布生命周期
+│   ├── agent_run_service.py       #   Run 查询
+│   ├── copilot_service.py         #   Copilot 流式处理
+│   ├── skill_service.py           #   技能 CRUD + 权限
+│   ├── model_service.py           #   模型解析（provider_name, model_name）
+│   ├── sandbox_manager.py         #   沙箱池管理
+│   └── ...                        #   （40+ 服务模块）
+├── websocket/                     # WebSocket 处理器
+│   ├── execution_subscription_handler.py  # /ws/executions 处理器
+│   ├── execution_subscription_manager.py  # 订阅注册 + 广播
+│   ├── notification_manager.py            # /ws/notifications
+│   ├── openclaw_handler.py                # /ws/openclaw/* 处理器
+│   └── auth.py                            # WS 认证
+├── templates/                     # 邮件模板（Jinja2）
+└── utils/                         # 共享工具
 ```
-app/core/graph/
-├── __init__.py                    # 导出 build_deep_agents_graph()
-├── deep_agents/
-│   ├── builder.py                 # 构建编排（无继承）
-│   ├── config.py                  # 纯配置提取
-│   ├── model_resolver.py          # 统一 LLM 解析，带缓存
-│   ├── agent_factory.py           # 创建 agent/code_agent/a2a worker
-│   ├── skills_loader.py           # 批量技能预加载，去重
-│   ├── tool_resolver.py           # 工具名 → 实例解析
-│   └── middleware.py              # Memory 中间件
-├── node_secrets.py                # A2A secret 处理
-└── runtime_prompt_template.py     # 运行时 prompt 变量替换
-
-app/core/code_executor.py          # Code 模式沙箱执行
+
+---
+
+## 6. 前端架构
+
+### 6.1 App Router 路由结构
+
+Next.js App Router + 路由分组：
+
+```
+app/
+├── (auth)/                       # 认证页面（登录、注册、验证、重置密码）
+├── dashboard/                    # 仪表盘
+├── agents/[agentId]/             # Agent 详情：编辑、版本、发布、任务、会话
+├── executions/[executionId]/     # 执行详情 + 实时追踪
+├── tasks/                        # 任务管理
+├── skills/                       # 技能市场 + 创建器
+├── tools/                        # 工具管理
+├── memory/                       # 记忆管理
+├── openclaw/                     # OpenClaw 看板
+└── settings/                     # 模型、成员、沙箱、Token
 ```
+
+### 6.2 WebSocket 客户端层
+
+```
+BaseWsClient（抽象基类）
+├── 生命周期管理（连接、断开、重连）
+├── 认证（ws-token）
+├── 心跳 + 指数退避自动重连
+│
+├── ExecutionWsClient     /ws/executions
+├── NotificationWsClient  /ws/notifications
+└── (OpenClaw 客户端)     /ws/openclaw/*
+```
+
+前端 `ExecutionSubscriptionManager` 订阅执行 ID，将收到的事件分发到对应的 UI Store。
+
+### 6.3 状态管理
+
+- **Zustand**：客户端 Store，管理 UI 状态（执行追踪、侧边栏、编辑器）
+- **TanStack Query**：服务端状态 + 缓存失效（agents、skills、models 等）
+
+### 6.4 错误消费
+
+前端 `ApiError` 类（`lib/api-client.ts`）镜像后端 `ErrorDescriptor`：
+
+```typescript
+class ApiError extends Error {
+  code: string              // 如 "SKILL_NOT_FOUND"
+  source: ErrorSource       // "api" | "engine" | "runtime" | ...
+  retryable: boolean        // 控制重试按钮可见性
+  userAction?: UserAction   // "retry" | "relogin" | "configure_model" | ...
+}
+```
+
+`source` 和 `userAction` 字段驱动 UI 行为：`relogin` 触发认证重定向，`retry` 显示重试按钮，`configure_model` 跳转到模型设置。
+
+### 6.5 API 客户端
+
+`lib/api-client.ts` 中的统一 `apiFetch()` 处理：
+- URL 构建（`API_BASE + path`）
+- CSRF Token 注入
+- 401 自动刷新 + 单航班去重
+- 基于 `AbortController` 的超时
+- 结构化错误提取 → `ApiError`
diff --git a/docs/architecture-diagram.drawio b/docs/architecture-diagram.drawio
index ad8942a29..af6853c5d 100644
--- a/docs/architecture-diagram.drawio
+++ b/docs/architecture-diagram.drawio
@@ -28,7 +28,7 @@
     <mxCell id="auth-ui" value="&lt;b&gt;Auth Pages&lt;/b&gt;&lt;br/&gt;Login / Register&lt;br/&gt;OAuth / Verify" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e3f2fd;strokeColor=#1565c0;fontSize=11;arcSize=12;" vertex="1" parent="1"><mxGeometry x="1340" y="110" width="140" height="65" as="geometry" /></mxCell>
 
     <!-- Frontend infra -->
-    <mxCell id="ws-clients" value="&lt;b&gt;WebSocket Clients (BaseWsClient)&lt;/b&gt;&lt;br/&gt;chatWsClient · runWsClient · NotificationWsClient" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff3e0;strokeColor=#e65100;fontSize=11;arcSize=8;" vertex="1" parent="1"><mxGeometry x="60" y="195" width="400" height="55" as="geometry" /></mxCell>
+    <mxCell id="ws-clients" value="&lt;b&gt;WebSocket Clients (BaseWsClient)&lt;/b&gt;&lt;br/&gt;ExecutionWsClient · NotificationWsClient · OpenClawWsClient" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff3e0;strokeColor=#e65100;fontSize=11;arcSize=8;" vertex="1" parent="1"><mxGeometry x="60" y="195" width="400" height="55" as="geometry" /></mxCell>
     <mxCell id="state-mgmt" value="&lt;b&gt;State Management&lt;/b&gt;&lt;br/&gt;Zustand Stores · TanStack Query · React Context" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff3e0;strokeColor=#e65100;fontSize=11;arcSize=8;" vertex="1" parent="1"><mxGeometry x="480" y="195" width="350" height="55" as="geometry" /></mxCell>
     <mxCell id="api-client" value="&lt;b&gt;API / Service Layer&lt;/b&gt;&lt;br/&gt;api-client.ts · REST services · i18next" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff3e0;strokeColor=#e65100;fontSize=11;arcSize=8;" vertex="1" parent="1"><mxGeometry x="850" y="195" width="350" height="55" as="geometry" /></mxCell>
     <mxCell id="nextjs-mw" value="&lt;b&gt;Next.js Middleware&lt;/b&gt;&lt;br/&gt;CSP · Auth Guard · Redirect" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff3e0;strokeColor=#e65100;fontSize=11;arcSize=8;" vertex="1" parent="1"><mxGeometry x="1220" y="195" width="300" height="55" as="geometry" /></mxCell>
@@ -37,14 +37,14 @@
     <mxCell id="ws-arrow-chat" value="" style="endArrow=classic;startArrow=classic;curved=1;strokeColor=#e65100;strokeWidth=2;exitX=0.15;exitY=1;entryX=0.15;entryY=0;" edge="1" parent="1" source="client-group" target="backend-group">
       <mxGeometry relative="1" as="geometry" />
     </mxCell>
-    <mxCell id="ws-arrow-chat-label" value="WS /ws/chat" style="text;fontSize=10;fontStyle=1;fontColor=#e65100;fillColor=none;strokeColor=none;" vertex="1" parent="1">
+    <mxCell id="ws-arrow-chat-label" value="WS /ws/executions" style="text;fontSize=10;fontStyle=1;fontColor=#e65100;fillColor=none;strokeColor=none;" vertex="1" parent="1">
       <mxGeometry x="100" y="283" width="80" height="20" as="geometry" />
     </mxCell>
 
     <mxCell id="ws-arrow-run" value="" style="endArrow=classic;startArrow=classic;curved=1;strokeColor=#e65100;strokeWidth=2;exitX=0.35;exitY=1;entryX=0.35;entryY=0;" edge="1" parent="1" source="client-group" target="backend-group">
       <mxGeometry relative="1" as="geometry" />
     </mxCell>
-    <mxCell id="ws-arrow-run-label" value="WS /ws/runs" style="text;fontSize=10;fontStyle=1;fontColor=#e65100;fillColor=none;strokeColor=none;" vertex="1" parent="1">
+    <mxCell id="ws-arrow-run-label" value="WS /ws/executions" style="text;fontSize=10;fontStyle=1;fontColor=#e65100;fillColor=none;strokeColor=none;" vertex="1" parent="1">
       <mxGeometry x="395" y="283" width="80" height="20" as="geometry" />
     </mxCell>
 
@@ -85,8 +85,8 @@
       <mxGeometry x="70" y="350" width="300" height="20" as="geometry" />
     </mxCell>
 
-    <mxCell id="chat-ws-handler" value="&lt;b&gt;ChatWsHandler&lt;/b&gt;&lt;br/&gt;chat.start / resume / stop" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="70" y="375" width="175" height="45" as="geometry" /></mxCell>
-    <mxCell id="run-ws-handler" value="&lt;b&gt;RunSubscriptionHandler&lt;/b&gt;&lt;br/&gt;subscribe / replay / live" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="260" y="375" width="175" height="45" as="geometry" /></mxCell>
+    <mxCell id="chat-ws-handler" value="&lt;b&gt;ExecutionSubscriptionHandler&lt;/b&gt;&lt;br/&gt;subscribe / snapshot / replay" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="70" y="375" width="175" height="45" as="geometry" /></mxCell>
+    <mxCell id="run-ws-handler" value="&lt;b&gt;ExecutionWsHandler&lt;/b&gt;&lt;br/&gt;snapshot / replay / live" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="260" y="375" width="175" height="45" as="geometry" /></mxCell>
     <mxCell id="notif-handler" value="&lt;b&gt;NotificationManager&lt;/b&gt;&lt;br/&gt;push / heartbeat" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="450" y="375" width="160" height="45" as="geometry" /></mxCell>
     <mxCell id="rest-routes" value="&lt;b&gt;REST API v1&lt;/b&gt;&lt;br/&gt;33+ Routers" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="625" y="375" width="450" height="45" as="geometry" /></mxCell>
     <mxCell id="openclaw-bridge" value="&lt;b&gt;OpenClaw Bridge&lt;/b&gt;&lt;br/&gt;WS Proxy" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#e1bee7;strokeColor=#7b1fa2;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="1090" y="375" width="130" height="45" as="geometry" /></mxCell>
@@ -100,11 +100,11 @@
       <mxGeometry x="70" y="447" width="400" height="20" as="geometry" />
     </mxCell>
 
-    <mxCell id="chat-svc" value="&lt;b&gt;ChatTurn&lt;br/&gt;Executor&lt;/b&gt;&lt;br/&gt;Supervisor" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="70" y="472" width="100" height="48" as="geometry" /></mxCell>
-    <mxCell id="graph-svc" value="&lt;b&gt;GraphService&lt;/b&gt;&lt;br/&gt;Compile · Cache&lt;br/&gt;Deploy" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="180" y="472" width="115" height="48" as="geometry" /></mxCell>
+    <mxCell id="chat-svc" value="&lt;b&gt;EngineRegistry&lt;/b&gt;&lt;br/&gt;runtime_kind&lt;br/&gt;→ engine" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="70" y="472" width="100" height="48" as="geometry" /></mxCell>
+    <mxCell id="graph-svc" value="&lt;b&gt;DispatchService&lt;/b&gt;&lt;br/&gt;API-facing&lt;br/&gt;execution entry" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="180" y="472" width="115" height="48" as="geometry" /></mxCell>
     <mxCell id="copilot-svc" value="&lt;b&gt;CopilotService&lt;/b&gt;&lt;br/&gt;Graph Actions&lt;br/&gt;DeepAgents" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="305" y="472" width="115" height="48" as="geometry" /></mxCell>
     <mxCell id="skill-svc" value="&lt;b&gt;SkillService&lt;/b&gt;&lt;br/&gt;Sandbox Loader&lt;br/&gt;Versions" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="430" y="472" width="110" height="48" as="geometry" /></mxCell>
-    <mxCell id="run-svc" value="&lt;b&gt;RunService&lt;/b&gt;&lt;br/&gt;Heartbeat&lt;br/&gt;Recovery" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="550" y="472" width="105" height="48" as="geometry" /></mxCell>
+    <mxCell id="run-svc" value="&lt;b&gt;ExecutionOrchestrator&lt;/b&gt;&lt;br/&gt;Run · Execution&lt;br/&gt;Engine dispatch" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="550" y="472" width="105" height="48" as="geometry" /></mxCell>
     <mxCell id="model-svc" value="&lt;b&gt;ModelProvider&lt;br/&gt;Service&lt;/b&gt;&lt;br/&gt;Sync · Resolve" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="665" y="472" width="110" height="48" as="geometry" /></mxCell>
     <mxCell id="tool-svc" value="&lt;b&gt;ToolRegistry&lt;/b&gt;&lt;br/&gt;MCP Client&lt;br/&gt;Builtin / Custom" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="785" y="472" width="115" height="48" as="geometry" /></mxCell>
     <mxCell id="memory-svc" value="&lt;b&gt;MemoryService&lt;/b&gt;&lt;br/&gt;Fact / Procedure&lt;br/&gt;Episodic" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#c8e6c9;strokeColor=#2e7d32;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="910" y="472" width="110" height="48" as="geometry" /></mxCell>
@@ -130,7 +130,7 @@
     <mxCell id="copilot-engine" value="&lt;b&gt;Copilot Engine&lt;/b&gt;&lt;br/&gt;Graph Tools · Parser&lt;br/&gt;Validator · Applier" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#fff9c4;strokeColor=#f57f17;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="1330" y="572" width="145" height="55" as="geometry" /></mxCell>
 
     <!-- Repository Layer -->
-    <mxCell id="repo-layer" value="&lt;b&gt;Repository Layer&lt;/b&gt; — SQLAlchemy ORM · 30+ models (AuthUser, AgentGraph, GraphNode, Skill, AgentRun, AgentRunEvent, Memory, McpServer, ModelProvider, OpenClawInstance, ...)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#efebe9;strokeColor=#5d4037;fontSize=10;arcSize=8;" vertex="1" parent="1"><mxGeometry x="60" y="678" width="1480" height="40" as="geometry" /></mxCell>
+    <mxCell id="repo-layer" value="&lt;b&gt;Repository Layer&lt;/b&gt; — SQLAlchemy ORM · 30+ models (AuthUser, Agent, AgentVersion, AgentRelease, AgentRun, Execution, ExecutionEvent, Memory, McpServer, ModelProvider, OpenClawInstance, ...)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#efebe9;strokeColor=#5d4037;fontSize=10;arcSize=8;" vertex="1" parent="1"><mxGeometry x="60" y="678" width="1480" height="40" as="geometry" /></mxCell>
 
     <!-- Alembic Migrations -->
     <mxCell id="alembic" value="&lt;b&gt;Alembic Migrations&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#efebe9;strokeColor=#5d4037;fontSize=10;arcSize=8;" vertex="1" parent="1"><mxGeometry x="60" y="730" width="150" height="30" as="geometry" /></mxCell>
@@ -143,7 +143,7 @@
       <mxGeometry x="60" y="865" width="400" height="24" as="geometry" />
     </mxCell>
 
-    <mxCell id="postgres" value="&lt;b&gt;PostgreSQL 15&lt;/b&gt;&lt;br/&gt;User Data · Graphs&lt;br/&gt;Runs · Events&lt;br/&gt;LangGraph Checkpoints" style="shape=cylinder3;whiteSpace=wrap;html=1;fillColor=#ffcdd2;strokeColor=#c62828;fontSize=10;arcSize=10;size=12;" vertex="1" parent="1"><mxGeometry x="80" y="895" width="150" height="100" as="geometry" /></mxCell>
+    <mxCell id="postgres" value="&lt;b&gt;PostgreSQL 15&lt;/b&gt;&lt;br/&gt;Users · Agents&lt;br/&gt;Versions · Executions&lt;br/&gt;LangGraph Checkpoints" style="shape=cylinder3;whiteSpace=wrap;html=1;fillColor=#ffcdd2;strokeColor=#c62828;fontSize=10;arcSize=10;size=12;" vertex="1" parent="1"><mxGeometry x="80" y="895" width="150" height="100" as="geometry" /></mxCell>
     <mxCell id="redis" value="&lt;b&gt;Redis 7&lt;/b&gt;&lt;br/&gt;Cache · Rate Limit&lt;br/&gt;Distributed Locks&lt;br/&gt;Refresh Tokens" style="shape=cylinder3;whiteSpace=wrap;html=1;fillColor=#ffcdd2;strokeColor=#c62828;fontSize=10;arcSize=10;size=12;" vertex="1" parent="1"><mxGeometry x="260" y="895" width="150" height="100" as="geometry" /></mxCell>
 
     <mxCell id="mcp-server" value="&lt;b&gt;MCP Server Container&lt;/b&gt;&lt;br/&gt;Ports 8001–8010&lt;br/&gt;Scanner · JEB · Demo Tools&lt;br/&gt;Shared backend-files volume" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#f3e5f5;strokeColor=#7b1fa2;fontSize=10;arcSize=10;" vertex="1" parent="1"><mxGeometry x="450" y="900" width="200" height="80" as="geometry" /></mxCell>
diff --git a/docs/architecture-diagram.mmd b/docs/architecture-diagram.mmd
index c74e3e6e5..ea966d54e 100644
--- a/docs/architecture-diagram.mmd
+++ b/docs/architecture-diagram.mmd
@@ -42,49 +42,89 @@ graph TB
 
         subgraph WS_LAYER["Unified WebSocket Layer"]
             BASE_WS["BaseWsClient\n(lifecycle · auth · reconnect)"]
-            CHAT_WS["ChatWsClient\n/ws/chat"]
-            RUN_WS["RunWsClient\n/ws/runs"]
+            EXEC_WS["ExecutionWsClient\n/ws/executions"]
             NOTIF_WS["NotificationWsClient\n/ws/notifications"]
         end
+
+        subgraph FE_ERROR["Error Consumption"]
+            API_ERROR["ApiError\nErrorDescriptor mirror\nsource · retryable · userAction"]
+        end
     end
 
     subgraph BACKEND["🐍 Backend — FastAPI · Python 3.12+"]
         direction TB
 
         subgraph API["REST + WebSocket API"]
-            REST["/v1  REST Endpoints\nChat · Runs · Graphs · Skills\nModels · Tools · Workspaces"]
-            WS_HANDLER["ChatWsHandler\nUnified WS Protocol\nchat · copilot · skill_creator"]
-            RUN_WS_HANDLER["RunWsHandler\nEvent Streaming\n& Replay"]
+            REST["/v1 REST Endpoints\nAgents · Versions · Releases\nTasks · Threads · Runs · Executions"]
+            EXEC_WS_HANDLER["ExecutionSubscriptionHandler\n/ws/executions\nSnapshot · Events · Replay"]
+            NOTIF_HANDLER["NotificationManager\n/ws/notifications"]
+            CLAW_HANDLER["OpenClawHandler\n/ws/openclaw/*"]
+        end
+
+        subgraph CONTRACTS["Contracts — Single Source of Truth"]
+            AGENT_CONTRACT["agent.py\nDefinitionKind · RuntimeKind\nDEFINITION_RUNTIME_KIND"]
+            EXEC_CONTRACT["execution.py\nRunStatus · ExecutionStatus\nTriggerSource · terminal sets"]
+            ERROR_CONTRACT["error.py\nErrorCode StrEnum (~180)\nErrorSource · UserAction"]
         end
 
         subgraph SERVICES["Service Layer"]
+            DISPATCH_SVC["DispatchService\nAPI-facing facade (L1.5)"]
+            ORCH_SVC["ExecutionOrchestrator\nRun + Execution lifecycle (L2)"]
+            ENGINE_REG["EngineRegistry\nruntime_kind → engine (L2.5)"]
             MODEL_SVC["ModelService\nUnified Resolution\n(provider_name, model_name)"]
-            RUN_SVC["RunService\nEvent Sourcing\nRun · Event · Snapshot"]
             SANDBOX_SVC["SandboxService\nRAII Handle\nPer-User Isolation"]
             SKILL_SVC["SkillService\nVersioning\n& Collaboration"]
-            GRAPH_SVC["GraphService\nTemplate · Deploy\n& Lookup"]
+        end
+
+        subgraph ENGINES["Execution Engines (L3)"]
+            CLI_ENG["CLIEngine\nruntime_kind=sandbox\nDocker + CLI agent"]
+            GRAPH_ENG["GraphEngine\nruntime_kind=graph\nLangGraph compiler"]
+            CODE_ENG["CodeEngine\nruntime_kind=code\nIn-process agent"]
+            COPILOT_ENG["CopilotEngine\nruntime_kind=copilot\nGraph analysis"]
+        end
+
+        subgraph EVENT_BUS["Two-Phase Event Bus (L3.5–L4)"]
+            CTX["ExecutionContext.emit()"]
+            BUS["ExecutionEventBus"]
+            subgraph PH1["Phase 1 (shared tx, sequential)"]
+                PERSIST_SUB["PersistenceSubscriber\nExecutionEvent rows + seq"]
+                STATE_SUB["StateTransitionSubscriber\nState machine validation"]
+            end
+            subgraph PH2["Phase 2 (parallel fan-out)"]
+                WS_SUB["WebSocketSubscriber\n→ SubscriptionManager"]
+                TASK_SUB["TaskSyncSubscriber\nRun→Task status sync"]
+            end
+        end
+
+        subgraph STATE_MACHINES["State Machines"]
+            SM["StateMachine engine\n6 entities:\nAgent · Version · Release\nRun · Execution · Task"]
+        end
+
+        subgraph OBSERVATION["Observation Layer"]
+            COLLECTOR["ObservationCollector\nOTel-backed tracing\ninjected into ExecutionContext"]
+        end
+
+        subgraph PORTS["Ports & Adapters"]
+            EVENT_PORT["ExecutionEventPort\n→ execution_event_adapter"]
+            READER_PORT["ExecutionReaderPort\n→ execution_reader_adapter"]
+        end
+
+        subgraph APP_ERRORS["Error System"]
+            APPEXC["AppError hierarchy\nto_payload() → ErrorDescriptor\n{code,message,data,source,retryable}"]
         end
 
         subgraph CORE["Core Engine"]
-            DEEP_AGENTS["DeepAgents v0.4\nManager-Worker\nOrchestration"]
+            DEEP_AGENTS["DeepAgents\nManager-Worker\nOrchestration"]
             LANGGRAPH["LangGraph Engine\nStateful Graphs\nPause · Resume · Branch"]
-            COPILOT["Copilot Engine\nGraph Analysis\n& Action Execution"]
             MODEL_FACTORY["ModelFactory\nProvider Registry\n& Credential Validation"]
             TOOL_RESOLVER["Tool Resolver\nMCP Protocol\n200+ Tools"]
             SKILL_LOADER["Skill Loader\nBatch Preload\n& Deduplication"]
         end
-
-        subgraph OBSERVABILITY["Observability & Cross-Cutting"]
-            TRACE["trace_id Propagation\n(contextvars)"]
-            LANGFUSE["Langfuse\nReal-Time Tracing"]
-            LOGURU["Loguru\nStructured Logging"]
-            APPEXC["AppException\nStructured Error Codes\ni18n Support"]
-        end
     end
 
     subgraph DATA["🗄️ Data Layer"]
         direction LR
-        PG["PostgreSQL\nGraphs · Runs · Events\nSnapshots · Skills\nCredentials · Memory"]
+        PG["PostgreSQL\nAgent Definitions · Versions · Releases\nRuns · Executions · Execution Events\nSnapshots · Skills · Credentials · Memory"]
         REDIS["Redis\nSession Cache\nRate Limiting"]
     end
 
@@ -102,48 +142,63 @@ graph TB
     USER --> FRONTEND
 
     %% WebSocket hierarchy
-    BASE_WS --> CHAT_WS
-    BASE_WS --> RUN_WS
+    BASE_WS --> EXEC_WS
     BASE_WS --> NOTIF_WS
 
     %% Frontend → Backend
-    CHAT_WS -->|"ws-token auth"| WS_HANDLER
-    RUN_WS -->|"event subscribe"| RUN_WS_HANDLER
+    EXEC_WS -->|"execution subscribe"| EXEC_WS_HANDLER
+    NOTIF_WS -->|"notifications"| NOTIF_HANDLER
     TANSTACK -->|"REST"| REST
+    API_ERROR -.->|"mirrors"| APPEXC
 
     %% API → Services
-    WS_HANDLER --> RUN_SVC
-    WS_HANDLER --> MODEL_SVC
-    RUN_WS_HANDLER --> RUN_SVC
-    REST --> GRAPH_SVC
+    REST --> DISPATCH_SVC
     REST --> SKILL_SVC
     REST --> MODEL_SVC
     REST --> SANDBOX_SVC
 
-    %% Services → Core
-    MODEL_SVC --> MODEL_FACTORY
-    RUN_SVC --> DEEP_AGENTS
-    RUN_SVC --> LANGGRAPH
-    GRAPH_SVC --> COPILOT
-    SKILL_SVC --> SKILL_LOADER
+    %% Services → Engines
+    DISPATCH_SVC --> ORCH_SVC
+    ORCH_SVC --> ENGINE_REG
+    ENGINE_REG --> CLI_ENG
+    ENGINE_REG --> GRAPH_ENG
+    ENGINE_REG --> CODE_ENG
+    ENGINE_REG --> COPILOT_ENG
+
+    %% Engines → Event Bus
+    CLI_ENG --> CTX
+    GRAPH_ENG --> CTX
+    CODE_ENG --> CTX
+    COPILOT_ENG --> CTX
+    CTX --> BUS
+    BUS --> PERSIST_SUB
+    BUS --> STATE_SUB
+    BUS --> WS_SUB
+    BUS --> TASK_SUB
+
+    %% State machines
+    STATE_SUB --> SM
+
+    %% Observation
+    COLLECTOR -.->|"injected into"| CTX
+
+    %% Ports
+    EVENT_PORT -.-> BUS
+    CLI_ENG -.-> EVENT_PORT
 
     %% Core internals
+    GRAPH_ENG --> DEEP_AGENTS
     DEEP_AGENTS --> LANGGRAPH
     DEEP_AGENTS --> TOOL_RESOLVER
     DEEP_AGENTS --> SKILL_LOADER
-    COPILOT --> LANGGRAPH
+    COPILOT_ENG --> LANGGRAPH
     TOOL_RESOLVER --> MCP_TOOLS
-
-    %% Observability
-    TRACE -.->|"flows through"| WS_HANDLER
-    TRACE -.->|"flows through"| LANGGRAPH
-    TRACE -.->|"persisted in"| PG
-    LANGFUSE -.-> DEEP_AGENTS
-    LOGURU -.-> SERVICES
+    MODEL_SVC --> MODEL_FACTORY
 
     %% Data
     SERVICES --> PG
     SERVICES --> REDIS
+    PERSIST_SUB --> PG
 
     %% Sandbox
     SANDBOX_SVC -->|"RAII handle"| DOCKER
diff --git a/docs/schemas/README.md b/docs/schemas/README.md
deleted file mode 100644
index b71e50e8d..000000000
--- a/docs/schemas/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Schemas
-
-## copilot-contract.json
-
-Canonical JSON Schema for Copilot WebSocket/SSE stream events and GraphAction.
-
-- **Source of truth**: `backend/app/core/copilot/action_types.py` (Pydantic models).
-- **Regenerate**: From repo root run:
-  ```bash
-  python backend/scripts/export_copilot_schema.py
-  ```
-- **Consumers**: Frontend types in `frontend/types/copilot.ts` and `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotWebSocketHandler.ts` are kept in sync with this schema; when adding or changing event/action fields, update the backend models, re-run the script, then update the frontend types.
-
-## copilot-apply-fixtures.json
-
-Shared test cases for the apply-actions contract: given `(initial_nodes, initial_edges, actions)`, both backend and frontend must produce the same `(expected_nodes, expected_edges)` (contract match: id/type/position/data.label/data.type/config superset for nodes; id/source/target for edges).
-
-- **Backend test**: `backend/tests/core/copilot/test_action_applier.py`
-- **Frontend test**: `frontend/lib/utils/copilot/__tests__/actionProcessor.contract.test.ts`
-- When changing apply logic (e.g. new action type or edge case), add or update a case in this file and run both tests.
-
-## Node type default config (contract)
-
-- **Source of truth for defaults**: Frontend `frontend/app/workspace/[workspaceId]/[agentId]/services/nodeRegistry.tsx` (defaultConfig and label per type).
-- **Backend**: `backend/app/core/copilot/action_applier.py` keeps `NODE_DEFAULT_CONFIGS` and `NODE_LABELS` in sync with nodeRegistry when adding or changing node types; no separate JSON is used.
-
-## Type and naming conventions
-
-- **Domain / API contract types**: `frontend/types/copilot.ts` — GraphAction, CopilotResponse, stream event shapes; aligned with backend and `docs/schemas/copilot-contract.json`.
diff --git a/docs/schemas/copilot-apply-fixtures.json b/docs/schemas/copilot-apply-fixtures.json
deleted file mode 100644
index eb5b6580d..000000000
--- a/docs/schemas/copilot-apply-fixtures.json
+++ /dev/null
@@ -1,207 +0,0 @@
-[
-  {
-    "name": "CREATE_NODE_single",
-    "initial_nodes": [],
-    "initial_edges": [],
-    "actions": [
-      {
-        "type": "CREATE_NODE",
-        "payload": {
-          "id": "n1",
-          "type": "agent",
-          "label": "My Agent",
-          "position": { "x": 100, "y": 200 },
-          "config": { "systemPrompt": "Hello" }
-        },
-        "reasoning": ""
-      }
-    ],
-    "expected_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 100, "y": 200 },
-        "data": {
-          "label": "My Agent",
-          "type": "agent",
-          "config": { "systemPrompt": "Hello" }
-        }
-      }
-    ],
-    "expected_edges": []
-  },
-  {
-    "name": "CONNECT_NODES",
-    "initial_nodes": [
-      {
-        "id": "a",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "A", "type": "agent", "config": {} }
-      },
-      {
-        "id": "b",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "B", "type": "agent", "config": {} }
-      }
-    ],
-    "initial_edges": [],
-    "actions": [
-      {
-        "type": "CONNECT_NODES",
-        "payload": { "source": "a", "target": "b" },
-        "reasoning": ""
-      }
-    ],
-    "expected_nodes": [
-      {
-        "id": "a",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "A", "type": "agent", "config": {} }
-      },
-      {
-        "id": "b",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "B", "type": "agent", "config": {} }
-      }
-    ],
-    "expected_edges": [{ "id": "e-a-b", "source": "a", "target": "b" }]
-  },
-  {
-    "name": "CONNECT_NODES_idempotent",
-    "initial_nodes": [
-      {
-        "id": "a",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "A", "type": "agent", "config": {} }
-      },
-      {
-        "id": "b",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "B", "type": "agent", "config": {} }
-      }
-    ],
-    "initial_edges": [{ "id": "e-a-b", "source": "a", "target": "b" }],
-    "actions": [
-      {
-        "type": "CONNECT_NODES",
-        "payload": { "source": "a", "target": "b" },
-        "reasoning": ""
-      }
-    ],
-    "expected_nodes": [
-      {
-        "id": "a",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "A", "type": "agent", "config": {} }
-      },
-      {
-        "id": "b",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "B", "type": "agent", "config": {} }
-      }
-    ],
-    "expected_edges": [{ "id": "e-a-b", "source": "a", "target": "b" }]
-  },
-  {
-    "name": "DELETE_NODE",
-    "initial_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "N1", "type": "agent", "config": {} }
-      },
-      {
-        "id": "n2",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "N2", "type": "agent", "config": {} }
-      }
-    ],
-    "initial_edges": [{ "id": "e-n1-n2", "source": "n1", "target": "n2" }],
-    "actions": [
-      { "type": "DELETE_NODE", "payload": { "id": "n1" }, "reasoning": "" }
-    ],
-    "expected_nodes": [
-      {
-        "id": "n2",
-        "type": "custom",
-        "position": { "x": 100, "y": 0 },
-        "data": { "label": "N2", "type": "agent", "config": {} }
-      }
-    ],
-    "expected_edges": []
-  },
-  {
-    "name": "UPDATE_CONFIG",
-    "initial_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": {
-          "label": "N1",
-          "type": "agent",
-          "config": { "systemPrompt": "Old" }
-        }
-      }
-    ],
-    "initial_edges": [],
-    "actions": [
-      {
-        "type": "UPDATE_CONFIG",
-        "payload": { "id": "n1", "config": { "systemPrompt": "New" } },
-        "reasoning": ""
-      }
-    ],
-    "expected_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": {
-          "label": "N1",
-          "type": "agent",
-          "config": { "systemPrompt": "New" }
-        }
-      }
-    ],
-    "expected_edges": []
-  },
-  {
-    "name": "UPDATE_POSITION",
-    "initial_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 0, "y": 0 },
-        "data": { "label": "N1", "type": "agent", "config": {} }
-      }
-    ],
-    "initial_edges": [],
-    "actions": [
-      {
-        "type": "UPDATE_POSITION",
-        "payload": { "id": "n1", "position": { "x": 50, "y": 100 } },
-        "reasoning": ""
-      }
-    ],
-    "expected_nodes": [
-      {
-        "id": "n1",
-        "type": "custom",
-        "position": { "x": 50, "y": 100 },
-        "data": { "label": "N1", "type": "agent", "config": {} }
-      }
-    ],
-    "expected_edges": []
-  }
-]
diff --git a/docs/schemas/copilot-contract.json b/docs/schemas/copilot-contract.json
deleted file mode 100644
index d8cc455f9..000000000
--- a/docs/schemas/copilot-contract.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "title": "CopilotStreamEvent",
-  "description": "Copilot WebSocket/SSE stream event contract. One of status, content, thought_step, tool_call, tool_result, result, done, error.",
-  "oneOf": [
-    {
-      "$ref": "#/$defs/CopilotStatusEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotContentEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotThoughtStepEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotToolCallEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotToolResultEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotResultEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotDoneEvent"
-    },
-    {
-      "$ref": "#/$defs/CopilotErrorEvent"
-    }
-  ],
-  "$defs": {
-    "CopilotStatusEvent": {
-      "description": "Stream event: progress status.",
-      "properties": {
-        "type": {
-          "const": "status",
-          "default": "status",
-          "title": "Type",
-          "type": "string"
-        },
-        "stage": {
-          "description": "Stage identifier (e.g. thinking, processing)",
-          "title": "Stage",
-          "type": "string"
-        },
-        "message": {
-          "description": "Human-readable status message",
-          "title": "Message",
-          "type": "string"
-        }
-      },
-      "required": ["stage", "message"],
-      "title": "CopilotStatusEvent",
-      "type": "object"
-    },
-    "CopilotContentEvent": {
-      "description": "Stream event: streaming AI response content.",
-      "properties": {
-        "type": {
-          "const": "content",
-          "default": "content",
-          "title": "Type",
-          "type": "string"
-        },
-        "content": {
-          "description": "Content chunk",
-          "title": "Content",
-          "type": "string"
-        }
-      },
-      "required": ["content"],
-      "title": "CopilotContentEvent",
-      "type": "object"
-    },
-    "CopilotThoughtStepEvent": {
-      "description": "Stream event: single thought step in AI reasoning.",
-      "properties": {
-        "type": {
-          "const": "thought_step",
-          "default": "thought_step",
-          "title": "Type",
-          "type": "string"
-        },
-        "step": {
-          "additionalProperties": true,
-          "description": "Step with index and content (e.g. {index, content})",
-          "title": "Step",
-          "type": "object"
-        }
-      },
-      "required": ["step"],
-      "title": "CopilotThoughtStepEvent",
-      "type": "object"
-    },
-    "CopilotToolCallEvent": {
-      "description": "Stream event: tool invocation started.",
-      "properties": {
-        "type": {
-          "const": "tool_call",
-          "default": "tool_call",
-          "title": "Type",
-          "type": "string"
-        },
-        "tool": {
-          "description": "Tool name",
-          "title": "Tool",
-          "type": "string"
-        },
-        "input": {
-          "additionalProperties": true,
-          "description": "Tool input parameters",
-          "title": "Input",
-          "type": "object"
-        }
-      },
-      "required": ["tool"],
-      "title": "CopilotToolCallEvent",
-      "type": "object"
-    },
-    "CopilotToolResultEvent": {
-      "description": "Stream event: tool execution result (action payload).",
-      "properties": {
-        "type": {
-          "const": "tool_result",
-          "default": "tool_result",
-          "title": "Type",
-          "type": "string"
-        },
-        "action": {
-          "additionalProperties": true,
-          "description": "Action dict: type, payload, reasoning (GraphAction-compatible)",
-          "title": "Action",
-          "type": "object"
-        }
-      },
-      "required": ["action"],
-      "title": "CopilotToolResultEvent",
-      "type": "object"
-    },
-    "CopilotResultEvent": {
-      "description": "Stream event: final result with message and actions.",
-      "properties": {
-        "type": {
-          "const": "result",
-          "default": "result",
-          "title": "Type",
-          "type": "string"
-        },
-        "message": {
-          "description": "Final assistant message",
-          "title": "Message",
-          "type": "string"
-        },
-        "actions": {
-          "description": "List of GraphAction-compatible dicts",
-          "items": {
-            "additionalProperties": true,
-            "type": "object"
-          },
-          "title": "Actions",
-          "type": "array"
-        },
-        "batch": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "default": null,
-          "description": "Optional batch flag for frontend",
-          "title": "Batch"
-        }
-      },
-      "required": ["message"],
-      "title": "CopilotResultEvent",
-      "type": "object"
-    },
-    "CopilotDoneEvent": {
-      "description": "Stream event: stream finished.",
-      "properties": {
-        "type": {
-          "const": "done",
-          "default": "done",
-          "title": "Type",
-          "type": "string"
-        }
-      },
-      "title": "CopilotDoneEvent",
-      "type": "object"
-    },
-    "CopilotErrorEvent": {
-      "description": "Stream event: error occurred.",
-      "properties": {
-        "type": {
-          "const": "error",
-          "default": "error",
-          "title": "Type",
-          "type": "string"
-        },
-        "message": {
-          "description": "Error message",
-          "title": "Message",
-          "type": "string"
-        },
-        "code": {
-          "description": "Error code for frontend mapping (e.g. CREDENTIAL_ERROR, UNKNOWN_ERROR)",
-          "title": "Code",
-          "type": "string"
-        }
-      },
-      "required": ["message", "code"],
-      "title": "CopilotErrorEvent",
-      "type": "object"
-    },
-    "GraphAction": {
-      "$defs": {
-        "GraphActionType": {
-          "description": "Graph action types that can be executed by Copilot.",
-          "enum": [
-            "CREATE_NODE",
-            "CONNECT_NODES",
-            "DELETE_NODE",
-            "UPDATE_CONFIG",
-            "UPDATE_POSITION"
-          ],
-          "title": "GraphActionType",
-          "type": "string"
-        }
-      },
-      "description": "Single graph action to be executed.",
-      "properties": {
-        "type": {
-          "$ref": "#/$defs/GraphActionType",
-          "description": "Action type"
-        },
-        "payload": {
-          "additionalProperties": true,
-          "description": "Action payload",
-          "title": "Payload",
-          "type": "object"
-        },
-        "reasoning": {
-          "description": "Reasoning for the action",
-          "title": "Reasoning",
-          "type": "string"
-        }
-      },
-      "required": ["type", "payload", "reasoning"],
-      "title": "GraphAction",
-      "type": "object"
-    },
-    "GraphActionType": {
-      "type": "string",
-      "enum": [
-        "CREATE_NODE",
-        "CONNECT_NODES",
-        "DELETE_NODE",
-        "UPDATE_CONFIG",
-        "UPDATE_POSITION"
-      ],
-      "description": "Graph action type"
-    }
-  }
-}
diff --git a/docs/superpowers/plans/2026-03-18-skill-creator-agent.md b/docs/superpowers/plans/2026-03-18-skill-creator-agent.md
deleted file mode 100644
index c9064dbae..000000000
--- a/docs/superpowers/plans/2026-03-18-skill-creator-agent.md
+++ /dev/null
@@ -1,1285 +0,0 @@
-# Skill Creator Agent — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Allow users to create/modify Skills through AI Agent conversation in a Docker sandbox, preview results, and save to DB after confirmation.
-
-**Architecture:** Reuse existing `/v1/chat/stream` SSE architecture with a new `mode="skill_creator"` parameter. A dedicated `create_skill_creator_graph()` method in `GraphService` creates a single-node DeepAgents graph with skill-creator system prompt. The `preview_skill` builtin tool reads generated files from the sandbox for frontend rendering. Frontend adds a Skill Creator page with chat + preview panel layout, and a Dashboard entry card.
-
-**Tech Stack:** FastAPI, LangGraph, DeepAgents, Docker Sandbox (pydantic-ai-backend), Next.js 16 (App Router), React 19, TypeScript, Zustand, TanStack Query
-
-**Spec:** `docs/superpowers/specs/2026-03-18-skill-creator-agent-design.md`
-
----
-
-## File Structure
-
-### Backend — New Files
-
-| File | Responsibility |
-|------|---------------|
-| `backend/app/core/tools/buildin/preview_skill.py` | `preview_skill` tool: reads skill files from sandbox host path, validates, returns structured JSON |
-
-### Backend — Modified Files
-
-| File | Change |
-|------|--------|
-| `backend/app/schemas/chat.py` | Add `mode` and `edit_skill_id` fields to `ChatRequest` |
-| `backend/app/api/v1/chat.py` | Handle `mode="skill_creator"` branch in `chat_stream` and `chat` |
-| `backend/app/services/graph_service.py` | Add `create_skill_creator_graph()` method |
-| `backend/app/core/tools/tool_registry.py` | Register `preview_skill` in `_initialize_builtin_tools()` |
-
-### Frontend — New Files
-
-| File | Responsibility |
-|------|---------------|
-| `frontend/app/skills/creator/page.tsx` | Skill Creator page (route: `/skills/creator`) |
-| `frontend/app/skills/creator/components/SkillCreatorChat.tsx` | Chat panel wrapping `ChatInterface` with `mode=skill_creator` |
-| `frontend/app/skills/creator/components/SkillPreviewPanel.tsx` | Right panel: file tree + content viewer + save button |
-| `frontend/app/skills/creator/components/SkillFileTree.tsx` | File directory tree |
-| `frontend/app/skills/creator/components/SkillFileViewer.tsx` | Single file content with syntax highlighting |
-| `frontend/app/skills/creator/components/SkillSaveDialog.tsx` | Confirmation dialog before saving to DB |
-
-### Frontend — Modified Files
-
-| File | Change |
-|------|--------|
-| `frontend/app/chat/hooks/useBackendChatStream.ts` | Pass `mode` through to backend in `streamChat` call |
-| `frontend/app/skills/page.tsx` | Add "AI Create" button linking to `/skills/creator` |
-| `frontend/app/chat/components/ChatHome.tsx` | Add Skill Creator entry card on chat home |
-
----
-
-## Task 1: Backend — Extend ChatRequest Schema
-
-**Files:**
-- Modify: `backend/app/schemas/chat.py:8-15`
-- Test: `backend/tests/test_schemas/test_chat.py` (create if needed)
-
-- [ ] **Step 1: Write the failing test**
-
-```python
-# backend/tests/test_schemas/test_chat.py
-from app.schemas.chat import ChatRequest
-
-
-def test_chat_request_with_mode():
-    req = ChatRequest(
-        message="Create a skill",
-        mode="skill_creator",
-        edit_skill_id="some-uuid-string",
-    )
-    assert req.mode == "skill_creator"
-    assert req.edit_skill_id == "some-uuid-string"
-
-
-def test_chat_request_mode_defaults_to_none():
-    req = ChatRequest(message="Hello")
-    assert req.mode is None
-    assert req.edit_skill_id is None
-
-
-def test_chat_request_mode_validation():
-    """mode must be None or 'skill_creator'"""
-    import pytest
-    from pydantic import ValidationError
-
-    with pytest.raises(ValidationError):
-        ChatRequest(message="Hello", mode="invalid_mode")
-```
-
-- [ ] **Step 2: Run test to verify it fails**
-
-Run: `cd backend && python -m pytest tests/test_schemas/test_chat.py -v`
-Expected: FAIL — `ChatRequest` doesn't accept `mode` or `edit_skill_id`
-
-- [ ] **Step 3: Implement schema changes**
-
-Edit `backend/app/schemas/chat.py`:
-
-```python
-from typing import Any, Literal
-
-class ChatRequest(PydanticBaseModel):
-    message: str = Field(..., description="用户消息")
-    thread_id: str | None = Field(None, description="会话线程ID，不提供则创建新会话")
-    graph_id: uuid.UUID | None = Field(None, description="图ID，使用指定的图进行对话")
-    metadata: dict[str, Any] = Field(default_factory=dict, description="元数据")
-    mode: Literal["skill_creator"] | None = Field(None, description="特殊模式: skill_creator 使用 Skill 创建专用 Graph")
-    edit_skill_id: str | None = Field(None, description="修改已有 Skill 时传入 Skill ID")
-```
-
-- [ ] **Step 4: Run test to verify it passes**
-
-Run: `cd backend && python -m pytest tests/test_schemas/test_chat.py -v`
-Expected: PASS
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/schemas/chat.py backend/tests/test_schemas/test_chat.py
-git commit -m "feat(schema): add mode and edit_skill_id to ChatRequest"
-```
-
----
-
-## Task 2: Backend — preview_skill Builtin Tool
-
-**Files:**
-- Create: `backend/app/core/tools/buildin/preview_skill.py`
-- Test: `backend/tests/test_tools/test_preview_skill.py` (create)
-
-- [ ] **Step 1: Write the failing test**
-
-```python
-# backend/tests/test_tools/test_preview_skill.py
-import json
-import os
-import tempfile
-from pathlib import Path
-
-import pytest
-
-from app.core.tools.buildin.preview_skill import preview_skill_in_sandbox
-
-
-@pytest.fixture
-def skill_dir():
-    """Create a temporary skill directory with SKILL.md and a script."""
-    with tempfile.TemporaryDirectory() as tmpdir:
-        skill_path = Path(tmpdir) / "skills" / "test-skill"
-        skill_path.mkdir(parents=True)
-
-        # Write SKILL.md
-        skill_md = skill_path / "SKILL.md"
-        skill_md.write_text(
-            "---\nname: test-skill\ndescription: A test skill\n---\n# Test Skill\nInstructions here."
-        )
-
-        # Write a script
-        scripts_dir = skill_path / "scripts"
-        scripts_dir.mkdir()
-        (scripts_dir / "run.py").write_text("print('hello')")
-
-        yield tmpdir
-
-
-def test_preview_skill_returns_structured_output(skill_dir):
-    result = preview_skill_in_sandbox(
-        skill_name="test-skill",
-        sandbox_root=skill_dir,
-    )
-    data = json.loads(result)
-    assert data["skill_name"] == "test-skill"
-    assert len(data["files"]) == 2
-    assert data["validation"]["valid"] is True
-
-    file_paths = [f["path"] for f in data["files"]]
-    assert "SKILL.md" in file_paths
-    assert "scripts/run.py" in file_paths
-
-
-def test_preview_skill_missing_skill_md(skill_dir):
-    """A skill without SKILL.md should fail validation."""
-    skill_path = Path(skill_dir) / "skills" / "bad-skill"
-    skill_path.mkdir(parents=True)
-    (skill_path / "readme.txt").write_text("no skill md")
-
-    result = preview_skill_in_sandbox(
-        skill_name="bad-skill",
-        sandbox_root=skill_dir,
-    )
-    data = json.loads(result)
-    assert data["validation"]["valid"] is False
-    assert any("SKILL.md" in e for e in data["validation"]["errors"])
-
-
-def test_preview_skill_nonexistent_dir(skill_dir):
-    result = preview_skill_in_sandbox(
-        skill_name="nonexistent",
-        sandbox_root=skill_dir,
-    )
-    data = json.loads(result)
-    assert data["validation"]["valid"] is False
-    assert any("not found" in e.lower() for e in data["validation"]["errors"])
-```
-
-- [ ] **Step 2: Run test to verify it fails**
-
-Run: `cd backend && python -m pytest tests/test_tools/test_preview_skill.py -v`
-Expected: FAIL — `ImportError: cannot import name 'preview_skill_in_sandbox'`
-
-- [ ] **Step 3: Implement preview_skill tool**
-
-Create `backend/app/core/tools/buildin/preview_skill.py`:
-
-```python
-"""preview_skill — reads generated skill files from sandbox and returns structured JSON."""
-import json
-from pathlib import Path
-from typing import Optional
-
-from app.core.skill.validators import (
-    validate_skill_description,
-    validate_skill_name,
-)
-from app.core.skill.yaml_parser import parse_skill_md
-
-
-def _detect_file_type(path: str) -> str:
-    ext_map = {
-        ".py": "python",
-        ".md": "markdown",
-        ".json": "json",
-        ".yaml": "yaml",
-        ".yml": "yaml",
-        ".txt": "text",
-        ".sh": "shell",
-        ".js": "javascript",
-        ".ts": "typescript",
-    }
-    suffix = Path(path).suffix.lower()
-    return ext_map.get(suffix, "text")
-
-
-def preview_skill_in_sandbox(
-    skill_name: str,
-    sandbox_root: str,
-    skills_subdir: str = "skills",
-) -> str:
-    """Read all files from a skill directory in the sandbox and return structured JSON.
-
-    Args:
-        skill_name: Directory name under /workspace/skills/ in the sandbox.
-        sandbox_root: Host-side sandbox root (e.g., /tmp/sandboxes/{user_id}).
-        skills_subdir: Subdirectory within sandbox_root where skills live.
-
-    Returns:
-        JSON string with skill_name, files[], and validation{}.
-    """
-    skill_dir = Path(sandbox_root) / skills_subdir / skill_name
-    errors: list[str] = []
-    warnings: list[str] = []
-    files: list[dict] = []
-
-    if not skill_dir.exists() or not skill_dir.is_dir():
-        return json.dumps(
-            {
-                "skill_name": skill_name,
-                "files": [],
-                "validation": {
-                    "valid": False,
-                    "errors": [f"Skill directory not found: {skill_name}"],
-                    "warnings": [],
-                },
-            },
-            ensure_ascii=False,
-        )
-
-    # Collect all files recursively
-    for file_path in sorted(skill_dir.rglob("*")):
-        if not file_path.is_file():
-            continue
-        rel_path = str(file_path.relative_to(skill_dir))
-        try:
-            content = file_path.read_text(encoding="utf-8")
-        except (UnicodeDecodeError, OSError):
-            content = f"[Binary or unreadable file: {rel_path}]"
-        files.append(
-            {
-                "path": rel_path,
-                "content": content,
-                "file_type": _detect_file_type(rel_path),
-                "size": file_path.stat().st_size,
-            }
-        )
-
-    # Validate: SKILL.md must exist
-    skill_md_files = [f for f in files if f["path"] == "SKILL.md"]
-    if not skill_md_files:
-        errors.append("Missing required file: SKILL.md")
-    else:
-        # Parse and validate frontmatter
-        skill_md_content = skill_md_files[0]["content"]
-        try:
-            frontmatter, body = parse_skill_md(skill_md_content)
-            name = frontmatter.get("name", "")
-            description = frontmatter.get("description", "")
-
-            name_valid, name_msg = validate_skill_name(name)
-            if not name_valid:
-                errors.append(f"Name validation: {name_msg}")
-
-            desc_valid, desc_msg = validate_skill_description(description)
-            if not desc_valid:
-                errors.append(f"Description validation: {desc_msg}")
-
-            if not body.strip():
-                warnings.append("SKILL.md body is empty")
-
-        except Exception as e:
-            errors.append(f"Failed to parse SKILL.md: {e}")
-
-    return json.dumps(
-        {
-            "skill_name": skill_name,
-            "files": files,
-            "validation": {
-                "valid": len(errors) == 0,
-                "errors": errors,
-                "warnings": warnings,
-            },
-        },
-        ensure_ascii=False,
-    )
-```
-
-- [ ] **Step 4: Run test to verify it passes**
-
-Run: `cd backend && python -m pytest tests/test_tools/test_preview_skill.py -v`
-Expected: PASS
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/core/tools/buildin/preview_skill.py backend/tests/test_tools/test_preview_skill.py
-git commit -m "feat(tools): add preview_skill builtin tool"
-```
-
----
-
-## Task 3: Backend — Register preview_skill in Tool Registry
-
-**Files:**
-- Modify: `backend/app/core/tools/tool_registry.py:611-652`
-
-- [ ] **Step 1: Add import and registration**
-
-Edit `backend/app/core/tools/tool_registry.py`, inside `_initialize_builtin_tools()`, after the existing `skill_tools.deploy_local_skill` registration block:
-
-```python
-from app.core.tools.buildin.preview_skill import preview_skill_in_sandbox
-
-registry.register_builtin(
-    callable_func=preview_skill_in_sandbox,
-    name="preview_skill",
-    description="Preview a skill generated in the sandbox. Reads all files from the skill directory and returns structured JSON with file contents and validation results.",
-    category="skill",
-    tags={"skill", "preview", "sandbox"},
-)
-```
-
-- [ ] **Step 2: Verify import works**
-
-Run: `cd backend && python -c "from app.core.tools.buildin.preview_skill import preview_skill_in_sandbox; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/core/tools/tool_registry.py
-git commit -m "feat(tools): register preview_skill in builtin tool registry"
-```
-
----
-
-## Task 4: Backend — GraphService.create_skill_creator_graph()
-
-**Files:**
-- Modify: `backend/app/services/graph_service.py:667-744` (add method after `create_default_deep_agents_graph`)
-
-- [ ] **Step 1: Read the existing `create_default_deep_agents_graph` method**
-
-Read `backend/app/services/graph_service.py` lines 667-744 to understand the exact pattern.
-
-- [ ] **Step 2: Implement `create_skill_creator_graph()`**
-
-Add new method to `GraphService` class, following the same pattern as `create_default_deep_agents_graph`:
-
-```python
-async def create_skill_creator_graph(
-    self,
-    llm_model: Optional[str] = None,
-    api_key: Optional[str] = None,
-    base_url: Optional[str] = None,
-    max_tokens: int = 4096,
-    user_id: Optional[Any] = None,
-    edit_skill_id: Optional[str] = None,
-) -> CompiledStateGraph:
-    """Create a specialized graph for the Skill Creator Agent.
-
-    Uses the same single-node DeepAgents pattern as the default graph,
-    but with a skill-creator-specific system prompt and tool configuration.
-    """
-    from app.core.skill.sandbox_loader import SkillSandboxLoader
-
-    # Build skill creator system prompt
-    skill_creator_system_prompt = (
-        "You are a Skill Creator Agent. Your job is to help users create and modify "
-        "Skills (reusable capability packages) through conversation.\n\n"
-        "## Workflow\n"
-        "1. Understand the user's requirements through conversation\n"
-        "2. Use init_skill.py to initialize the skill directory structure\n"
-        "3. Write SKILL.md with proper YAML frontmatter (name, description) + markdown body\n"
-        "4. Create supporting files in scripts/, references/, assets/ as needed\n"
-        "5. Run quick_validate.py to validate the skill\n"
-        "6. Call the preview_skill tool to output the final result for user review\n\n"
-        "## Rules\n"
-        "- Skill names must match: ^[a-z0-9]+(-[a-z0-9]+)*$ (max 64 chars)\n"
-        "- SKILL.md is required with YAML frontmatter containing 'name' and 'description'\n"
-        "- Always validate before previewing\n"
-        "- The skill-creator skill is pre-loaded at /workspace/skills/skill-creator/ — "
-        "use its scripts (init_skill.py, quick_validate.py) and references for guidance\n"
-    )
-
-    if edit_skill_id:
-        skill_creator_system_prompt += (
-            f"\n## Editing Mode\n"
-            f"The user wants to modify an existing skill (ID: {edit_skill_id}). "
-            f"The skill files have been pre-loaded into the sandbox. "
-            f"Read the existing files first, then apply the user's requested changes.\n"
-        )
-
-    graph_id = uuid.uuid4()
-    graph = AgentGraph(
-        id=graph_id,
-        name="Skill Creator",
-        description="AI-powered skill creation and modification",
-    )
-
-    node = GraphNode(
-        id=uuid.uuid4(),
-        graph_id=graph_id,
-        type="agent",
-        data={
-            "label": "Skill Creator Agent",
-            "config": {
-                "useDeepAgents": True,
-                "skills": ["*"],
-                "mode": "skill_creator",
-                "system_prompt": skill_creator_system_prompt,
-            },
-        },
-        position={"x": 0, "y": 0},
-    )
-
-    builder = GraphBuilder(
-        graph=graph,
-        nodes=[node],
-        edges=[],
-        llm_model=llm_model,
-        api_key=api_key,
-        base_url=base_url,
-        max_tokens=max_tokens,
-        user_id=user_id,
-    )
-    return await builder.build()
-```
-
-- [ ] **Step 3: Verify no import errors**
-
-Run: `cd backend && python -c "from app.services.graph_service import GraphService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/services/graph_service.py
-git commit -m "feat(graph): add create_skill_creator_graph() to GraphService"
-```
-
----
-
-## Task 5: Backend — Wire mode="skill_creator" into Chat Stream
-
-**Files:**
-- Modify: `backend/app/api/v1/chat.py:694-713` (inside `event_generator()` in `chat_stream`)
-
-- [ ] **Step 1: Read the current branching logic**
-
-Read `backend/app/api/v1/chat.py` lines 690-720 to see the exact graph creation branch.
-
-- [ ] **Step 2: Add skill_creator mode branch**
-
-Insert the new branch between `graph_service = GraphService(db)` (line 694) and `if payload.graph_id is None` (line 695):
-
-```python
-graph_service = GraphService(db)
-
-# Skill Creator mode — dedicated graph
-if payload.mode == "skill_creator":
-    graph = await graph_service.create_skill_creator_graph(
-        llm_model=llm_model,
-        api_key=api_key,
-        base_url=base_url,
-        max_tokens=max_tokens,
-        user_id=str(current_user.id),
-        edit_skill_id=payload.edit_skill_id,
-    )
-elif payload.graph_id is None:
-    # ... existing default graph creation
-```
-
-Also add the same branch in the non-streaming `chat` endpoint (around lines 554-573) following the identical pattern.
-
-- [ ] **Step 3: Handle edit_skill_id preloading**
-
-After the graph is created in skill_creator mode, add skill preloading logic. If `edit_skill_id` is provided, load the target skill into the sandbox before the agent starts:
-
-```python
-if payload.mode == "skill_creator" and payload.edit_skill_id:
-    try:
-        from app.core.skill.sandbox_loader import SkillSandboxLoader
-        from app.services.skill_service import SkillService
-
-        skill_service = SkillService(db)
-        loader = SkillSandboxLoader(db, user_id=str(current_user.id))
-        # The sandbox backend will be available from the graph's agent node
-        # Preloading happens at graph build time via DeepAgentsGraphBuilder
-    except Exception as e:
-        logger.warning(f"Failed to preload skill for editing: {e}")
-```
-
-Note: The actual preloading mechanism depends on how `DeepAgentsGraphBuilder` initializes the sandbox. The `edit_skill_id` is passed into the graph config so the builder can handle it during `build()`. Verify by reading `deep_agents_builder.py` before implementing this step.
-
-- [ ] **Step 4: Test manually**
-
-Run: `cd backend && python -c "from app.api.v1.chat import router; print('Router loaded OK')"`
-Expected: `OK` (no import errors)
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/api/v1/chat.py
-git commit -m "feat(chat): wire mode=skill_creator into chat_stream endpoint"
-```
-
----
-
-## Task 6: Frontend — Skill Creator Page Layout
-
-**Files:**
-- Create: `frontend/app/skills/creator/page.tsx`
-
-- [ ] **Step 1: Create the page**
-
-```tsx
-// frontend/app/skills/creator/page.tsx
-"use client";
-
-import { useSearchParams } from "next/navigation";
-import { useState, useCallback } from "react";
-import { SkillCreatorChat } from "./components/SkillCreatorChat";
-import { SkillPreviewPanel } from "./components/SkillPreviewPanel";
-
-export interface SkillPreviewData {
-  skill_name: string;
-  files: Array<{
-    path: string;
-    content: string;
-    file_type: string;
-    size: number;
-  }>;
-  validation: {
-    valid: boolean;
-    errors: string[];
-    warnings: string[];
-  };
-}
-
-export default function SkillCreatorPage() {
-  const searchParams = useSearchParams();
-  const editSkillId = searchParams.get("edit");
-  const [previewData, setPreviewData] = useState<SkillPreviewData | null>(null);
-
-  const handlePreviewUpdate = useCallback((data: SkillPreviewData) => {
-    setPreviewData(data);
-  }, []);
-
-  return (
-    <div className="flex h-full w-full">
-      {/* Left: Chat panel */}
-      <div className="flex-1 min-w-0 border-r border-border">
-        <SkillCreatorChat
-          editSkillId={editSkillId}
-          onPreviewUpdate={handlePreviewUpdate}
-        />
-      </div>
-
-      {/* Right: Preview panel */}
-      <div className="w-[480px] shrink-0">
-        <SkillPreviewPanel
-          data={previewData}
-          editSkillId={editSkillId}
-        />
-      </div>
-    </div>
-  );
-}
-```
-
-- [ ] **Step 2: Verify route exists**
-
-Run: `ls frontend/app/skills/creator/page.tsx`
-Expected: File exists
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/skills/creator/page.tsx
-git commit -m "feat(frontend): add Skill Creator page layout"
-```
-
----
-
-## Task 7: Frontend — SkillCreatorChat Component
-
-**Files:**
-- Create: `frontend/app/skills/creator/components/SkillCreatorChat.tsx`
-
-- [ ] **Step 1: Create the component**
-
-This component wraps the existing chat stream hook with `mode="skill_creator"`. It intercepts `tool_end` events for `preview_skill` to extract preview data.
-
-```tsx
-// frontend/app/skills/creator/components/SkillCreatorChat.tsx
-"use client";
-
-import { useState, useCallback, useRef } from "react";
-import { useBackendChatStream } from "@/app/chat/hooks/useBackendChatStream";
-import type { SkillPreviewData } from "../page";
-
-interface SkillCreatorChatProps {
-  editSkillId: string | null;
-  onPreviewUpdate: (data: SkillPreviewData) => void;
-}
-
-interface ChatMessage {
-  id: string;
-  role: "user" | "assistant";
-  content: string;
-}
-
-export function SkillCreatorChat({
-  editSkillId,
-  onPreviewUpdate,
-}: SkillCreatorChatProps) {
-  const [messages, setMessages] = useState<ChatMessage[]>([]);
-  const [input, setInput] = useState("");
-  const [isStreaming, setIsStreaming] = useState(false);
-  const threadIdRef = useRef<string | null>(null);
-  const messagesEndRef = useRef<HTMLDivElement>(null);
-
-  const { sendMessage } = useBackendChatStream(setMessages as any, {
-    onEvent: (event: any) => {
-      // Intercept preview_skill tool_end events
-      if (
-        event.type === "tool_end" &&
-        event.data?.tool_name === "preview_skill"
-      ) {
-        try {
-          const previewData = JSON.parse(event.data.output);
-          onPreviewUpdate(previewData);
-        } catch {
-          // ignore parse errors
-        }
-      }
-      if (event.type === "thread_id" && event.data?.thread_id) {
-        threadIdRef.current = event.data.thread_id;
-      }
-    },
-  });
-
-  const handleSend = useCallback(async () => {
-    if (!input.trim() || isStreaming) return;
-
-    const userMessage = input.trim();
-    setInput("");
-    setMessages((prev) => [
-      ...prev,
-      { id: crypto.randomUUID(), role: "user", content: userMessage },
-    ]);
-    setIsStreaming(true);
-
-    try {
-      await sendMessage(userMessage, {
-        threadId: threadIdRef.current,
-        graphId: null,
-        metadata: {
-          mode: "skill_creator",
-          edit_skill_id: editSkillId,
-        },
-      });
-    } finally {
-      setIsStreaming(false);
-    }
-  }, [input, isStreaming, sendMessage, editSkillId]);
-
-  return (
-    <div className="flex flex-col h-full">
-      <div className="p-4 border-b border-border">
-        <h2 className="text-lg font-semibold">
-          {editSkillId ? "AI Skill Editor" : "AI Skill Creator"}
-        </h2>
-      </div>
-
-      {/* Messages */}
-      <div className="flex-1 overflow-y-auto p-4 space-y-4">
-        {messages.map((msg) => (
-          <div
-            key={msg.id}
-            className={`flex ${msg.role === "user" ? "justify-end" : "justify-start"}`}
-          >
-            <div
-              className={`max-w-[80%] rounded-lg px-4 py-2 ${
-                msg.role === "user"
-                  ? "bg-primary text-primary-foreground"
-                  : "bg-muted"
-              }`}
-            >
-              {msg.content}
-            </div>
-          </div>
-        ))}
-        <div ref={messagesEndRef} />
-      </div>
-
-      {/* Input */}
-      <div className="p-4 border-t border-border">
-        <div className="flex gap-2">
-          <input
-            className="flex-1 px-3 py-2 rounded-md border border-input bg-background"
-            value={input}
-            onChange={(e) => setInput(e.target.value)}
-            onKeyDown={(e) => e.key === "Enter" && !e.shiftKey && handleSend()}
-            placeholder={
-              editSkillId
-                ? "Describe what you want to change..."
-                : "Describe the skill you want to create..."
-            }
-            disabled={isStreaming}
-          />
-          <button
-            className="px-4 py-2 rounded-md bg-primary text-primary-foreground disabled:opacity-50"
-            onClick={handleSend}
-            disabled={isStreaming || !input.trim()}
-          >
-            {isStreaming ? "Generating..." : "Send"}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/skills/creator/components/SkillCreatorChat.tsx
-git commit -m "feat(frontend): add SkillCreatorChat component"
-```
-
----
-
-## Task 8: Frontend — SkillPreviewPanel + File Viewer
-
-**Files:**
-- Create: `frontend/app/skills/creator/components/SkillPreviewPanel.tsx`
-- Create: `frontend/app/skills/creator/components/SkillFileTree.tsx`
-- Create: `frontend/app/skills/creator/components/SkillFileViewer.tsx`
-- Create: `frontend/app/skills/creator/components/SkillSaveDialog.tsx`
-
-- [ ] **Step 1: Create SkillFileTree**
-
-```tsx
-// frontend/app/skills/creator/components/SkillFileTree.tsx
-"use client";
-
-interface FileEntry {
-  path: string;
-  file_type: string;
-  size: number;
-}
-
-interface SkillFileTreeProps {
-  files: FileEntry[];
-  selectedPath: string | null;
-  onSelectFile: (path: string) => void;
-}
-
-const FILE_ICONS: Record<string, string> = {
-  markdown: "📄",
-  python: "🐍",
-  json: "{ }",
-  yaml: "⚙️",
-  shell: "🖥️",
-  text: "📝",
-};
-
-export function SkillFileTree({
-  files,
-  selectedPath,
-  onSelectFile,
-}: SkillFileTreeProps) {
-  return (
-    <div className="text-sm">
-      {files.map((file) => (
-        <button
-          key={file.path}
-          className={`w-full text-left px-2 py-1 rounded hover:bg-accent ${
-            selectedPath === file.path ? "bg-accent" : ""
-          }`}
-          onClick={() => onSelectFile(file.path)}
-        >
-          <span className="mr-1">{FILE_ICONS[file.file_type] ?? "📄"}</span>
-          <span className="font-mono text-xs">{file.path}</span>
-          <span className="ml-2 text-muted-foreground text-xs">
-            {file.size}B
-          </span>
-        </button>
-      ))}
-    </div>
-  );
-}
-```
-
-- [ ] **Step 2: Create SkillFileViewer**
-
-```tsx
-// frontend/app/skills/creator/components/SkillFileViewer.tsx
-"use client";
-
-interface SkillFileViewerProps {
-  path: string;
-  content: string;
-  fileType: string;
-}
-
-export function SkillFileViewer({ path, content, fileType }: SkillFileViewerProps) {
-  return (
-    <div className="h-full flex flex-col">
-      <div className="px-3 py-2 border-b border-border text-xs font-mono text-muted-foreground">
-        {path}
-      </div>
-      <pre className="flex-1 overflow-auto p-3 text-xs font-mono bg-muted/30 whitespace-pre-wrap">
-        {content}
-      </pre>
-    </div>
-  );
-}
-```
-
-- [ ] **Step 3: Create SkillSaveDialog**
-
-```tsx
-// frontend/app/skills/creator/components/SkillSaveDialog.tsx
-"use client";
-
-import { useState } from "react";
-import type { SkillPreviewData } from "../page";
-
-interface SkillSaveDialogProps {
-  data: SkillPreviewData;
-  editSkillId: string | null;
-  onConfirm: () => void;
-  onCancel: () => void;
-  isSaving: boolean;
-}
-
-export function SkillSaveDialog({
-  data,
-  editSkillId,
-  onConfirm,
-  onCancel,
-  isSaving,
-}: SkillSaveDialogProps) {
-  return (
-    <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50">
-      <div className="bg-background rounded-lg p-6 max-w-md w-full mx-4 shadow-xl">
-        <h3 className="text-lg font-semibold mb-4">
-          {editSkillId ? "Update Skill" : "Save Skill"}
-        </h3>
-
-        <div className="space-y-2 mb-6 text-sm">
-          <div>
-            <span className="text-muted-foreground">Name: </span>
-            <span className="font-mono">{data.skill_name}</span>
-          </div>
-          <div>
-            <span className="text-muted-foreground">Files: </span>
-            <span>{data.files.length}</span>
-          </div>
-          {data.validation.warnings.length > 0 && (
-            <div className="text-yellow-600 text-xs">
-              {data.validation.warnings.map((w, i) => (
-                <div key={i}>⚠ {w}</div>
-              ))}
-            </div>
-          )}
-        </div>
-
-        <div className="flex gap-2 justify-end">
-          <button
-            className="px-4 py-2 rounded-md border border-input hover:bg-accent"
-            onClick={onCancel}
-            disabled={isSaving}
-          >
-            Cancel
-          </button>
-          <button
-            className="px-4 py-2 rounded-md bg-primary text-primary-foreground disabled:opacity-50"
-            onClick={onConfirm}
-            disabled={isSaving}
-          >
-            {isSaving ? "Saving..." : editSkillId ? "Update" : "Save"}
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-```
-
-- [ ] **Step 4: Create SkillPreviewPanel**
-
-```tsx
-// frontend/app/skills/creator/components/SkillPreviewPanel.tsx
-"use client";
-
-import { useState, useCallback } from "react";
-import { SkillFileTree } from "./SkillFileTree";
-import { SkillFileViewer } from "./SkillFileViewer";
-import { SkillSaveDialog } from "./SkillSaveDialog";
-import type { SkillPreviewData } from "../page";
-
-interface SkillPreviewPanelProps {
-  data: SkillPreviewData | null;
-  editSkillId: string | null;
-}
-
-export function SkillPreviewPanel({ data, editSkillId }: SkillPreviewPanelProps) {
-  const [selectedPath, setSelectedPath] = useState<string | null>(null);
-  const [showSaveDialog, setShowSaveDialog] = useState(false);
-  const [isSaving, setIsSaving] = useState(false);
-
-  const selectedFile = data?.files.find((f) => f.path === selectedPath) ?? null;
-
-  const handleSave = useCallback(async () => {
-    if (!data) return;
-    setIsSaving(true);
-    try {
-      const skillFiles = data.files.map((f) => ({
-        path: f.path,
-        file_name: f.path.split("/").pop() ?? f.path,
-        file_type: f.file_type,
-        content: f.content,
-        size: f.size,
-      }));
-
-      // Parse name/description from SKILL.md frontmatter
-      const skillMd = data.files.find((f) => f.path === "SKILL.md");
-      const frontmatterMatch = skillMd?.content.match(
-        /^---\n([\s\S]*?)\n---/
-      );
-      let name = data.skill_name;
-      let description = "";
-      let content = skillMd?.content ?? "";
-
-      if (frontmatterMatch) {
-        const lines = frontmatterMatch[1].split("\n");
-        for (const line of lines) {
-          const [key, ...vals] = line.split(":");
-          if (key.trim() === "name") name = vals.join(":").trim();
-          if (key.trim() === "description") description = vals.join(":").trim();
-        }
-        // content = body after frontmatter
-        content = (skillMd?.content ?? "").replace(/^---\n[\s\S]*?\n---\n?/, "");
-      }
-
-      const payload = {
-        name,
-        description,
-        content,
-        tags: [],
-        is_public: false,
-        files: skillFiles,
-      };
-
-      const baseUrl = process.env.NEXT_PUBLIC_BACKEND_URL ?? "";
-      const url = editSkillId
-        ? `${baseUrl}/api/v1/skills/${editSkillId}`
-        : `${baseUrl}/api/v1/skills`;
-
-      const resp = await fetch(url, {
-        method: editSkillId ? "PUT" : "POST",
-        headers: { "Content-Type": "application/json" },
-        credentials: "include",
-        body: JSON.stringify(payload),
-      });
-
-      if (!resp.ok) {
-        const err = await resp.json().catch(() => ({}));
-        throw new Error(err.detail ?? `HTTP ${resp.status}`);
-      }
-
-      setShowSaveDialog(false);
-      // TODO: show success toast / redirect to skills list
-    } catch (error) {
-      console.error("Failed to save skill:", error);
-      // TODO: show error toast
-    } finally {
-      setIsSaving(false);
-    }
-  }, [data, editSkillId]);
-
-  if (!data) {
-    return (
-      <div className="h-full flex items-center justify-center text-muted-foreground text-sm p-8 text-center">
-        Skill preview will appear here once the Agent generates it.
-      </div>
-    );
-  }
-
-  return (
-    <div className="h-full flex flex-col">
-      {/* Header */}
-      <div className="p-4 border-b border-border flex items-center justify-between">
-        <div>
-          <h3 className="font-semibold font-mono">{data.skill_name}/</h3>
-          {!data.validation.valid && (
-            <span className="text-xs text-destructive">
-              {data.validation.errors.join("; ")}
-            </span>
-          )}
-        </div>
-        <button
-          className="px-3 py-1.5 rounded-md bg-primary text-primary-foreground text-sm disabled:opacity-50"
-          onClick={() => setShowSaveDialog(true)}
-          disabled={!data.validation.valid}
-        >
-          Save to Library
-        </button>
-      </div>
-
-      {/* File tree */}
-      <div className="p-2 border-b border-border">
-        <SkillFileTree
-          files={data.files}
-          selectedPath={selectedPath}
-          onSelectFile={setSelectedPath}
-        />
-      </div>
-
-      {/* File content viewer */}
-      <div className="flex-1 min-h-0">
-        {selectedFile ? (
-          <SkillFileViewer
-            path={selectedFile.path}
-            content={selectedFile.content}
-            fileType={selectedFile.file_type}
-          />
-        ) : (
-          <div className="h-full flex items-center justify-center text-muted-foreground text-sm">
-            Select a file to preview
-          </div>
-        )}
-      </div>
-
-      {/* Save dialog */}
-      {showSaveDialog && (
-        <SkillSaveDialog
-          data={data}
-          editSkillId={editSkillId}
-          onConfirm={handleSave}
-          onCancel={() => setShowSaveDialog(false)}
-          isSaving={isSaving}
-        />
-      )}
-    </div>
-  );
-}
-```
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/skills/creator/components/
-git commit -m "feat(frontend): add Skill preview panel, file tree, viewer, save dialog"
-```
-
----
-
-## Task 9: Frontend — Dashboard Entry Card + Skills Page Button
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatHome.tsx` (add Skill Creator card)
-- Modify: `frontend/app/skills/page.tsx` (add "AI Create" button)
-
-- [ ] **Step 1: Read existing ChatHome.tsx**
-
-Read `frontend/app/chat/components/ChatHome.tsx` to understand the current layout and how mode cards are rendered (Rapid Mode, Deep Mode, etc.).
-
-- [ ] **Step 2: Add Skill Creator card to ChatHome**
-
-Add a new card alongside existing mode cards. Follow the existing card pattern. Example addition:
-
-```tsx
-<Link href="/skills/creator">
-  <div className="/* same card classes as Rapid/Deep Mode cards */">
-    <h3>Skill Creator</h3>
-    <p>AI-powered skill creation and modification</p>
-  </div>
-</Link>
-```
-
-Exact classes and structure must match the existing cards — read the file first.
-
-- [ ] **Step 3: Add "AI Create" button to Skills page**
-
-Edit `frontend/app/skills/page.tsx`. Add a button/link near the tab switcher:
-
-```tsx
-import Link from "next/link";
-
-// In the header/action area of the skills page:
-<Link href="/skills/creator">
-  <button className="/* match existing button styles */">
-    AI Create
-  </button>
-</Link>
-```
-
-- [ ] **Step 4: Verify no build errors**
-
-Run: `cd frontend && npx next build --no-lint 2>&1 | tail -20`
-Expected: No errors related to the new pages
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatHome.tsx frontend/app/skills/page.tsx
-git commit -m "feat(frontend): add Skill Creator entry on chat home and skills page"
-```
-
----
-
-## Task 10: Backend — Pass mode through Chat Stream to Metadata
-
-**Files:**
-- Modify: `frontend/app/chat/hooks/useBackendChatStream.ts`
-- Modify: `frontend/services/chatBackend.ts` (or wherever `streamChat` is defined)
-
-- [ ] **Step 1: Read the streaming service**
-
-Read `frontend/app/chat/hooks/useBackendChatStream.ts` and the `streamChat` function to understand how metadata is passed to the backend.
-
-- [ ] **Step 2: Ensure mode passes through**
-
-The `metadata` field in `ChatRequest` already supports arbitrary keys. The `SkillCreatorChat` component passes `mode: "skill_creator"` via metadata. Verify that the `streamChat` function forwards metadata to the `POST /v1/chat/stream` body. If `mode` needs to be a top-level field (not inside metadata), update the `streamChat` function to include it.
-
-If `mode` is a top-level ChatRequest field (as designed in Task 1), the frontend `streamChat` call needs to pass it at the top level:
-
-```typescript
-// In streamChat or equivalent:
-const body = {
-  message: userPrompt,
-  thread_id: opts.threadId,
-  graph_id: opts.graphId,
-  mode: opts.metadata?.mode ?? null,
-  edit_skill_id: opts.metadata?.edit_skill_id ?? null,
-  metadata: opts.metadata ?? {},
-};
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/chat/hooks/useBackendChatStream.ts frontend/services/chatBackend.ts
-git commit -m "feat(frontend): pass mode and edit_skill_id through to chat API"
-```
-
----
-
-## Task 11: Integration Test — End-to-End Skill Creator Flow
-
-**Files:**
-- Create: `backend/tests/test_api/test_skill_creator.py`
-
-- [ ] **Step 1: Write integration test**
-
-```python
-# backend/tests/test_api/test_skill_creator.py
-"""Integration test for skill_creator mode in chat stream."""
-import pytest
-from httpx import AsyncClient
-
-
-@pytest.mark.asyncio
-async def test_chat_stream_skill_creator_mode_accepted(
-    client: AsyncClient, auth_headers: dict
-):
-    """Verify that mode=skill_creator is accepted by the chat stream endpoint."""
-    response = await client.post(
-        "/api/v1/chat/stream",
-        json={
-            "message": "Create a simple hello-world skill",
-            "mode": "skill_creator",
-        },
-        headers=auth_headers,
-    )
-    # SSE endpoint returns 200 with streaming response
-    assert response.status_code == 200
-
-
-@pytest.mark.asyncio
-async def test_chat_request_rejects_invalid_mode(
-    client: AsyncClient, auth_headers: dict
-):
-    """Verify that an invalid mode value is rejected."""
-    response = await client.post(
-        "/api/v1/chat/stream",
-        json={
-            "message": "Hello",
-            "mode": "invalid_mode",
-        },
-        headers=auth_headers,
-    )
-    assert response.status_code == 422  # Pydantic validation error
-```
-
-- [ ] **Step 2: Run test**
-
-Run: `cd backend && python -m pytest tests/test_api/test_skill_creator.py -v`
-Expected: PASS (requires test fixtures — adapt to existing test setup)
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/tests/test_api/test_skill_creator.py
-git commit -m "test: add integration tests for skill_creator chat mode"
-```
-
----
-
-## Dependency Order
-
-```
-Task 1 (Schema)
-    ↓
-Task 2 (preview_skill tool) → Task 3 (Register tool)
-    ↓
-Task 4 (GraphService method)
-    ↓
-Task 5 (Wire into chat.py) — depends on Tasks 1, 3, 4
-    ↓
-Task 6 (Page layout) → Task 7 (Chat component) → Task 8 (Preview components)
-    ↓
-Task 9 (Entry points)
-    ↓
-Task 10 (Frontend streaming passthrough) — depends on Tasks 7, 5
-    ↓
-Task 11 (Integration test) — depends on all above
-```
-
-Tasks 1-5 are backend (sequential). Tasks 6-9 are frontend (can parallelize with backend after Task 1). Task 10 bridges both. Task 11 is final verification.
diff --git a/docs/superpowers/plans/2026-03-19-workspace-member-auth-fixes.md b/docs/superpowers/plans/2026-03-19-workspace-member-auth-fixes.md
deleted file mode 100644
index 6960c0251..000000000
--- a/docs/superpowers/plans/2026-03-19-workspace-member-auth-fixes.md
+++ /dev/null
@@ -1,586 +0,0 @@
-# Workspace Member Authorization System Fixes
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Fix all critical bugs, security holes, and inconsistencies in the workspace member authorization system so that "1 workspace = 1 team" with creator-managed membership is fully self-consistent end-to-end.
-
-**Architecture:** Fixes are organized into 4 phases — (P1) Backend critical route/security fixes, (P2) Backend service-layer logic fixes, (P3) Frontend bug fixes, (P4) Resource access control gaps. Each phase is independently testable and committable.
-
-**Tech Stack:** Python/FastAPI/SQLAlchemy (backend), TypeScript/Next.js/React Query (frontend)
-
----
-
-## Phase 1: Backend Critical Route & Security Fixes
-
-### Task 1: Fix route ordering — invitation routes shadowed by `/{workspace_id}`
-
-All `GET /invitations*` routes are declared AFTER `GET /{workspace_id}`, so FastAPI matches "invitations" as a `workspace_id` UUID and returns 422. Move all invitation routes before the dynamic `/{workspace_id}` route.
-
-Note: `/members/{user_id}` routes (PATCH/DELETE) are NOT affected by this shadowing issue — they have a different prefix segment ("members") and don't collide with `/{workspace_id}`. Only invitation routes need to be moved.
-
-**Files:**
-- Modify: `backend/app/api/v1/workspaces.py`
-
-- [ ] **Step 1: Move all `/invitations*` routes before `/{workspace_id}`**
-
-Move the following route blocks (currently at lines 166-263) to appear BEFORE `@router.get("/{workspace_id}")` (currently at line 89):
-
-```python
-# --- Static invitation routes (MUST be before /{workspace_id}) ---
-
-@router.get("/invitations")
-async def list_invitations(...):
-    ...
-
-@router.get("/invitations/pending")
-async def list_pending_invitations(...):
-    ...
-
-@router.get("/invitations/all")
-async def list_all_invitations(...):
-    ...
-
-@router.post("/invitations")
-async def create_invitation(...):
-    ...
-
-@router.get("/invitations/{token}")
-async def get_invitation_by_token(...):
-    ...
-
-@router.post("/invitations/{invitation_id}/accept")
-async def accept_invitation(...):
-    ...
-
-@router.post("/invitations/{invitation_id}/reject")
-async def reject_invitation(...):
-    ...
-
-@router.post("/invitations/token/{token}/accept")
-async def accept_invitation_by_token(...):
-    ...
-
-# --- Dynamic workspace routes (AFTER all static paths) ---
-
-@router.get("/{workspace_id}")
-async def get_workspace(...):
-    ...
-```
-
-The final order in the file should be:
-1. `GET /` (list workspaces)
-2. `POST /` (create workspace)
-3. All `/invitations*` routes (GET, POST, accept, reject, token-accept)
-4. `GET /{workspace_id}` and other `/{workspace_id}/*` routes
-5. `/members/{user_id}` routes (can stay at end — not shadowed)
-
-- [ ] **Step 2: Verify by starting the server and testing**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.api.v1.workspaces import router; print([r.path for r in router.routes])"`
-Expected: `/invitations` appears before `/{workspace_id}` in the route list.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/workspaces.py
-git commit -m "fix: reorder workspace routes to prevent invitation paths being shadowed by /{workspace_id}"
-```
-
----
-
-### Task 2: Delete unused `require_roles()` — dead code with broken logic
-
-`require_roles(*roles)` accepts roles but never checks them — any authenticated user passes. Confirmed via grep: this function is NOT called anywhere in the backend. It is only defined in `dependencies.py`. Delete it.
-
-**Files:**
-- Modify: `backend/app/common/dependencies.py:138-146`
-
-- [ ] **Step 1: Delete the `require_roles` function (lines 138-146)**
-
-Remove the entire function:
-
-```python
-# DELETE THIS ENTIRE BLOCK:
-def require_roles(*roles: str):
-    """角色权限检查装饰器"""
-
-    async def check_roles(current_user: User = Depends(get_current_user)):
-        if current_user.is_superuser:
-            return current_user
-        return current_user
-
-    return Depends(check_roles)
-```
-
-- [ ] **Step 2: Verify no import breakage**
-
-```bash
-cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter && grep -rn "require_roles" backend/
-```
-
-Expected: Only appears in the import line of the file being edited (if any), and the definition itself. After deletion, zero matches.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/common/dependencies.py
-git commit -m "fix: remove unused require_roles function that silently bypassed role checks"
-```
-
----
-
-### Task 3: Protect owner from being removed via `remove_member`
-
-An admin can currently remove the workspace owner from `workspace_members`. Add a guard identical to what exists in `update_member_role`.
-
-**Files:**
-- Modify: `backend/app/services/workspace_service.py:921-960`
-
-- [ ] **Step 1: Add owner removal guard**
-
-Add after the `NotFoundException` guard (after `if not target_member: raise NotFoundException(...)` at line 941), before `current_role` is fetched:
-
-```python
-# 不能移除工作空间拥有者
-if str(workspace.owner_id) == str(target_user_id):
-    raise BadRequestException("Cannot remove workspace owner")
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/workspace_service.py
-git commit -m "fix: prevent workspace owner from being removed via remove_member"
-```
-
----
-
-## Phase 2: Backend Service Logic Fixes
-
-### Task 4: Fix repository `update_status` double-commit breaking transaction atomicity
-
-`WorkspaceInvitationRepository.update_status()` calls `self.db.commit()` directly, but its callers (`accept_invitation`, `reject_invitation`) also call `self.commit()`. This breaks atomicity — the invitation status update and member creation happen in separate transactions.
-
-**Files:**
-- Modify: `backend/app/repositories/workspace.py:136-144`
-
-- [ ] **Step 1: Replace `commit()` with `flush()` in `update_status`**
-
-```python
-async def update_status(self, invitation_id: uuid.UUID, status: WorkspaceInvitationStatus) -> WorkspaceInvitation:
-    """更新邀请状态"""
-    invitation = await self.get(invitation_id)
-    if not invitation:
-        raise NotFoundException("Invitation not found")
-    invitation.status = status
-    await self.db.flush()  # flush, not commit — let the service layer control the transaction
-    await self.db.refresh(invitation)
-    return invitation
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/repositories/workspace.py
-git commit -m "fix: use flush instead of commit in invitation update_status to preserve transaction atomicity"
-```
-
----
-
-### Task 5: Fix `accept_invitation` — mutates state then raises error for existing members
-
-**Dependency: Task 4 must be completed first** (Task 4 changes `update_status` from `commit()` to `flush()`, which this task relies on for correct transaction behavior).
-
-When a user is already a member, the code marks the invitation as `accepted` and THEN raises a 400 error. The invitation is permanently consumed for no reason. Fix: return success instead (idempotent behavior). Note: `accept_invitation_by_token` (line 673-678) calls this method internally, so it also gets the fix.
-
-**Files:**
-- Modify: `backend/app/services/workspace_service.py:620-626`
-
-- [ ] **Step 1: Return success instead of raising error when already a member**
-
-Replace lines 620-626:
-
-```python
-# 检查用户是否已经是成员
-existing_member = await self.member_repo.get_member(invitation.workspace_id, current_user.id)
-if existing_member:
-    # 用户已是成员 — 标记邀请为已接受并返回成功（幂等操作）
-    await self.invitation_repo.update_status(invitation.id, WorkspaceInvitationStatus.accepted)
-    await self.commit()
-    workspace = await self.workspace_repo.get(invitation.workspace_id)
-    return {
-        "success": True,
-        "workspace": await self._serialize_workspace(workspace, current_user),
-        "message": "You are already a member of this workspace",
-    }
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/workspace_service.py
-git commit -m "fix: accept_invitation returns success for existing members instead of error"
-```
-
----
-
-### Task 6: Add duplicate invitation check in `create_invitation`
-
-`find_pending()` repository method exists but is never called. An admin can spam unlimited invitations to the same email.
-
-**Files:**
-- Modify: `backend/app/services/workspace_service.py:269-310`
-
-- [ ] **Step 1: Add duplicate check after existing-member check (around line 295)**
-
-Insert after the existing-member check block:
-
-```python
-# 检查是否已有未过期的待处理邀请
-existing_pending = await self.invitation_repo.find_pending(workspace_id, email.lower())
-if existing_pending:
-    if existing_pending.expires_at and existing_pending.expires_at > datetime.now(timezone.utc):
-        raise BadRequestException(
-            f"A pending invitation already exists for {email}. 该用户已有待处理的邀请"
-        )
-```
-
-- [ ] **Step 2: Normalize email to lowercase before storing**
-
-Change line 302 from `"email": email,` to `"email": email.lower(),`.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/services/workspace_service.py
-git commit -m "fix: prevent duplicate invitations and normalize email to lowercase"
-```
-
----
-
-### Task 7: Remove dead code — `datetime.utcnow()` call and deprecated method
-
-**Files:**
-- Modify: `backend/app/services/workspace_service.py`
-
-- [ ] **Step 1: Verify no callers of deprecated method exist**
-
-```bash
-cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter && grep -rn "list_all_invitations_for_user[^_]" backend/
-```
-
-Expected: Only the method definition itself appears. If any route or service calls it, do NOT delete — update the caller to use the paginated version first.
-
-- [ ] **Step 2: Remove orphaned `datetime.utcnow()` call at line 134**
-
-Delete the line `datetime.utcnow()` in `create_workspace`.
-
-- [ ] **Step 3: Remove deprecated `list_all_invitations_for_user` method (lines 439-478)**
-
-Delete the entire method that is marked `已废弃，使用分页版本`.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/services/workspace_service.py
-git commit -m "chore: remove dead code (orphaned datetime call, deprecated invitation list method)"
-```
-
----
-
-### Task 8: Delete unused `_ensure_workspace_role` in environment.py
-
-The local helper in `environment.py` (lines 34-46) doesn't handle superusers or owners not in the members table. However, **the function is never called** — the actual workspace routes in this file already use `require_workspace_role` from `dependencies.py` as a FastAPI dependency. Simply delete the dead code.
-
-**Files:**
-- Modify: `backend/app/api/v1/environment.py:34-46`
-
-- [ ] **Step 1: Delete the `_ensure_workspace_role` function and its unused import**
-
-Delete lines 34-46 (the entire function). Also remove the unused import of `WorkspaceMemberRepository` at line 24 if it's no longer used elsewhere in the file.
-
-- [ ] **Step 2: Verify no callers remain**
-
-```bash
-grep -n "_ensure_workspace_role" backend/app/api/v1/environment.py
-```
-
-Expected: Zero matches after deletion.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/environment.py
-git commit -m "fix: environment workspace role check now handles superuser and owner-not-in-members"
-```
-
----
-
-## Phase 3: Frontend Bug Fixes
-
-### Task 9: Fix invitation accept page — wrong `/auth/signin` redirect
-
-The actual signin route is `/signin` (Next.js route group `(auth)/signin`), not `/auth/signin`.
-
-**Files:**
-- Modify: `frontend/app/workspace/invitations/accept/page.tsx:94,119`
-
-- [ ] **Step 1: Replace `/auth/signin` with `/signin`**
-
-Line 94:
-```typescript
-router.push(`/signin?callbackUrl=${encodeURIComponent(`/workspace/invitations/accept?token=${token}`)}`)
-```
-
-Line 119:
-```typescript
-router.push(`/signin?callbackUrl=${encodeURIComponent(`/workspace/invitations/accept?token=${token}`)}`)
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/workspace/invitations/accept/page.tsx
-git commit -m "fix: correct signin redirect path in invitation accept page (/signin not /auth/signin)"
-```
-
----
-
-### Task 10: Fix `acceptInvitation` in workspaceService — token vs ID inconsistency
-
-The accept page uses `token` but calls `acceptInvitation(token)` which hits `/invitations/{token}/accept`. The backend has TWO accept endpoints: `/invitations/{invitation_id}/accept` (by ID) and `/invitations/token/{token}/accept` (by token). The frontend service should use the token-specific endpoint when passing a token.
-
-**Files:**
-- Modify: `frontend/services/workspaceService.ts:215-219`
-
-- [ ] **Step 1: Add separate methods for accept-by-ID and accept-by-token**
-
-```typescript
-/**
- * Accept invitation by ID (for notification banner)
- */
-async acceptInvitationById(invitationId: string): Promise<AcceptInvitationResponse> {
-  return apiPost<AcceptInvitationResponse>(
-    `${API_ENDPOINTS.workspaces}/invitations/${invitationId}/accept`
-  )
-},
-
-/**
- * Accept invitation by token (for email link)
- */
-async acceptInvitationByToken(token: string): Promise<AcceptInvitationResponse> {
-  return apiPost<AcceptInvitationResponse>(
-    `${API_ENDPOINTS.workspaces}/invitations/token/${token}/accept`
-  )
-},
-```
-
-Keep the old `acceptInvitation` as an alias for `acceptInvitationById` for backward compat:
-
-```typescript
-async acceptInvitation(invitationId: string): Promise<AcceptInvitationResponse> {
-  return this.acceptInvitationById(invitationId)
-},
-```
-
-- [ ] **Step 2: Update the accept page to use `acceptInvitationByToken`**
-
-In `frontend/app/workspace/invitations/accept/page.tsx`, change the mutation:
-
-```typescript
-mutationFn: async () => {
-  if (!token) throw new Error('Token is required')
-  return workspaceService.acceptInvitationByToken(token)
-},
-```
-
-- [ ] **Step 3: Verify notification banner uses `acceptInvitationById` with `invitation.id`**
-
-Search for `acceptInvitation` calls in notification components and ensure they pass `invitation.id` and call `acceptInvitationById` (or the existing `acceptInvitation` alias).
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/services/workspaceService.ts frontend/app/workspace/invitations/accept/page.tsx
-git commit -m "fix: distinguish acceptInvitationById vs acceptInvitationByToken to fix token/ID mismatch"
-```
-
----
-
-### Task 11: Fix workspace switcher menu — hide admin-only items from non-admin users
-
-The workspace context menu in the header shows "Members Management" and "API Keys" to all roles, including viewers.
-
-**Files:**
-- Modify: `frontend/components/sidebar/components/workspace-header/workspace-header.tsx`
-
-**Context:** This component does NOT currently import `useWorkspacePermissions` or `useUserPermissions`. However, each workspace object in the `workspaces` list already carries a `role` field (serialized by the backend's `_serialize_workspace`). Use this existing `role` field directly instead of adding new hook calls.
-
-- [ ] **Step 1: Find the context menu rendering (around lines 740-803)**
-
-Read the file to locate the exact menu items for "Members Management" and "API Keys", and confirm the workspace object structure includes `role`.
-
-- [ ] **Step 2: Gate admin-only menu items using the workspace's `role` field**
-
-Check the role of the active workspace and conditionally render:
-
-```tsx
-{(activeWorkspace.role === 'owner' || activeWorkspace.role === 'admin') && (
-  <>
-    <DropdownMenuItem onClick={...}>Members Management</DropdownMenuItem>
-    <DropdownMenuItem onClick={...}>API Keys</DropdownMenuItem>
-  </>
-)}
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/components/sidebar/components/workspace-header/workspace-header.tsx
-git commit -m "fix: hide admin-only menu items (Members, API Keys) from non-admin users in workspace switcher"
-```
-
----
-
-## Phase 4: Resource Access Control Gaps
-
-### Task 12: Add workspace membership check to Traces API
-
-Currently any authenticated user can query any workspace's traces by passing an arbitrary `workspace_id`. Add workspace membership validation.
-
-**Files:**
-- Modify: `backend/app/api/v1/traces.py:162-198`
-
-- [ ] **Step 1: Add workspace membership check when `workspace_id` is provided**
-
-In `list_traces`, after the service is created and before querying:
-
-```python
-# 如果指定了 workspace_id，校验当前用户是否有权限访问该工作空间
-if workspace_id:
-    from app.services.workspace_permission import check_workspace_access
-    from app.models.workspace import WorkspaceMemberRole
-    has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.viewer)
-    if not has_access:
-        raise ForbiddenException("No access to workspace traces")
-```
-
-Add the import at the top:
-```python
-from app.common.exceptions import ForbiddenException
-```
-
-- [ ] **Step 2: Same check in `get_trace_detail` — validate workspace ownership of the trace**
-
-After fetching the trace, if `trace.workspace_id` is set, check membership:
-
-```python
-if trace.workspace_id:
-    from app.services.workspace_permission import check_workspace_access
-    from app.models.workspace import WorkspaceMemberRole
-    has_access = await check_workspace_access(db, trace.workspace_id, current_user, WorkspaceMemberRole.viewer)
-    if not has_access:
-        raise ForbiddenException("No access to workspace traces")
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/traces.py
-git commit -m "fix: add workspace membership check to traces API endpoints"
-```
-
----
-
-### Task 13: Add workspace access check to Copilot endpoints
-
-The copilot history/messages endpoints under `/graphs/{graph_id}/copilot/*` never check graph or workspace access.
-
-**Files:**
-- Modify: `backend/app/api/v1/graphs.py` (copilot endpoints)
-
-- [ ] **Step 1: Identify the copilot endpoints in graphs.py**
-
-Search for `copilot` in the file to find exact line numbers.
-
-- [ ] **Step 2: Add workspace access check to each copilot endpoint**
-
-The copilot endpoints use `CopilotService`, not the graph service. To look up the graph's workspace, you need to query the graph separately. The existing `_ensure_workspace_member` helper in `graphs.py` calls `check_workspace_access` and raises `ForbiddenException` — reuse it.
-
-For each copilot endpoint (`GET /{graph_id}/copilot/history`, `DELETE /{graph_id}/copilot/history`, `POST /{graph_id}/copilot/messages`):
-
-1. Import and instantiate the graph repository to look up the graph
-2. Use the existing `_ensure_workspace_member` helper
-
-```python
-from app.repositories.graph import GraphRepository
-
-# At the start of the copilot endpoint:
-graph_repo = GraphRepository(db)
-graph = await graph_repo.get(graph_id)
-if graph and graph.workspace_id:
-    await _ensure_workspace_member(db, graph.workspace_id, current_user, WorkspaceMemberRole.viewer)
-```
-
-For write operations (POST messages, DELETE history), use `WorkspaceMemberRole.member` instead of `viewer`.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/graphs.py
-git commit -m "fix: add workspace access check to copilot history and messages endpoints"
-```
-
----
-
-### Task 14: Add workspace membership check to graph schema import
-
-`POST /schema/import` passes `workspace_id` from the request body to create a graph without checking membership.
-
-**Files:**
-- Modify: `backend/app/api/v1/graph_schemas.py`
-
-- [ ] **Step 1: Read the file to find the import endpoint**
-
-```bash
-grep -n "import" backend/app/api/v1/graph_schemas.py
-```
-
-- [ ] **Step 2: Add workspace membership check before creating the graph**
-
-```python
-if workspace_id:
-    from app.services.workspace_permission import check_workspace_access
-    from app.models.workspace import WorkspaceMemberRole
-    has_access = await check_workspace_access(db, workspace_id, current_user, WorkspaceMemberRole.member)
-    if not has_access:
-        raise ForbiddenException("No access to import into this workspace")
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/graph_schemas.py
-git commit -m "fix: add workspace membership check to graph schema import endpoint"
-```
-
----
-
-## Summary of All Changes
-
-| # | File | Change | Severity | Deps |
-|---|------|--------|----------|------|
-| 1 | `workspaces.py` | Reorder invitation routes before `/{workspace_id}` | CRITICAL | — |
-| 2 | `dependencies.py` | Delete unused `require_roles` (broken no-op) | CRITICAL | — |
-| 3 | `workspace_service.py` | Prevent owner removal in `remove_member` | CRITICAL | — |
-| 4 | `repositories/workspace.py` | `flush()` instead of `commit()` in `update_status` | HIGH | — |
-| 5 | `workspace_service.py` | Accept-invitation idempotent for existing members | HIGH | Task 4 |
-| 6 | `workspace_service.py` | Duplicate invitation check + email normalization | HIGH | — |
-| 7 | `workspace_service.py` | Remove dead code (datetime call + deprecated method) | LOW | — |
-| 8 | `environment.py` | Delete unused `_ensure_workspace_role` helper | MEDIUM | — |
-| 9 | `accept/page.tsx` | Fix `/auth/signin` → `/signin` | CRITICAL | — |
-| 10 | `workspaceService.ts` + `accept/page.tsx` | Token vs ID accept distinction | HIGH | Task 1 |
-| 11 | `workspace-header.tsx` | Hide admin-only menu items via `workspace.role` | HIGH | — |
-| 12 | `traces.py` | Add workspace membership check | CRITICAL | — |
-| 13 | `graphs.py` (copilot) | Add workspace access check via graph lookup | HIGH | — |
-| 14 | `graph_schemas.py` | Add workspace membership check to import | HIGH | — |
diff --git a/docs/superpowers/plans/2026-03-20-chat-interaction-refactor.md b/docs/superpowers/plans/2026-03-20-chat-interaction-refactor.md
deleted file mode 100644
index 54fa5cd50..000000000
--- a/docs/superpowers/plans/2026-03-20-chat-interaction-refactor.md
+++ /dev/null
@@ -1,1335 +0,0 @@
-# Chat Interaction Refactor Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Refactor Chat to borrow Skill Creator's proven UX patterns (human-readable tool calls, persistent preview panel, per-message actions, starter prompts) while preserving free-form conversation.
-
-**Architecture:** Two-phase approach. Phase 1 extracts ChatInterface's 14 useState into a useReducer + Context, splits the 683-line component into focused modules (ChatLayout, ConversationPanel, PreviewPanel, ChatProvider). Phase 2 introduces shared components (ToolCallDisplay, ActionBar, StarterPrompts) and converts the overlay-based side panels into a ResizablePanel column.
-
-**Tech Stack:** React 18, Next.js App Router, TypeScript, Tailwind CSS, shadcn/ui ResizablePanel, TanStack Query
-
-**Spec:** `docs/superpowers/specs/2026-03-20-chat-interaction-refactor-design.md`
-
----
-
-## File Structure
-
-All paths relative to `frontend/app/`.
-
-**Phase 1 — New files:**
-| File | Responsibility |
-|------|---------------|
-| `chat/hooks/useChatReducer.ts` | ChatState/ChatAction types, reducer function, initial state |
-| `chat/ChatProvider.tsx` | ChatStateContext + ChatStreamContext providers |
-| `chat/ChatLayout.tsx` | Three-column ResizablePanelGroup skeleton |
-| `chat/conversation/ConversationPanel.tsx` | Message list + streaming + input container |
-| `chat/conversation/MessageList.tsx` | Message rendering (from ThreadContent) |
-| `chat/conversation/MessageBubble.tsx` | Single message (from MessageItem) |
-| `chat/conversation/ChatInput.tsx` | Input (moved from components/) |
-| `chat/conversation/index.ts` | Barrel export |
-| `chat/preview/PreviewPanel.tsx` | Tab-based preview container |
-| `chat/preview/FileTreePreview.tsx` | File tree + code viewer (from ArtifactPanel) |
-| `chat/preview/index.ts` | Barrel export |
-| `chat/hooks/usePreviewTrigger.ts` | Auto-expand/collapse logic |
-| `chat/types.ts` | Extended with FileTreeEntry, NodeLogEntry, MessageMetadata |
-
-**Phase 1 — Modified files:**
-| File | Change |
-|------|--------|
-| `chat/ChatInterface.tsx` | Rename to ChatPage.tsx, reduce to <50 lines |
-| `chat/page.tsx` | Update import from ChatInterface to ChatPage |
-| `chat/hooks/useBackendChatStream.ts` | Accept dispatch instead of setMessages |
-
-**Phase 1 — Deleted files (Phase 2 Step 2):**
-| File | Replaced by |
-|------|------------|
-| `chat/components/ArtifactsDrawer.tsx` | preview/PreviewPanel |
-| `chat/components/CompactArtifactStatus.tsx` | PreviewPanel auto-expand |
-| `chat/components/ToolExecutionPanel.tsx` | preview/PreviewPanel tool tab |
-| `chat/components/CompactToolStatus.tsx` | shared/ToolCallDisplay |
-
-**Phase 2 — New files:**
-| File | Responsibility |
-|------|---------------|
-| `shared/ToolCallDisplay/toolDisplayRegistry.ts` | Tool name → label registry |
-| `shared/ToolCallDisplay/ToolCallBadge.tsx` | Compact inline tool display |
-| `shared/ToolCallDisplay/ToolCallDetail.tsx` | Expanded tool detail view |
-| `shared/ToolCallDisplay/index.ts` | Barrel export |
-| `shared/ActionBar/ActionBar.tsx` | Per-message action container |
-| `shared/ActionBar/actions/CopyAction.tsx` | Copy message content |
-| `shared/ActionBar/actions/RetryAction.tsx` | Retry message |
-| `shared/ActionBar/index.ts` | Barrel export |
-| `shared/StarterPrompts/StarterPrompts.tsx` | Guided start chips |
-| `shared/StarterPrompts/index.ts` | Barrel export |
-
----
-
-## Phase 1: Architecture Cleanup
-
-### Task 1: Extend types.ts with typed metadata
-
-**Files:**
-- Modify: `chat/types.ts` (71 lines)
-
-- [ ] **Step 1: Add FileTreeEntry, NodeLogEntry, MessageMetadata types**
-
-Add above the existing `Message` interface at line 25:
-
-```typescript
-export interface FileTreeEntry {
-  action: string
-  size?: number
-  timestamp?: number
-}
-
-export interface NodeLogEntry {
-  type: 'command' | 'route_decision' | 'loop_iteration' | 'parallel_task' | 'state_update' | 'node_transition'
-  nodeName: string
-  timestamp: number
-  data?: Record<string, unknown>
-}
-
-export interface MessageMetadata {
-  fileTree?: Record<string, FileTreeEntry>
-  nodeExecutionLog?: NodeLogEntry[]
-  currentNode?: string
-  lastNode?: string
-  lastRunId?: string
-  lastUpdate?: number
-  lastRouteDecision?: any
-  lastLoopIteration?: any
-  [key: string]: any  // keep backwards compat
-}
-```
-
-Update the `Message` interface to use `MessageMetadata`:
-
-```typescript
-export interface Message {
-  // ... existing fields unchanged
-  metadata?: MessageMetadata
-}
-```
-
-- [ ] **Step 2: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-Expected: No new errors (existing errors may remain)
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/chat/types.ts
-git commit -m "refactor(chat): add typed FileTreeEntry, NodeLogEntry, MessageMetadata to types.ts"
-```
-
----
-
-### Task 2: Create useChatReducer and ChatProvider
-
-**Files:**
-- Create: `chat/hooks/useChatReducer.ts`
-- Create: `chat/ChatProvider.tsx`
-
-- [ ] **Step 1: Create useChatReducer.ts**
-
-```typescript
-'use client'
-
-import { useReducer } from 'react'
-import type { Message, ToolCall, FileTreeEntry, NodeLogEntry } from '../types'
-
-// ─── State ───────────────────────────────────────────────────────────────────
-export interface ChatState {
-  messages: Message[]
-  threadId: string | null
-  input: string
-  streaming: {
-    isProcessing: boolean
-    isSubmitting: boolean
-    text: string
-    nodeExecutionLog: NodeLogEntry[]
-  }
-  preview: {
-    visible: boolean
-    fileTree: Record<string, FileTreeEntry>
-    activeFile: string | null
-    userDismissed: boolean
-  }
-  ui: {
-    sidebarVisible: boolean
-    selectedTool: ToolCall | null
-    showNoDefaultModelNotice: boolean
-  }
-  mode: {
-    currentMode: string | undefined
-    currentGraphId: string | null
-    hasShownApkPrompt: boolean
-  }
-}
-
-export const initialChatState: ChatState = {
-  messages: [],
-  threadId: null,
-  input: '',
-  streaming: {
-    isProcessing: false,
-    isSubmitting: false,
-    text: '',
-    nodeExecutionLog: [],
-  },
-  preview: {
-    visible: false,
-    fileTree: {},
-    activeFile: null,
-    userDismissed: false,
-  },
-  ui: {
-    sidebarVisible: false,
-    selectedTool: null,
-    showNoDefaultModelNotice: false,
-  },
-  mode: {
-    currentMode: undefined,
-    currentGraphId: null,
-    hasShownApkPrompt: false,
-  },
-}
-
-// ─── Actions ─────────────────────────────────────────────────────────────────
-export type ChatAction =
-  // Thread
-  | { type: 'SET_THREAD'; threadId: string }
-  | { type: 'RESET' }
-  // Messages
-  | { type: 'APPEND_MESSAGE'; message: Message }
-  | { type: 'UPDATE_MESSAGE'; id: string; patch: Partial<Message> }
-  | { type: 'SET_MESSAGES'; messages: Message[] }
-  // Input
-  | { type: 'SET_INPUT'; value: string }
-  // Streaming lifecycle
-  | { type: 'STREAM_START' }
-  | { type: 'STREAM_CONTENT'; delta: string }
-  | { type: 'STREAM_DONE' }
-  | { type: 'STREAM_ERROR'; error: string }
-  // File & tool events
-  | { type: 'FILE_EVENT'; path: string; info: FileTreeEntry }
-  | { type: 'TOOL_START'; tool: ToolCall }
-  | { type: 'TOOL_END'; id: string; result: string }
-  // Node execution (agent mode)
-  | { type: 'NODE_START'; nodeId: string; label: string }
-  | { type: 'NODE_END'; nodeId: string }
-  | { type: 'NODE_LOG'; entry: NodeLogEntry }
-  // UI
-  | { type: 'TOGGLE_SIDEBAR' }
-  | { type: 'SHOW_PREVIEW'; tab?: string }
-  | { type: 'HIDE_PREVIEW' }
-  | { type: 'SELECT_TOOL'; tool: ToolCall | null }
-  | { type: 'DISMISS_MODEL_NOTICE' }
-  | { type: 'SHOW_MODEL_NOTICE' }
-  // Mode
-  | { type: 'SET_MODE'; mode: string; graphId: string | null }
-  | { type: 'SET_APK_PROMPT_SHOWN' }
-
-// ─── Reducer ─────────────────────────────────────────────────────────────────
-export function chatReducer(state: ChatState, action: ChatAction): ChatState {
-  switch (action.type) {
-    case 'SET_THREAD':
-      return { ...state, threadId: action.threadId }
-
-    case 'RESET':
-      return {
-        ...initialChatState,
-        ui: { ...initialChatState.ui, sidebarVisible: state.ui.sidebarVisible },
-      }
-
-    case 'APPEND_MESSAGE':
-      return { ...state, messages: [...state.messages, action.message] }
-
-    case 'UPDATE_MESSAGE':
-      return {
-        ...state,
-        messages: state.messages.map((m) =>
-          m.id === action.id ? { ...m, ...action.patch } : m
-        ),
-      }
-
-    case 'SET_MESSAGES':
-      return { ...state, messages: action.messages }
-
-    case 'SET_INPUT':
-      return { ...state, input: action.value }
-
-    case 'STREAM_START':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          isProcessing: true,
-          isSubmitting: false,
-          text: '',
-          nodeExecutionLog: [],
-        },
-        preview: { ...state.preview, userDismissed: false },
-      }
-
-    case 'STREAM_CONTENT': {
-      const lastMsg = state.messages[state.messages.length - 1]
-      if (!lastMsg || lastMsg.role !== 'assistant') return state
-      return {
-        ...state,
-        streaming: { ...state.streaming, text: (lastMsg.content ?? '') + action.delta },
-      }
-    }
-
-    case 'STREAM_DONE':
-      return {
-        ...state,
-        streaming: { ...state.streaming, isProcessing: false, isSubmitting: false, text: '' },
-      }
-
-    case 'STREAM_ERROR':
-      return {
-        ...state,
-        streaming: { ...state.streaming, isProcessing: false, isSubmitting: false },
-      }
-
-    case 'FILE_EVENT':
-      return {
-        ...state,
-        preview: {
-          ...state.preview,
-          fileTree: { ...state.preview.fileTree, [action.path]: action.info },
-        },
-      }
-
-    case 'TOOL_START':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? { ...m, tool_calls: [...(m.tool_calls ?? []), action.tool] }
-            : m
-        ),
-      }
-
-    case 'TOOL_END':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? {
-                ...m,
-                tool_calls: m.tool_calls?.map((tc) =>
-                  tc.id === action.id ? { ...tc, status: 'completed' as const, result: action.result, endTime: Date.now() } : tc
-                ),
-              }
-            : m
-        ),
-      }
-
-    case 'NODE_START':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? { ...m, metadata: { ...m.metadata, currentNode: action.label } }
-            : m
-        ),
-      }
-
-    case 'NODE_END':
-      return state // currentNode cleared on next NODE_START or STREAM_DONE
-
-    case 'NODE_LOG':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          nodeExecutionLog: [...state.streaming.nodeExecutionLog, action.entry],
-        },
-      }
-
-    case 'TOGGLE_SIDEBAR':
-      return { ...state, ui: { ...state.ui, sidebarVisible: !state.ui.sidebarVisible } }
-
-    case 'SHOW_PREVIEW':
-      return { ...state, preview: { ...state.preview, visible: true } }
-
-    case 'HIDE_PREVIEW':
-      return { ...state, preview: { ...state.preview, visible: false, userDismissed: true } }
-
-    case 'SELECT_TOOL':
-      return { ...state, ui: { ...state.ui, selectedTool: action.tool } }
-
-    case 'DISMISS_MODEL_NOTICE':
-      return { ...state, ui: { ...state.ui, showNoDefaultModelNotice: false } }
-
-    case 'SHOW_MODEL_NOTICE':
-      return { ...state, ui: { ...state.ui, showNoDefaultModelNotice: true } }
-
-    case 'SET_MODE':
-      return {
-        ...state,
-        mode: { ...state.mode, currentMode: action.mode, currentGraphId: action.graphId },
-      }
-
-    case 'SET_APK_PROMPT_SHOWN':
-      return { ...state, mode: { ...state.mode, hasShownApkPrompt: true } }
-
-    default:
-      return state
-  }
-}
-
-export function useChatReducer(initialState?: Partial<ChatState>) {
-  return useReducer(chatReducer, { ...initialChatState, ...initialState })
-}
-```
-
-- [ ] **Step 2: Create ChatProvider.tsx**
-
-```typescript
-'use client'
-
-import React, { createContext, useContext, useMemo } from 'react'
-import type { ChatState, ChatAction } from './hooks/useChatReducer'
-import { useChatReducer, initialChatState } from './hooks/useChatReducer'
-
-// Low-frequency context: messages, UI, mode
-interface ChatStateContextValue {
-  state: ChatState
-  dispatch: React.Dispatch<ChatAction>
-}
-
-// High-frequency context: streaming text, isProcessing
-interface ChatStreamContextValue {
-  text: string
-  isProcessing: boolean
-  isSubmitting: boolean
-}
-
-const ChatStateContext = createContext<ChatStateContextValue | null>(null)
-const ChatStreamContext = createContext<ChatStreamContextValue | null>(null)
-
-export function ChatProvider({ children }: { children: React.ReactNode }) {
-  const [state, dispatch] = useChatReducer()
-
-  const stateValue = useMemo(
-    () => ({ state, dispatch }),
-    // Exclude streaming fields from dependency to avoid re-rendering state consumers on every delta
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [state.messages, state.threadId, state.input, state.preview, state.ui, state.mode, dispatch]
-  )
-
-  const streamValue = useMemo(
-    () => ({
-      text: state.streaming.text,
-      isProcessing: state.streaming.isProcessing,
-      isSubmitting: state.streaming.isSubmitting,
-    }),
-    [state.streaming.text, state.streaming.isProcessing, state.streaming.isSubmitting]
-  )
-
-  return (
-    <ChatStateContext.Provider value={stateValue}>
-      <ChatStreamContext.Provider value={streamValue}>
-        {children}
-      </ChatStreamContext.Provider>
-    </ChatStateContext.Provider>
-  )
-}
-
-export function useChatState() {
-  const ctx = useContext(ChatStateContext)
-  if (!ctx) throw new Error('useChatState must be used within ChatProvider')
-  return ctx
-}
-
-export function useChatStream() {
-  const ctx = useContext(ChatStreamContext)
-  if (!ctx) throw new Error('useChatStream must be used within ChatProvider')
-  return ctx
-}
-
-export { ChatStateContext, ChatStreamContext }
-```
-
-- [ ] **Step 3: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-Expected: No new errors
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/hooks/useChatReducer.ts frontend/app/chat/ChatProvider.tsx
-git commit -m "refactor(chat): add useChatReducer and ChatProvider with dual-context split"
-```
-
----
-
-### Task 3: Adapt useBackendChatStream to dispatch
-
-**Files:**
-- Modify: `chat/hooks/useBackendChatStream.ts` (549 lines)
-
-This is the most critical migration step. The hook must accept `dispatch` instead of `setMessages` and convert every SSE event handler from `safeSetMessages(prev => ...)` to `dispatch({ type: ... })`.
-
-- [ ] **Step 1: Change hook signature**
-
-Replace the function signature (line 26):
-
-```typescript
-// Before:
-export const useBackendChatStream = (
-  setMessages: React.Dispatch<React.SetStateAction<Message[]>>,
-)
-
-// After:
-export const useBackendChatStream = (
-  dispatch: React.Dispatch<ChatAction>,
-)
-```
-
-Add import at top:
-```typescript
-import type { ChatAction } from './useChatReducer'
-```
-
-- [ ] **Step 2: Replace all safeSetMessages calls with dispatch calls**
-
-Key transformations (referencing actual event handlers in the file):
-
-| SSE Event | Current pattern | New pattern |
-|-----------|----------------|-------------|
-| Before stream (blank assistant msg) | `setMessages(prev => [...prev, blankMsg])` | `dispatch({ type: 'APPEND_MESSAGE', message: blankMsg })` |
-| `content` | `safeSetMessages(prev => prev.map(...update last msg content))` | `dispatch({ type: 'UPDATE_MESSAGE', id: lastMsgId, patch: { content: accumulated } })` |
-| `tool_start` | `safeSetMessages(prev => prev.map(...push tool to last msg))` | `dispatch({ type: 'TOOL_START', tool: { id, name, args, status: 'running', startTime } })` |
-| `tool_end` | `safeSetMessages(prev => prev.map(...update tool status))` | `dispatch({ type: 'TOOL_END', id, result })` |
-| `file_event` | `safeSetMessages(prev => prev.map(...update metadata.fileTree))` | `dispatch({ type: 'FILE_EVENT', path, info: { action, size, timestamp } })` |
-| `node_start` | `safeSetMessages(prev => prev.map(...set metadata.currentNode))` | `dispatch({ type: 'NODE_START', nodeId, label })` |
-| `node_end` | `safeSetMessages(prev => prev.map(...clear currentNode))` | `dispatch({ type: 'NODE_END', nodeId })` |
-| `command`/`route_decision`/etc. | `nodeExecutionLog.push(...); safeSetMessages(...)` | `dispatch({ type: 'NODE_LOG', entry: { type, nodeName, timestamp, data } })` |
-| `error` | `safeSetMessages(prev => prev.map(...append error))` | `dispatch({ type: 'STREAM_ERROR', error: text })` |
-| `done` | `safeSetMessages(prev => prev.map(...set isStreaming false))` | `dispatch({ type: 'STREAM_DONE' })` |
-| `thread_id` | `threadIdRef.current = id` | Keep ref + `dispatch({ type: 'SET_THREAD', threadId: id })` |
-
-Remove the `nodeExecutionLog` closure variable — it is now in the reducer state.
-
-Remove `safeSetMessages` wrapper — dispatch is already safe to call after unmount (no-op on unmounted reducer).
-
-Keep `abortRef` and `isMountedRef` for abort logic.
-
-- [ ] **Step 3: Update sendMessage to dispatch STREAM_START**
-
-At the beginning of `sendMessage`, before creating the blank assistant message:
-```typescript
-dispatch({ type: 'STREAM_START' })
-```
-
-- [ ] **Step 4: Keep the lastMsgId tracking**
-
-The hook needs to track the ID of the current assistant message being streamed. Use a ref:
-```typescript
-const currentMsgIdRef = useRef<string>('')
-// Set when creating blank assistant message
-currentMsgIdRef.current = blankMsg.id
-// Use in UPDATE_MESSAGE dispatches
-dispatch({ type: 'UPDATE_MESSAGE', id: currentMsgIdRef.current, patch: { ... } })
-```
-
-- [ ] **Step 5: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-Expected: Errors in ChatInterface.tsx (expected — it still passes setMessages). No errors in useBackendChatStream.ts itself.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/app/chat/hooks/useBackendChatStream.ts
-git commit -m "refactor(chat): adapt useBackendChatStream to dispatch-based state management"
-```
-
----
-
-### Task 4: Create ConversationPanel and move components
-
-**Files:**
-- Create: `chat/conversation/ConversationPanel.tsx`
-- Create: `chat/conversation/MessageList.tsx` (copy from `chat/components/ThreadContent.tsx`)
-- Create: `chat/conversation/MessageBubble.tsx` (copy from `chat/components/MessageItem.tsx`)
-- Move: `chat/components/ChatInput.tsx` → `chat/conversation/ChatInput.tsx`
-- Create: `chat/conversation/index.ts`
-
-- [ ] **Step 1: Copy ThreadContent.tsx to MessageList.tsx**
-
-Copy `chat/components/ThreadContent.tsx` to `chat/conversation/MessageList.tsx`. Update:
-- Rename component from `ThreadContent` to `MessageList`
-- Update import of `MessageItem` to `MessageBubble` from `./MessageBubble`
-- The props interface stays the same for now (will consume Context in Task 6)
-
-- [ ] **Step 2: Copy MessageItem.tsx to MessageBubble.tsx**
-
-Copy `chat/components/MessageItem.tsx` to `chat/conversation/MessageBubble.tsx`. Update:
-- Rename component from `MessageItem` to `MessageBubble`
-- Rename `MessageItemProps` to `MessageBubbleProps`
-- Update import paths for types (now `../../types` instead of `../types`)
-
-- [ ] **Step 3: Move ChatInput.tsx**
-
-Copy `chat/components/ChatInput.tsx` to `chat/conversation/ChatInput.tsx`. Update import paths:
-- `../hooks/useFileUpload` → `../../hooks/useFileUpload` (or from hooks directory)
-- `../services/modeHandlers/types` → `../../services/modeHandlers/types`
-
-- [ ] **Step 4: Create ConversationPanel.tsx**
-
-This component replaces the middle section of ChatInterface (lines 561-616). It consumes ChatStateContext:
-
-```typescript
-'use client'
-
-import React, { useRef, useEffect, useMemo } from 'react'
-import { useChatState, useChatStream } from '../ChatProvider'
-import MessageList from './MessageList'
-import ChatInput from './ChatInput'
-import type { ToolCall } from '../types'
-
-interface ConversationPanelProps {
-  onSubmit: (text: string, mode?: string, graphId?: string | null, files?: any[]) => void
-  onStop: () => void
-  onToolClick: (toolCall: ToolCall) => void
-}
-
-export default function ConversationPanel({ onSubmit, onStop, onToolClick }: ConversationPanelProps) {
-  const { state, dispatch } = useChatState()
-  const stream = useChatStream()
-  const scrollRef = useRef<HTMLDivElement>(null)
-
-  // Auto-scroll
-  useEffect(() => {
-    const id = requestAnimationFrame(() => {
-      requestAnimationFrame(() => {
-        if (scrollRef.current) {
-          scrollRef.current.scrollTop = scrollRef.current.scrollHeight
-        }
-      })
-    })
-    return () => cancelAnimationFrame(id)
-  }, [state.messages, stream.isProcessing])
-
-  const agentStatus = useMemo<'idle' | 'running' | 'connecting' | 'error'>(
-    () => (stream.isProcessing || stream.isSubmitting ? 'running' : 'idle'),
-    [stream.isProcessing, stream.isSubmitting],
-  )
-
-  const lastMsg = state.messages[state.messages.length - 1]
-  const streamingText = useMemo(() => {
-    if (!lastMsg || lastMsg.role !== 'assistant') return ''
-    if (!stream.isProcessing && !lastMsg.isStreaming) return ''
-    return lastMsg.content ?? ''
-  }, [lastMsg, stream.isProcessing])
-
-  const currentNodeLabel = useMemo(
-    () => lastMsg?.role === 'assistant' ? (lastMsg.metadata?.currentNode ?? undefined) : undefined,
-    [lastMsg],
-  )
-
-  return (
-    <div className="relative flex h-full flex-col overflow-hidden">
-      <div className="flex min-h-0 flex-1 flex-col overflow-hidden">
-        <div className="min-h-0 flex-1 overflow-hidden">
-          <MessageList
-            messages={state.messages}
-            streamingText={streamingText}
-            agentStatus={agentStatus}
-            currentNodeLabel={currentNodeLabel}
-            onToolClick={onToolClick}
-            scrollContainerRef={scrollRef}
-          />
-        </div>
-      </div>
-      <div className="relative flex-shrink-0 bg-gray-50 px-6 pb-6 pt-2">
-        <ChatInput
-          input={state.input}
-          setInput={(v) => dispatch({ type: 'SET_INPUT', value: v })}
-          onSubmit={onSubmit}
-          isProcessing={stream.isProcessing}
-          onStop={onStop}
-          currentMode={state.mode.currentMode}
-          currentGraphId={state.mode.currentGraphId}
-        />
-      </div>
-    </div>
-  )
-}
-```
-
-- [ ] **Step 5: Create barrel export**
-
-```typescript
-// chat/conversation/index.ts
-export { default as ConversationPanel } from './ConversationPanel'
-export { default as MessageList } from './MessageList'
-export { default as MessageBubble } from './MessageBubble'
-export { default as ChatInput } from './ChatInput'
-```
-
-- [ ] **Step 6: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add frontend/app/chat/conversation/
-git commit -m "refactor(chat): create conversation/ module with ConversationPanel, MessageList, MessageBubble"
-```
-
----
-
-### Task 5: Create PreviewPanel and FileTreePreview
-
-**Files:**
-- Create: `chat/preview/PreviewPanel.tsx`
-- Create: `chat/preview/FileTreePreview.tsx` (from ArtifactPanel)
-- Create: `chat/preview/index.ts`
-- Create: `chat/hooks/usePreviewTrigger.ts`
-
-- [ ] **Step 1: Copy ArtifactPanel.tsx to FileTreePreview.tsx**
-
-Copy `chat/components/ArtifactPanel.tsx` (198 lines) to `chat/preview/FileTreePreview.tsx`. Update:
-- Rename component from `ArtifactPanel` to `FileTreePreview`
-- Update import paths
-
-- [ ] **Step 2: Create PreviewPanel.tsx**
-
-Tab-based container wrapping FileTreePreview and tool detail:
-
-```typescript
-'use client'
-
-import React, { useState } from 'react'
-import { X, FolderTree, Wrench } from 'lucide-react'
-import { useChatState } from '../ChatProvider'
-import FileTreePreview from './FileTreePreview'
-import type { ToolCall } from '../types'
-
-export default function PreviewPanel() {
-  const { state, dispatch } = useChatState()
-  const { preview, ui, threadId } = state
-  const [activeTab, setActiveTab] = useState<'files' | 'tool'>('files')
-
-  const hasFiles = Object.keys(preview.fileTree).length > 0
-  const hasTool = !!ui.selectedTool
-
-  return (
-    <div className="flex h-full flex-col bg-white">
-      {/* Header with tabs */}
-      <div className="flex items-center justify-between border-b px-3 py-2">
-        <div className="flex gap-1">
-          {hasFiles && (
-            <button
-              onClick={() => setActiveTab('files')}
-              className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm ${
-                activeTab === 'files' ? 'bg-gray-100 font-medium' : 'text-gray-500 hover:text-gray-700'
-              }`}
-            >
-              <FolderTree size={14} />
-              Files ({Object.keys(preview.fileTree).length})
-            </button>
-          )}
-          {hasTool && (
-            <button
-              onClick={() => setActiveTab('tool')}
-              className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm ${
-                activeTab === 'tool' ? 'bg-gray-100 font-medium' : 'text-gray-500 hover:text-gray-700'
-              }`}
-            >
-              <Wrench size={14} />
-              {ui.selectedTool?.name}
-            </button>
-          )}
-        </div>
-        <button
-          onClick={() => dispatch({ type: 'HIDE_PREVIEW' })}
-          className="rounded-md p-1 text-gray-400 hover:bg-gray-100 hover:text-gray-600"
-        >
-          <X size={16} />
-        </button>
-      </div>
-
-      {/* Content */}
-      <div className="min-h-0 flex-1 overflow-hidden">
-        {activeTab === 'files' && threadId && (
-          <FileTreePreview threadId={threadId} fileTree={preview.fileTree} />
-        )}
-        {activeTab === 'tool' && ui.selectedTool && (
-          <div className="p-4">
-            {/* Inline tool detail — simplified from ToolExecutionPanel for now */}
-            <pre className="text-sm whitespace-pre-wrap">{JSON.stringify(ui.selectedTool, null, 2)}</pre>
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
-```
-
-- [ ] **Step 3: Create usePreviewTrigger.ts**
-
-```typescript
-'use client'
-
-import { useEffect, useRef } from 'react'
-import type { ChatState, ChatAction } from './useChatReducer'
-
-export function usePreviewTrigger(
-  state: ChatState,
-  dispatch: React.Dispatch<ChatAction>,
-) {
-  const prevFileCountRef = useRef(0)
-
-  useEffect(() => {
-    const currentFileCount = Object.keys(state.preview.fileTree).length
-    const isNew = currentFileCount > prevFileCountRef.current
-
-    // Auto-show when new files appear (unless user dismissed)
-    if (isNew && currentFileCount > 0 && !state.preview.visible && !state.preview.userDismissed) {
-      dispatch({ type: 'SHOW_PREVIEW', tab: 'files' })
-    }
-
-    prevFileCountRef.current = currentFileCount
-  }, [state.preview.fileTree, state.preview.visible, state.preview.userDismissed, dispatch])
-
-  // Auto-hide when stream ends with no files
-  useEffect(() => {
-    if (
-      !state.streaming.isProcessing &&
-      Object.keys(state.preview.fileTree).length === 0 &&
-      state.preview.visible
-    ) {
-      dispatch({ type: 'HIDE_PREVIEW' })
-    }
-  }, [state.streaming.isProcessing, state.preview.fileTree, state.preview.visible, dispatch])
-}
-```
-
-- [ ] **Step 4: Create barrel export**
-
-```typescript
-// chat/preview/index.ts
-export { default as PreviewPanel } from './PreviewPanel'
-export { default as FileTreePreview } from './FileTreePreview'
-```
-
-- [ ] **Step 5: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/app/chat/preview/ frontend/app/chat/hooks/usePreviewTrigger.ts
-git commit -m "refactor(chat): create preview/ module with PreviewPanel, FileTreePreview, usePreviewTrigger"
-```
-
----
-
-### Task 6: Create ChatLayout and wire everything together
-
-**Files:**
-- Create: `chat/ChatLayout.tsx`
-- Modify: `chat/ChatInterface.tsx` → rename to `chat/ChatPage.tsx`
-- Modify: `chat/page.tsx`
-
-- [ ] **Step 1: Create ChatLayout.tsx**
-
-```typescript
-'use client'
-
-import React, { useEffect, useCallback } from 'react'
-import { useRouter } from 'next/navigation'
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable'
-import { useDeployedGraphs, useWorkspaces } from '@/hooks/queries'
-import { useAvailableModels } from '@/hooks/queries/models'
-import { useTranslation } from '@/lib/i18n'
-import { conversationService } from '@/services/conversationService'
-
-import ChatSidebar from './components/ChatSidebar'
-import ChatHome from './components/ChatHome'
-import { ConversationPanel } from './conversation'
-import { PreviewPanel } from './preview'
-import { useChatState, useChatStream } from './ChatProvider'
-import { useBackendChatStream } from './hooks/useBackendChatStream'
-import { usePreviewTrigger } from './hooks/usePreviewTrigger'
-import { graphResolutionService } from './services/graphResolutionService'
-import { generateId, Message } from './types'
-import type { ToolCall } from './types'
-// Import model notice dialog (extracted from old ChatInterface)
-import { ModelNoticeDialog } from './components/ModelNoticeDialog'
-
-export default function ChatLayout({ chatId: propChatId }: { chatId?: string | null }) {
-  const { state, dispatch } = useChatState()
-  const stream = useChatStream()
-  const { t } = useTranslation()
-  const router = useRouter()
-
-  // Data fetching
-  const { data: deployedAgents = [] } = useDeployedGraphs()
-  const { data: workspacesData } = useWorkspaces()
-  const personalWorkspaceId = workspacesData?.find((w) => w.type === 'personal')?.id ?? null
-  const { data: availableModels = [], isSuccess: modelsLoaded, isError: modelsError } = useAvailableModels('chat', { enabled: true })
-
-  // Hook integrations
-  const { sendMessage, stopMessage } = useBackendChatStream(dispatch)
-  usePreviewTrigger(state, dispatch)
-
-  // Keyboard shortcut: Cmd+B toggle sidebar
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.metaKey || e.ctrlKey) && e.key === 'b') {
-        e.preventDefault()
-        dispatch({ type: 'TOGGLE_SIDEBAR' })
-      }
-    }
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [dispatch])
-
-  // Model notice check
-  // ... (migrate useEffect from ChatInterface lines 86-103)
-
-  // Sync propChatId
-  // ... (migrate useEffect from ChatInterface lines 172-190)
-
-  // handleSubmit, handleSelectConversation, handleNewChat, handleToolClick
-  // ... (migrate from ChatInterface lines 244-430, using dispatch instead of setState)
-
-  const hasMessages = state.messages.length > 0 || !!state.threadId || !!propChatId
-
-  return (
-    <div className="relative flex h-full w-full flex-col overflow-hidden bg-gray-50">
-      <ResizablePanelGroup direction="horizontal" className="flex-1">
-        {/* Sidebar */}
-        {state.ui.sidebarVisible && (
-          <>
-            <ResizablePanel defaultSize={12} minSize={10} maxSize={25}>
-              <ChatSidebar
-                isCollapsed={false}
-                onToggle={() => dispatch({ type: 'TOGGLE_SIDEBAR' })}
-                onSelectConversation={handleSelectConversation}
-                currentThreadId={state.threadId}
-                onNewChat={handleNewChat}
-              />
-            </ResizablePanel>
-            <ResizableHandle className="w-px bg-gray-200" />
-          </>
-        )}
-
-        {/* Conversation */}
-        <ResizablePanel defaultSize={state.preview.visible ? 55 : 88} minSize={40}>
-          {!hasMessages ? (
-            <ChatHome
-              onStartChat={handleSubmit}
-              onSelectConversation={handleSelectConversation}
-              isProcessing={stream.isProcessing}
-              onStop={() => stopMessage(state.threadId)}
-            />
-          ) : (
-            <ConversationPanel
-              onSubmit={handleSubmit}
-              onStop={() => stopMessage(state.threadId)}
-              onToolClick={handleToolClick}
-            />
-          )}
-        </ResizablePanel>
-
-        {/* Preview */}
-        {state.preview.visible && (
-          <>
-            <ResizableHandle className="w-px bg-gray-200" />
-            <ResizablePanel defaultSize={45} minSize={30} maxSize={60}>
-              <PreviewPanel />
-            </ResizablePanel>
-          </>
-        )}
-      </ResizablePanelGroup>
-
-      <ModelNoticeDialog />
-    </div>
-  )
-}
-```
-
-Note: The `handleSubmit`, `handleSelectConversation`, `handleNewChat`, `handleToolClick` callbacks are migrated directly from ChatInterface lines 244-430, replacing all `setXxx()` calls with `dispatch({ type: 'XXX', ... })`.
-
-- [ ] **Step 2: Rename ChatInterface.tsx to ChatPage.tsx**
-
-Replace entire content with:
-
-```typescript
-'use client'
-
-import { ChatProvider } from './ChatProvider'
-import ChatLayout from './ChatLayout'
-
-interface ChatPageProps {
-  chatId?: string | null
-}
-
-export default function ChatPage({ chatId }: ChatPageProps) {
-  return (
-    <ChatProvider>
-      <ChatLayout chatId={chatId} />
-    </ChatProvider>
-  )
-}
-```
-
-- [ ] **Step 3: Update page.tsx import**
-
-In `chat/page.tsx` (line 5), change:
-```typescript
-// Before:
-import ChatInterface from './ChatInterface'
-// After:
-import ChatPage from './ChatPage'
-```
-
-And update the JSX (line 15):
-```typescript
-// Before:
-<ChatInterface chatId={threadId} />
-// After:
-<ChatPage chatId={threadId} />
-```
-
-- [ ] **Step 4: Extract ModelNoticeDialog**
-
-Create `chat/components/ModelNoticeDialog.tsx` containing the AlertDialog from ChatInterface lines 648-679. This component consumes ChatStateContext for `showNoDefaultModelNotice` and dispatches `DISMISS_MODEL_NOTICE`.
-
-- [ ] **Step 5: Verify app compiles and runs**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30`
-Run: `cd frontend && npm run dev` — verify chat page loads, can send messages, sidebar works, conversation switching works.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/app/chat/ChatLayout.tsx frontend/app/chat/ChatPage.tsx frontend/app/chat/page.tsx frontend/app/chat/components/ModelNoticeDialog.tsx
-git rm frontend/app/chat/ChatInterface.tsx
-git commit -m "refactor(chat): replace ChatInterface with ChatProvider + ChatLayout + ChatPage (<50 lines)"
-```
-
----
-
-## Phase 2: Interaction Enhancement
-
-### Task 7: Shared ToolCallDisplay components
-
-**Files:**
-- Create: `shared/ToolCallDisplay/toolDisplayRegistry.ts`
-- Create: `shared/ToolCallDisplay/ToolCallBadge.tsx`
-- Create: `shared/ToolCallDisplay/ToolCallDetail.tsx`
-- Create: `shared/ToolCallDisplay/index.ts`
-
-- [ ] **Step 1: Create toolDisplayRegistry.ts**
-
-Migrate and generalize from `skills/creator/components/toolDisplayUtils.ts` (140 lines). Include all tool name mappings from that file plus the icon logic from `MessageItem.tsx`'s `ToolCallItem`.
-
-```typescript
-export interface ToolDisplayConfig {
-  label: string
-  icon?: string  // lucide icon name
-  formatArgs?: (args: Record<string, any>) => string
-  formatDetail?: (args: Record<string, any>) => string
-  category: 'file' | 'code' | 'search' | 'network' | 'other'
-}
-
-const registry = new Map<string, ToolDisplayConfig>()
-
-// Register all known tools (from toolDisplayUtils.ts)
-function registerDefaults() {
-  register('read_file',     { label: 'Reading',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('read',          { label: 'Reading',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('write_file',    { label: 'Writing',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('write',         { label: 'Writing',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('create_file',   { label: 'Creating',       category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('edit_file',     { label: 'Editing',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('edit',          { label: 'Editing',        category: 'file',   formatArgs: a => shortenPath(a.path || a.file_path) })
-  register('str_replace_editor', { label: 'Editing',   category: 'file',   formatArgs: a => shortenPath(a.path) })
-  register('execute',       { label: 'Executing',      category: 'code',   formatArgs: a => truncate(a.command, 60) })
-  register('bash',          { label: 'Running',        category: 'code',   formatArgs: a => truncate(a.command, 60) })
-  register('run_command',   { label: 'Running',        category: 'code',   formatArgs: a => truncate(a.command, 60) })
-  register('python',        { label: 'Python',         category: 'code',   formatArgs: a => truncate(a.code?.split('\n')[0], 60) })
-  register('python_interpreter', { label: 'Python',    category: 'code' })
-  register('web_search',    { label: 'Searching',      category: 'search', formatArgs: a => a.query })
-  register('preview_skill', { label: 'Deploying skill', category: 'other', formatArgs: a => a.skill_name })
-  register('glob',          { label: 'Finding files',  category: 'search' })
-  register('find_files',    { label: 'Finding files',  category: 'search' })
-  register('grep',          { label: 'Searching code', category: 'search' })
-  register('search',        { label: 'Searching',      category: 'search' })
-  register('ls',            { label: 'Listing',        category: 'file',   formatArgs: a => shortenPath(a.path) })
-  register('list_directory', { label: 'Listing',       category: 'file',   formatArgs: a => shortenPath(a.path) })
-  register('think',         { label: 'Thinking...',    category: 'other' })
-  register('reasoning',     { label: 'Thinking...',    category: 'other' })
-  register('write_todos',   { label: 'Updating plan',  category: 'other' })
-  register('todo_write',    { label: 'Updating plan',  category: 'other' })
-  register('planner',       { label: 'Planning',       category: 'other' })
-}
-
-export function register(name: string, config: ToolDisplayConfig) { registry.set(name, config) }
-export function getToolDisplay(name: string, args: Record<string, any>): { label: string; detail: string; category: string } { /* ... */ }
-
-function shortenPath(p?: string): string { /* from toolDisplayUtils.ts */ }
-function truncate(s?: string, max = 60): string { /* ... */ }
-
-registerDefaults()
-```
-
-- [ ] **Step 2: Create ToolCallBadge.tsx**
-
-Compact inline badge showing icon + label + args summary + status indicator. Replaces `ToolCallItem` inside `MessageItem.tsx`.
-
-- [ ] **Step 3: Create ToolCallDetail.tsx**
-
-Generalized from `ToolExecutionPanel.tsx` (375 lines) — shows tool input JSON, output (JSON/Markdown/text), copy buttons, timestamp.
-
-- [ ] **Step 4: Create barrel export**
-
-- [ ] **Step 5: Integrate into MessageBubble.tsx**
-
-Replace the inline `ToolCallItem` in `MessageBubble.tsx` with `ToolCallBadge` from the shared library.
-
-- [ ] **Step 6: Verify TypeScript compiles and tool display renders correctly**
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add frontend/app/shared/ToolCallDisplay/
-git commit -m "feat(chat): add shared ToolCallDisplay with human-readable tool labels and badge"
-```
-
----
-
-### Task 8: Persistent preview panel (layout switch)
-
-**Files:**
-- Modify: `chat/ChatLayout.tsx` (already has ResizablePanel structure from Task 6)
-- Delete: `chat/components/ArtifactsDrawer.tsx`
-- Delete: `chat/components/CompactArtifactStatus.tsx`
-- Delete: `chat/components/ToolExecutionPanel.tsx`
-- Delete: `chat/components/CompactToolStatus.tsx`
-- Modify: `chat/conversation/ChatInput.tsx` — remove `compactToolStatus` and `compactArtifactStatus` props
-
-- [ ] **Step 1: Remove overlay rendering from ChatLayout**
-
-Remove the `renderFloatingPanel` pattern and the `SIDE_PANEL_WIDTH` / `CONTENT_PR` / `CONTENT_MR` constants. The ResizablePanel preview column replaces them.
-
-- [ ] **Step 2: Remove compact status slot props from ChatInput**
-
-Remove `compactToolStatus` and `compactArtifactStatus` props from `ChatInput.tsx` — the preview panel is now always visible when content exists, no compact trigger needed.
-
-- [ ] **Step 3: Delete old overlay components**
-
-```bash
-git rm frontend/app/chat/components/ArtifactsDrawer.tsx
-git rm frontend/app/chat/components/CompactArtifactStatus.tsx
-git rm frontend/app/chat/components/ToolExecutionPanel.tsx
-git rm frontend/app/chat/components/CompactToolStatus.tsx
-```
-
-- [ ] **Step 4: Add responsive fallback**
-
-In `ChatLayout.tsx`, add a media query check. For `window.innerWidth < 768`, render PreviewPanel as a slide-over overlay instead of a ResizablePanel column.
-
-- [ ] **Step 5: Verify app works end-to-end**
-
-Manual test: send a message that triggers file creation, verify preview panel auto-opens with file tree, close it manually, send another message and verify `userDismissed` suppresses auto-open, verify new conversation resets the flag.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add -A
-git commit -m "feat(chat): replace overlay panels with persistent ResizablePanel preview column"
-```
-
----
-
-### Task 9: Per-message ActionBar
-
-**Files:**
-- Create: `shared/ActionBar/ActionBar.tsx`
-- Create: `shared/ActionBar/actions/CopyAction.tsx`
-- Create: `shared/ActionBar/actions/RetryAction.tsx`
-- Create: `shared/ActionBar/index.ts`
-- Modify: `chat/conversation/MessageBubble.tsx`
-
-- [ ] **Step 1: Create ActionBar.tsx**
-
-```typescript
-interface ActionConfig {
-  id: string
-  label: string
-  icon: React.ComponentType<{ size?: number }>
-  onClick: () => void
-  show?: boolean
-}
-
-interface ActionBarProps {
-  actions: ActionConfig[]
-  visible: boolean  // hover state or isLast
-}
-```
-
-Renders a row of icon buttons. Fade in/out via `opacity` + `transition`.
-
-- [ ] **Step 2: Create CopyAction and RetryAction**
-
-`CopyAction`: copies message content to clipboard, shows checkmark for 2s.
-`RetryAction`: calls `onRetry(messageId)` which re-sends the preceding user message.
-
-- [ ] **Step 3: Integrate into MessageBubble**
-
-Add `ActionBar` below assistant message content. Show on hover (via `group-hover` Tailwind class). Always show on the last assistant message.
-
-- [ ] **Step 4: Create barrel export**
-
-- [ ] **Step 5: Verify actions work**
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/app/shared/ActionBar/
-git commit -m "feat(chat): add per-message ActionBar with Copy and Retry actions"
-```
-
----
-
-### Task 10: Starter prompts for guided entry
-
-**Files:**
-- Create: `shared/StarterPrompts/StarterPrompts.tsx`
-- Create: `shared/StarterPrompts/index.ts`
-- Modify: `chat/config/modeConfig.ts` — add `starterPrompts` field
-- Modify: `chat/components/ChatHome.tsx` — integrate StarterPrompts
-
-- [ ] **Step 1: Add starterPrompts to ModeConfig**
-
-In `modeConfig.ts`, extend the interface:
-
-```typescript
-export interface StarterPrompt {
-  labelKey: string
-  promptKey: string
-  icon: any
-}
-
-export interface ModeConfig {
-  // ... existing fields
-  starterPrompts?: StarterPrompt[]
-}
-```
-
-Add prompts to `default-chat`:
-```typescript
-{
-  id: 'default-chat',
-  // ... existing
-  starterPrompts: [
-    { labelKey: 'chat.starter.analyzeCode', promptKey: 'chat.starter.analyzeCodePrompt', icon: Code },
-    { labelKey: 'chat.starter.writeScript', promptKey: 'chat.starter.writeScriptPrompt', icon: Terminal },
-    { labelKey: 'chat.starter.explainConcept', promptKey: 'chat.starter.explainConceptPrompt', icon: BookOpen },
-  ]
-}
-```
-
-- [ ] **Step 2: Create StarterPrompts.tsx**
-
-```typescript
-interface StarterPromptsProps {
-  prompts: StarterPrompt[]
-  onSelect: (prompt: string) => void
-}
-```
-
-Renders a row of clickable chips. On click: calls `onSelect(t(prompt.promptKey))`, adds brief highlight animation.
-
-- [ ] **Step 3: Integrate into ChatHome**
-
-Below the mode cards in `ChatHome.tsx`, render `StarterPrompts` for the currently selected mode. On select, fill the input and focus the textarea.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/shared/StarterPrompts/ frontend/app/chat/config/modeConfig.ts frontend/app/chat/components/ChatHome.tsx
-git commit -m "feat(chat): add starter prompts for guided entry experience"
-```
-
----
-
-### Task 11: Skill Creator migration to shared components
-
-**Files:**
-- Modify: `skills/creator/components/SkillCreatorChat.tsx`
-- Modify: `skills/creator/components/toolDisplayUtils.ts` → deprecate, import from shared registry
-
-- [ ] **Step 1: Replace toolDisplayUtils with shared registry**
-
-In `SkillCreatorChat.tsx`, replace:
-```typescript
-import { formatToolDisplay } from './toolDisplayUtils'
-```
-with:
-```typescript
-import { getToolDisplay } from '@/app/shared/ToolCallDisplay'
-```
-
-Update all `formatToolDisplay()` calls to use `getToolDisplay()`.
-
-- [ ] **Step 2: Replace inline tool badges with ToolCallBadge**
-
-If the Skill Creator renders custom tool badges inline, replace them with `ToolCallBadge` from the shared library.
-
-- [ ] **Step 3: Verify Skill Creator still works**
-
-Manual test: navigate to `/skills/creator`, create a skill with AI, verify tool display is correct and preview works.
-
-- [ ] **Step 4: Delete or deprecate toolDisplayUtils.ts**
-
-Add a deprecation comment or delete if all imports are migrated.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/skills/creator/ frontend/app/shared/ToolCallDisplay/
-git commit -m "refactor(skills): migrate Skill Creator to shared ToolCallDisplay components"
-```
-
----
-
-## Final Cleanup
-
-### Task 12: Remove dead code and update imports
-
-- [ ] **Step 1: Remove old ThreadContent and MessageItem**
-
-If no other files import the old components:
-```bash
-git rm frontend/app/chat/components/ThreadContent.tsx
-git rm frontend/app/chat/components/MessageItem.tsx
-```
-
-Keep `ChatSidebar.tsx` and `ChatHome.tsx` in `components/` — they are still used.
-
-- [ ] **Step 2: Verify no broken imports**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -50`
-
-- [ ] **Step 3: Final commit**
-
-```bash
-git add -A
-git commit -m "refactor(chat): remove deprecated components and clean up imports"
-```
diff --git a/docs/superpowers/plans/2026-03-20-skill-versioning-permissions-api.md b/docs/superpowers/plans/2026-03-20-skill-versioning-permissions-api.md
deleted file mode 100644
index 64c17070f..000000000
--- a/docs/superpowers/plans/2026-03-20-skill-versioning-permissions-api.md
+++ /dev/null
@@ -1,2942 +0,0 @@
-# Skill Versioning, Permissions & Token API Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Add semantic versioning, team collaboration permissions, and PlatformToken auth to the Skill system.
-
-**Architecture:** 4 new DB tables (skill_versions, skill_version_files, skill_collaborators, platform_tokens) with zero changes to existing tables. New repos/services/routes follow existing layered pattern (Repository → Service → API). A unified `check_skill_access()` replaces hardcoded `owner_id` checks. Dual-mode auth dependency supports session + `sk_` PlatformToken.
-
-**Tech Stack:** FastAPI, SQLAlchemy async (PostgreSQL), Alembic, Pydantic v2, `semver` PyPI package, `secrets` stdlib.
-
-**Spec:** `docs/superpowers/specs/2026-03-20-skill-versioning-permissions-api-design.md`
-
----
-
-## File Structure
-
-### New Files
-| File | Responsibility |
-|------|---------------|
-| `backend/app/models/skill_version.py` | SkillVersion + SkillVersionFile ORM models |
-| `backend/app/models/skill_collaborator.py` | CollaboratorRole enum + SkillCollaborator ORM model |
-| `backend/app/models/platform_token.py` | PlatformToken ORM model |
-| `backend/app/schemas/skill_version.py` | Pydantic schemas for version CRUD |
-| `backend/app/schemas/skill_collaborator.py` | Pydantic schemas for collaborator CRUD |
-| `backend/app/schemas/platform_token.py` | Pydantic schemas for token CRUD |
-| `backend/app/repositories/skill_version.py` | SkillVersion + SkillVersionFile repository |
-| `backend/app/repositories/skill_collaborator.py` | SkillCollaborator repository |
-| `backend/app/repositories/platform_token.py` | PlatformToken repository |
-| `backend/app/services/skill_version_service.py` | Version publish/list/restore logic |
-| `backend/app/services/skill_collaborator_service.py` | Collaborator CRUD + transfer |
-| `backend/app/services/platform_token_service.py` | Token create/list/revoke |
-| `backend/app/common/skill_permissions.py` | `check_skill_access()` unified permission check |
-| `backend/app/common/auth_dependency.py` | `get_current_user_or_token()` dual-mode auth |
-| `backend/app/api/v1/skill_versions.py` | Version API routes |
-| `backend/app/api/v1/skill_collaborators.py` | Collaborator API routes |
-| `backend/app/api/v1/tokens.py` | Token API routes |
-| `backend/alembic/versions/20260321_000011_add_skill_versioning_permissions_tokens.py` | Migration |
-| `backend/tests/test_api/test_skill_versions.py` | Version API tests |
-| `backend/tests/test_api/test_skill_collaborators.py` | Collaborator API tests |
-| `backend/tests/test_api/test_platform_tokens.py` | Token API tests |
-| `backend/tests/test_services/test_skill_permissions.py` | Permission utility tests |
-
-### Modified Files
-| File | Change |
-|------|--------|
-| `backend/app/models/__init__.py` | Register 4 new models + CollaboratorRole enum |
-| `backend/app/api/v1/__init__.py` | Register 3 new routers |
-| `backend/app/repositories/skill.py` | Extend `list_by_user()` with collaborator subquery |
-| `backend/app/services/skill_service.py` | Replace `owner_id` checks with `check_skill_access()` |
-| `backend/app/schemas/skill.py` | Add `latest_version` field to SkillSchema |
-
----
-
-### Task 1: SkillCollaborator Model + CollaboratorRole Enum
-
-**Files:**
-- Create: `backend/app/models/skill_collaborator.py`
-- Test: `backend/tests/test_services/test_skill_permissions.py` (placeholder)
-
-- [ ] **Step 1: Create the SkillCollaborator model file**
-
-```python
-# backend/app/models/skill_collaborator.py
-"""Skill Collaborator model — per-skill role-based access control."""
-
-from __future__ import annotations
-
-import enum
-from typing import TYPE_CHECKING
-
-from sqlalchemy import Enum, ForeignKey, Index, String, UniqueConstraint
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel
-
-if TYPE_CHECKING:
-    from .auth import AuthUser
-    from .skill import Skill
-
-
-class CollaboratorRole(str, enum.Enum):
-    """Roles ordered by privilege: viewer < editor < publisher < admin."""
-    viewer = "viewer"
-    editor = "editor"
-    publisher = "publisher"
-    admin = "admin"
-
-    @classmethod
-    def rank(cls, role: "CollaboratorRole") -> int:
-        _order = [cls.viewer, cls.editor, cls.publisher, cls.admin]
-        return _order.index(role)
-
-    def __ge__(self, other):
-        if not isinstance(other, CollaboratorRole):
-            return NotImplemented
-        return CollaboratorRole.rank(self) >= CollaboratorRole.rank(other)
-
-    def __gt__(self, other):
-        if not isinstance(other, CollaboratorRole):
-            return NotImplemented
-        return CollaboratorRole.rank(self) > CollaboratorRole.rank(other)
-
-    def __le__(self, other):
-        if not isinstance(other, CollaboratorRole):
-            return NotImplemented
-        return CollaboratorRole.rank(self) <= CollaboratorRole.rank(other)
-
-    def __lt__(self, other):
-        if not isinstance(other, CollaboratorRole):
-            return NotImplemented
-        return CollaboratorRole.rank(self) < CollaboratorRole.rank(other)
-
-
-class SkillCollaborator(BaseModel):
-    """Per-skill collaborator with role."""
-
-    __tablename__ = "skill_collaborators"
-
-    skill_id: Mapped["uuid.UUID"] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("skills.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    role: Mapped[CollaboratorRole] = mapped_column(
-        Enum(CollaboratorRole, name="collaborator_role", create_constraint=True),
-        nullable=False,
-    )
-    invited_by: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-
-    # Relationships
-    skill: Mapped["Skill"] = relationship("Skill", lazy="selectin")
-    user: Mapped["AuthUser"] = relationship("AuthUser", foreign_keys=[user_id], lazy="selectin")
-    inviter: Mapped["AuthUser"] = relationship("AuthUser", foreign_keys=[invited_by], lazy="selectin")
-
-    __table_args__ = (
-        UniqueConstraint("skill_id", "user_id", name="skill_collaborators_skill_user_unique"),
-        Index("skill_collaborators_user_skill_idx", "user_id", "skill_id"),
-    )
-```
-
-Add the missing `import uuid` at the top (after `import enum`):
-```python
-import uuid
-```
-
-- [ ] **Step 2: Verify the file is syntactically correct**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.models.skill_collaborator import SkillCollaborator, CollaboratorRole; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/models/skill_collaborator.py
-git commit -m "feat(models): add SkillCollaborator model and CollaboratorRole enum"
-```
-
----
-
-### Task 2: SkillVersion + SkillVersionFile Models
-
-**Files:**
-- Create: `backend/app/models/skill_version.py`
-
-- [ ] **Step 1: Create the SkillVersion model file**
-
-```python
-# backend/app/models/skill_version.py
-"""Immutable skill version snapshots."""
-
-from __future__ import annotations
-
-import uuid
-from typing import TYPE_CHECKING, List, Optional
-
-from sqlalchemy import DateTime, ForeignKey, Index, Integer, String, Text, UniqueConstraint
-from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel
-
-if TYPE_CHECKING:
-    from .auth import AuthUser
-    from .skill import Skill
-
-
-class SkillVersion(BaseModel):
-    """Published immutable version snapshot of a Skill."""
-
-    __tablename__ = "skill_versions"
-
-    skill_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("skills.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    version: Mapped[str] = mapped_column(String(20), nullable=False)
-    release_notes: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-
-    # Snapshot fields
-    skill_name: Mapped[str] = mapped_column(String(64), nullable=False)
-    skill_description: Mapped[str] = mapped_column(String(1024), nullable=False)
-    content: Mapped[str] = mapped_column(Text, nullable=False)
-    tags: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
-    meta_data: Mapped[dict] = mapped_column("metadata", JSONB, nullable=False, default=dict)
-    allowed_tools: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
-    compatibility: Mapped[Optional[str]] = mapped_column(String(500), nullable=True)
-    license: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
-
-    published_by_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    published_at: Mapped["datetime"] = mapped_column(
-        DateTime(timezone=True),
-        nullable=False,
-    )
-
-    # Relationships
-    skill: Mapped["Skill"] = relationship("Skill", lazy="selectin")
-    published_by: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-    files: Mapped[List["SkillVersionFile"]] = relationship(
-        "SkillVersionFile",
-        back_populates="version",
-        cascade="all, delete-orphan",
-        lazy="selectin",
-    )
-
-    __table_args__ = (
-        UniqueConstraint("skill_id", "version", name="skill_versions_skill_version_unique"),
-        Index("skill_versions_skill_idx", "skill_id"),
-        Index("skill_versions_published_at_idx", "published_at"),
-    )
-
-
-class SkillVersionFile(BaseModel):
-    """File snapshot belonging to a published version."""
-
-    __tablename__ = "skill_version_files"
-
-    version_id: Mapped[uuid.UUID] = mapped_column(
-        UUID(as_uuid=True),
-        ForeignKey("skill_versions.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    path: Mapped[str] = mapped_column(String(512), nullable=False)
-    file_name: Mapped[str] = mapped_column(String(255), nullable=False)
-    file_type: Mapped[str] = mapped_column(String(50), nullable=False)
-    content: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-    storage_type: Mapped[str] = mapped_column(String(20), nullable=False, default="database")
-    storage_key: Mapped[Optional[str]] = mapped_column(String(512), nullable=True)
-    size: Mapped[int] = mapped_column(Integer, nullable=False, default=0)
-
-    # Relationship
-    version: Mapped["SkillVersion"] = relationship("SkillVersion", back_populates="files", lazy="selectin")
-
-    __table_args__ = (
-        Index("skill_version_files_version_idx", "version_id"),
-    )
-```
-
-Add `from datetime import datetime` at top (after `import uuid`).
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.models.skill_version import SkillVersion, SkillVersionFile; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/models/skill_version.py
-git commit -m "feat(models): add SkillVersion and SkillVersionFile models"
-```
-
----
-
-### Task 3: PlatformToken Model
-
-**Files:**
-- Create: `backend/app/models/platform_token.py`
-
-- [ ] **Step 1: Create the PlatformToken model file**
-
-```python
-# backend/app/models/platform_token.py
-"""Universal PlatformToken for API authentication."""
-
-from __future__ import annotations
-
-import uuid
-from datetime import datetime
-from typing import TYPE_CHECKING, Optional
-
-from sqlalchemy import Boolean, DateTime, ForeignKey, Index, String
-from sqlalchemy.dialects.postgresql import JSONB, UUID
-from sqlalchemy.orm import Mapped, mapped_column, relationship
-
-from .base import BaseModel
-
-if TYPE_CHECKING:
-    from .auth import AuthUser
-
-
-class PlatformToken(BaseModel):
-    """API token with scoped permissions."""
-
-    __tablename__ = "platform_tokens"
-
-    user_id: Mapped[str] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="CASCADE"),
-        nullable=False,
-    )
-    name: Mapped[str] = mapped_column(String(255), nullable=False)
-    token_hash: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
-    token_prefix: Mapped[str] = mapped_column(String(12), nullable=False)
-    scopes: Mapped[list] = mapped_column(JSONB, nullable=False, default=list)
-    resource_type: Mapped[Optional[str]] = mapped_column(String(50), nullable=True)
-    resource_id: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), nullable=True)
-    expires_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-    last_used_at: Mapped[Optional[datetime]] = mapped_column(DateTime(timezone=True), nullable=True)
-    is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
-
-    # Relationship
-    user: Mapped["AuthUser"] = relationship("AuthUser", lazy="selectin")
-
-    __table_args__ = (
-        Index("platform_tokens_user_idx", "user_id"),
-        Index("platform_tokens_hash_idx", "token_hash"),
-        Index("platform_tokens_active_idx", "is_active"),
-    )
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.models.platform_token import PlatformToken; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/models/platform_token.py
-git commit -m "feat(models): add PlatformToken model"
-```
-
----
-
-### Task 4: Register Models in `__init__.py`
-
-**Files:**
-- Modify: `backend/app/models/__init__.py`
-
-- [ ] **Step 1: Add imports and __all__ entries**
-
-Add these imports after `from .skill import Skill, SkillFile`:
-```python
-from .skill_collaborator import CollaboratorRole, SkillCollaborator
-from .skill_version import SkillVersion, SkillVersionFile
-from .platform_token import PlatformToken
-```
-
-Add to `__all__`:
-```python
-    "CollaboratorRole",
-    "SkillCollaborator",
-    "SkillVersion",
-    "SkillVersionFile",
-    "PlatformToken",
-```
-
-- [ ] **Step 2: Verify import**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.models import SkillVersion, SkillVersionFile, SkillCollaborator, CollaboratorRole, PlatformToken; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/models/__init__.py
-git commit -m "feat(models): register new models in __init__.py"
-```
-
----
-
-### Task 5: Alembic Migration
-
-**Files:**
-- Create: `backend/alembic/versions/20260321_000011_add_skill_versioning_permissions_tokens.py`
-
-- [ ] **Step 1: Generate migration**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && alembic revision --autogenerate -m "add_skill_versioning_permissions_tokens"`
-
-If autogenerate fails, create manually. The migration must create these 4 tables:
-- `skill_collaborators` (with `collaborator_role` enum type)
-- `skill_versions`
-- `skill_version_files`
-- `platform_tokens`
-
-- [ ] **Step 2: Review the generated migration**
-
-Open the generated file and verify:
-1. `collaborator_role` enum is created before table
-2. All columns, FKs, indexes, unique constraints match the spec
-3. `downgrade()` drops tables in correct order (version_files before versions) and drops the enum
-
-- [ ] **Step 3: Test migration runs**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && alembic upgrade head`
-Expected: No errors, 4 tables created.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/alembic/versions/
-git commit -m "feat(migration): add skill_versions, skill_collaborators, platform_tokens tables"
-```
-
----
-
-### Task 6: Skill Permission Utility — `check_skill_access()`
-
-**Files:**
-- Create: `backend/app/common/skill_permissions.py`
-- Test: `backend/tests/test_services/test_skill_permissions.py`
-
-- [ ] **Step 1: Write failing tests**
-
-```python
-# backend/tests/test_services/test_skill_permissions.py
-"""Tests for check_skill_access unified permission check."""
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-from app.common.exceptions import ForbiddenException
-from app.common.skill_permissions import check_skill_access
-from app.models.skill_collaborator import CollaboratorRole
-
-
-def _make_skill(owner_id="owner-1", is_public=False):
-    skill = MagicMock()
-    skill.id = uuid.uuid4()
-    skill.owner_id = owner_id
-    skill.is_public = is_public
-    return skill
-
-
-def _make_user(user_id="user-1", is_superuser=False):
-    user = MagicMock()
-    user.id = user_id
-    user.is_superuser = is_superuser
-    return user
-
-
-@pytest.mark.asyncio
-async def test_superuser_always_passes():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    await check_skill_access(db, skill, "super-1", CollaboratorRole.admin, is_superuser=True)
-    # Should not raise
-
-
-@pytest.mark.asyncio
-async def test_owner_always_passes():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    await check_skill_access(db, skill, "owner-1", CollaboratorRole.admin)
-    # Should not raise
-
-
-@pytest.mark.asyncio
-async def test_collaborator_with_sufficient_role():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    mock_collab = MagicMock()
-    mock_collab.role = CollaboratorRole.editor
-    with patch("app.common.skill_permissions._get_collaborator", return_value=mock_collab):
-        await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_collaborator_with_insufficient_role():
-    skill = _make_skill(owner_id="other")
-    db = AsyncMock()
-    mock_collab = MagicMock()
-    mock_collab.role = CollaboratorRole.viewer
-    with patch("app.common.skill_permissions._get_collaborator", return_value=mock_collab):
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_public_skill_viewer_access():
-    skill = _make_skill(owner_id="other", is_public=True)
-    db = AsyncMock()
-    with patch("app.common.skill_permissions._get_collaborator", return_value=None):
-        await check_skill_access(db, skill, "user-1", CollaboratorRole.viewer)
-
-
-@pytest.mark.asyncio
-async def test_public_skill_editor_access_denied():
-    skill = _make_skill(owner_id="other", is_public=True)
-    db = AsyncMock()
-    with patch("app.common.skill_permissions._get_collaborator", return_value=None):
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "user-1", CollaboratorRole.editor)
-
-
-@pytest.mark.asyncio
-async def test_token_scope_check_passes():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    await check_skill_access(
-        db, skill, "owner-1", CollaboratorRole.viewer,
-        token_scopes=["skills:read"], required_scope="skills:read",
-    )
-
-
-@pytest.mark.asyncio
-async def test_token_scope_check_fails():
-    skill = _make_skill(owner_id="owner-1")
-    db = AsyncMock()
-    with pytest.raises(ForbiddenException):
-        await check_skill_access(
-            db, skill, "owner-1", CollaboratorRole.viewer,
-            token_scopes=["skills:read"], required_scope="skills:write",
-        )
-```
-
-- [ ] **Step 2: Run tests to verify they fail**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_services/test_skill_permissions.py -v`
-Expected: FAIL — `ModuleNotFoundError: No module named 'app.common.skill_permissions'`
-
-- [ ] **Step 3: Implement `check_skill_access()`**
-
-```python
-# backend/app/common/skill_permissions.py
-"""Unified skill permission check — replaces hardcoded owner_id comparisons."""
-
-from __future__ import annotations
-
-from typing import List, Optional
-
-from sqlalchemy import and_, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.exceptions import ForbiddenException
-from app.models.skill import Skill
-from app.models.skill_collaborator import CollaboratorRole, SkillCollaborator
-
-
-async def _get_collaborator(
-    db: AsyncSession,
-    skill_id,
-    user_id: str,
-) -> Optional[SkillCollaborator]:
-    result = await db.execute(
-        select(SkillCollaborator).where(
-            and_(
-                SkillCollaborator.skill_id == skill_id,
-                SkillCollaborator.user_id == user_id,
-            )
-        )
-    )
-    return result.scalar_one_or_none()
-
-
-async def check_skill_access(
-    db: AsyncSession,
-    skill: Skill,
-    user_id: str,
-    min_role: CollaboratorRole,
-    *,
-    is_superuser: bool = False,
-    token_scopes: Optional[List[str]] = None,
-    required_scope: Optional[str] = None,
-) -> None:
-    """
-    Unified permission check.
-
-    Raises ForbiddenException if the user lacks sufficient access.
-    """
-    # 1. Superuser bypass
-    if is_superuser:
-        _check_token_scope(token_scopes, required_scope)
-        return
-
-    # 2. Owner always passes
-    if skill.owner_id and skill.owner_id == user_id:
-        _check_token_scope(token_scopes, required_scope)
-        return
-
-    # 3. Check collaborator role
-    collab = await _get_collaborator(db, skill.id, user_id)
-    if collab and collab.role >= min_role:
-        _check_token_scope(token_scopes, required_scope)
-        return
-
-    # 4. Public skill + viewer access
-    if skill.is_public and min_role == CollaboratorRole.viewer:
-        _check_token_scope(token_scopes, required_scope)
-        return
-
-    raise ForbiddenException("You don't have permission to access this skill")
-
-
-def _check_token_scope(
-    token_scopes: Optional[List[str]],
-    required_scope: Optional[str],
-) -> None:
-    """If request came via PlatformToken, verify scope."""
-    if token_scopes is not None and required_scope is not None:
-        if required_scope not in token_scopes:
-            raise ForbiddenException(f"Token missing required scope: {required_scope}")
-```
-
-- [ ] **Step 4: Run tests to verify they pass**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_services/test_skill_permissions.py -v`
-Expected: All 8 tests PASS
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/common/skill_permissions.py backend/tests/test_services/test_skill_permissions.py
-git commit -m "feat(permissions): add check_skill_access() unified permission utility"
-```
-
----
-
-### Task 7: Dual-Mode Auth Dependency — `get_current_user_or_token()`
-
-**Files:**
-- Create: `backend/app/common/auth_dependency.py`
-
-- [ ] **Step 1: Implement the dual-mode auth dependency**
-
-```python
-# backend/app/common/auth_dependency.py
-"""Dual-mode authentication: session/JWT + PlatformToken (sk_ prefix)."""
-
-from __future__ import annotations
-
-import hashlib
-from dataclasses import dataclass
-from datetime import datetime, timezone
-from typing import List, Optional
-
-from fastapi import Depends, Request
-from fastapi.security import OAuth2PasswordBearer
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.common.exceptions import UnauthorizedException
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.models.platform_token import PlatformToken
-
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/auth/login", auto_error=False)
-
-# Debounce interval for last_used_at updates (5 minutes)
-_LAST_USED_DEBOUNCE_SECONDS = 300
-
-
-@dataclass
-class AuthContext:
-    """Result of authentication — carries user + optional token scopes."""
-    user: User
-    token_scopes: Optional[List[str]] = None
-
-    @property
-    def is_token_auth(self) -> bool:
-        return self.token_scopes is not None
-
-
-async def get_current_user_or_token(
-    token: Optional[str] = Depends(oauth2_scheme),
-    request: Request = None,
-    db: AsyncSession = Depends(get_db),
-) -> AuthContext:
-    """
-    Authenticate via session/JWT or PlatformToken.
-
-    If Bearer token starts with 'sk_', route to PlatformToken path.
-    Otherwise, fall through to existing session/JWT auth.
-    """
-    # Try to extract token from cookie if not in header
-    raw_token = token
-    if not raw_token and request:
-        from app.core.settings import settings
-        raw_token = (
-            request.cookies.get(settings.cookie_name)
-            or request.cookies.get("session-token")
-            or request.cookies.get("session_token")
-            or request.cookies.get("access_token")
-            or request.cookies.get("Authorization")
-            or request.cookies.get("auth_token")
-        )
-
-    # PlatformToken path
-    if raw_token and raw_token.startswith("sk_"):
-        return await _authenticate_platform_token(raw_token, db)
-
-    # Fall through to existing session/JWT auth
-    user = await get_current_user(token=token, request=request, db=db)
-    return AuthContext(user=user, token_scopes=None)
-
-
-async def _authenticate_platform_token(
-    raw_token: str,
-    db: AsyncSession,
-) -> AuthContext:
-    """Verify a PlatformToken and return AuthContext with scopes."""
-    token_hash = hashlib.sha256(raw_token.encode()).hexdigest()
-
-    result = await db.execute(
-        select(PlatformToken).where(PlatformToken.token_hash == token_hash)
-    )
-    pt = result.scalar_one_or_none()
-
-    if not pt:
-        raise UnauthorizedException("Invalid API token")
-
-    if not pt.is_active:
-        raise UnauthorizedException("API token has been revoked")
-
-    if pt.expires_at and pt.expires_at < datetime.now(timezone.utc):
-        raise UnauthorizedException("API token has expired")
-
-    # Debounce last_used_at update
-    now = datetime.now(timezone.utc)
-    if not pt.last_used_at or (now - pt.last_used_at).total_seconds() > _LAST_USED_DEBOUNCE_SECONDS:
-        pt.last_used_at = now
-        await db.commit()
-
-    # Load the user
-    user_result = await db.execute(select(User).where(User.id == pt.user_id))
-    user = user_result.scalar_one_or_none()
-    if not user or not user.is_active:
-        raise UnauthorizedException("Token owner account is inactive")
-
-    return AuthContext(user=user, token_scopes=list(pt.scopes))
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.common.auth_dependency import get_current_user_or_token, AuthContext; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/common/auth_dependency.py
-git commit -m "feat(auth): add get_current_user_or_token() dual-mode auth dependency"
-```
-
----
-
-### Task 8: Repositories — SkillCollaborator
-
-**Files:**
-- Create: `backend/app/repositories/skill_collaborator.py`
-
-- [ ] **Step 1: Create SkillCollaborator repository**
-
-```python
-# backend/app/repositories/skill_collaborator.py
-"""Skill Collaborator Repository."""
-
-from __future__ import annotations
-
-import uuid
-from typing import List, Optional
-
-from sqlalchemy import and_, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.skill_collaborator import CollaboratorRole, SkillCollaborator
-
-from .base import BaseRepository
-
-
-class SkillCollaboratorRepository(BaseRepository[SkillCollaborator]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(SkillCollaborator, db)
-
-    async def get_by_skill_and_user(
-        self, skill_id: uuid.UUID, user_id: str
-    ) -> Optional[SkillCollaborator]:
-        result = await self.db.execute(
-            select(SkillCollaborator).where(
-                and_(
-                    SkillCollaborator.skill_id == skill_id,
-                    SkillCollaborator.user_id == user_id,
-                )
-            )
-        )
-        return result.scalar_one_or_none()
-
-    async def list_by_skill(self, skill_id: uuid.UUID) -> List[SkillCollaborator]:
-        result = await self.db.execute(
-            select(SkillCollaborator).where(SkillCollaborator.skill_id == skill_id)
-        )
-        return list(result.scalars().all())
-
-    async def list_skill_ids_for_user(self, user_id: str) -> List[uuid.UUID]:
-        """Return skill IDs where user is a collaborator (used by list_by_user)."""
-        result = await self.db.execute(
-            select(SkillCollaborator.skill_id).where(
-                SkillCollaborator.user_id == user_id
-            )
-        )
-        return [row[0] for row in result.all()]
-
-    async def delete_by_skill_and_user(
-        self, skill_id: uuid.UUID, user_id: str
-    ) -> bool:
-        collab = await self.get_by_skill_and_user(skill_id, user_id)
-        if not collab:
-            return False
-        await self.db.delete(collab)
-        await self.db.flush()
-        return True
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.repositories.skill_collaborator import SkillCollaboratorRepository; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/repositories/skill_collaborator.py
-git commit -m "feat(repos): add SkillCollaboratorRepository"
-```
-
----
-
-### Task 9: Repositories — SkillVersion + SkillVersionFile
-
-**Files:**
-- Create: `backend/app/repositories/skill_version.py`
-
-- [ ] **Step 1: Create SkillVersion repository**
-
-```python
-# backend/app/repositories/skill_version.py
-"""Skill Version Repository."""
-
-from __future__ import annotations
-
-import uuid
-from typing import List, Optional
-
-from sqlalchemy import and_, select
-from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy.orm import selectinload
-
-from app.models.skill_version import SkillVersion, SkillVersionFile
-
-from .base import BaseRepository
-
-
-class SkillVersionRepository(BaseRepository[SkillVersion]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(SkillVersion, db)
-
-    async def list_by_skill(self, skill_id: uuid.UUID) -> List[SkillVersion]:
-        result = await self.db.execute(
-            select(SkillVersion)
-            .where(SkillVersion.skill_id == skill_id)
-            .options(selectinload(SkillVersion.files))
-            .order_by(SkillVersion.published_at.desc())
-        )
-        return list(result.scalars().all())
-
-    async def get_latest(self, skill_id: uuid.UUID) -> Optional[SkillVersion]:
-        result = await self.db.execute(
-            select(SkillVersion)
-            .where(SkillVersion.skill_id == skill_id)
-            .options(selectinload(SkillVersion.files))
-            .order_by(SkillVersion.published_at.desc())
-            .limit(1)
-        )
-        return result.scalar_one_or_none()
-
-    async def get_by_version(
-        self, skill_id: uuid.UUID, version: str
-    ) -> Optional[SkillVersion]:
-        result = await self.db.execute(
-            select(SkillVersion)
-            .where(
-                and_(
-                    SkillVersion.skill_id == skill_id,
-                    SkillVersion.version == version,
-                )
-            )
-            .options(selectinload(SkillVersion.files))
-        )
-        return result.scalar_one_or_none()
-
-    async def get_highest_version_str(self, skill_id: uuid.UUID) -> Optional[str]:
-        """Return the highest semver version string for a skill."""
-        versions = await self.list_by_skill(skill_id)
-        if not versions:
-            return None
-        import semver
-        parsed = [(v, semver.Version.parse(v.version)) for v in versions]
-        parsed.sort(key=lambda x: x[1], reverse=True)
-        return parsed[0][0].version
-
-
-class SkillVersionFileRepository(BaseRepository[SkillVersionFile]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(SkillVersionFile, db)
-
-    async def list_by_version(self, version_id: uuid.UUID) -> List[SkillVersionFile]:
-        result = await self.db.execute(
-            select(SkillVersionFile).where(
-                SkillVersionFile.version_id == version_id
-            )
-        )
-        return list(result.scalars().all())
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.repositories.skill_version import SkillVersionRepository, SkillVersionFileRepository; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/repositories/skill_version.py
-git commit -m "feat(repos): add SkillVersionRepository and SkillVersionFileRepository"
-```
-
----
-
-### Task 10: Repository — PlatformToken
-
-**Files:**
-- Create: `backend/app/repositories/platform_token.py`
-
-- [ ] **Step 1: Create PlatformToken repository**
-
-```python
-# backend/app/repositories/platform_token.py
-"""PlatformToken Repository."""
-
-from __future__ import annotations
-
-from typing import List, Optional
-
-from sqlalchemy import and_, func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.platform_token import PlatformToken
-
-from .base import BaseRepository
-
-
-class PlatformTokenRepository(BaseRepository[PlatformToken]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(PlatformToken, db)
-
-    async def get_by_hash(self, token_hash: str) -> Optional[PlatformToken]:
-        result = await self.db.execute(
-            select(PlatformToken).where(PlatformToken.token_hash == token_hash)
-        )
-        return result.scalar_one_or_none()
-
-    async def list_by_user(self, user_id: str) -> List[PlatformToken]:
-        result = await self.db.execute(
-            select(PlatformToken)
-            .where(PlatformToken.user_id == user_id)
-            .order_by(PlatformToken.created_at.desc())
-        )
-        return list(result.scalars().all())
-
-    async def count_active_by_user(self, user_id: str) -> int:
-        result = await self.db.execute(
-            select(func.count()).select_from(PlatformToken).where(
-                and_(
-                    PlatformToken.user_id == user_id,
-                    PlatformToken.is_active.is_(True),
-                )
-            )
-        )
-        return result.scalar() or 0
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.repositories.platform_token import PlatformTokenRepository; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/repositories/platform_token.py
-git commit -m "feat(repos): add PlatformTokenRepository"
-```
-
----
-
-### Task 11: Extend `SkillRepository.list_by_user()` for Collaborator Access
-
-**Files:**
-- Modify: `backend/app/repositories/skill.py:23-66`
-
-- [ ] **Step 1: Add collaborator subquery to list_by_user**
-
-In `backend/app/repositories/skill.py`, add import at top:
-```python
-from app.models.skill_collaborator import SkillCollaborator
-```
-
-Modify the `list_by_user` method — in the `if user_id:` block where `include_public` is True, change:
-```python
-# OLD
-conditions.append(
-    or_(
-        Skill.owner_id == user_id,
-        Skill.is_public.is_(True),
-        Skill.owner_id.is_(None),
-    )
-)
-```
-to:
-```python
-# NEW — include skills where user is a collaborator
-collab_subquery = select(SkillCollaborator.skill_id).where(
-    SkillCollaborator.user_id == user_id
-).scalar_subquery()
-conditions.append(
-    or_(
-        Skill.owner_id == user_id,
-        Skill.id.in_(collab_subquery),
-        Skill.is_public.is_(True),
-        Skill.owner_id.is_(None),
-    )
-)
-```
-
-And the `include_public=False` branch:
-```python
-# OLD
-conditions.append(Skill.owner_id == user_id)
-```
-to:
-```python
-# NEW
-collab_subquery = select(SkillCollaborator.skill_id).where(
-    SkillCollaborator.user_id == user_id
-).scalar_subquery()
-conditions.append(
-    or_(
-        Skill.owner_id == user_id,
-        Skill.id.in_(collab_subquery),
-    )
-)
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.repositories.skill import SkillRepository; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/repositories/skill.py
-git commit -m "feat(repos): extend list_by_user to include collaborator skills"
-```
-
----
-
-### Task 12: Pydantic Schemas — SkillCollaborator
-
-**Files:**
-- Create: `backend/app/schemas/skill_collaborator.py`
-
-- [ ] **Step 1: Create schemas**
-
-```python
-# backend/app/schemas/skill_collaborator.py
-"""Pydantic schemas for Skill Collaborator API."""
-
-import uuid
-from datetime import datetime
-from typing import Optional
-
-from pydantic import BaseModel, Field, field_validator
-
-from app.models.skill_collaborator import CollaboratorRole
-
-
-class CollaboratorCreate(BaseModel):
-    user_id: str = Field(..., description="User ID to add as collaborator")
-    role: CollaboratorRole = Field(..., description="Role to assign")
-
-
-class CollaboratorUpdate(BaseModel):
-    role: CollaboratorRole = Field(..., description="New role")
-
-
-class CollaboratorSchema(BaseModel):
-    id: str
-    skill_id: str
-    user_id: str
-    role: CollaboratorRole
-    invited_by: str
-    created_at: Optional[str] = None
-
-    @field_validator("id", "skill_id", mode="before")
-    @classmethod
-    def convert_uuid_to_str(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    @field_validator("created_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-    class Config:
-        from_attributes = True
-
-
-class TransferOwnershipRequest(BaseModel):
-    new_owner_id: str = Field(..., description="User ID of new owner")
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.schemas.skill_collaborator import CollaboratorCreate, CollaboratorSchema, TransferOwnershipRequest; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/schemas/skill_collaborator.py
-git commit -m "feat(schemas): add skill collaborator Pydantic schemas"
-```
-
----
-
-### Task 13: Pydantic Schemas — SkillVersion
-
-**Files:**
-- Create: `backend/app/schemas/skill_version.py`
-
-- [ ] **Step 1: Create schemas**
-
-```python
-# backend/app/schemas/skill_version.py
-"""Pydantic schemas for Skill Version API."""
-
-import uuid
-from datetime import datetime
-from typing import List, Optional
-
-from pydantic import BaseModel, Field, field_validator
-
-
-class VersionPublishRequest(BaseModel):
-    version: str = Field(..., description="Semver MAJOR.MINOR.PATCH", max_length=20)
-    release_notes: Optional[str] = Field(None, description="Changelog / release notes")
-
-
-class VersionRestoreRequest(BaseModel):
-    version: str = Field(..., description="Version to restore draft from")
-
-
-class VersionFileSchema(BaseModel):
-    id: str
-    version_id: str
-    path: str
-    file_name: str
-    file_type: str
-    content: Optional[str] = None
-    storage_type: str = "database"
-    storage_key: Optional[str] = None
-    size: int = 0
-
-    @field_validator("id", "version_id", mode="before")
-    @classmethod
-    def convert_uuid_to_str(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    class Config:
-        from_attributes = True
-
-
-class VersionSchema(BaseModel):
-    id: str
-    skill_id: str
-    version: str
-    release_notes: Optional[str] = None
-    skill_name: str
-    skill_description: str
-    content: str
-    tags: List[str] = Field(default_factory=list)
-    metadata: dict = Field(default_factory=dict, validation_alias="meta_data")
-    allowed_tools: List[str] = Field(default_factory=list)
-    compatibility: Optional[str] = None
-    license: Optional[str] = None
-    published_by_id: str
-    published_at: Optional[str] = None
-    created_at: Optional[str] = None
-    files: Optional[List[VersionFileSchema]] = None
-
-    @field_validator("id", "skill_id", mode="before")
-    @classmethod
-    def convert_uuid_to_str(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    @field_validator("published_at", "created_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-    class Config:
-        from_attributes = True
-        populate_by_name = True
-
-
-class VersionSummarySchema(BaseModel):
-    """Lightweight version info for embedding in SkillSchema."""
-    version: str
-    release_notes: Optional[str] = None
-    published_at: Optional[str] = None
-
-    @field_validator("published_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-    class Config:
-        from_attributes = True
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.schemas.skill_version import VersionPublishRequest, VersionSchema, VersionSummarySchema; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/schemas/skill_version.py
-git commit -m "feat(schemas): add skill version Pydantic schemas"
-```
-
----
-
-### Task 14: Pydantic Schemas — PlatformToken
-
-**Files:**
-- Create: `backend/app/schemas/platform_token.py`
-
-- [ ] **Step 1: Create schemas**
-
-```python
-# backend/app/schemas/platform_token.py
-"""Pydantic schemas for PlatformToken API."""
-
-import uuid
-from datetime import datetime
-from typing import List, Optional
-
-from pydantic import BaseModel, Field, field_validator
-
-
-class TokenCreate(BaseModel):
-    name: str = Field(..., max_length=255)
-    scopes: List[str] = Field(..., description="e.g. ['skills:read', 'skills:write']")
-    resource_type: Optional[str] = Field(None, max_length=50)
-    resource_id: Optional[str] = None
-    expires_at: Optional[datetime] = None
-
-
-class TokenCreateResponse(BaseModel):
-    """Returned only once at creation — contains plaintext token."""
-    id: str
-    name: str
-    token: str  # plaintext, shown only once
-    token_prefix: str
-    scopes: List[str]
-    expires_at: Optional[str] = None
-
-    @field_validator("id", mode="before")
-    @classmethod
-    def convert_uuid_to_str(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    @field_validator("expires_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-
-class TokenSchema(BaseModel):
-    """List view — never contains plaintext token."""
-    id: str
-    name: str
-    token_prefix: str
-    scopes: List[str]
-    resource_type: Optional[str] = None
-    resource_id: Optional[str] = None
-    expires_at: Optional[str] = None
-    last_used_at: Optional[str] = None
-    is_active: bool
-    created_at: Optional[str] = None
-
-    @field_validator("id", mode="before")
-    @classmethod
-    def convert_uuid_to_str(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    @field_validator("resource_id", mode="before")
-    @classmethod
-    def convert_resource_id(cls, v):
-        if isinstance(v, uuid.UUID):
-            return str(v)
-        return v
-
-    @field_validator("expires_at", "last_used_at", "created_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-    class Config:
-        from_attributes = True
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.schemas.platform_token import TokenCreate, TokenCreateResponse, TokenSchema; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/schemas/platform_token.py
-git commit -m "feat(schemas): add PlatformToken Pydantic schemas"
-```
-
----
-
-### Task 15: SkillCollaborator Service
-
-**Files:**
-- Create: `backend/app/services/skill_collaborator_service.py`
-- Test: `backend/tests/test_api/test_skill_collaborators.py` (later in Task 21)
-
-- [ ] **Step 1: Implement service**
-
-```python
-# backend/app/services/skill_collaborator_service.py
-"""Skill Collaborator Service — add/update/remove collaborators + ownership transfer."""
-
-from __future__ import annotations
-
-import uuid
-from typing import List
-
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
-from app.common.skill_permissions import check_skill_access
-from app.models.skill import Skill
-from app.models.skill_collaborator import CollaboratorRole, SkillCollaborator
-from app.repositories.skill import SkillRepository
-from app.repositories.skill_collaborator import SkillCollaboratorRepository
-
-from .base import BaseService
-
-
-class SkillCollaboratorService(BaseService[SkillCollaborator]):
-    def __init__(self, db):
-        super().__init__(db)
-        self.repo = SkillCollaboratorRepository(db)
-        self.skill_repo = SkillRepository(db)
-
-    async def list_collaborators(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        is_superuser: bool = False,
-    ) -> List[SkillCollaborator]:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.viewer,
-            is_superuser=is_superuser,
-        )
-        return await self.repo.list_by_skill(skill_id)
-
-    async def add_collaborator(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        target_user_id: str,
-        role: CollaboratorRole,
-        is_superuser: bool = False,
-    ) -> SkillCollaborator:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.admin,
-            is_superuser=is_superuser,
-        )
-
-        if target_user_id == skill.owner_id:
-            raise BadRequestException("Cannot add the owner as a collaborator")
-
-        existing = await self.repo.get_by_skill_and_user(skill_id, target_user_id)
-        if existing:
-            raise BadRequestException("User is already a collaborator")
-
-        collab = SkillCollaborator(
-            skill_id=skill_id,
-            user_id=target_user_id,
-            role=role,
-            invited_by=current_user_id,
-        )
-        self.db.add(collab)
-        await self.db.commit()
-        await self.db.refresh(collab)
-        return collab
-
-    async def update_collaborator_role(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        target_user_id: str,
-        new_role: CollaboratorRole,
-        is_superuser: bool = False,
-    ) -> SkillCollaborator:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.admin,
-            is_superuser=is_superuser,
-        )
-
-        collab = await self.repo.get_by_skill_and_user(skill_id, target_user_id)
-        if not collab:
-            raise NotFoundException("Collaborator not found")
-
-        collab.role = new_role
-        await self.db.commit()
-        await self.db.refresh(collab)
-        return collab
-
-    async def remove_collaborator(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        target_user_id: str,
-        is_superuser: bool = False,
-    ) -> None:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.admin,
-            is_superuser=is_superuser,
-        )
-
-        deleted = await self.repo.delete_by_skill_and_user(skill_id, target_user_id)
-        if not deleted:
-            raise NotFoundException("Collaborator not found")
-        await self.db.commit()
-
-    async def transfer_ownership(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        new_owner_id: str,
-    ) -> Skill:
-        """Transfer ownership. Only the current owner can do this."""
-        skill = await self._get_skill_or_404(skill_id)
-
-        if skill.owner_id != current_user_id:
-            raise ForbiddenException("Only the owner can transfer ownership")
-
-        # Check new owner doesn't have a skill with the same name
-        existing = await self.skill_repo.get_by_name_and_owner(skill.name, new_owner_id)
-        if existing:
-            raise BadRequestException(
-                f"New owner already has a skill named '{skill.name}'"
-            )
-
-        # Remove new owner from collaborators if present
-        await self.repo.delete_by_skill_and_user(skill_id, new_owner_id)
-
-        # Add old owner as admin collaborator
-        old_owner_collab = SkillCollaborator(
-            skill_id=skill_id,
-            user_id=current_user_id,
-            role=CollaboratorRole.admin,
-            invited_by=current_user_id,
-        )
-        self.db.add(old_owner_collab)
-
-        # Transfer
-        skill.owner_id = new_owner_id
-        await self.db.commit()
-        await self.db.refresh(skill)
-        return skill
-
-    async def _get_skill_or_404(self, skill_id: uuid.UUID) -> Skill:
-        skill = await self.skill_repo.get(skill_id)
-        if not skill:
-            raise NotFoundException("Skill not found")
-        return skill
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.services.skill_collaborator_service import SkillCollaboratorService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/services/skill_collaborator_service.py
-git commit -m "feat(services): add SkillCollaboratorService"
-```
-
----
-
-### Task 16: SkillVersion Service
-
-**Files:**
-- Create: `backend/app/services/skill_version_service.py`
-
-- [ ] **Step 1: Implement service**
-
-```python
-# backend/app/services/skill_version_service.py
-"""Skill Version Service — publish, list, get, delete, restore."""
-
-from __future__ import annotations
-
-import uuid
-from datetime import datetime, timezone
-from typing import List, Optional
-
-import semver
-
-from app.common.exceptions import BadRequestException, NotFoundException
-from app.common.skill_permissions import check_skill_access
-from app.models.skill import Skill, SkillFile
-from app.models.skill_collaborator import CollaboratorRole
-from app.models.skill_version import SkillVersion, SkillVersionFile
-from app.repositories.skill import SkillFileRepository, SkillRepository
-from app.repositories.skill_version import SkillVersionFileRepository, SkillVersionRepository
-
-from .base import BaseService
-
-
-class SkillVersionService(BaseService[SkillVersion]):
-    def __init__(self, db):
-        super().__init__(db)
-        self.repo = SkillVersionRepository(db)
-        self.file_repo = SkillVersionFileRepository(db)
-        self.skill_repo = SkillRepository(db)
-        self.skill_file_repo = SkillFileRepository(db)
-
-    async def publish_version(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        version_str: str,
-        release_notes: Optional[str] = None,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> SkillVersion:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.publisher,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:publish",
-        )
-
-        # Validate semver format
-        try:
-            new_ver = semver.Version.parse(version_str)
-        except ValueError:
-            raise BadRequestException(
-                f"Invalid version format: '{version_str}'. Must be MAJOR.MINOR.PATCH"
-            )
-        # Reject pre-release / build metadata
-        if new_ver.prerelease or new_ver.build:
-            raise BadRequestException("Pre-release and build metadata are not supported")
-
-        # Check > highest existing
-        highest_str = await self.repo.get_highest_version_str(skill_id)
-        if highest_str:
-            highest = semver.Version.parse(highest_str)
-            if new_ver <= highest:
-                raise BadRequestException(
-                    f"Version {version_str} must be greater than current highest {highest_str}"
-                )
-
-        # Snapshot
-        sv = SkillVersion(
-            skill_id=skill_id,
-            version=version_str,
-            release_notes=release_notes,
-            skill_name=skill.name,
-            skill_description=skill.description,
-            content=skill.content,
-            tags=list(skill.tags) if skill.tags else [],
-            meta_data=dict(skill.meta_data) if skill.meta_data else {},
-            allowed_tools=list(skill.allowed_tools) if skill.allowed_tools else [],
-            compatibility=skill.compatibility,
-            license=skill.license,
-            published_by_id=current_user_id,
-            published_at=datetime.now(timezone.utc),
-        )
-        self.db.add(sv)
-        await self.db.flush()
-        await self.db.refresh(sv)
-
-        # Copy files
-        skill_files = await self.skill_file_repo.list_by_skill(skill_id)
-        for sf in skill_files:
-            vf = SkillVersionFile(
-                version_id=sv.id,
-                path=sf.path,
-                file_name=sf.file_name,
-                file_type=sf.file_type,
-                content=sf.content,
-                storage_type=sf.storage_type,
-                storage_key=sf.storage_key,
-                size=sf.size,
-            )
-            self.db.add(vf)
-
-        await self.db.commit()
-        await self.db.refresh(sv)
-        return sv
-
-    async def list_versions(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> List[SkillVersion]:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.viewer,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:read",
-        )
-        return await self.repo.list_by_skill(skill_id)
-
-    async def get_version(
-        self,
-        skill_id: uuid.UUID,
-        version_str: str,
-        current_user_id: str,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> SkillVersion:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.viewer,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:read",
-        )
-        sv = await self.repo.get_by_version(skill_id, version_str)
-        if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
-        return sv
-
-    async def get_latest_version(
-        self,
-        skill_id: uuid.UUID,
-        current_user_id: str,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> SkillVersion:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.viewer,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:read",
-        )
-        sv = await self.repo.get_latest(skill_id)
-        if not sv:
-            raise NotFoundException("No published versions found")
-        return sv
-
-    async def delete_version(
-        self,
-        skill_id: uuid.UUID,
-        version_str: str,
-        current_user_id: str,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> None:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.admin,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:admin",
-        )
-        sv = await self.repo.get_by_version(skill_id, version_str)
-        if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
-        await self.db.delete(sv)
-        await self.db.commit()
-
-    async def restore_draft(
-        self,
-        skill_id: uuid.UUID,
-        version_str: str,
-        current_user_id: str,
-        is_superuser: bool = False,
-        token_scopes: Optional[List[str]] = None,
-    ) -> Skill:
-        skill = await self._get_skill_or_404(skill_id)
-        await check_skill_access(
-            self.db, skill, current_user_id, CollaboratorRole.publisher,
-            is_superuser=is_superuser,
-            token_scopes=token_scopes, required_scope="skills:write",
-        )
-        sv = await self.repo.get_by_version(skill_id, version_str)
-        if not sv:
-            raise NotFoundException(f"Version {version_str} not found")
-
-        # Overwrite draft
-        skill.name = sv.skill_name
-        skill.description = sv.skill_description
-        skill.content = sv.content
-        skill.tags = list(sv.tags) if sv.tags else []
-        skill.meta_data = dict(sv.meta_data) if sv.meta_data else {}
-        skill.allowed_tools = list(sv.allowed_tools) if sv.allowed_tools else []
-        skill.compatibility = sv.compatibility
-        skill.license = sv.license
-
-        # Replace draft files
-        await self.skill_file_repo.delete_by_skill(skill_id)
-        version_files = await self.file_repo.list_by_version(sv.id)
-        for vf in version_files:
-            sf = SkillFile(
-                skill_id=skill_id,
-                path=vf.path,
-                file_name=vf.file_name,
-                file_type=vf.file_type,
-                content=vf.content,
-                storage_type=vf.storage_type,
-                storage_key=vf.storage_key,
-                size=vf.size,
-            )
-            self.db.add(sf)
-
-        await self.db.commit()
-        await self.db.refresh(skill)
-        return skill
-
-    async def _get_skill_or_404(self, skill_id: uuid.UUID) -> Skill:
-        skill = await self.skill_repo.get_with_files(skill_id)
-        if not skill:
-            raise NotFoundException("Skill not found")
-        return skill
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.services.skill_version_service import SkillVersionService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/services/skill_version_service.py
-git commit -m "feat(services): add SkillVersionService with publish/restore/delete"
-```
-
----
-
-### Task 17: PlatformToken Service
-
-**Files:**
-- Create: `backend/app/services/platform_token_service.py`
-
-- [ ] **Step 1: Implement service**
-
-```python
-# backend/app/services/platform_token_service.py
-"""PlatformToken Service — create, list, revoke."""
-
-from __future__ import annotations
-
-import hashlib
-import secrets
-import uuid
-from datetime import datetime
-from typing import List, Optional, Tuple
-
-from app.common.exceptions import BadRequestException, ForbiddenException, NotFoundException
-from app.models.platform_token import PlatformToken
-from app.repositories.platform_token import PlatformTokenRepository
-
-from .base import BaseService
-
-MAX_ACTIVE_TOKENS_PER_USER = 50
-TOKEN_PREFIX = "sk_"
-
-
-class PlatformTokenService(BaseService[PlatformToken]):
-    def __init__(self, db):
-        super().__init__(db)
-        self.repo = PlatformTokenRepository(db)
-
-    async def create_token(
-        self,
-        user_id: str,
-        name: str,
-        scopes: List[str],
-        resource_type: Optional[str] = None,
-        resource_id: Optional[uuid.UUID] = None,
-        expires_at: Optional[datetime] = None,
-    ) -> Tuple[PlatformToken, str]:
-        """Create a new token. Returns (token_record, plaintext_token)."""
-        # Check limit
-        active_count = await self.repo.count_active_by_user(user_id)
-        if active_count >= MAX_ACTIVE_TOKENS_PER_USER:
-            raise BadRequestException(
-                f"Maximum of {MAX_ACTIVE_TOKENS_PER_USER} active tokens reached"
-            )
-
-        # Generate token
-        raw_secret = secrets.token_urlsafe(36)  # ~48 chars
-        plaintext = f"{TOKEN_PREFIX}{raw_secret}"
-        token_hash = hashlib.sha256(plaintext.encode()).hexdigest()
-        token_prefix = plaintext[:12]
-
-        pt = PlatformToken(
-            user_id=user_id,
-            name=name,
-            token_hash=token_hash,
-            token_prefix=token_prefix,
-            scopes=scopes,
-            resource_type=resource_type,
-            resource_id=resource_id,
-            expires_at=expires_at,
-            is_active=True,
-        )
-        self.db.add(pt)
-        await self.db.commit()
-        await self.db.refresh(pt)
-        return pt, plaintext
-
-    async def list_tokens(self, user_id: str) -> List[PlatformToken]:
-        return await self.repo.list_by_user(user_id)
-
-    async def revoke_token(
-        self,
-        token_id: uuid.UUID,
-        user_id: str,
-    ) -> None:
-        pt = await self.repo.get(token_id)
-        if not pt:
-            raise NotFoundException("Token not found")
-        if pt.user_id != user_id:
-            raise ForbiddenException("You can only revoke your own tokens")
-        pt.is_active = False
-        await self.db.commit()
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.services.platform_token_service import PlatformTokenService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/services/platform_token_service.py
-git commit -m "feat(services): add PlatformTokenService with create/list/revoke"
-```
-
----
-
-### Task 18: Update SkillService — Replace Hardcoded Permission Checks
-
-**Files:**
-- Modify: `backend/app/services/skill_service.py`
-
-- [ ] **Step 1: Add imports at top of skill_service.py**
-
-Add after the existing imports:
-```python
-from app.common.skill_permissions import check_skill_access
-from app.models.skill_collaborator import CollaboratorRole
-```
-
-- [ ] **Step 2: Replace permission checks in `get_skill()`**
-
-Replace lines 66-68:
-```python
-# OLD
-if skill.owner_id and skill.owner_id != current_user_id and not skill.is_public:
-    raise ForbiddenException("You don't have permission to access this skill")
-```
-with:
-```python
-# NEW
-if current_user_id:
-    await check_skill_access(
-        self.db, skill, current_user_id, CollaboratorRole.viewer,
-    )
-elif not skill.is_public:
-    raise ForbiddenException("You don't have permission to access this skill")
-```
-
-- [ ] **Step 3: Replace permission check in `update_skill()`**
-
-Replace lines 310-312:
-```python
-# OLD
-if skill.owner_id != current_user_id:
-    raise ForbiddenException("You can only update your own skills")
-```
-with:
-```python
-# NEW
-await check_skill_access(
-    self.db, skill, current_user_id, CollaboratorRole.editor,
-)
-```
-
-- [ ] **Step 4: Replace permission check in `delete_skill()`**
-
-Replace lines 473-475:
-```python
-# OLD
-if skill.owner_id != current_user_id:
-    raise ForbiddenException("You can only delete your own skills")
-```
-with:
-```python
-# NEW — only owner can delete
-if skill.owner_id != current_user_id:
-    raise ForbiddenException("Only the owner can delete a skill")
-```
-
-(Keep owner-only for delete — spec says owner only.)
-
-- [ ] **Step 5: Replace permission checks in `add_file()`, `delete_file()`, `update_file()`**
-
-In `add_file()` (around line 501-503), replace:
-```python
-if skill.owner_id != current_user_id:
-    raise ForbiddenException("You can only add files to your own skills")
-```
-with:
-```python
-await check_skill_access(
-    self.db, skill, current_user_id, CollaboratorRole.editor,
-)
-```
-
-Apply the same pattern to `delete_file()` (around line 559-561) and `update_file()` (around line 583-585).
-
-- [ ] **Step 6: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.services.skill_service import SkillService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add backend/app/services/skill_service.py
-git commit -m "refactor(services): replace hardcoded owner_id checks with check_skill_access()"
-```
-
----
-
-### Task 19: Skill Versions API Routes
-
-**Files:**
-- Create: `backend/app/api/v1/skill_versions.py`
-
-- [ ] **Step 1: Write the route file**
-
-```python
-"""Skill Version API routes."""
-
-from __future__ import annotations
-
-import uuid
-from typing import Optional
-
-from fastapi import APIRouter, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.auth_dependency import AuthContext, get_current_user_or_token
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.schemas.skill_version import (
-    VersionPublishRequest,
-    VersionRestoreRequest,
-    VersionSchema,
-    VersionSummarySchema,
-)
-from app.services.skill_version_service import SkillVersionService
-
-router = APIRouter(prefix="/v1/skills", tags=["Skill Versions"])
-
-
-@router.post("/{skill_id}/versions")
-async def publish_version(
-    skill_id: uuid.UUID,
-    payload: VersionPublishRequest,
-    db: AsyncSession = Depends(get_db),
-    auth: AuthContext = Depends(get_current_user_or_token),
-):
-    """发布新版本（快照当前 draft）。"""
-    service = SkillVersionService(db)
-    version = await service.publish_version(
-        skill_id=skill_id,
-        current_user_id=auth.user.id,
-        version_str=payload.version,
-        release_notes=payload.release_notes,
-        is_superuser=auth.user.is_superuser,
-        token_scopes=auth.scopes,
-    )
-    return {
-        "success": True,
-        "data": VersionSchema.model_validate(version).model_dump(),
-    }
-
-
-@router.get("/{skill_id}/versions")
-async def list_versions(
-    skill_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    auth: AuthContext = Depends(get_current_user_or_token),
-):
-    """列出所有已发布版本（按版本号降序）。"""
-    service = SkillVersionService(db)
-    versions = await service.list_versions(
-        skill_id=skill_id,
-        current_user_id=auth.user.id,
-        is_superuser=auth.user.is_superuser,
-        token_scopes=auth.scopes,
-    )
-    return {
-        "success": True,
-        "data": [VersionSummarySchema.model_validate(v).model_dump() for v in versions],
-    }
-
-
-@router.get("/{skill_id}/versions/latest")
-async def get_latest_version(
-    skill_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    auth: AuthContext = Depends(get_current_user_or_token),
-):
-    """获取最新已发布版本详情（含文件）。"""
-    service = SkillVersionService(db)
-    version = await service.get_latest_version(
-        skill_id=skill_id,
-        current_user_id=auth.user.id,
-        is_superuser=auth.user.is_superuser,
-        token_scopes=auth.scopes,
-    )
-    return {
-        "success": True,
-        "data": VersionSchema.model_validate(version).model_dump(),
-    }
-
-
-@router.get("/{skill_id}/versions/{version}")
-async def get_version(
-    skill_id: uuid.UUID,
-    version: str,
-    db: AsyncSession = Depends(get_db),
-    auth: AuthContext = Depends(get_current_user_or_token),
-):
-    """获取特定版本详情（含文件）。"""
-    service = SkillVersionService(db)
-    ver = await service.get_version(
-        skill_id=skill_id,
-        version_str=version,
-        current_user_id=auth.user.id,
-        is_superuser=auth.user.is_superuser,
-        token_scopes=auth.scopes,
-    )
-    return {
-        "success": True,
-        "data": VersionSchema.model_validate(ver).model_dump(),
-    }
-
-
-@router.delete("/{skill_id}/versions/{version}")
-async def delete_version(
-    skill_id: uuid.UUID,
-    version: str,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """删除版本（admin+ 权限，仅 session auth）。"""
-    service = SkillVersionService(db)
-    await service.delete_version(
-        skill_id=skill_id,
-        version_str=version,
-        current_user_id=current_user.id,
-        is_superuser=current_user.is_superuser,
-    )
-    return {"success": True}
-
-
-@router.post("/{skill_id}/restore")
-async def restore_version(
-    skill_id: uuid.UUID,
-    payload: VersionRestoreRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """基于历史版本恢复 draft（仅 session auth）。"""
-    service = SkillVersionService(db)
-    skill = await service.restore_draft(
-        skill_id=skill_id,
-        version_str=payload.version,
-        current_user_id=current_user.id,
-        is_superuser=current_user.is_superuser,
-    )
-    from app.schemas.skill import SkillSchema
-
-    return {
-        "success": True,
-        "data": SkillSchema.model_validate(skill).model_dump(),
-    }
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.api.v1.skill_versions import router; print(len(router.routes), 'routes')"`
-Expected: `6 routes`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/skill_versions.py
-git commit -m "feat(api): add skill versions API routes"
-```
-
----
-
-### Task 20: Skill Collaborators API Routes
-
-**Files:**
-- Create: `backend/app/api/v1/skill_collaborators.py`
-
-- [ ] **Step 1: Write the route file**
-
-```python
-"""Skill Collaborator API routes."""
-
-from __future__ import annotations
-
-import uuid
-
-from fastapi import APIRouter, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.schemas.skill_collaborator import (
-    CollaboratorCreate,
-    CollaboratorSchema,
-    CollaboratorUpdate,
-    TransferOwnershipRequest,
-)
-from app.services.skill_collaborator_service import SkillCollaboratorService
-
-router = APIRouter(prefix="/v1/skills", tags=["Skill Collaborators"])
-
-
-@router.get("/{skill_id}/collaborators")
-async def list_collaborators(
-    skill_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """列出 skill 的所有协作者。"""
-    service = SkillCollaboratorService(db)
-    collaborators = await service.list_collaborators(
-        skill_id=skill_id,
-        current_user_id=current_user.id,
-        is_superuser=current_user.is_superuser,
-    )
-    return {
-        "success": True,
-        "data": [CollaboratorSchema.model_validate(c).model_dump() for c in collaborators],
-    }
-
-
-@router.post("/{skill_id}/collaborators")
-async def add_collaborator(
-    skill_id: uuid.UUID,
-    payload: CollaboratorCreate,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """添加协作者（admin+ 权限）。"""
-    service = SkillCollaboratorService(db)
-    collaborator = await service.add_collaborator(
-        skill_id=skill_id,
-        current_user_id=current_user.id,
-        target_user_id=payload.user_id,
-        role=payload.role,
-        is_superuser=current_user.is_superuser,
-    )
-    return {
-        "success": True,
-        "data": CollaboratorSchema.model_validate(collaborator).model_dump(),
-    }
-
-
-@router.put("/{skill_id}/collaborators/{target_user_id}")
-async def update_collaborator(
-    skill_id: uuid.UUID,
-    target_user_id: str,
-    payload: CollaboratorUpdate,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """修改协作者角色（admin+ 权限）。"""
-    service = SkillCollaboratorService(db)
-    collaborator = await service.update_collaborator_role(
-        skill_id=skill_id,
-        current_user_id=current_user.id,
-        target_user_id=target_user_id,
-        new_role=payload.role,
-        is_superuser=current_user.is_superuser,
-    )
-    return {
-        "success": True,
-        "data": CollaboratorSchema.model_validate(collaborator).model_dump(),
-    }
-
-
-@router.delete("/{skill_id}/collaborators/{target_user_id}")
-async def remove_collaborator(
-    skill_id: uuid.UUID,
-    target_user_id: str,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """移除协作者（admin+ 权限）。"""
-    service = SkillCollaboratorService(db)
-    await service.remove_collaborator(
-        skill_id=skill_id,
-        current_user_id=current_user.id,
-        target_user_id=target_user_id,
-        is_superuser=current_user.is_superuser,
-    )
-    return {"success": True}
-
-
-@router.post("/{skill_id}/transfer")
-async def transfer_ownership(
-    skill_id: uuid.UUID,
-    payload: TransferOwnershipRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """转让 ownership（仅 owner 可操作）。"""
-    service = SkillCollaboratorService(db)
-    await service.transfer_ownership(
-        skill_id=skill_id,
-        current_user_id=current_user.id,
-        new_owner_id=payload.new_owner_id,
-        is_superuser=current_user.is_superuser,
-    )
-    return {"success": True}
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.api.v1.skill_collaborators import router; print(len(router.routes), 'routes')"`
-Expected: `5 routes`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/skill_collaborators.py
-git commit -m "feat(api): add skill collaborators API routes"
-```
-
----
-
-### Task 21: Token API Routes
-
-**Files:**
-- Create: `backend/app/api/v1/tokens.py`
-
-- [ ] **Step 1: Write the route file**
-
-```python
-"""PlatformToken API routes.
-
-Token management is session-auth only — PlatformToken cannot manage PlatformToken.
-"""
-
-from __future__ import annotations
-
-import uuid
-
-from fastapi import APIRouter, Depends
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.schemas.platform_token import (
-    TokenCreate,
-    TokenCreateResponse,
-    TokenSchema,
-)
-from app.services.platform_token_service import PlatformTokenService
-
-router = APIRouter(prefix="/v1/tokens", tags=["Tokens"])
-
-
-@router.post("")
-async def create_token(
-    payload: TokenCreate,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """创建 token（返回明文，仅此一次）。"""
-    service = PlatformTokenService(db)
-    token_record, raw_token = await service.create_token(
-        user_id=current_user.id,
-        name=payload.name,
-        scopes=payload.scopes,
-        resource_type=payload.resource_type,
-        resource_id=payload.resource_id,
-        expires_at=payload.expires_at,
-    )
-    resp = TokenCreateResponse.model_validate(token_record)
-    # Inject the raw token (not stored in DB)
-    data = resp.model_dump()
-    data["token"] = raw_token
-    return {"success": True, "data": data}
-
-
-@router.get("")
-async def list_tokens(
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """列出我的 tokens（不含明文，显示 prefix）。"""
-    service = PlatformTokenService(db)
-    tokens = await service.list_tokens(user_id=current_user.id)
-    return {
-        "success": True,
-        "data": [TokenSchema.model_validate(t).model_dump() for t in tokens],
-    }
-
-
-@router.delete("/{token_id}")
-async def revoke_token(
-    token_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """撤销 token（soft delete: is_active = False）。"""
-    service = PlatformTokenService(db)
-    await service.revoke_token(token_id=token_id, user_id=current_user.id)
-    return {"success": True}
-```
-
-- [ ] **Step 2: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.api.v1.tokens import router; print(len(router.routes), 'routes')"`
-Expected: `3 routes`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/api/v1/tokens.py
-git commit -m "feat(api): add platform token API routes"
-```
-
----
-
-### Task 22: Register New Routers
-
-**Files:**
-- Modify: `backend/app/api/v1/__init__.py`
-
-- [ ] **Step 1: Add imports**
-
-After `from .skills import router as skills_router` (line 31), add:
-
-```python
-from .skill_collaborators import router as skill_collaborators_router
-from .skill_versions import router as skill_versions_router
-from .tokens import router as tokens_router
-```
-
-- [ ] **Step 2: Add to ROUTERS list**
-
-After `skills_router,` (line 58), add:
-
-```python
-    skill_versions_router,
-    skill_collaborators_router,
-    tokens_router,
-```
-
-- [ ] **Step 3: Verify import**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.api.v1 import api_router; print(len(api_router.routes), 'total routes')"`
-Expected: prints route count (should be previous count + 14 new routes)
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/api/v1/__init__.py
-git commit -m "feat(api): register skill versions, collaborators, and token routers"
-```
-
----
-
-### Task 23: Update SkillSchema — Add `latest_version` Field
-
-**Files:**
-- Modify: `backend/app/schemas/skill.py:65-133`
-
-- [ ] **Step 1: Add `latest_version` to SkillSchema**
-
-In `SkillSchema` class (line 65), add a new optional field after `files`:
-
-```python
-    files: Optional[List[SkillFileSchema]] = None
-    latest_version: Optional[str] = None
-```
-
-- [ ] **Step 2: Update `map_meta_data_from_attributes` validator**
-
-In the `model_validator` method (line 103-129), update the loop that gets extra attributes (line 120) to include `latest_version`:
-
-Replace:
-```python
-            for key in ["id", "created_at", "updated_at", "files"]:
-```
-with:
-```python
-            for key in ["id", "created_at", "updated_at", "files", "latest_version"]:
-```
-
-- [ ] **Step 3: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.schemas.skill import SkillSchema; print(SkillSchema.model_fields.keys())"`
-Expected: includes `latest_version`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/schemas/skill.py
-git commit -m "feat(schemas): add latest_version field to SkillSchema"
-```
-
----
-
-### Task 24: Populate `latest_version` in SkillService
-
-**Files:**
-- Modify: `backend/app/services/skill_service.py`
-
-Note: Task 11 already handles the `list_by_user()` collaborator subquery. This task adds `latest_version` population.
-
-- [ ] **Step 1: Add helper to populate latest_version**
-
-In `SkillService`, add a helper method:
-
-```python
-from app.repositories.skill_version import SkillVersionRepository
-
-async def _attach_latest_version(self, skill):
-    """Attach latest_version string to skill for API response."""
-    ver_repo = SkillVersionRepository(self.db)
-    latest = await ver_repo.get_latest(skill.id)
-    skill.latest_version = latest.version if latest else None
-    return skill
-```
-
-- [ ] **Step 2: Call helper in `get_skill()`**
-
-At the end of `get_skill()`, before returning the skill, call:
-```python
-skill = await self._attach_latest_version(skill)
-```
-
-- [ ] **Step 3: Verify syntax**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "from app.services.skill_service import SkillService; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/services/skill_service.py
-git commit -m "feat(services): populate latest_version on skill responses"
-```
-
----
-
-### Task 25: Unit Tests — Skill Permissions Utility
-
-**Files:**
-- Create: `backend/tests/test_services/__init__.py`
-- Create: `backend/tests/test_services/test_skill_permissions.py`
-
-- [ ] **Step 1: Create `__init__.py`**
-
-```python
-# (empty)
-```
-
-- [ ] **Step 2: Write tests for `check_skill_access`**
-
-```python
-"""Unit tests for check_skill_access permission utility."""
-
-from __future__ import annotations
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock
-
-import pytest
-
-from app.common.skill_permissions import check_skill_access
-from app.models.skill_collaborator import CollaboratorRole
-
-
-def _mock_skill(owner_id: str = "owner-1", is_public: bool = False):
-    s = MagicMock()
-    s.id = uuid.uuid4()
-    s.owner_id = owner_id
-    s.is_public = is_public
-    return s
-
-
-def _mock_db(collaborator_role=None):
-    """Return an AsyncMock db session.
-
-    If collaborator_role is given, simulate a SkillCollaborator record.
-    """
-    db = AsyncMock()
-    result_mock = MagicMock()
-    if collaborator_role is not None:
-        collab = MagicMock()
-        collab.role = collaborator_role
-        result_mock.scalar_one_or_none.return_value = collab
-    else:
-        result_mock.scalar_one_or_none.return_value = None
-    db.execute.return_value = result_mock
-    return db
-
-
-class TestCheckSkillAccess:
-    """Verify the unified permission checking logic."""
-
-    @pytest.mark.asyncio
-    async def test_owner_always_passes(self):
-        skill = _mock_skill(owner_id="user-1")
-        db = _mock_db()
-        # Owner should pass even with admin requirement
-        await check_skill_access(db, skill, "user-1", CollaboratorRole.admin)
-
-    @pytest.mark.asyncio
-    async def test_superuser_always_passes(self):
-        skill = _mock_skill(owner_id="other")
-        db = _mock_db()
-        # Superuser bypasses all role checks via is_superuser param
-        await check_skill_access(
-            db, skill, "superadmin", CollaboratorRole.admin,
-            is_superuser=True,
-        )
-
-    @pytest.mark.asyncio
-    async def test_collaborator_with_sufficient_role(self):
-        skill = _mock_skill(owner_id="other")
-        db = _mock_db(collaborator_role=CollaboratorRole.editor)
-        await check_skill_access(db, skill, "collab-1", CollaboratorRole.editor)
-
-    @pytest.mark.asyncio
-    async def test_collaborator_with_insufficient_role(self):
-        skill = _mock_skill(owner_id="other")
-        db = _mock_db(collaborator_role=CollaboratorRole.viewer)
-        from app.common.exceptions import ForbiddenException
-
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "collab-1", CollaboratorRole.editor)
-
-    @pytest.mark.asyncio
-    async def test_public_skill_viewer_access(self):
-        skill = _mock_skill(owner_id="other", is_public=True)
-        db = _mock_db()
-        await check_skill_access(db, skill, "random-user", CollaboratorRole.viewer)
-
-    @pytest.mark.asyncio
-    async def test_public_skill_edit_denied(self):
-        skill = _mock_skill(owner_id="other", is_public=True)
-        db = _mock_db()
-        from app.common.exceptions import ForbiddenException
-
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "random-user", CollaboratorRole.editor)
-
-    @pytest.mark.asyncio
-    async def test_no_access_denied(self):
-        skill = _mock_skill(owner_id="other", is_public=False)
-        db = _mock_db()
-        from app.common.exceptions import ForbiddenException
-
-        with pytest.raises(ForbiddenException):
-            await check_skill_access(db, skill, "stranger", CollaboratorRole.viewer)
-```
-
-- [ ] **Step 3: Run tests**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_services/test_skill_permissions.py -v`
-Expected: All 7 tests pass
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/tests/test_services/
-git commit -m "test: add unit tests for check_skill_access permission utility"
-```
-
----
-
-### Task 26: Unit Tests — Skill Version Service
-
-**Files:**
-- Create: `backend/tests/test_services/test_skill_version_service.py`
-
-- [ ] **Step 1: Write tests**
-
-```python
-"""Unit tests for SkillVersionService."""
-
-from __future__ import annotations
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-
-def _mock_skill(owner_id="user-1", name="test-skill", content="body"):
-    s = MagicMock()
-    s.id = uuid.uuid4()
-    s.owner_id = owner_id
-    s.name = name
-    s.description = "desc"
-    s.content = content
-    s.tags = ["a"]
-    s.meta_data = {}
-    s.allowed_tools = []
-    s.compatibility = None
-    s.license = None
-    s.is_public = False
-    s.files = []
-    return s
-
-
-def _mock_db():
-    db = AsyncMock()
-    db.commit = AsyncMock()
-    db.flush = AsyncMock()
-    db.refresh = AsyncMock()
-    db.add = MagicMock()
-    return db
-
-
-class TestSkillVersionServicePublish:
-    """Test version publishing logic."""
-
-    @pytest.mark.asyncio
-    async def test_publish_validates_semver_format(self):
-        """Invalid semver should raise BadRequestException."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        skill = _mock_skill()
-        with patch("app.services.skill_version_service.SkillRepository") as MockSkillRepo, \
-             patch("app.services.skill_version_service.SkillVersionRepository") as MockVerRepo, \
-             patch("app.services.skill_version_service.check_skill_access", new_callable=AsyncMock):
-            MockSkillRepo.return_value.get.return_value = skill
-            from app.services.skill_version_service import SkillVersionService
-
-            service = SkillVersionService(db)
-            with pytest.raises(BadRequestException, match="semver"):
-                await service.publish_version(
-                    skill_id=skill.id, user_id="user-1",
-                    version="invalid", release_notes="",
-                )
-
-    @pytest.mark.asyncio
-    async def test_publish_rejects_lower_version(self):
-        """New version must be greater than existing highest."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        skill = _mock_skill()
-        existing_version = MagicMock()
-        existing_version.version = "2.0.0"
-
-        with patch("app.services.skill_version_service.SkillRepository") as MockSkillRepo, \
-             patch("app.services.skill_version_service.SkillVersionRepository") as MockVerRepo, \
-             patch("app.services.skill_version_service.check_skill_access", new_callable=AsyncMock):
-            MockSkillRepo.return_value.get.return_value = skill
-            MockVerRepo.return_value.get_latest_version.return_value = existing_version
-            from app.services.skill_version_service import SkillVersionService
-
-            service = SkillVersionService(db)
-            with pytest.raises(BadRequestException, match="greater"):
-                await service.publish_version(
-                    skill_id=skill.id, user_id="user-1",
-                    version="1.0.0", release_notes="",
-                )
-```
-
-- [ ] **Step 2: Run tests**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_services/test_skill_version_service.py -v`
-Expected: All 2 tests pass
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/tests/test_services/test_skill_version_service.py
-git commit -m "test: add unit tests for SkillVersionService publish logic"
-```
-
----
-
-### Task 27: Unit Tests — Platform Token Service
-
-**Files:**
-- Create: `backend/tests/test_services/test_platform_token_service.py`
-
-- [ ] **Step 1: Write tests**
-
-```python
-"""Unit tests for PlatformTokenService."""
-
-from __future__ import annotations
-
-import uuid
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
-
-
-def _mock_db():
-    db = AsyncMock()
-    db.commit = AsyncMock()
-    db.flush = AsyncMock()
-    db.refresh = AsyncMock()
-    db.add = MagicMock()
-    return db
-
-
-class TestPlatformTokenServiceCreate:
-    """Test token creation logic."""
-
-    @pytest.mark.asyncio
-    async def test_create_returns_raw_token_starting_with_sk(self):
-        """Created token should start with 'sk_' prefix."""
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user.return_value = 0
-            MockRepo.return_value.create.return_value = MagicMock(
-                id=uuid.uuid4(),
-                token_prefix="sk_testprefix",
-            )
-            db.refresh = AsyncMock()
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            record, raw_token = await service.create_token(
-                user_id="user-1",
-                name="test",
-                scopes=["skills:read"],
-            )
-            assert raw_token.startswith("sk_")
-            assert len(raw_token) > 12
-
-    @pytest.mark.asyncio
-    async def test_create_rejects_when_limit_exceeded(self):
-        """Should raise BadRequestException when user has 50 active tokens."""
-        from app.common.exceptions import BadRequestException
-
-        db = _mock_db()
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.count_active_by_user.return_value = 50
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(BadRequestException, match="50"):
-                await service.create_token(
-                    user_id="user-1",
-                    name="test",
-                    scopes=["skills:read"],
-                )
-
-
-class TestPlatformTokenServiceRevoke:
-    """Test token revocation logic."""
-
-    @pytest.mark.asyncio
-    async def test_revoke_sets_inactive(self):
-        """Revoke should set is_active to False."""
-        db = _mock_db()
-        token = MagicMock()
-        token.id = uuid.uuid4()
-        token.user_id = "user-1"
-        token.is_active = True
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.get.return_value = token
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            await service.revoke_token(token_id=token.id, user_id="user-1")
-            assert token.is_active is False
-
-    @pytest.mark.asyncio
-    async def test_revoke_wrong_user_denied(self):
-        """Should raise ForbiddenException when revoking another user's token."""
-        from app.common.exceptions import ForbiddenException
-
-        db = _mock_db()
-        token = MagicMock()
-        token.id = uuid.uuid4()
-        token.user_id = "user-1"
-        token.is_active = True
-        with patch("app.services.platform_token_service.PlatformTokenRepository") as MockRepo:
-            MockRepo.return_value.get.return_value = token
-            from app.services.platform_token_service import PlatformTokenService
-
-            service = PlatformTokenService(db)
-            with pytest.raises(ForbiddenException):
-                await service.revoke_token(token_id=token.id, user_id="user-2")
-```
-
-- [ ] **Step 2: Run tests**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_services/test_platform_token_service.py -v`
-Expected: All 4 tests pass
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/tests/test_services/test_platform_token_service.py
-git commit -m "test: add unit tests for PlatformTokenService"
-```
-
----
-
-## Summary
-
-| Task | Component | Files |
-|------|-----------|-------|
-| 1 | CollaboratorRole enum + SkillCollaborator model | `models/skill_collaborator.py` |
-| 2 | SkillVersion + SkillVersionFile models | `models/skill_version.py` |
-| 3 | PlatformToken model | `models/platform_token.py` |
-| 4 | Register models in `__init__` | `models/__init__.py` |
-| 5 | Alembic migration | `alembic/versions/...` |
-| 6 | Skill permissions utility | `common/skill_permissions.py` |
-| 7 | Dual-mode auth dependency | `common/auth_dependency.py` |
-| 8 | SkillCollaborator repository | `repositories/skill_collaborator.py` |
-| 9 | SkillVersion + SkillVersionFile repository | `repositories/skill_version.py` |
-| 10 | PlatformToken repository | `repositories/platform_token.py` |
-| 11 | Extend `list_by_user()` with collaborator subquery | `repositories/skill.py` |
-| 12 | SkillCollaborator schemas | `schemas/skill_collaborator.py` |
-| 13 | SkillVersion schemas | `schemas/skill_version.py` |
-| 14 | PlatformToken schemas | `schemas/platform_token.py` |
-| 15 | SkillCollaboratorService | `services/skill_collaborator_service.py` |
-| 16 | SkillVersionService | `services/skill_version_service.py` |
-| 17 | PlatformTokenService | `services/platform_token_service.py` |
-| 18 | Update SkillService permission checks | `services/skill_service.py` |
-| 19 | Skill Versions API routes | `api/v1/skill_versions.py` |
-| 20 | Skill Collaborators API routes | `api/v1/skill_collaborators.py` |
-| 21 | Token API routes | `api/v1/tokens.py` |
-| 22 | Register new routers | `api/v1/__init__.py` |
-| 23 | SkillSchema `latest_version` field | `schemas/skill.py` |
-| 24 | Populate `latest_version` in SkillService | `services/skill_service.py` |
-| 25 | Tests — skill permissions | `tests/test_services/test_skill_permissions.py` |
-| 26 | Tests — version service | `tests/test_services/test_skill_version_service.py` |
-| 27 | Tests — token service | `tests/test_services/test_platform_token_service.py` |
diff --git a/docs/superpowers/plans/2026-03-21-chat-layout-interaction-alignment.md b/docs/superpowers/plans/2026-03-21-chat-layout-interaction-alignment.md
deleted file mode 100644
index 23b48277f..000000000
--- a/docs/superpowers/plans/2026-03-21-chat-layout-interaction-alignment.md
+++ /dev/null
@@ -1,731 +0,0 @@
-# Chat Layout & Interaction Alignment Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Align the Chat page's layout structure and interaction patterns with the Skill page by refactoring the sidebar, upgrading mode cards, and redesigning the input area.
-
-**Architecture:** Extract duplicated sidebar JSX into a reusable `ConversationGroup` component, replace conditional DOM mount/unmount with `ResizablePanel` collapsible animation, upgrade mode card styling to match SkillCard, and compact the input area to match Skill Creator's gray-bg pill pattern.
-
-**Tech Stack:** Next.js, React, Tailwind CSS, react-resizable-panels, lucide-react, shadcn/ui AlertDialog
-
-**Spec:** `docs/superpowers/specs/2026-03-21-chat-layout-interaction-alignment-design.md`
-
-**Verification:** No test infrastructure exists in frontend. All verification is visual — run `npm run dev` from `frontend/` and check the Chat page in browser.
-
----
-
-## File Structure
-
-| File | Action | Responsibility |
-|------|--------|---------------|
-| `frontend/app/chat/components/ConversationGroup.tsx` | Create | `ConversationItem` + `ConversationGroup` — extracted sidebar row + group |
-| `frontend/app/chat/components/ChatSidebar.tsx` | Modify | Use `ConversationGroup` instead of 3 duplicated blocks |
-| `frontend/app/chat/hooks/useChatReducer.ts` | Modify | Add `SET_SIDEBAR_VISIBLE` action |
-| `frontend/app/chat/ChatLayout.tsx` | Modify | Collapsible sidebar panel with ref-based toggle |
-| `frontend/app/chat/components/ChatHome.tsx` | Modify | Mode card styling + input area compaction |
-| `frontend/app/chat/components/ChatInput.tsx` | Modify | Input area compaction |
-| `frontend/app/chat/conversation/ConversationPanel.tsx` | Modify | Input wrapper styling |
-
----
-
-### Task 1: Extract ConversationGroup Component (Area 1)
-
-**Files:**
-- Create: `frontend/app/chat/components/ConversationGroup.tsx`
-- Modify: `frontend/app/chat/components/ChatSidebar.tsx`
-
-- [ ] **Step 1: Create `ConversationGroup.tsx` with both components**
-
-Create `frontend/app/chat/components/ConversationGroup.tsx`:
-
-```tsx
-'use client'
-
-import { MessageSquare, Trash2, ChevronDown, ChevronRight } from 'lucide-react'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from '@/components/ui/alert-dialog'
-import { cn } from '@/lib/utils'
-import { useTranslation } from '@/lib/i18n'
-
-interface Conversation {
-  thread_id: string
-  title: string
-  updated_at: string
-}
-
-interface ConversationItemProps {
-  conv: Conversation
-  isActive: boolean
-  isCollapsed: boolean
-  onSelect: (threadId: string) => void
-  onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void
-  formatTime: (date: string) => string
-  deleteConfirmOpen: boolean
-  conversationToDelete: { threadId: string; title: string } | null
-  onDeleteConfirmChange: (open: boolean) => void
-  onConfirmDelete: () => void
-  onCancelDelete: () => void
-}
-
-function ConversationItem({
-  conv,
-  isActive,
-  isCollapsed,
-  onSelect,
-  onDeleteClick,
-  formatTime,
-  deleteConfirmOpen,
-  conversationToDelete,
-  onDeleteConfirmChange,
-  onConfirmDelete,
-  onCancelDelete,
-}: ConversationItemProps) {
-  const { t } = useTranslation()
-
-  if (isCollapsed) {
-    return (
-      <div
-        className={cn(
-          'flex cursor-pointer items-center justify-center rounded-lg p-2 transition-colors hover:bg-gray-100',
-          isActive && 'bg-blue-50',
-        )}
-        onClick={() => onSelect(conv.thread_id)}
-        title={conv.title || t('chat.untitled')}
-      >
-        <MessageSquare size={16} className={isActive ? 'text-blue-600' : 'text-gray-500'} />
-      </div>
-    )
-  }
-
-  return (
-    <div
-      className={cn(
-        'group flex cursor-pointer items-center gap-3 rounded-lg px-3 py-2 transition-colors hover:bg-gray-100',
-        isActive && 'bg-blue-50',
-      )}
-      onClick={() => onSelect(conv.thread_id)}
-    >
-      <MessageSquare
-        size={16}
-        className={cn('flex-shrink-0', isActive ? 'text-blue-600' : 'text-gray-400')}
-      />
-      <div className="min-w-0 flex-1">
-        <p
-          className={cn(
-            'truncate text-sm',
-            isActive ? 'font-medium text-blue-600' : 'text-gray-700',
-          )}
-        >
-          {conv.title || t('chat.untitled')}
-        </p>
-        <p className="text-xs text-gray-400">{formatTime(conv.updated_at)}</p>
-      </div>
-      <AlertDialog
-        open={deleteConfirmOpen && conversationToDelete?.threadId === conv.thread_id}
-        onOpenChange={onDeleteConfirmChange}
-      >
-        <AlertDialogTrigger asChild>
-          <button
-            className="flex-shrink-0 rounded p-1 opacity-0 transition-opacity hover:bg-gray-200 group-hover:opacity-100"
-            onClick={(e) => onDeleteClick(e, conv.thread_id, conv.title)}
-          >
-            <Trash2 size={14} className="text-gray-400 hover:text-red-500" />
-          </button>
-        </AlertDialogTrigger>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{t('chat.deleteConversation')}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {t('chat.deleteConversationConfirm', {
-                title: conversationToDelete?.title || t('chat.untitled'),
-              })}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel onClick={onCancelDelete}>{t('common.cancel')}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={onConfirmDelete}
-              className="bg-red-500 hover:bg-red-600"
-            >
-              {t('common.delete')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  )
-}
-
-interface ConversationGroupProps {
-  label: string
-  conversations: Conversation[]
-  isExpanded: boolean
-  onToggleExpand: () => void
-  isCollapsed: boolean
-  currentThreadId: string | null
-  onSelectConversation: (threadId: string) => void
-  onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void
-  formatTime: (date: string) => string
-  maxItems?: number
-  deleteConfirmOpen: boolean
-  conversationToDelete: { threadId: string; title: string } | null
-  onDeleteConfirmChange: (open: boolean) => void
-  onConfirmDelete: () => void
-  onCancelDelete: () => void
-}
-
-export default function ConversationGroup({
-  label,
-  conversations,
-  isExpanded,
-  onToggleExpand,
-  isCollapsed,
-  currentThreadId,
-  onSelectConversation,
-  onDeleteClick,
-  formatTime,
-  maxItems,
-  deleteConfirmOpen,
-  conversationToDelete,
-  onDeleteConfirmChange,
-  onConfirmDelete,
-  onCancelDelete,
-}: ConversationGroupProps) {
-  if (conversations.length === 0) return null
-
-  const displayConversations = maxItems ? conversations.slice(0, maxItems) : conversations
-
-  return (
-    <div className="mb-2">
-      {!isCollapsed && (
-        <button
-          className="flex w-full items-center gap-1 px-3 py-1.5 text-xs font-medium text-gray-500 hover:text-gray-700"
-          onClick={onToggleExpand}
-        >
-          {isExpanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
-          {label}
-          <span className="ml-auto text-gray-400">{conversations.length}</span>
-        </button>
-      )}
-      {(isExpanded || isCollapsed) && (
-        <div className="space-y-0.5">
-          {displayConversations.map((conv) => (
-            <ConversationItem
-              key={conv.thread_id}
-              conv={conv}
-              isActive={currentThreadId === conv.thread_id}
-              isCollapsed={isCollapsed}
-              onSelect={onSelectConversation}
-              onDeleteClick={onDeleteClick}
-              formatTime={formatTime}
-              deleteConfirmOpen={deleteConfirmOpen}
-              conversationToDelete={conversationToDelete}
-              onDeleteConfirmChange={onDeleteConfirmChange}
-              onConfirmDelete={onConfirmDelete}
-              onCancelDelete={onCancelDelete}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  )
-}
-```
-
-- [ ] **Step 2: Refactor ChatSidebar to use ConversationGroup**
-
-In `frontend/app/chat/components/ChatSidebar.tsx`:
-
-**2a.** Add import at top (after other imports):
-```tsx
-import ConversationGroup from './ConversationGroup'
-```
-
-**2b.** Replace the three state variables (lines 81-83):
-```tsx
-// Before:
-const [isTodayCollapsed, setIsTodayCollapsed] = useState(false)
-const [isThisMonthCollapsed, setIsThisMonthCollapsed] = useState(true)
-const [isOlderCollapsed, setIsOlderCollapsed] = useState(true)
-
-// After:
-const [isTodayExpanded, setIsTodayExpanded] = useState(true)
-const [isThisMonthExpanded, setIsThisMonthExpanded] = useState(false)
-const [isOlderExpanded, setIsOlderExpanded] = useState(false)
-```
-
-**2c.** Replace the entire conversation list section (the three groups of todayConvs, monthConvs, olderConvs — approximately lines 185-535) with:
-
-```tsx
-<ConversationGroup
-  label={t('chat.today')}
-  conversations={todayConvs}
-  isExpanded={isTodayExpanded}
-  onToggleExpand={() => setIsTodayExpanded(!isTodayExpanded)}
-  isCollapsed={isCollapsed}
-  currentThreadId={currentThreadId}
-  onSelectConversation={onSelectConversation}
-  onDeleteClick={handleDeleteConversation}
-  formatTime={formatTime}
-  deleteConfirmOpen={deleteConfirmOpen}
-  conversationToDelete={conversationToDelete}
-  onDeleteConfirmChange={setDeleteConfirmOpen}
-  onConfirmDelete={handleConfirmDelete}
-  onCancelDelete={handleCancelDelete}
-/>
-<ConversationGroup
-  label={t('chat.thisMonth')}
-  conversations={monthConvs}
-  isExpanded={isThisMonthExpanded}
-  onToggleExpand={() => setIsThisMonthExpanded(!isThisMonthExpanded)}
-  isCollapsed={isCollapsed}
-  currentThreadId={currentThreadId}
-  onSelectConversation={onSelectConversation}
-  onDeleteClick={handleDeleteConversation}
-  formatTime={formatTime}
-  deleteConfirmOpen={deleteConfirmOpen}
-  conversationToDelete={conversationToDelete}
-  onDeleteConfirmChange={setDeleteConfirmOpen}
-  onConfirmDelete={handleConfirmDelete}
-  onCancelDelete={handleCancelDelete}
-/>
-<ConversationGroup
-  label={t('chat.older')}
-  conversations={olderConvs}
-  isExpanded={isOlderExpanded}
-  onToggleExpand={() => setIsOlderExpanded(!isOlderExpanded)}
-  isCollapsed={isCollapsed}
-  currentThreadId={currentThreadId}
-  onSelectConversation={onSelectConversation}
-  onDeleteClick={handleDeleteConversation}
-  formatTime={formatTime}
-  maxItems={10}
-  deleteConfirmOpen={deleteConfirmOpen}
-  conversationToDelete={conversationToDelete}
-  onDeleteConfirmChange={setDeleteConfirmOpen}
-  onConfirmDelete={handleConfirmDelete}
-  onCancelDelete={handleCancelDelete}
-/>
-```
-
-**2d.** Remove unused imports that were only used by the inlined conversation rows: `MessageSquare`, `Trash2`, `ChevronDown`, `ChevronRight` (if no longer referenced elsewhere in the file), and remove all `AlertDialog*` imports.
-
-**2e.** The existing `handleDeleteConversation` handler (line 101) is kept as-is. Add two new handlers for confirm/cancel if they don't exist:
-
-```tsx
-const handleConfirmDelete = async () => {
-  if (conversationToDelete) {
-    await deleteConversation(conversationToDelete.threadId)
-  }
-  setDeleteConfirmOpen(false)
-  setConversationToDelete(null)
-}
-
-const handleCancelDelete = () => {
-  setDeleteConfirmOpen(false)
-  setConversationToDelete(null)
-}
-```
-
-Check the existing code — if `handleConfirmDelete` already exists with this logic inline in the AlertDialog, extract it. If `handleCancelDelete` logic is inline, extract it too.
-
-- [ ] **Step 3: Visual verification**
-
-Run: `cd frontend && npm run dev`
-
-Check:
-- Sidebar shows three conversation groups (Today, This Month, Older)
-- Clicking group headers expands/collapses them
-- Today and This Month start expanded, Older starts collapsed
-- Conversation rows show icon, title, time, delete button on hover
-- Delete confirmation dialog works
-- Active conversation is highlighted in blue
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/components/ConversationGroup.tsx frontend/app/chat/components/ChatSidebar.tsx
-git commit -m "refactor: extract ConversationGroup component from ChatSidebar to deduplicate conversation row JSX"
-```
-
----
-
-### Task 2: Sidebar Collapse Animation (Area 2)
-
-**Files:**
-- Modify: `frontend/app/chat/hooks/useChatReducer.ts`
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-
-- [ ] **Step 1: Add `SET_SIDEBAR_VISIBLE` action to reducer**
-
-In `frontend/app/chat/hooks/useChatReducer.ts`:
-
-**1a.** Add to the `ChatAction` type union (near line 95 where other actions are defined):
-```tsx
-| { type: 'SET_SIDEBAR_VISIBLE'; visible: boolean }
-```
-
-**1b.** Add reducer case (near `TOGGLE_SIDEBAR` case around line 266):
-```tsx
-case 'SET_SIDEBAR_VISIBLE':
-  return { ...state, ui: { ...state.ui, sidebarVisible: action.visible } }
-```
-
-- [ ] **Step 2: Refactor ChatLayout sidebar to use collapsible panel**
-
-In `frontend/app/chat/ChatLayout.tsx`:
-
-**2a.** Update imports — add `ImperativePanelHandle` from `react-resizable-panels` and `useRef` is already imported:
-```tsx
-// Before (line 8):
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable'
-
-// After:
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable'
-import type { ImperativePanelHandle } from 'react-resizable-panels'
-```
-
-**2b.** Add panel ref after other refs (around line 44):
-```tsx
-const sidebarPanelRef = useRef<ImperativePanelHandle>(null)
-```
-
-**2c.** Replace the Cmd+B shortcut handler (lines 48-57):
-```tsx
-// Before:
-useEffect(() => {
-  const handleKeyDown = (e: KeyboardEvent) => {
-    if ((e.metaKey || e.ctrlKey) && e.key === 'b') {
-      e.preventDefault()
-      dispatch({ type: 'TOGGLE_SIDEBAR' })
-    }
-  }
-  window.addEventListener('keydown', handleKeyDown)
-  return () => window.removeEventListener('keydown', handleKeyDown)
-}, [dispatch])
-
-// After:
-useEffect(() => {
-  const handleKeyDown = (e: KeyboardEvent) => {
-    if ((e.metaKey || e.ctrlKey) && e.key === 'b') {
-      e.preventDefault()
-      if (state.ui.sidebarVisible) {
-        sidebarPanelRef.current?.collapse()
-      } else {
-        sidebarPanelRef.current?.expand()
-      }
-    }
-  }
-  window.addEventListener('keydown', handleKeyDown)
-  return () => window.removeEventListener('keydown', handleKeyDown)
-}, [state.ui.sidebarVisible])
-```
-
-**2d.** Replace the header toggle button onClick (line 258):
-```tsx
-// Before:
-onClick={() => dispatch({ type: 'TOGGLE_SIDEBAR' })}
-
-// After:
-onClick={() => {
-  if (state.ui.sidebarVisible) {
-    sidebarPanelRef.current?.collapse()
-  } else {
-    sidebarPanelRef.current?.expand()
-  }
-}}
-```
-
-**2e.** Replace the sidebar panel section (lines 322-341):
-```tsx
-// Before:
-{state.ui.sidebarVisible && (
-  <>
-    <ResizablePanel
-      defaultSize={12}
-      minSize={10}
-      maxSize={25}
-      className="transition-all duration-300"
-    >
-      <ChatSidebar
-        isCollapsed={false}
-        onToggle={() => dispatch({ type: 'TOGGLE_SIDEBAR' })}
-        onSelectConversation={handleSelectConversation}
-        currentThreadId={state.threadId}
-        onNewChat={handleNewChat}
-      />
-    </ResizablePanel>
-    <ResizableHandle className="w-px bg-gray-200" />
-  </>
-)}
-
-// After:
-<ResizablePanel
-  ref={sidebarPanelRef}
-  defaultSize={12}
-  minSize={10}
-  maxSize={25}
-  collapsible
-  collapsedSize={0}
-  onCollapse={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: false })}
-  onExpand={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: true })}
-  className="overflow-hidden transition-all duration-300"
->
-  <ChatSidebar
-    isCollapsed={!state.ui.sidebarVisible}
-    onToggle={() => {
-      if (state.ui.sidebarVisible) {
-        sidebarPanelRef.current?.collapse()
-      } else {
-        sidebarPanelRef.current?.expand()
-      }
-    }}
-    onSelectConversation={handleSelectConversation}
-    currentThreadId={state.threadId}
-    onNewChat={handleNewChat}
-  />
-</ResizablePanel>
-<ResizableHandle className="w-px bg-gray-200" />
-```
-
-- [ ] **Step 3: Visual verification**
-
-Run: `cd frontend && npm run dev`
-
-Check:
-- Sidebar toggle button collapses/expands the sidebar
-- Cmd+B shortcut works
-- Sidebar animates (or at least doesn't flash/unmount)
-- When collapsed, sidebar takes zero width
-- ResizableHandle remains visible as panel edge
-- Sidebar isCollapsed prop now triggers icon-only mode in ChatSidebar (if collapsed while visible)
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/hooks/useChatReducer.ts frontend/app/chat/ChatLayout.tsx
-git commit -m "feat: replace sidebar mount/unmount with ResizablePanel collapsible animation"
-```
-
----
-
-### Task 3: Mode Card Beautification (Area 3)
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
-- [ ] **Step 1: Update mode card container className**
-
-In `frontend/app/chat/components/ChatHome.tsx`, find the mode card `className` (around line 644-648):
-
-```tsx
-// Before:
-'group flex cursor-pointer items-start gap-4 rounded-xl border p-4 transition-all',
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-  : 'border-gray-200 bg-white hover:border-blue-300 hover:shadow-md',
-
-// After:
-'group flex cursor-pointer items-start gap-4 overflow-hidden rounded-xl border bg-white p-4 transition-all duration-200',
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-  : 'border-gray-200 hover:border-blue-200 hover:shadow-lg',
-```
-
-- [ ] **Step 2: Update icon container className**
-
-Find the icon container inside each card (around line 651-654):
-
-```tsx
-// Before:
-<div className={cn(
-  'rounded-lg p-2 transition-colors',
-  isSelected ? 'bg-blue-100' : 'bg-gray-50 group-hover:bg-blue-50',
-)}>
-
-// After:
-<div className="rounded-lg border border-blue-100 bg-blue-50 p-2">
-```
-
-- [ ] **Step 3: Visual verification**
-
-Run: `cd frontend && npm run dev`
-
-Navigate to Chat home page. Check:
-- Mode cards have smooth `duration-200` hover transition
-- Hover shows `shadow-lg` and `border-blue-200` (softer than before)
-- Icon containers are uniformly blue (`bg-blue-50` with `border-blue-100`) regardless of selected state
-- Selected card still shows blue ring and blue background
-- Cards have `overflow-hidden`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatHome.tsx
-git commit -m "style: upgrade mode card styling to match SkillCard design language"
-```
-
----
-
-### Task 4: Input Area Alignment (Area 4)
-
-**Files:**
-- Modify: `frontend/app/chat/conversation/ConversationPanel.tsx`
-- Modify: `frontend/app/chat/components/ChatInput.tsx`
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
-- [ ] **Step 1: Update ConversationPanel input wrapper**
-
-In `frontend/app/chat/conversation/ConversationPanel.tsx` line 76:
-
-```tsx
-// Before:
-<div className="bg-white px-6 py-4 shadow-[0_-4px_24px_-4px_rgba(0,0,0,0.06)]">
-
-// After:
-<div className="border-t border-gray-100 bg-white p-4">
-```
-
-- [ ] **Step 2: Update ChatInput container**
-
-In `frontend/app/chat/components/ChatInput.tsx` line 134:
-
-```tsx
-// Before:
-'flex items-end gap-3 rounded-[24px] border border-gray-200 bg-white p-4 shadow-md transition-all',
-
-// After:
-'flex items-end gap-2 rounded-2xl border border-gray-200 bg-gray-50 px-4 py-3 transition-all',
-```
-
-- [ ] **Step 3: Update ChatInput textarea**
-
-In `frontend/app/chat/components/ChatInput.tsx` line 157:
-
-```tsx
-// Before:
-className="max-h-[200px] min-h-[100px] flex-1 resize-none overflow-y-auto border-none bg-transparent px-0.5 pb-6 pt-4 text-base shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-
-// After:
-className="max-h-[160px] min-h-[24px] flex-1 resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-```
-
-- [ ] **Step 4: Update ChatInput buttons**
-
-In `frontend/app/chat/components/ChatInput.tsx`:
-
-Attach button (line 169): change `h-10 w-10 rounded-2xl` to `h-8 w-8 rounded-xl`
-Stop button (line 180): change `h-10 w-10` to `h-8 w-8`
-Send button (line 191): change `h-10 w-10` to `h-8 w-8`
-
-- [ ] **Step 5: Update ChatInput auto-resize cap**
-
-In `frontend/app/chat/components/ChatInput.tsx` line 58:
-
-```tsx
-// Before:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 200)}px`
-
-// After:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-```
-
-- [ ] **Step 6: Update ChatHome input outer container**
-
-In `frontend/app/chat/components/ChatHome.tsx` around line 419:
-
-```tsx
-// Before:
-<div className="rounded-[24px] border border-gray-200 bg-white shadow-sm transition-all">
-
-// After:
-<div className="rounded-2xl border border-gray-200 bg-gray-50 transition-all">
-```
-
-- [ ] **Step 7: Update ChatHome input inner container**
-
-In `frontend/app/chat/components/ChatHome.tsx` around line 420:
-
-```tsx
-// Before:
-<div className="flex w-full flex-col gap-2 p-2 pb-3">
-
-// After:
-<div className="flex w-full flex-col gap-2 px-4 py-3">
-```
-
-- [ ] **Step 8: Update ChatHome textarea**
-
-In `frontend/app/chat/components/ChatHome.tsx` around line 480:
-
-```tsx
-// Before:
-className="max-h-[240px] min-h-[120px] w-full resize-none overflow-y-auto border-none bg-transparent px-1 pb-14 pt-5 text-base shadow-none transition-all duration-200 placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-
-// After:
-className="max-h-[160px] min-h-[24px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-```
-
-- [ ] **Step 9: Update ChatHome bottom buttons position**
-
-In `frontend/app/chat/components/ChatHome.tsx` around line 484, the absolutely-positioned buttons container:
-
-```tsx
-// Before:
-absolute bottom-2 left-1
-
-// After:
-absolute bottom-1 left-1
-```
-
-- [ ] **Step 10: Update ChatHome buttons size**
-
-In `frontend/app/chat/components/ChatHome.tsx` (lines 552-609), change all button sizes:
-
-All `h-10 w-10` → `h-8 w-8` (attach, stop, send buttons)
-
-- [ ] **Step 11: Update ChatHome auto-resize cap**
-
-In `frontend/app/chat/components/ChatHome.tsx` around line 137:
-
-```tsx
-// Before:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 200)}px`
-
-// After:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-```
-
-- [ ] **Step 12: Visual verification**
-
-Run: `cd frontend && npm run dev`
-
-Check Chat home page:
-- Input area uses gray background (`bg-gray-50`)
-- Input is compact — no oversized textarea
-- Buttons are smaller (`h-8 w-8`)
-- No bottom overflow on small viewports
-- Text is `text-sm` (not `text-base`)
-- Bottom buttons don't overlap text content
-
-Check Chat conversation page:
-- Input wrapper has subtle `border-t` instead of heavy shadow
-- Input container matches home page styling
-- Textarea starts small and grows with content up to 160px max
-
-- [ ] **Step 13: Commit**
-
-```bash
-git add frontend/app/chat/conversation/ConversationPanel.tsx frontend/app/chat/components/ChatInput.tsx frontend/app/chat/components/ChatHome.tsx
-git commit -m "style: compact input area to match Skill Creator pattern"
-```
diff --git a/docs/superpowers/plans/2026-03-21-chat-ui-beautification.md b/docs/superpowers/plans/2026-03-21-chat-ui-beautification.md
deleted file mode 100644
index ab6023c90..000000000
--- a/docs/superpowers/plans/2026-03-21-chat-ui-beautification.md
+++ /dev/null
@@ -1,622 +0,0 @@
-# Chat UI Beautification Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Align the Chat page's visual quality with the Skill page by establishing a consistent blue brand color, improving surface depth, upgrading message bubbles, sidebar, header, empty/loading states, and standardizing animations.
-
-**Architecture:** Pure CSS/Tailwind class changes across 8 existing files. No new components, no state changes, no business logic changes. One new import (`getModeConfig`) in ChatLayout for header title derivation.
-
-**Tech Stack:** Next.js App Router, Tailwind CSS, shadcn/ui `<Button>`, `lucide-react` icons, `cn()` utility from `@/lib/utils`, `useTranslation()` i18n hook.
-
----
-
-## File Map
-
-| File | Action | Responsibility |
-|------|--------|---------------|
-| `frontend/app/chat/components/MessageItem.tsx` | Modify | User bubble dark bg, AI card container, avatar gradient, label badge, user animation |
-| `frontend/app/chat/components/ThreadContent.tsx` | Modify | Empty state, streaming/processing avatar gradients, processing glassmorphism |
-| `frontend/app/chat/components/ChatSidebar.tsx` | Modify | Sidebar bg, header bg, selected/hover rows, skeleton loading, empty state, transition |
-| `frontend/app/chat/ChatLayout.tsx` | Modify | Header height/bg/border, new chat button brand, center title, hover states |
-| `frontend/app/chat/conversation/ConversationPanel.tsx` | Modify | Input wrapper shadow |
-| `frontend/app/chat/components/ChatInput.tsx` | Modify | Send button brand color, container shadow |
-| `frontend/app/chat/components/ChatHome.tsx` | Modify | Send button brand color, mode card ring |
-| `frontend/app/chat/preview/PreviewPanel.tsx` | Modify | Tab transition animation |
-
----
-
-### Task 1: MessageItem — User Bubble & AI Card Redesign
-
-**Files:**
-- Modify: `frontend/app/chat/components/MessageItem.tsx`
-
-**Covers:** Area 1 (brand color), Area 2 (bubble redesign), Area 7 (animation)
-
-- [ ] **Step 1: Update user message bubble background**
-
-In `MessageItem.tsx` around line 72, change the user bubble div:
-
-```tsx
-// FROM:
-<div className="max-w-[80%] rounded-2xl rounded-tr-sm bg-gray-100 px-5 py-3.5 text-gray-900 shadow-sm">
-
-// TO:
-<div className="max-w-[80%] rounded-2xl rounded-tr-sm bg-gray-800 px-5 py-3.5 text-white shadow-sm">
-```
-
-- [ ] **Step 2: Add slide animation to user message**
-
-Around line 71, update the user message animation wrapper:
-
-```tsx
-// FROM:
-<div className="mb-6 flex justify-end duration-200 animate-in fade-in">
-
-// TO:
-<div className="mb-6 flex justify-end duration-200 animate-in fade-in slide-in-from-bottom-1">
-```
-
-- [ ] **Step 3: Update AI avatar gradient**
-
-Around line 87, change the AI avatar gradient:
-
-```tsx
-// FROM:
-from-blue-600 to-purple-600
-
-// TO:
-from-blue-500 to-indigo-600
-```
-
-- [ ] **Step 4: Add AI message card container**
-
-Around line 90, add card styling to the AI content wrapper:
-
-```tsx
-// FROM:
-<div className="min-w-[50%] max-w-[85%]">
-
-// TO:
-<div className="min-w-[50%] max-w-[85%] rounded-2xl border border-gray-100 bg-white shadow-sm">
-```
-
-- [ ] **Step 5: Update AI label badge colors**
-
-Around line 92, change the AI label badge:
-
-```tsx
-// FROM:
-<span className="rounded border border-gray-200 bg-gray-100 px-1.5 py-0.5 text-[10px] text-gray-400">
-
-// TO:
-<span className="rounded border border-blue-100 bg-blue-50 px-1.5 py-0.5 text-[10px] text-blue-500">
-```
-
-- [ ] **Step 6: Verify changes visually**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/frontend && npm run dev`
-
-Check: Open chat, send a message. User bubble should be dark gray with white text. AI message should have white card with subtle border and shadow. Avatar should be blue-to-indigo gradient.
-
-- [ ] **Step 7: Commit**
-
-```bash
-cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter
-git add frontend/app/chat/components/MessageItem.tsx
-git commit -m "style: redesign message bubbles - dark user bubble, AI card container, blue brand avatar"
-```
-
----
-
-### Task 2: ThreadContent — Empty State, Avatar Gradients & Glassmorphism
-
-**Files:**
-- Modify: `frontend/app/chat/components/ThreadContent.tsx`
-
-**Covers:** Area 1 (brand color), Area 6 (empty/loading states)
-
-- [ ] **Step 1: Replace empty state with structured component**
-
-Around lines 50-53, replace the plain text empty state:
-
-```tsx
-// FROM:
-<div className="flex items-center justify-center py-20 text-sm text-gray-400">
-  {t('chat.startConversation')}
-</div>
-
-// TO:
-<div className="flex flex-col items-center justify-center gap-3 py-20">
-  <div className="rounded-full bg-blue-50 p-4">
-    <MessageSquare size={24} className="text-blue-500" />
-  </div>
-  <p className="text-base font-medium text-gray-600">{t('chat.startConversation')}</p>
-  <p className="text-sm text-gray-400">{t('chat.askAnything', { defaultValue: 'Ask anything to get started' })}</p>
-</div>
-```
-
-Add a new import line at the top of the file (ThreadContent.tsx has no existing lucide-react import):
-
-```tsx
-import { MessageSquare } from 'lucide-react'
-```
-
-- [ ] **Step 2: Update streaming AI avatar gradient**
-
-Around line 80:
-
-```tsx
-// FROM:
-from-blue-600 to-purple-600
-
-// TO:
-from-blue-500 to-indigo-600
-```
-
-- [ ] **Step 3: Update streaming AI label badge (if present)**
-
-Around line 85, same badge change as MessageItem:
-
-```tsx
-// FROM:
-bg-gray-100 ... text-gray-400
-
-// TO:
-bg-blue-50 ... text-blue-500
-```
-
-And update border from `border-gray-200` to `border-blue-100`.
-
-- [ ] **Step 4: Add glassmorphism to processing container**
-
-Around lines 104-106, add `backdrop-blur-sm`:
-
-```tsx
-// FROM:
-'border border-gray-200/80 bg-white/90 shadow-sm',
-
-// TO:
-'border border-gray-200/80 bg-white/90 shadow-sm backdrop-blur-sm',
-```
-
-- [ ] **Step 5: Update processing avatar gradient**
-
-Around line 111:
-
-```tsx
-// FROM:
-from-blue-600 to-purple-600
-
-// TO:
-from-blue-500 to-indigo-600
-```
-
-- [ ] **Step 6: Verify**
-
-Check: Empty conversation should show blue icon in circle with title and subtitle. Processing state should have subtle blur effect. All avatars should use blue-to-indigo gradient.
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add frontend/app/chat/components/ThreadContent.tsx
-git commit -m "style: upgrade empty state, avatar gradients, and processing glassmorphism"
-```
-
----
-
-### Task 3: ChatSidebar — Surface, Selection, Skeleton & Empty States
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatSidebar.tsx`
-
-**Covers:** Area 1 (brand color), Area 3 (sidebar upgrade), Area 5 (surface depth), Area 6 (empty/loading), Area 7 (animation)
-
-- [ ] **Step 1: Update sidebar overall background**
-
-Around line 143:
-
-```tsx
-// FROM:
-<div className="flex h-full flex-col bg-gray-50">
-
-// TO:
-<div className="flex h-full flex-col bg-gray-50/50">
-```
-
-- [ ] **Step 2: Update sidebar header background**
-
-Around line 147:
-
-```tsx
-// FROM:
-'border-b border-gray-100 bg-gray-50 p-3 transition-all',
-
-// TO:
-'border-b border-gray-100 bg-white p-3 transition-all',
-```
-
-- [ ] **Step 3: Update selected/hover rows — todayConvs block**
-
-Around lines 195-197:
-
-```tsx
-// FROM:
-currentThreadId === conv.thread_id
-  ? 'bg-gray-100 text-gray-900'
-  : 'text-gray-600 hover:bg-gray-50',
-
-// TO:
-currentThreadId === conv.thread_id
-  ? 'bg-white text-gray-900 shadow-sm ring-1 ring-blue-50'
-  : 'text-gray-600 hover:bg-white/60',
-```
-
-- [ ] **Step 4: Add transition duration to todayConvs row**
-
-On the same conversation row element (around line 193), the row already has `transition-colors` in its className. Append only `duration-150` (do NOT duplicate `transition-colors`).
-
-- [ ] **Step 5: Update selected/hover rows — monthConvs block**
-
-Around lines 313-315, apply the same change as Step 3:
-
-```tsx
-// FROM:
-currentThreadId === conv.thread_id
-  ? 'bg-gray-100 text-gray-900'
-  : 'text-gray-600 hover:bg-gray-50',
-
-// TO:
-currentThreadId === conv.thread_id
-  ? 'bg-white text-gray-900 shadow-sm ring-1 ring-blue-50'
-  : 'text-gray-600 hover:bg-white/60',
-```
-
-Append `duration-150` to the row element (already has `transition-colors`).
-
-- [ ] **Step 6: Update selected/hover rows — olderConvs block**
-
-Around lines 429-431, same change:
-
-```tsx
-// FROM:
-currentThreadId === conv.thread_id
-  ? 'bg-gray-100 text-gray-900'
-  : 'text-gray-600 hover:bg-gray-50',
-
-// TO:
-currentThreadId === conv.thread_id
-  ? 'bg-white text-gray-900 shadow-sm ring-1 ring-blue-50'
-  : 'text-gray-600 hover:bg-white/60',
-```
-
-Append `duration-150` to the row element (already has `transition-colors`).
-
-- [ ] **Step 7: Replace loading state with skeleton**
-
-Around line 166, replace:
-
-```tsx
-// FROM:
-<div className="py-4 text-center text-xs text-gray-400">{t('chat.loading')}</div>
-
-// TO:
-<div className="space-y-2 px-2 py-3">
-  {[0, 1, 2].map((i) => (
-    <div key={i} className="flex items-center gap-2 rounded-md px-2 py-1.5">
-      <div className="h-4 w-4 flex-shrink-0 rounded bg-gray-200 animate-pulse" />
-      <div className="flex-1 space-y-1.5">
-        <div className="h-3 w-3/4 rounded bg-gray-200 animate-pulse" />
-        <div className="h-2.5 w-1/2 rounded bg-gray-100 animate-pulse" />
-      </div>
-    </div>
-  ))}
-</div>
-```
-
-- [ ] **Step 8: Replace empty state with icon + text**
-
-Around line 168, replace:
-
-```tsx
-// FROM:
-<div className="py-4 text-center text-xs text-gray-400">{t('chat.noConversations')}</div>
-
-// TO:
-<div className="flex flex-col items-center gap-2 py-6">
-  <div className="rounded-full bg-gray-100 p-2">
-    <MessageSquare size={16} className="text-gray-400" />
-  </div>
-  <span className="text-xs text-gray-400">{t('chat.noConversations')}</span>
-</div>
-```
-
-Add `MessageSquare` to the lucide-react import at the top of the file (`MessageSquare` is already imported in ChatSidebar — no new import needed).
-
-- [ ] **Step 9: Verify**
-
-Check: Sidebar should have lighter bg. Header white. Selected row white with blue ring. Loading shows 3 pulsing skeleton rows. Empty shows icon in circle.
-
-- [ ] **Step 10: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatSidebar.tsx
-git commit -m "style: upgrade sidebar - surface depth, selection ring, skeleton loading, empty state"
-```
-
----
-
-### Task 4: ChatLayout — Header Redesign & New Chat Button
-
-**Files:**
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-
-**Covers:** Area 1 (brand color), Area 4 (header redesign), Area 5 (surface depth)
-
-- [ ] **Step 1: Add getModeConfig import**
-
-At the top of `ChatLayout.tsx`, add:
-
-```tsx
-import { getModeConfig } from './config/modeConfig'
-```
-
-- [ ] **Step 2: Update header container**
-
-Around line 249:
-
-```tsx
-// FROM:
-<div className="z-10 flex h-12 flex-shrink-0 items-center gap-2 bg-gray-50 px-6">
-
-// TO:
-<div className="z-10 flex h-14 flex-shrink-0 items-center gap-2 border-b border-gray-100 bg-white px-6">
-```
-
-- [ ] **Step 3: Update sidebar toggle hover**
-
-Around line 257, the sidebar toggle button currently has `className="h-9 w-9 p-0 transition-colors hover:bg-gray-100"`. Add `rounded-lg`:
-
-```tsx
-// FROM:
-className="h-9 w-9 p-0 transition-colors hover:bg-gray-100"
-
-// TO:
-className="h-9 w-9 rounded-lg p-0 transition-colors hover:bg-gray-100"
-```
-
-- [ ] **Step 4: Rebrand new chat button**
-
-Around lines 268-275, change:
-
-```tsx
-// FROM:
-<Button variant="ghost" size="sm" onClick={handleNewChat}
-  className="h-9 w-9 p-0 transition-colors hover:bg-gray-100">
-  <Plus size={18} className="text-gray-600" />
-</Button>
-
-// TO:
-<Button variant="ghost" size="sm" onClick={handleNewChat}
-  className="h-9 w-9 rounded-full bg-blue-600 p-0 text-white transition-colors hover:bg-blue-700">
-  <Plus size={18} />
-</Button>
-```
-
-- [ ] **Step 5: Add center title**
-
-Insert after the new chat button's closing `</Tooltip>` (after line ~280), before the preview toggle conditional block. Use `useChatState()` (already available) and `useTranslation()` (already imported):
-
-```tsx
-<div className="flex min-w-0 flex-1 justify-center">
-  <span className="truncate text-sm font-medium text-gray-700">
-    {t(getModeConfig(state.mode.currentMode)?.labelKey || 'chat.modes.default-chat')}
-  </span>
-</div>
-```
-
-Note: `state.mode.currentMode` is the correct field (ChatState has no `currentTitle` field). The fallback key `chat.modes.default-chat` should already exist in the i18n files as it's used by modeConfig. If it doesn't exist, use a `defaultValue`: `t(... || 'chat.modes.default-chat', { defaultValue: 'Chat' })`.
-
-- [ ] **Step 6: Update preview toggle hover**
-
-Around line 294, the preview toggle button currently has `className="h-9 w-9 p-0 transition-colors hover:bg-gray-100"`. Add `rounded-lg`:
-
-```tsx
-// FROM:
-className="h-9 w-9 p-0 transition-colors hover:bg-gray-100"
-
-// TO:
-className="h-9 w-9 rounded-lg p-0 transition-colors hover:bg-gray-100"
-```
-
-- [ ] **Step 7: Verify**
-
-Check: Header should be taller (h-14), white bg with bottom border. New chat button is blue circle. Center shows mode name. Sidebar/preview toggles have consistent hover.
-
-- [ ] **Step 8: Commit**
-
-```bash
-git add frontend/app/chat/ChatLayout.tsx
-git commit -m "style: redesign header - white bg, branded new-chat button, center title"
-```
-
----
-
-### Task 5: ConversationPanel & ChatInput — Surface Depth & Brand Color
-
-**Files:**
-- Modify: `frontend/app/chat/conversation/ConversationPanel.tsx`
-- Modify: `frontend/app/chat/components/ChatInput.tsx`
-
-**Covers:** Area 1 (brand color), Area 5 (surface depth)
-
-- [ ] **Step 1: Update input wrapper in ConversationPanel**
-
-In `ConversationPanel.tsx` around line 76:
-
-```tsx
-// FROM:
-<div className="border-t border-gray-100 bg-white px-6 py-4">
-
-// TO:
-<div className="bg-white px-6 py-4 shadow-[0_-4px_24px_-4px_rgba(0,0,0,0.06)]">
-```
-
-- [ ] **Step 2: Upgrade ChatInput container shadow**
-
-In `ChatInput.tsx` around line 134:
-
-```tsx
-// FROM:
-'flex items-end gap-3 rounded-[24px] border border-gray-200 bg-white p-4 shadow-sm transition-all',
-
-// TO:
-'flex items-end gap-3 rounded-[24px] border border-gray-200 bg-white p-4 shadow-md transition-all',
-```
-
-- [ ] **Step 3: Rebrand ChatInput send button**
-
-In `ChatInput.tsx` around lines 192-193:
-
-```tsx
-// FROM:
-canSubmit && !isProcessing && !isUploading
-  ? 'bg-gray-900 hover:bg-gray-800'
-  : 'cursor-not-allowed bg-gray-100',
-
-// TO:
-canSubmit && !isProcessing && !isUploading
-  ? 'bg-blue-600 hover:bg-blue-700'
-  : 'cursor-not-allowed bg-gray-100',
-```
-
-- [ ] **Step 4: Verify**
-
-Check: Input area has upward soft shadow instead of hard border-top line. Input container has slightly stronger shadow. Send button is blue when active.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/chat/conversation/ConversationPanel.tsx frontend/app/chat/components/ChatInput.tsx
-git commit -m "style: upgrade input area surface depth and brand send button"
-```
-
----
-
-### Task 6: ChatHome — Send Button & Mode Card
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
-**Covers:** Area 1 (brand color)
-
-- [ ] **Step 1: Rebrand ChatHome send button**
-
-Around lines 591-592:
-
-```tsx
-// FROM:
-state.input.trim() && !isProcessing && !state.isRedirecting
-  ? 'bg-gray-900 hover:bg-gray-800'
-  : 'cursor-not-allowed bg-gray-100',
-
-// TO:
-state.input.trim() && !isProcessing && !state.isRedirecting
-  ? 'bg-blue-600 hover:bg-blue-700'
-  : 'cursor-not-allowed bg-gray-100',
-```
-
-- [ ] **Step 2: Add ring to selected mode card**
-
-Around lines 646-647:
-
-```tsx
-// FROM:
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md'
-  : 'border-gray-200 bg-white hover:border-blue-300 hover:shadow-md',
-
-// TO:
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-  : 'border-gray-200 bg-white hover:border-blue-300 hover:shadow-md',
-```
-
-- [ ] **Step 3: Verify**
-
-Check: ChatHome send button is blue. Selected mode card has subtle blue ring.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatHome.tsx
-git commit -m "style: brand ChatHome send button and mode card ring"
-```
-
----
-
-### Task 7: PreviewPanel — Tab Animation
-
-**Files:**
-- Modify: `frontend/app/chat/preview/PreviewPanel.tsx`
-
-**Covers:** Area 5 (surface depth — already bg-white, no change), Area 7 (animation)
-
-- [ ] **Step 1: Add transition to Files tab button**
-
-Around lines 28-31, add `transition-all duration-200` to the className:
-
-```tsx
-// FROM:
-className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm ${
-  activeTab === 'files'
-    ? 'bg-gray-100 font-medium'
-    : 'text-gray-500 hover:text-gray-700'
-}`}
-
-// TO:
-className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm transition-all duration-200 ${
-  activeTab === 'files'
-    ? 'bg-gray-100 font-medium'
-    : 'text-gray-500 hover:text-gray-700'
-}`}
-```
-
-- [ ] **Step 2: Add transition to Tool tab button**
-
-Around lines 41-44, same change:
-
-```tsx
-// FROM:
-className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm ${
-  activeTab === 'tool'
-    ? 'bg-gray-100 font-medium'
-    : 'text-gray-500 hover:text-gray-700'
-}`}
-
-// TO:
-className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm transition-all duration-200 ${
-  activeTab === 'tool'
-    ? 'bg-gray-100 font-medium'
-    : 'text-gray-500 hover:text-gray-700'
-}`}
-```
-
-- [ ] **Step 3: Verify**
-
-Check: Switching tabs in PreviewPanel should animate smoothly.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/preview/PreviewPanel.tsx
-git commit -m "style: add transition animation to PreviewPanel tabs"
-```
-
----
-
-## Final Verification
-
-- [ ] Run full dev server and test all 7 areas visually
-- [ ] Verify no TypeScript errors: `cd frontend && npx tsc --noEmit`
-- [ ] Verify no lint errors: `cd frontend && npm run lint`
-- [ ] Final commit if any adjustments needed
diff --git a/docs/superpowers/plans/2026-03-23-skill-frontend-versioning-collab-token.md b/docs/superpowers/plans/2026-03-23-skill-frontend-versioning-collab-token.md
deleted file mode 100644
index 90764c083..000000000
--- a/docs/superpowers/plans/2026-03-23-skill-frontend-versioning-collab-token.md
+++ /dev/null
@@ -1,2093 +0,0 @@
-# Skill 前端：版本管理 + 协作者管理 + Token 管理 实现计划
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Implement the complete frontend UI for skill versioning, collaborator management, and platform token management.
-
-**Architecture:** Three service files (one per API domain) expose async methods calling `apiGet/apiPost/apiPut/apiDelete`. Three React Query hook files provide `useQuery`/`useMutation` wrappers with key factories. UI components integrate into SkillsManager (version + collaborator tabs) and Settings dialog (token page). All strings use i18n.
-
-**Tech Stack:** Next.js + React 19, TypeScript, React Query v5, shadcn/ui (Radix), Tailwind CSS, react-hook-form + Zod, lucide-react icons.
-
-**Spec:** `docs/superpowers/specs/2026-03-23-skill-frontend-versioning-collab-token-design.md`
-
----
-
-## Task 1: Backend — Extend VersionSummarySchema with `published_by_id`
-
-**Files:**
-- Modify: `backend/app/schemas/skill_version.py` (VersionSummarySchema class, ~line 78)
-
-- [ ] **Step 1: Add `published_by_id` to VersionSummarySchema**
-
-```python
-class VersionSummarySchema(BaseModel):
-    """Lightweight version info for list endpoints."""
-
-    version: str
-    release_notes: Optional[str] = None
-    published_by_id: str
-    published_at: Optional[str] = None
-
-    @field_validator("published_at", mode="before")
-    @classmethod
-    def convert_datetime_to_str(cls, v):
-        if isinstance(v, datetime):
-            return v.isoformat()
-        return v
-
-    class Config:
-        from_attributes = True
-```
-
-- [ ] **Step 2: Verify existing tests still pass**
-
-Run: `cd backend && python -m pytest tests/ -x -q --timeout=30 2>/dev/null || echo "no tests or pass"`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add backend/app/schemas/skill_version.py
-git commit -m "feat(schema): add published_by_id to VersionSummarySchema for frontend display"
-```
-
----
-
-## Task 2: Service — `skillVersionService.ts`
-
-**Files:**
-- Create: `frontend/services/skillVersionService.ts`
-
-- [ ] **Step 1: Create the service file**
-
-```typescript
-import { apiGet, apiPost, apiDelete } from '@/lib/api-client'
-
-// ---------- Types ----------
-
-export interface SkillVersionSummary {
-  version: string
-  releaseNotes: string | null
-  publishedById: string
-  publishedAt: string | null
-}
-
-export interface SkillVersionFile {
-  id: string
-  versionId: string
-  path: string
-  fileName: string
-  fileType: string
-  content: string | null
-  storageType: string
-  storageKey: string | null
-  size: number
-}
-
-export interface SkillVersion {
-  id: string
-  skillId: string
-  version: string
-  releaseNotes: string | null
-  skillName: string
-  skillDescription: string
-  content: string
-  tags: string[]
-  metadata: Record<string, unknown>
-  allowedTools: string[]
-  compatibility: string | null
-  license: string | null
-  publishedById: string
-  publishedAt: string | null
-  createdAt: string | null
-  files: SkillVersionFile[] | null
-}
-
-// ---------- Normalizers ----------
-
-function normalizeVersionSummary(raw: any): SkillVersionSummary {
-  return {
-    version: raw.version,
-    releaseNotes: raw.release_notes ?? null,
-    publishedById: raw.published_by_id,
-    publishedAt: raw.published_at ?? null,
-  }
-}
-
-function normalizeVersion(raw: any): SkillVersion {
-  return {
-    id: raw.id,
-    skillId: raw.skill_id,
-    version: raw.version,
-    releaseNotes: raw.release_notes ?? null,
-    skillName: raw.skill_name,
-    skillDescription: raw.skill_description,
-    content: raw.content,
-    tags: raw.tags ?? [],
-    metadata: raw.metadata ?? {},
-    allowedTools: raw.allowed_tools ?? [],
-    compatibility: raw.compatibility ?? null,
-    license: raw.license ?? null,
-    publishedById: raw.published_by_id,
-    publishedAt: raw.published_at ?? null,
-    createdAt: raw.created_at ?? null,
-    files: raw.files?.map((f: any) => ({
-      id: f.id,
-      versionId: f.version_id,
-      path: f.path,
-      fileName: f.file_name,
-      fileType: f.file_type,
-      content: f.content ?? null,
-      storageType: f.storage_type,
-      storageKey: f.storage_key ?? null,
-      size: f.size ?? 0,
-    })) ?? null,
-  }
-}
-
-// ---------- Service ----------
-
-export const skillVersionService = {
-  async listVersions(skillId: string): Promise<SkillVersionSummary[]> {
-    const data = await apiGet<any[]>(`skills/${skillId}/versions`)
-    return (Array.isArray(data) ? data : []).map(normalizeVersionSummary)
-  },
-
-  async getVersion(skillId: string, version: string): Promise<SkillVersion> {
-    const data = await apiGet<any>(`skills/${skillId}/versions/${version}`)
-    return normalizeVersion(data)
-  },
-
-  async getLatestVersion(skillId: string): Promise<SkillVersion> {
-    const data = await apiGet<any>(`skills/${skillId}/versions/latest`)
-    return normalizeVersion(data)
-  },
-
-  async publishVersion(skillId: string, payload: { version: string; release_notes?: string }): Promise<SkillVersion> {
-    const data = await apiPost<any>(`skills/${skillId}/versions`, payload)
-    return normalizeVersion(data)
-  },
-
-  async deleteVersion(skillId: string, version: string): Promise<void> {
-    await apiDelete<any>(`skills/${skillId}/versions/${version}`)
-  },
-
-  async restoreDraft(skillId: string, payload: { version: string }): Promise<any> {
-    return await apiPost<any>(`skills/${skillId}/restore`, payload)
-  },
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/services/skillVersionService.ts
-git commit -m "feat: add skillVersionService with all version API methods"
-```
-
----
-
-## Task 3: Service — `skillCollaboratorService.ts`
-
-**Files:**
-- Create: `frontend/services/skillCollaboratorService.ts`
-
-- [ ] **Step 1: Create the service file**
-
-```typescript
-import { apiGet, apiPost, apiPut, apiDelete } from '@/lib/api-client'
-
-// ---------- Types ----------
-
-export type CollaboratorRole = 'viewer' | 'editor' | 'publisher' | 'admin'
-
-export interface SkillCollaborator {
-  id: string
-  skillId: string
-  userId: string
-  role: CollaboratorRole
-  invitedBy: string
-  createdAt: string | null
-}
-
-// ---------- Normalizer ----------
-
-function normalizeCollaborator(raw: any): SkillCollaborator {
-  return {
-    id: raw.id,
-    skillId: raw.skill_id,
-    userId: raw.user_id,
-    role: raw.role,
-    invitedBy: raw.invited_by,
-    createdAt: raw.created_at ?? null,
-  }
-}
-
-// ---------- Service ----------
-
-export const skillCollaboratorService = {
-  async listCollaborators(skillId: string): Promise<SkillCollaborator[]> {
-    const data = await apiGet<any[]>(`skills/${skillId}/collaborators`)
-    return (Array.isArray(data) ? data : []).map(normalizeCollaborator)
-  },
-
-  async addCollaborator(skillId: string, payload: { user_id: string; role: CollaboratorRole }): Promise<SkillCollaborator> {
-    const data = await apiPost<any>(`skills/${skillId}/collaborators`, payload)
-    return normalizeCollaborator(data)
-  },
-
-  async updateRole(skillId: string, userId: string, payload: { role: CollaboratorRole }): Promise<SkillCollaborator> {
-    const data = await apiPut<any>(`skills/${skillId}/collaborators/${userId}`, payload)
-    return normalizeCollaborator(data)
-  },
-
-  async removeCollaborator(skillId: string, userId: string): Promise<void> {
-    await apiDelete<any>(`skills/${skillId}/collaborators/${userId}`)
-  },
-
-  async transferOwnership(skillId: string, payload: { new_owner_id: string }): Promise<void> {
-    await apiPost<any>(`skills/${skillId}/transfer`, payload)
-  },
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/services/skillCollaboratorService.ts
-git commit -m "feat: add skillCollaboratorService with collaborator API methods"
-```
-
----
-
-## Task 4: Service — `platformTokenService.ts`
-
-**Files:**
-- Create: `frontend/services/platformTokenService.ts`
-
-- [ ] **Step 1: Create the service file**
-
-```typescript
-import { apiGet, apiPost, apiDelete } from '@/lib/api-client'
-
-// ---------- Types ----------
-
-export interface PlatformToken {
-  id: string
-  name: string
-  tokenPrefix: string
-  scopes: string[]
-  resourceType: string | null
-  resourceId: string | null
-  expiresAt: string | null
-  lastUsedAt: string | null
-  isActive: boolean
-  createdAt: string | null
-}
-
-export interface PlatformTokenCreateResponse {
-  id: string
-  name: string
-  token: string
-  tokenPrefix: string
-  scopes: string[]
-  expiresAt: string | null
-}
-
-export interface TokenCreateRequest {
-  name: string
-  scopes: string[]
-  expires_at?: string | null
-}
-
-// ---------- Normalizers ----------
-
-function normalizeToken(raw: any): PlatformToken {
-  return {
-    id: raw.id,
-    name: raw.name,
-    tokenPrefix: raw.token_prefix,
-    scopes: raw.scopes ?? [],
-    resourceType: raw.resource_type ?? null,
-    resourceId: raw.resource_id ?? null,
-    expiresAt: raw.expires_at ?? null,
-    lastUsedAt: raw.last_used_at ?? null,
-    isActive: raw.is_active ?? true,
-    createdAt: raw.created_at ?? null,
-  }
-}
-
-function normalizeTokenCreateResponse(raw: any): PlatformTokenCreateResponse {
-  return {
-    id: raw.id,
-    name: raw.name,
-    token: raw.token,
-    tokenPrefix: raw.token_prefix,
-    scopes: raw.scopes ?? [],
-    expiresAt: raw.expires_at ?? null,
-  }
-}
-
-// ---------- Service ----------
-
-export const platformTokenService = {
-  async listTokens(): Promise<PlatformToken[]> {
-    const data = await apiGet<any[]>('tokens')
-    return (Array.isArray(data) ? data : []).map(normalizeToken)
-  },
-
-  async createToken(payload: TokenCreateRequest): Promise<PlatformTokenCreateResponse> {
-    const data = await apiPost<any>('tokens', payload)
-    return normalizeTokenCreateResponse(data)
-  },
-
-  async revokeToken(tokenId: string): Promise<void> {
-    await apiDelete<any>(`tokens/${tokenId}`)
-  },
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/services/platformTokenService.ts
-git commit -m "feat: add platformTokenService with token CRUD methods"
-```
-
----
-
-## Task 5: React Query Hooks — `skillVersions.ts`
-
-**Files:**
-- Create: `frontend/hooks/queries/skillVersions.ts`
-- Modify: `frontend/hooks/queries/index.ts` (add export)
-
-- [ ] **Step 1: Create the query hooks file**
-
-```typescript
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-
-import { STALE_TIME } from './constants'
-import { skillKeys } from './skills'
-import { skillVersionService } from '@/services/skillVersionService'
-import type { SkillVersionSummary, SkillVersion } from '@/services/skillVersionService'
-
-export { type SkillVersionSummary, type SkillVersion } from '@/services/skillVersionService'
-
-// ---------- Key factory ----------
-
-export const skillVersionKeys = {
-  all: ['skill-versions'] as const,
-  list: (skillId: string) => [...skillVersionKeys.all, 'list', skillId] as const,
-  detail: (skillId: string, version: string) =>
-    [...skillVersionKeys.all, 'detail', skillId, version] as const,
-  latest: (skillId: string) => [...skillVersionKeys.all, 'latest', skillId] as const,
-}
-
-// ---------- Queries ----------
-
-export function useSkillVersions(skillId: string) {
-  return useQuery({
-    queryKey: skillVersionKeys.list(skillId),
-    queryFn: () => skillVersionService.listVersions(skillId),
-    enabled: !!skillId,
-    retry: false,
-    staleTime: STALE_TIME.STANDARD,
-  })
-}
-
-export function useSkillVersion(skillId: string, version: string) {
-  return useQuery({
-    queryKey: skillVersionKeys.detail(skillId, version),
-    queryFn: () => skillVersionService.getVersion(skillId, version),
-    enabled: !!skillId && !!version,
-    retry: false,
-    staleTime: STALE_TIME.STANDARD,
-  })
-}
-
-// ---------- Mutations ----------
-
-export function usePublishVersion(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (payload: { version: string; release_notes?: string }) =>
-      skillVersionService.publishVersion(skillId, payload),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillVersionKeys.list(skillId) })
-      queryClient.invalidateQueries({ queryKey: skillKeys.all })
-    },
-  })
-}
-
-export function useDeleteVersion(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (version: string) => skillVersionService.deleteVersion(skillId, version),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillVersionKeys.list(skillId) })
-    },
-  })
-}
-
-export function useRestoreDraft(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (version: string) =>
-      skillVersionService.restoreDraft(skillId, { version }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillKeys.all })
-    },
-  })
-}
-```
-
-- [ ] **Step 2: Add export to index.ts**
-
-In `frontend/hooks/queries/index.ts`, add:
-
-```typescript
-export * from './skillVersions'
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/hooks/queries/skillVersions.ts frontend/hooks/queries/index.ts
-git commit -m "feat: add React Query hooks for skill versions"
-```
-
----
-
-## Task 6: React Query Hooks — `skillCollaborators.ts`
-
-**Files:**
-- Create: `frontend/hooks/queries/skillCollaborators.ts`
-- Modify: `frontend/hooks/queries/index.ts` (add export)
-
-- [ ] **Step 1: Create the query hooks file**
-
-```typescript
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-
-import { STALE_TIME } from './constants'
-import { skillKeys } from './skills'
-import { skillCollaboratorService } from '@/services/skillCollaboratorService'
-import type { SkillCollaborator, CollaboratorRole } from '@/services/skillCollaboratorService'
-
-export { type SkillCollaborator, type CollaboratorRole } from '@/services/skillCollaboratorService'
-
-// ---------- Key factory ----------
-
-export const skillCollaboratorKeys = {
-  all: ['skill-collaborators'] as const,
-  list: (skillId: string) => [...skillCollaboratorKeys.all, 'list', skillId] as const,
-}
-
-// ---------- Queries ----------
-
-export function useSkillCollaborators(skillId: string) {
-  return useQuery({
-    queryKey: skillCollaboratorKeys.list(skillId),
-    queryFn: () => skillCollaboratorService.listCollaborators(skillId),
-    enabled: !!skillId,
-    retry: false,
-    staleTime: STALE_TIME.STANDARD,
-  })
-}
-
-// ---------- Mutations ----------
-
-export function useAddCollaborator(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (payload: { user_id: string; role: CollaboratorRole }) =>
-      skillCollaboratorService.addCollaborator(skillId, payload),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillCollaboratorKeys.list(skillId) })
-    },
-  })
-}
-
-export function useUpdateCollaboratorRole(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: ({ userId, role }: { userId: string; role: CollaboratorRole }) =>
-      skillCollaboratorService.updateRole(skillId, userId, { role }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillCollaboratorKeys.list(skillId) })
-    },
-  })
-}
-
-export function useRemoveCollaborator(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (userId: string) =>
-      skillCollaboratorService.removeCollaborator(skillId, userId),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillCollaboratorKeys.list(skillId) })
-    },
-  })
-}
-
-export function useTransferOwnership(skillId: string) {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (newOwnerId: string) =>
-      skillCollaboratorService.transferOwnership(skillId, { new_owner_id: newOwnerId }),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: skillCollaboratorKeys.list(skillId) })
-      queryClient.invalidateQueries({ queryKey: skillKeys.all })
-    },
-  })
-}
-```
-
-- [ ] **Step 2: Add export to index.ts**
-
-In `frontend/hooks/queries/index.ts`, add:
-
-```typescript
-export * from './skillCollaborators'
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/hooks/queries/skillCollaborators.ts frontend/hooks/queries/index.ts
-git commit -m "feat: add React Query hooks for skill collaborators"
-```
-
----
-
-## Task 7: React Query Hooks — `platformTokens.ts`
-
-**Files:**
-- Create: `frontend/hooks/queries/platformTokens.ts`
-- Modify: `frontend/hooks/queries/index.ts` (add export)
-
-- [ ] **Step 1: Create the query hooks file**
-
-```typescript
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-
-import { STALE_TIME } from './constants'
-import { platformTokenService } from '@/services/platformTokenService'
-import type { PlatformToken, PlatformTokenCreateResponse, TokenCreateRequest } from '@/services/platformTokenService'
-
-export { type PlatformToken, type PlatformTokenCreateResponse, type TokenCreateRequest } from '@/services/platformTokenService'
-
-// ---------- Key factory ----------
-
-export const platformTokenKeys = {
-  all: ['platform-tokens'] as const,
-  list: () => [...platformTokenKeys.all, 'list'] as const,
-}
-
-// ---------- Queries ----------
-
-export function usePlatformTokens() {
-  return useQuery({
-    queryKey: platformTokenKeys.list(),
-    queryFn: () => platformTokenService.listTokens(),
-    retry: false,
-    staleTime: STALE_TIME.LONG,
-  })
-}
-
-// ---------- Mutations ----------
-
-export function useCreateToken() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (payload: TokenCreateRequest) =>
-      platformTokenService.createToken(payload),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: platformTokenKeys.all })
-    },
-  })
-}
-
-export function useRevokeToken() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: (tokenId: string) => platformTokenService.revokeToken(tokenId),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: platformTokenKeys.all })
-    },
-  })
-}
-```
-
-- [ ] **Step 2: Add export to index.ts**
-
-In `frontend/hooks/queries/index.ts`, add:
-
-```typescript
-export * from './platformTokens'
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/hooks/queries/platformTokens.ts frontend/hooks/queries/index.ts
-git commit -m "feat: add React Query hooks for platform tokens"
-```
-
----
-
-## Task 8: i18n — Add translation keys for all three features
-
-**Files:**
-- Modify: `frontend/lib/i18n/locales/en.ts`
-- Modify: `frontend/lib/i18n/locales/zh.ts`
-
-- [ ] **Step 1: Add English translation keys**
-
-Add `editor` key to the `skills` block (if not already present):
-
-```typescript
-editor: 'Editor',
-```
-
-Add inside the `settings` block, after the `sandboxes` key:
-
-```typescript
-tokens: {
-  title: 'API Tokens',
-  description: 'Manage your API access tokens',
-  create: 'Create Token',
-  revoke: 'Revoke',
-  revokeConfirmTitle: 'Revoke Token',
-  revokeConfirmMessage: 'API calls using this token will fail immediately after revoking.',
-  name: 'Token Name',
-  namePlaceholder: 'e.g. CI deploy token',
-  scopes: 'Scopes',
-  expiresAt: 'Expiration',
-  noExpiry: 'No expiry',
-  lastUsed: 'Last used',
-  neverUsed: 'never',
-  createdSuccess: 'Token created successfully',
-  revokedSuccess: 'Token revoked',
-  tokenCreatedTitle: 'Token Created',
-  tokenCreatedMessage: 'Copy this token now. You won\'t be able to see it again.',
-  copyToken: 'Copy Token',
-  copied: 'Copied!',
-  emptyState: 'No API tokens created yet',
-  limitReached: 'Token limit reached (50)',
-  justNow: 'just now',
-  minutesAgo: '{{count}}m ago',
-  hoursAgo: '{{count}}h ago',
-  daysAgo: '{{count}}d ago',
-},
-```
-
-Add a new top-level `skillVersions` block:
-
-```typescript
-skillVersions: {
-  title: 'Version History',
-  publish: 'Publish New Version',
-  publishButton: 'Publish',
-  versionNumber: 'Version Number',
-  versionPlaceholder: 'e.g. 1.0.0',
-  releaseNotes: 'Release Notes',
-  releaseNotesPlaceholder: 'Describe what changed...',
-  restore: 'Restore',
-  delete: 'Delete',
-  restoreConfirmTitle: 'Restore Draft',
-  restoreConfirmMessage: 'This will overwrite the current draft with version {{version}}. Continue?',
-  deleteConfirmTitle: 'Delete Version',
-  deleteConfirmMessage: 'This version will be permanently deleted. This cannot be undone.',
-  publishedBy: 'by {{user}}',
-  publishedSuccess: 'Version {{version}} published',
-  restoredSuccess: 'Draft restored from version {{version}}',
-  deletedSuccess: 'Version {{version}} deleted',
-  emptyState: 'No versions published yet',
-  invalidVersion: 'Must be MAJOR.MINOR.PATCH format (e.g. 1.0.0)',
-},
-```
-
-Add a new top-level `skillCollaborators` block:
-
-```typescript
-skillCollaborators: {
-  title: 'Collaborators',
-  add: 'Add Collaborator',
-  userId: 'User ID',
-  userIdPlaceholder: 'Enter user ID',
-  role: 'Role',
-  owner: 'owner',
-  viewer: 'viewer',
-  editor: 'editor',
-  publisher: 'publisher',
-  admin: 'admin',
-  remove: 'Remove',
-  removeConfirmTitle: 'Remove Collaborator',
-  removeConfirmMessage: 'This user will lose access to this skill.',
-  transferOwnership: 'Transfer Ownership',
-  transferConfirmTitle: 'Transfer Ownership',
-  transferConfirmMessage: 'You will become an admin collaborator. The new owner will have full control.',
-  newOwner: 'New Owner',
-  newOwnerPlaceholder: 'Enter new owner user ID',
-  addedSuccess: 'Collaborator added',
-  updatedSuccess: 'Role updated',
-  removedSuccess: 'Collaborator removed',
-  transferredSuccess: 'Ownership transferred',
-  emptyState: 'No collaborators yet',
-},
-```
-
-- [ ] **Step 2: Add Chinese translation keys**
-
-Add the same structure in `zh.ts` with Chinese translations.
-
-Add `editor` key to the `skills` block:
-
-```typescript
-editor: '编辑器',
-```
-
-`settings.tokens`:
-```typescript
-tokens: {
-  title: 'API Token',
-  description: '管理您的 API 访问令牌',
-  create: '创建 Token',
-  revoke: '撤销',
-  revokeConfirmTitle: '撤销 Token',
-  revokeConfirmMessage: '撤销后，使用此 Token 的 API 调用将立即失败。',
-  name: 'Token 名称',
-  namePlaceholder: '例如 CI 部署 Token',
-  scopes: '权限范围',
-  expiresAt: '过期时间',
-  noExpiry: '永不过期',
-  lastUsed: '最后使用',
-  neverUsed: '从未使用',
-  createdSuccess: 'Token 创建成功',
-  revokedSuccess: 'Token 已撤销',
-  tokenCreatedTitle: 'Token 已创建',
-  tokenCreatedMessage: '请立即复制此 Token，关闭后将无法再次查看。',
-  copyToken: '复制 Token',
-  copied: '已复制！',
-  emptyState: '尚未创建 API Token',
-  limitReached: '已达 Token 数量上限（50）',
-  justNow: '刚刚',
-  minutesAgo: '{{count}} 分钟前',
-  hoursAgo: '{{count}} 小时前',
-  daysAgo: '{{count}} 天前',
-},
-```
-
-`skillVersions`:
-```typescript
-skillVersions: {
-  title: '版本历史',
-  publish: '发布新版本',
-  publishButton: '发布',
-  versionNumber: '版本号',
-  versionPlaceholder: '例如 1.0.0',
-  releaseNotes: '更新说明',
-  releaseNotesPlaceholder: '描述变更内容...',
-  restore: '恢复',
-  delete: '删除',
-  restoreConfirmTitle: '恢复 Draft',
-  restoreConfirmMessage: '这将用版本 {{version}} 覆盖当前 Draft。是否继续？',
-  deleteConfirmTitle: '删除版本',
-  deleteConfirmMessage: '此版本将被永久删除，此操作不可撤销。',
-  publishedBy: '由 {{user}}',
-  publishedSuccess: '版本 {{version}} 已发布',
-  restoredSuccess: '已从版本 {{version}} 恢复 Draft',
-  deletedSuccess: '版本 {{version}} 已删除',
-  emptyState: '尚未发布任何版本',
-  invalidVersion: '格式须为 MAJOR.MINOR.PATCH（如 1.0.0）',
-},
-```
-
-`skillCollaborators`:
-```typescript
-skillCollaborators: {
-  title: '协作者',
-  add: '添加协作者',
-  userId: '用户 ID',
-  userIdPlaceholder: '输入用户 ID',
-  role: '角色',
-  owner: '所有者',
-  viewer: '查看者',
-  editor: '编辑者',
-  publisher: '发布者',
-  admin: '管理员',
-  remove: '移除',
-  removeConfirmTitle: '移除协作者',
-  removeConfirmMessage: '该用户将失去对此 Skill 的访问权限。',
-  transferOwnership: '转让所有权',
-  transferConfirmTitle: '转让所有权',
-  transferConfirmMessage: '您将成为管理员协作者，新所有者将拥有完全控制权。',
-  newOwner: '新所有者',
-  newOwnerPlaceholder: '输入新所有者用户 ID',
-  addedSuccess: '协作者已添加',
-  updatedSuccess: '角色已更新',
-  removedSuccess: '协作者已移除',
-  transferredSuccess: '所有权已转让',
-  emptyState: '暂无协作者',
-},
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/i18n/locales/en.ts frontend/lib/i18n/locales/zh.ts
-git commit -m "feat(i18n): add en/zh translations for versions, collaborators, tokens"
-```
-
----
-
-## Task 9: UI — VersionHistoryTab component
-
-**Files:**
-- Create: `frontend/app/skills/components/VersionHistoryTab.tsx`
-- Create: `frontend/app/skills/schemas/versionPublishSchema.ts`
-
-- [ ] **Step 1: Create Zod schema for publish form**
-
-```typescript
-// frontend/app/skills/schemas/versionPublishSchema.ts
-import { z } from 'zod'
-
-export const versionPublishSchema = z.object({
-  version: z
-    .string()
-    .min(1, 'Version is required')
-    .regex(/^\d+\.\d+\.\d+$/, 'Must be MAJOR.MINOR.PATCH format (e.g. 1.0.0)'),
-  release_notes: z.string().optional().default(''),
-})
-
-export type VersionPublishFormData = z.infer<typeof versionPublishSchema>
-```
-
-- [ ] **Step 2: Create the VersionHistoryTab component**
-
-Create `frontend/app/skills/components/VersionHistoryTab.tsx`:
-
-```tsx
-'use client'
-
-import { ChevronDown, ChevronUp, History, Plus, RotateCcw, Trash2 } from 'lucide-react'
-import React, { useState } from 'react'
-import { useForm } from 'react-hook-form'
-import { zodResolver } from '@hookform/resolvers/zod'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { Textarea } from '@/components/ui/textarea'
-import { useToast } from '@/hooks/use-toast'
-import {
-  useSkillVersions,
-  usePublishVersion,
-  useDeleteVersion,
-  useRestoreDraft,
-} from '@/hooks/queries/skillVersions'
-import { useTranslation } from '@/lib/i18n'
-import {
-  versionPublishSchema,
-  type VersionPublishFormData,
-} from '../schemas/versionPublishSchema'
-
-interface VersionHistoryTabProps {
-  skillId: string
-  /** Current user's effective role for this skill: 'owner' | 'admin' | 'publisher' | 'editor' | 'viewer' */
-  userRole: string
-}
-
-export function VersionHistoryTab({ skillId, userRole }: VersionHistoryTabProps) {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-
-  const [showPublishForm, setShowPublishForm] = useState(false)
-  const [confirmDialog, setConfirmDialog] = useState<{
-    type: 'restore' | 'delete'
-    version: string
-    open: boolean
-  }>({ type: 'restore', version: '', open: false })
-
-  const { data: versions = [], isLoading } = useSkillVersions(skillId)
-  const publishMutation = usePublishVersion(skillId)
-  const deleteMutation = useDeleteVersion(skillId)
-  const restoreMutation = useRestoreDraft(skillId)
-
-  const canPublish = ['owner', 'admin', 'publisher'].includes(userRole)
-  const canDelete = ['owner', 'admin'].includes(userRole)
-  const canRestore = ['owner', 'admin', 'publisher'].includes(userRole)
-
-  const form = useForm<VersionPublishFormData>({
-    resolver: zodResolver(versionPublishSchema),
-    defaultValues: { version: '', release_notes: '' },
-  })
-
-  const handlePublish = async (data: VersionPublishFormData) => {
-    try {
-      await publishMutation.mutateAsync(data)
-      toast({ title: t('skillVersions.publishedSuccess', { version: data.version }) })
-      form.reset()
-      setShowPublishForm(false)
-    } catch (error: any) {
-      toast({
-        title: error?.message || t('common.error'),
-        variant: 'destructive',
-      })
-    }
-  }
-
-  const handleConfirmAction = async () => {
-    const { type, version } = confirmDialog
-    try {
-      if (type === 'restore') {
-        await restoreMutation.mutateAsync(version)
-        toast({ title: t('skillVersions.restoredSuccess', { version }) })
-      } else {
-        await deleteMutation.mutateAsync(version)
-        toast({ title: t('skillVersions.deletedSuccess', { version }) })
-      }
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-    setConfirmDialog((prev) => ({ ...prev, open: false }))
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex h-64 items-center justify-center">
-        <div className="h-6 w-6 animate-spin rounded-full border-2 border-gray-300 border-t-gray-600" />
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex flex-col gap-4 p-4">
-      {/* Publish form toggle */}
-      {canPublish && (
-        <div>
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => setShowPublishForm(!showPublishForm)}
-            className="gap-2"
-          >
-            {showPublishForm ? <ChevronUp size={14} /> : <Plus size={14} />}
-            {t('skillVersions.publish')}
-          </Button>
-
-          {showPublishForm && (
-            <form
-              onSubmit={form.handleSubmit(handlePublish)}
-              className="mt-3 space-y-3 rounded-lg border border-gray-200 bg-gray-50 p-4"
-            >
-              <div>
-                <Label className="text-xs">{t('skillVersions.versionNumber')}</Label>
-                <Input
-                  {...form.register('version')}
-                  placeholder={t('skillVersions.versionPlaceholder')}
-                  className="mt-1"
-                />
-                {form.formState.errors.version && (
-                  <p className="mt-1 text-xs text-red-500">
-                    {t('skillVersions.invalidVersion')}
-                  </p>
-                )}
-              </div>
-              <div>
-                <Label className="text-xs">{t('skillVersions.releaseNotes')}</Label>
-                <Textarea
-                  {...form.register('release_notes')}
-                  placeholder={t('skillVersions.releaseNotesPlaceholder')}
-                  className="mt-1"
-                  rows={3}
-                />
-              </div>
-              <Button type="submit" size="sm" disabled={publishMutation.isPending}>
-                {t('skillVersions.publishButton')}
-              </Button>
-            </form>
-          )}
-        </div>
-      )}
-
-      {/* Version list */}
-      {versions.length === 0 ? (
-        <div className="flex flex-col items-center gap-2 py-12 text-center">
-          <History className="h-8 w-8 text-gray-300" />
-          <p className="text-sm text-gray-500">{t('skillVersions.emptyState')}</p>
-        </div>
-      ) : (
-        <div className="space-y-2">
-          {versions.map((v) => (
-            <div
-              key={v.version}
-              className="flex items-start justify-between rounded-lg border border-gray-200 bg-white p-3"
-            >
-              <div className="min-w-0 flex-1">
-                <div className="flex items-center gap-2">
-                  <span className="font-mono text-sm font-semibold">{v.version}</span>
-                  {v.publishedAt && (
-                    <span className="text-xs text-gray-400">
-                      {new Date(v.publishedAt).toLocaleDateString()}
-                    </span>
-                  )}
-                </div>
-                {v.releaseNotes && (
-                  <p className="mt-1 text-xs text-gray-600">{v.releaseNotes}</p>
-                )}
-              </div>
-              <div className="flex shrink-0 items-center gap-1">
-                {canRestore && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-7 gap-1 text-xs"
-                    onClick={() =>
-                      setConfirmDialog({ type: 'restore', version: v.version, open: true })
-                    }
-                  >
-                    <RotateCcw size={12} />
-                    {t('skillVersions.restore')}
-                  </Button>
-                )}
-                {canDelete && (
-                  <Button
-                    variant="ghost"
-                    size="sm"
-                    className="h-7 gap-1 text-xs text-red-500 hover:text-red-700"
-                    onClick={() =>
-                      setConfirmDialog({ type: 'delete', version: v.version, open: true })
-                    }
-                  >
-                    <Trash2 size={12} />
-                    {t('skillVersions.delete')}
-                  </Button>
-                )}
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-
-      {/* Confirm dialog */}
-      <AlertDialog
-        open={confirmDialog.open}
-        onOpenChange={(open) => setConfirmDialog((prev) => ({ ...prev, open }))}
-      >
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>
-              {confirmDialog.type === 'restore'
-                ? t('skillVersions.restoreConfirmTitle')
-                : t('skillVersions.deleteConfirmTitle')}
-            </AlertDialogTitle>
-            <AlertDialogDescription>
-              {confirmDialog.type === 'restore'
-                ? t('skillVersions.restoreConfirmMessage', {
-                    version: confirmDialog.version,
-                  })
-                : t('skillVersions.deleteConfirmMessage')}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleConfirmAction}
-              className={
-                confirmDialog.type === 'delete'
-                  ? 'bg-red-600 text-white hover:bg-red-700'
-                  : ''
-              }
-            >
-              {confirmDialog.type === 'restore'
-                ? t('skillVersions.restore')
-                : t('skillVersions.delete')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  )
-}
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/skills/schemas/versionPublishSchema.ts frontend/app/skills/components/VersionHistoryTab.tsx
-git commit -m "feat: add VersionHistoryTab component with publish form and version list"
-```
-
----
-
-## Task 10: UI — CollaboratorsTab component
-
-**Files:**
-- Create: `frontend/app/skills/components/CollaboratorsTab.tsx`
-
-- [ ] **Step 1: Create the CollaboratorsTab component**
-
-Create `frontend/app/skills/components/CollaboratorsTab.tsx`:
-
-```tsx
-'use client'
-
-import { Plus, User, UserPlus, Users, X } from 'lucide-react'
-import React, { useState } from 'react'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select'
-import { useToast } from '@/hooks/use-toast'
-import {
-  useSkillCollaborators,
-  useAddCollaborator,
-  useUpdateCollaboratorRole,
-  useRemoveCollaborator,
-  useTransferOwnership,
-} from '@/hooks/queries/skillCollaborators'
-import type { CollaboratorRole } from '@/hooks/queries/skillCollaborators'
-import { useTranslation } from '@/lib/i18n'
-
-interface CollaboratorsTabProps {
-  skillId: string
-  ownerId: string
-  userRole: string // current user's role: 'owner' | 'admin' | etc.
-}
-
-const ROLES: CollaboratorRole[] = ['viewer', 'editor', 'publisher', 'admin']
-
-export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTabProps) {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-
-  const [showAddForm, setShowAddForm] = useState(false)
-  const [newUserId, setNewUserId] = useState('')
-  const [newRole, setNewRole] = useState<CollaboratorRole>('viewer')
-  const [removeTarget, setRemoveTarget] = useState<{ userId: string; open: boolean }>({
-    userId: '',
-    open: false,
-  })
-  const [transferDialog, setTransferDialog] = useState(false)
-  const [transferTargetId, setTransferTargetId] = useState('')
-
-  const { data: collaborators = [], isLoading } = useSkillCollaborators(skillId)
-  const addMutation = useAddCollaborator(skillId)
-  const updateRoleMutation = useUpdateCollaboratorRole(skillId)
-  const removeMutation = useRemoveCollaborator(skillId)
-  const transferMutation = useTransferOwnership(skillId)
-
-  const canManage = ['owner', 'admin'].includes(userRole)
-  const isOwner = userRole === 'owner'
-
-  const handleAdd = async () => {
-    if (!newUserId.trim()) return
-    try {
-      await addMutation.mutateAsync({ user_id: newUserId.trim(), role: newRole })
-      toast({ title: t('skillCollaborators.addedSuccess') })
-      setNewUserId('')
-      setNewRole('viewer')
-      setShowAddForm(false)
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-  }
-
-  const handleRoleChange = async (userId: string, role: CollaboratorRole) => {
-    try {
-      await updateRoleMutation.mutateAsync({ userId, role })
-      toast({ title: t('skillCollaborators.updatedSuccess') })
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-  }
-
-  const handleRemove = async () => {
-    try {
-      await removeMutation.mutateAsync(removeTarget.userId)
-      toast({ title: t('skillCollaborators.removedSuccess') })
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-    setRemoveTarget({ userId: '', open: false })
-  }
-
-  const handleTransfer = async () => {
-    if (!transferTargetId.trim()) return
-    try {
-      await transferMutation.mutateAsync(transferTargetId.trim())
-      toast({ title: t('skillCollaborators.transferredSuccess') })
-      setTransferDialog(false)
-      setTransferTargetId('')
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex h-64 items-center justify-center">
-        <div className="h-6 w-6 animate-spin rounded-full border-2 border-gray-300 border-t-gray-600" />
-      </div>
-    )
-  }
-
-  return (
-    <div className="flex flex-col gap-4 p-4">
-      {/* Add collaborator button */}
-      {canManage && (
-        <div>
-          <Button
-            variant="outline"
-            size="sm"
-            onClick={() => setShowAddForm(!showAddForm)}
-            className="gap-2"
-          >
-            <UserPlus size={14} />
-            {t('skillCollaborators.add')}
-          </Button>
-
-          {showAddForm && (
-            <div className="mt-3 flex items-end gap-2 rounded-lg border border-gray-200 bg-gray-50 p-4">
-              <div className="flex-1">
-                <Label className="text-xs">{t('skillCollaborators.userId')}</Label>
-                <Input
-                  value={newUserId}
-                  onChange={(e) => setNewUserId(e.target.value)}
-                  placeholder={t('skillCollaborators.userIdPlaceholder')}
-                  className="mt-1"
-                />
-              </div>
-              <div className="w-32">
-                <Label className="text-xs">{t('skillCollaborators.role')}</Label>
-                <Select
-                  value={newRole}
-                  onValueChange={(v) => setNewRole(v as CollaboratorRole)}
-                >
-                  <SelectTrigger className="mt-1">
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {ROLES.map((r) => (
-                      <SelectItem key={r} value={r}>
-                        {t(`skillCollaborators.${r}`)}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
-              <Button size="sm" onClick={handleAdd} disabled={addMutation.isPending}>
-                <Plus size={14} />
-              </Button>
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* Collaborator list */}
-      <div className="space-y-1">
-        {/* Owner row (always first) */}
-        <div className="flex items-center gap-3 rounded-lg border border-gray-200 bg-white px-3 py-2">
-          <div className="flex h-6 w-6 items-center justify-center rounded-full bg-gray-200">
-            <User size={12} className="text-gray-500" />
-          </div>
-          <span className="flex-1 text-sm font-medium">{ownerId}</span>
-          <span className="text-xs text-gray-400">({t('skillCollaborators.owner')})</span>
-        </div>
-
-        {/* Collaborator rows */}
-        {collaborators.map((c) => (
-          <div
-            key={c.userId}
-            className="flex items-center gap-3 rounded-lg border border-gray-200 bg-white px-3 py-2"
-          >
-            <div className="h-6 w-6 rounded-full bg-gray-200 text-center text-xs leading-6">
-              👤
-            </div>
-            <span className="flex-1 text-sm">{c.userId}</span>
-            {canManage ? (
-              <Select
-                value={c.role}
-                onValueChange={(v) => handleRoleChange(c.userId, v as CollaboratorRole)}
-              >
-                <SelectTrigger className="h-7 w-28 text-xs">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {ROLES.map((r) => (
-                    <SelectItem key={r} value={r}>
-                      {t(`skillCollaborators.${r}`)}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            ) : (
-              <span className="text-xs text-gray-500">
-                {t(`skillCollaborators.${c.role}`)}
-              </span>
-            )}
-            {canManage && (
-              <Button
-                variant="ghost"
-                size="sm"
-                className="h-7 w-7 p-0 text-gray-400 hover:text-red-500"
-                onClick={() => setRemoveTarget({ userId: c.userId, open: true })}
-              >
-                <X size={14} />
-              </Button>
-            )}
-          </div>
-        ))}
-
-        {collaborators.length === 0 && (
-          <p className="py-4 text-center text-xs text-gray-400">
-            {t('skillCollaborators.emptyState')}
-          </p>
-        )}
-      </div>
-
-      {/* Transfer ownership button */}
-      {isOwner && (
-        <div className="border-t border-gray-200 pt-4">
-          <Button
-            variant="outline"
-            size="sm"
-            className="gap-2"
-            onClick={() => setTransferDialog(true)}
-          >
-            {t('skillCollaborators.transferOwnership')}
-          </Button>
-        </div>
-      )}
-
-      {/* Remove confirm dialog */}
-      <AlertDialog
-        open={removeTarget.open}
-        onOpenChange={(open) => setRemoveTarget((prev) => ({ ...prev, open }))}
-      >
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{t('skillCollaborators.removeConfirmTitle')}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {t('skillCollaborators.removeConfirmMessage')}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleRemove}
-              className="bg-red-600 text-white hover:bg-red-700"
-            >
-              {t('skillCollaborators.remove')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-
-      {/* Transfer ownership dialog */}
-      <Dialog open={transferDialog} onOpenChange={setTransferDialog}>
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle>{t('skillCollaborators.transferConfirmTitle')}</DialogTitle>
-            <DialogDescription>
-              {t('skillCollaborators.transferConfirmMessage')}
-            </DialogDescription>
-          </DialogHeader>
-          <div className="py-4">
-            <Label>{t('skillCollaborators.newOwner')}</Label>
-            <Input
-              value={transferTargetId}
-              onChange={(e) => setTransferTargetId(e.target.value)}
-              placeholder={t('skillCollaborators.newOwnerPlaceholder')}
-              className="mt-1"
-            />
-          </div>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setTransferDialog(false)}>
-              {t('common.cancel')}
-            </Button>
-            <Button onClick={handleTransfer} disabled={transferMutation.isPending}>
-              {t('skillCollaborators.transferOwnership')}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </div>
-  )
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/skills/components/CollaboratorsTab.tsx
-git commit -m "feat: add CollaboratorsTab with inline role editing and ownership transfer"
-```
-
----
-
-## Task 11: UI — Token management pages (TokensPage + dialogs)
-
-**Files:**
-- Create: `frontend/components/settings/tokens-page.tsx`
-- Create: `frontend/components/settings/create-token-dialog.tsx`
-- Create: `frontend/components/settings/token-created-dialog.tsx`
-
-- [ ] **Step 1: Create `create-token-dialog.tsx`**
-
-```tsx
-'use client'
-
-import React, { useState } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { Checkbox } from '@/components/ui/checkbox'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { useTranslation } from '@/lib/i18n'
-
-const AVAILABLE_SCOPES = [
-  { value: 'skills:read', label: 'Read' },
-  { value: 'skills:write', label: 'Write' },
-  { value: 'skills:publish', label: 'Publish' },
-  { value: 'skills:admin', label: 'Admin' },
-]
-
-interface CreateTokenDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  onSubmit: (data: { name: string; scopes: string[]; expires_at?: string | null }) => Promise<void>
-  isPending: boolean
-}
-
-export function CreateTokenDialog({
-  open,
-  onOpenChange,
-  onSubmit,
-  isPending,
-}: CreateTokenDialogProps) {
-  const { t } = useTranslation()
-  const [name, setName] = useState('')
-  const [scopes, setScopes] = useState<string[]>([])
-  const [expiresAt, setExpiresAt] = useState('')
-
-  const handleScopeToggle = (scope: string, checked: boolean) => {
-    setScopes((prev) => (checked ? [...prev, scope] : prev.filter((s) => s !== scope)))
-  }
-
-  const handleSubmit = async () => {
-    await onSubmit({
-      name: name.trim(),
-      scopes,
-      expires_at: expiresAt ? new Date(expiresAt).toISOString() : null,
-    })
-    setName('')
-    setScopes([])
-    setExpiresAt('')
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{t('settings.tokens.create')}</DialogTitle>
-          <DialogDescription>{t('settings.tokens.description')}</DialogDescription>
-        </DialogHeader>
-        <div className="space-y-4 py-4">
-          <div>
-            <Label>{t('settings.tokens.name')}</Label>
-            <Input
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder={t('settings.tokens.namePlaceholder')}
-              className="mt-1"
-            />
-          </div>
-          <div>
-            <Label>{t('settings.tokens.scopes')}</Label>
-            <div className="mt-2 space-y-2">
-              {AVAILABLE_SCOPES.map((s) => (
-                <div key={s.value} className="flex items-center gap-2">
-                  <Checkbox
-                    id={s.value}
-                    checked={scopes.includes(s.value)}
-                    onCheckedChange={(checked) =>
-                      handleScopeToggle(s.value, checked === true)
-                    }
-                  />
-                  <label htmlFor={s.value} className="text-sm">
-                    {s.label}
-                    <span className="ml-1 text-xs text-gray-400">({s.value})</span>
-                  </label>
-                </div>
-              ))}
-            </div>
-          </div>
-          <div>
-            <Label>{t('settings.tokens.expiresAt')}</Label>
-            <Input
-              type="date"
-              value={expiresAt}
-              onChange={(e) => setExpiresAt(e.target.value)}
-              className="mt-1"
-              min={new Date().toISOString().split('T')[0]}
-            />
-            <p className="mt-1 text-xs text-gray-400">
-              {t('settings.tokens.noExpiry')} if left blank
-            </p>
-          </div>
-        </div>
-        <DialogFooter>
-          <Button variant="outline" onClick={() => onOpenChange(false)}>
-            {t('common.cancel')}
-          </Button>
-          <Button
-            onClick={handleSubmit}
-            disabled={isPending || !name.trim() || scopes.length === 0}
-          >
-            {t('settings.tokens.create')}
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
-```
-
-- [ ] **Step 2: Create `token-created-dialog.tsx`**
-
-```tsx
-'use client'
-
-import { Check, Copy } from 'lucide-react'
-import React, { useState } from 'react'
-
-import { Button } from '@/components/ui/button'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog'
-import { useTranslation } from '@/lib/i18n'
-
-interface TokenCreatedDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  token: string | null
-}
-
-export function TokenCreatedDialog({ open, onOpenChange, token }: TokenCreatedDialogProps) {
-  const { t } = useTranslation()
-  const [copied, setCopied] = useState(false)
-
-  const handleCopy = async () => {
-    if (!token) return
-    await navigator.clipboard.writeText(token)
-    setCopied(true)
-    setTimeout(() => setCopied(false), 2000)
-  }
-
-  return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{t('settings.tokens.tokenCreatedTitle')}</DialogTitle>
-          <DialogDescription>
-            {t('settings.tokens.tokenCreatedMessage')}
-          </DialogDescription>
-        </DialogHeader>
-        <div className="my-4">
-          <div className="flex items-center gap-2 rounded-lg bg-gray-100 p-3">
-            <code className="flex-1 break-all text-xs">{token}</code>
-            <Button variant="ghost" size="sm" className="shrink-0" onClick={handleCopy}>
-              {copied ? <Check size={14} /> : <Copy size={14} />}
-              <span className="ml-1 text-xs">
-                {copied ? t('settings.tokens.copied') : t('settings.tokens.copyToken')}
-              </span>
-            </Button>
-          </div>
-        </div>
-        <DialogFooter>
-          <Button onClick={() => onOpenChange(false)}>OK</Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  )
-}
-```
-
-- [ ] **Step 3: Create `tokens-page.tsx`**
-
-```tsx
-'use client'
-
-import { Key, Loader2, Plus, ShieldAlert } from 'lucide-react'
-import React, { useState } from 'react'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { useToast } from '@/components/ui/use-toast'
-import {
-  usePlatformTokens,
-  useCreateToken,
-  useRevokeToken,
-} from '@/hooks/queries/platformTokens'
-import type { PlatformTokenCreateResponse } from '@/hooks/queries/platformTokens'
-import { useTranslation } from '@/lib/i18n'
-import { CreateTokenDialog } from './create-token-dialog'
-import { TokenCreatedDialog } from './token-created-dialog'
-
-function formatRelativeTime(dateStr: string | null, t: (key: string, opts?: any) => string): string {
-  if (!dateStr) return t('settings.tokens.neverUsed')
-  const diff = Date.now() - new Date(dateStr).getTime()
-  const mins = Math.floor(diff / 60000)
-  if (mins < 1) return t('settings.tokens.justNow')
-  if (mins < 60) return t('settings.tokens.minutesAgo', { count: mins })
-  const hours = Math.floor(mins / 60)
-  if (hours < 24) return t('settings.tokens.hoursAgo', { count: hours })
-  const days = Math.floor(hours / 24)
-  return t('settings.tokens.daysAgo', { count: days })
-}
-
-export const TokensPage = () => {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-
-  const [showCreateDialog, setShowCreateDialog] = useState(false)
-  const [createdToken, setCreatedToken] = useState<string | null>(null)
-  const [revokeTarget, setRevokeTarget] = useState<{ id: string; name: string; open: boolean }>({
-    id: '',
-    name: '',
-    open: false,
-  })
-
-  const { data: tokens = [], isLoading } = usePlatformTokens()
-  const createMutation = useCreateToken()
-  const revokeMutation = useRevokeToken()
-
-  const handleCreate = async (data: { name: string; scopes: string[]; expires_at?: string | null }) => {
-    try {
-      const result: PlatformTokenCreateResponse = await createMutation.mutateAsync(data)
-      setShowCreateDialog(false)
-      setCreatedToken(result.token)
-      toast({ title: t('settings.tokens.createdSuccess') })
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-  }
-
-  const handleRevoke = async () => {
-    try {
-      await revokeMutation.mutateAsync(revokeTarget.id)
-      toast({ title: t('settings.tokens.revokedSuccess') })
-    } catch (error: any) {
-      toast({ title: error?.message || t('common.error'), variant: 'destructive' })
-    }
-    setRevokeTarget({ id: '', name: '', open: false })
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex h-full min-h-[400px] items-center justify-center">
-        <Loader2 className="h-6 w-6 animate-spin text-gray-400" />
-      </div>
-    )
-  }
-
-  const activeTokens = tokens.filter((t) => t.isActive)
-
-  return (
-    <div className="flex h-full flex-col">
-      {/* Header */}
-      <div className="mb-6 flex items-center justify-between">
-        <div className="flex items-center gap-3">
-          <div className="rounded-lg bg-gradient-to-br from-amber-500 to-orange-600 p-2 shadow-sm">
-            <Key className="h-5 w-5 text-white" />
-          </div>
-          <div>
-            <h2 className="text-lg font-bold tracking-tight text-gray-900">
-              {t('settings.tokens.title')}
-            </h2>
-            <p className="mt-0.5 text-xs text-gray-500">
-              {t('settings.tokens.description')}
-            </p>
-          </div>
-        </div>
-        <Button size="sm" className="gap-2" onClick={() => setShowCreateDialog(true)}>
-          <Plus size={14} />
-          {t('settings.tokens.create')}
-        </Button>
-      </div>
-
-      {/* Token cards */}
-      {activeTokens.length === 0 ? (
-        <div className="flex flex-1 flex-col items-center justify-center gap-3 py-12">
-          <div className="rounded-full border bg-gray-100 p-4">
-            <Key className="h-8 w-8 text-gray-300" />
-          </div>
-          <p className="text-sm text-gray-500">{t('settings.tokens.emptyState')}</p>
-        </div>
-      ) : (
-        <div className="space-y-3 overflow-auto">
-          {activeTokens.map((token) => (
-            <div
-              key={token.id}
-              className="rounded-xl border border-gray-200 bg-white p-4 shadow-sm"
-            >
-              <div className="flex items-start justify-between">
-                <div>
-                  <h3 className="text-sm font-semibold text-gray-900">{token.name}</h3>
-                  <p className="mt-0.5 font-mono text-xs text-gray-400">
-                    {token.tokenPrefix}...
-                  </p>
-                </div>
-                <Button
-                  variant="outline"
-                  size="sm"
-                  className="text-red-500 hover:text-red-700"
-                  onClick={() =>
-                    setRevokeTarget({ id: token.id, name: token.name, open: true })
-                  }
-                >
-                  {t('settings.tokens.revoke')}
-                </Button>
-              </div>
-              <div className="mt-2 flex flex-wrap gap-1">
-                {token.scopes.map((scope) => (
-                  <Badge key={scope} variant="secondary" className="text-xs">
-                    {scope.replace('skills:', '')}
-                  </Badge>
-                ))}
-              </div>
-              <div className="mt-2 flex gap-4 text-xs text-gray-400">
-                <span>
-                  {t('settings.tokens.expiresAt')}:{' '}
-                  {token.expiresAt
-                    ? new Date(token.expiresAt).toLocaleDateString()
-                    : t('settings.tokens.noExpiry')}
-                </span>
-                <span>
-                  {t('settings.tokens.lastUsed')}:{' '}
-                  {formatRelativeTime(token.lastUsedAt, t)}
-                </span>
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-
-      {/* Create dialog */}
-      <CreateTokenDialog
-        open={showCreateDialog}
-        onOpenChange={setShowCreateDialog}
-        onSubmit={handleCreate}
-        isPending={createMutation.isPending}
-      />
-
-      {/* Token created dialog */}
-      <TokenCreatedDialog
-        open={!!createdToken}
-        onOpenChange={(open) => {
-          if (!open) setCreatedToken(null)
-        }}
-        token={createdToken}
-      />
-
-      {/* Revoke confirm dialog */}
-      <AlertDialog
-        open={revokeTarget.open}
-        onOpenChange={(open) => setRevokeTarget((prev) => ({ ...prev, open }))}
-      >
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>{t('settings.tokens.revokeConfirmTitle')}</AlertDialogTitle>
-            <AlertDialogDescription>
-              {t('settings.tokens.revokeConfirmMessage')}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleRevoke}
-              className="bg-red-600 text-white hover:bg-red-700"
-            >
-              {t('settings.tokens.revoke')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  )
-}
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/components/settings/tokens-page.tsx frontend/components/settings/create-token-dialog.tsx frontend/components/settings/token-created-dialog.tsx
-git commit -m "feat: add TokensPage, CreateTokenDialog, and TokenCreatedDialog"
-```
-
----
-
-## Task 12: Integration — Add tabs to SkillsManager
-
-**Files:**
-- Modify: `frontend/app/skills/SkillsManager.tsx`
-
-This task integrates the VersionHistoryTab and CollaboratorsTab into the SkillsManager component.
-
-- [ ] **Step 1: Read the current SkillsManager.tsx to identify the exact insertion points**
-
-The file is ~1021 lines. Key areas:
-1. Import section at top
-2. Component state declarations
-3. The editor area (flex-1 panel on the right side)
-
-- [ ] **Step 2: Add imports**
-
-At the top of `SkillsManager.tsx`, add:
-
-```typescript
-import { VersionHistoryTab } from './components/VersionHistoryTab'
-import { CollaboratorsTab } from './components/CollaboratorsTab'
-```
-
-- [ ] **Step 3: Add tab state**
-
-Inside the component, add a new state:
-
-```typescript
-const [activeTab, setActiveTab] = useState<'editor' | 'versions' | 'collaborators'>('editor')
-```
-
-- [ ] **Step 4: Add tab bar and conditional rendering**
-
-In the editor area (the rightmost flex-1 panel), wrap the existing editor content with a Tab bar:
-
-```tsx
-{/* Tab bar — 3 tabs (file tree is a permanent side panel, not a tab) */}
-<div className="flex border-b border-gray-200 px-2">
-  {['editor', 'versions', 'collaborators'].map((tab) => (
-    <button
-      key={tab}
-      onClick={() => setActiveTab(tab as any)}
-      className={cn(
-        'px-3 py-2 text-xs font-medium transition-colors',
-        activeTab === tab
-          ? 'border-b-2 border-blue-500 text-blue-600'
-          : 'text-gray-500 hover:text-gray-700'
-      )}
-    >
-      {tab === 'editor' && t('skills.editor')}
-      {tab === 'versions' && t('skillVersions.title')}
-      {tab === 'collaborators' && t('skillCollaborators.title')}
-    </button>
-  ))}
-</div>
-
-{/* Tab content */}
-{activeTab === 'editor' && (
-  /* existing editor content */
-)}
-{activeTab === 'versions' && selectedSkill && (
-  <VersionHistoryTab
-    skillId={selectedSkill.id}
-    userRole="owner" /* TODO: derive from actual skill permissions */
-  />
-)}
-{activeTab === 'collaborators' && selectedSkill && (
-  <CollaboratorsTab
-    skillId={selectedSkill.id}
-    ownerId={selectedSkill.owner_id || selectedSkill.created_by_id || ''}
-    userRole="owner" /* TODO: derive from actual skill permissions */
-  />
-)}
-```
-
-**Note:** The `userRole` prop is hardcoded to `"owner"` for now. A follow-up task should derive the actual role from the skill's collaborator data and the current user. For the initial integration, `"owner"` ensures all features are visible and testable.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/skills/SkillsManager.tsx
-git commit -m "feat: integrate version history and collaborator tabs into SkillsManager"
-```
-
----
-
-## Task 13: Integration — Add API Tokens tab to Settings dialog
-
-**Files:**
-- Modify: `frontend/components/settings/settings-dialog.tsx`
-
-- [ ] **Step 1: Add import**
-
-```typescript
-import { Key } from 'lucide-react'
-import { TokensPage } from './tokens-page'
-```
-
-- [ ] **Step 2: Add MenuItem in sidebar**
-
-In the sidebar section (after the Sandboxes MenuItem), add:
-
-```tsx
-<MenuItem
-  icon={Key}
-  label={t('settings.tokens.title')}
-  isActive={activeTab === 'tokens'}
-  onClick={() => setActiveTab('tokens')}
-/>
-```
-
-- [ ] **Step 3: Add content rendering**
-
-In the content area, add:
-
-```tsx
-{activeTab === 'tokens' && (
-  <div className="flex-1 overflow-hidden p-6">
-    <TokensPage />
-  </div>
-)}
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/components/settings/settings-dialog.tsx
-git commit -m "feat: add API Tokens tab to Settings dialog"
-```
-
----
-
-## Task 14: Smoke test — Verify TypeScript compilation
-
-**Files:** None (verification only)
-
-- [ ] **Step 1: Run TypeScript compilation check**
-
-```bash
-cd frontend && npx tsc --noEmit 2>&1 | head -50
-```
-
-Expected: No errors related to the new files. Pre-existing errors in other files are acceptable.
-
-- [ ] **Step 2: Fix any type errors in new files**
-
-If there are errors in the new files, fix them.
-
-- [ ] **Step 3: Run existing tests to ensure no regressions**
-
-```bash
-cd frontend && npx vitest run --reporter=verbose 2>&1 | tail -30
-```
-
-- [ ] **Step 4: Final commit (if fixes needed)**
-
-```bash
-git add -A && git commit -m "fix: resolve TypeScript errors in new skill frontend files"
-```
-
----
-
-## Task 15: Follow-up — Derive actual `userRole` from skill permissions
-
-**Files:**
-- Modify: `frontend/app/skills/SkillsManager.tsx`
-
-This is a follow-up task to replace the hardcoded `userRole="owner"` with the actual user's role derived from the skill's collaborator data and the current user session.
-
-- [ ] **Step 1: Derive user role**
-
-In `SkillsManager.tsx`, use `useSkillCollaborators` and the current user session to determine the role:
-
-```typescript
-// After selectedSkill is set, derive userRole:
-const { data: session } = useSession()
-const { data: collaborators = [] } = useSkillCollaborators(selectedSkill?.id ?? '')
-const currentUserId = session?.user?.id
-
-const userRole = useMemo(() => {
-  if (!selectedSkill || !currentUserId) return 'viewer'
-  if (selectedSkill.owner_id === currentUserId) return 'owner'
-  const collab = collaborators.find((c) => c.userId === currentUserId)
-  return collab?.role ?? (selectedSkill.is_public ? 'viewer' : 'viewer')
-}, [selectedSkill, currentUserId, collaborators])
-```
-
-- [ ] **Step 2: Pass derived `userRole` to tab components**
-
-Replace the hardcoded `"owner"` with the computed `userRole`:
-
-```tsx
-<VersionHistoryTab skillId={selectedSkill.id} userRole={userRole} />
-<CollaboratorsTab skillId={selectedSkill.id} ownerId={selectedSkill.owner_id || ''} userRole={userRole} />
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/skills/SkillsManager.tsx
-git commit -m "feat: derive actual userRole from skill permissions for version/collaborator tabs"
-```
diff --git a/docs/superpowers/plans/2026-03-24-ws-chat-unification.md b/docs/superpowers/plans/2026-03-24-ws-chat-unification.md
deleted file mode 100644
index 7291e342c..000000000
--- a/docs/superpowers/plans/2026-03-24-ws-chat-unification.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# WS Chat Unification Implementation Plan
-
-> Historical implementation plan. Final implementation on 2026-03-24 also migrated workspace execution and Skill Creator to `WS /ws/chat`, then removed the public `/v1/chat*` HTTP routes.
-
-**Goal:** Replace the Chat page's SSE streaming path with a persistent `WS /ws/chat` connection, unify per-turn chat operations under request-scoped WS frames, and remove the dead legacy session chat websocket.
-
-**Architecture:** Extract shared stream execution helpers from `backend/app/api/v1/chat.py`, add a connection-scoped `ChatWsHandler` that multiplexes turns by `request_id`, then move the frontend Chat subtree to a provider-owned WebSocket hook. Notification/copilot websockets stay unchanged. The final implementation also migrated workspace execution and Skill Creator, so `/v1/chat*` is no longer registered as a public API.
-
-**Tech Stack:** FastAPI WebSocket, asyncio tasks, existing LangGraph `astream_events`, React hooks, browser `WebSocket`, TypeScript
-
-**Spec:** `docs/superpowers/specs/2026-03-24-ws-chat-unification-design.md`
-
-**Verification:** Backend import/tests + frontend `tsc --noEmit`. Prefer targeted verification for touched modules if the full suite is too heavy.
-
----
-
-## Scope Guardrails
-
-- Migrate Chat page traffic from `POST /v1/chat/stream` to `WS /ws/chat`.
-- Initial draft kept `POST /v1/chat/stop` and `POST /v1/chat/resume` for workspace-builder callers; this was later superseded by migrating those callers to WS as well.
-- Delete legacy `WS /ws/{session_id}` and its implementation files only after removing the endpoint reference from `main.py`.
-- Delete Chat-page SSE hook and SSE client helper once frontend is fully switched.
-
----
-
-## Task 1: Backend Shared Execution Helpers
-
-**Files:**
-- Modify: `backend/app/api/v1/chat.py`
-
-- [ ] Extract helper(s) for graph/context preparation so SSE and WS can share:
-  - thread/conversation bootstrap
-  - graph metadata lookup (`workspace_id`, display name)
-  - initial context extraction from graph variables
-  - graph creation for default-chat vs graph_id-backed runs
-- [ ] Extract helper(s) for finalization so SSE and WS can share:
-  - `task_manager.unregister_task`
-  - `save_run_result`
-  - backend cleanup
-  - artifact manifest write
-  - interrupt marker cleanup
-- [ ] Keep existing HTTP behavior unchanged for `POST /v1/chat/stop` and `POST /v1/chat/resume`.
-
-**Verification**
-- [ ] `python -m py_compile backend/app/api/v1/chat.py`
-
----
-
-## Task 2: Add `ChatWsHandler` And WS Endpoint
-
-**Files:**
-- Create: `backend/app/websocket/chat_ws_handler.py`
-- Modify: `backend/app/main.py`
-- Delete: `backend/app/websocket/chat_handler.py`
-- Delete: `backend/app/websocket/connection_manager.py`
-
-- [ ] Implement `ChatWsHandler` with:
-  - authenticated persistent connection
-  - frame routing for `chat`, `resume`, `stop`, `ping`
-  - `_tasks: request_id -> (thread_id, asyncio.Task)` tracking
-  - thread-level concurrency guard
-  - safe `None` filtering when converting SSE strings to WS JSON envelopes
-  - disconnect cleanup for all in-flight tasks
-- [ ] Register `@app.websocket("/ws/chat")` in `main.py`.
-- [ ] Remove legacy `@app.websocket("/ws/{session_id}")` endpoint and stale imports.
-
-**Verification**
-- [ ] `python -m py_compile backend/app/main.py backend/app/websocket/chat_ws_handler.py`
-
----
-
-## Task 3: Frontend WS Hook And Provider Migration
-
-**Files:**
-- Create: `frontend/app/chat/hooks/useChatWebSocket.ts`
-- Modify: `frontend/app/chat/ChatProvider.tsx`
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-- Modify: `frontend/services/chatBackend.ts`
-- Delete: `frontend/app/chat/hooks/useBackendChatStream.ts`
-
-- [ ] Move chat event type definitions into a reusable module or keep them in `chatBackend.ts` while removing `streamChat()`.
-- [ ] Implement provider-owned `useChatWebSocket` with:
-  - single persistent `/ws/chat` connection
-  - reconnect/backoff
-  - request tracking by `request_id`
-  - reverse lookup `threadId -> requestId` for stop
-  - `done` / `error` driven `STREAM_DONE`
-  - `4001` auth-close handling
-- [ ] Extend `ChatStreamContext` to expose:
-  - `isConnected`
-  - `sendMessage`
-  - `stopMessage`
-  - `resumeChat`
-- [ ] Update `ChatLayout.tsx` to consume WS functions from context and remove direct SSE hook usage.
-- [ ] Delete `useBackendChatStream.ts` after references are removed.
-
-**Verification**
-- [ ] `cd frontend && npx tsc --noEmit`
-
----
-
-## Task 4: Cutover Cleanup
-
-**Files:**
-- Modify: `backend/app/api/v1/chat.py`
-
-- [ ] Remove `POST /v1/chat/stream` SSE endpoint once the frontend no longer references it.
-- [ ] Keep `POST /v1/chat` only if there are live callers; otherwise remove it in the same cleanup batch if unused.
-- [ ] Run a repo-wide search to confirm no stale Chat-page SSE references remain.
-
-**Verification**
-- [ ] `rg -n "chat/stream|useBackendChatStream|streamChat\\(" frontend backend -S`
-
----
-
-## Task 5: Final Verification
-
-- [ ] Run backend targeted tests if present, otherwise at least import/compile verification for touched modules.
-- [ ] Run frontend type-check.
-- [ ] Update planning/progress files with outcomes and residual risks.
-
-## Final Outcome
-
-- `WS /ws/chat` is the active transport for Chat page, Skill Creator, and workspace execution flows.
-- Legacy `WS /ws/{session_id}` plus its implementation files were deleted.
-- Public `/v1/chat`, `/v1/chat/stream`, `/v1/chat/stop`, and `/v1/chat/resume` are no longer registered.
-- `backend/app/api/v1/chat.py` remains as an internal helper module reused by `chat_ws_handler.py`.
diff --git a/docs/superpowers/plans/2026-03-25-frontend-design-fixes.md b/docs/superpowers/plans/2026-03-25-frontend-design-fixes.md
deleted file mode 100644
index ef80c2f26..000000000
--- a/docs/superpowers/plans/2026-03-25-frontend-design-fixes.md
+++ /dev/null
@@ -1,561 +0,0 @@
-# Frontend Design Fixes Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Fix all design inconsistencies across the JoySafeter frontend, from P0 color unification to P3 Framer Motion micro-interactions.
-
-**Architecture:** Systematic fixes starting with the global design token layer (globals.css, tailwind.config.ts), then propagating through component-level usage, then removing dead assets, then adding motion polish. Each task is self-contained and can be verified visually in a dev server.
-
-**Tech Stack:** Next.js 14 App Router, Tailwind CSS v3, shadcn/ui, Framer Motion v12, CSS custom properties
-
----
-
-## File Map
-
-| File | Task(s) |
-|------|---------|
-| `frontend/styles/globals.css` | T1 (surface tokens), T4 (z-index vars) |
-| `frontend/components/app-shell/index.tsx` | T2 (sidebar width) |
-| `frontend/app/chat/components/ChatHome.tsx` | T3 (brand color), T5 (visual upgrade) |
-| `frontend/app/chat/components/ChatInput.tsx` | T3 (brand color) |
-| `frontend/app/skills/page.tsx` | T3 (brand color) |
-| `frontend/app/chat/components/MessageItem.tsx` | T6 (Framer Motion) |
-| `frontend/app/layout.tsx` | T7 (remove unused fonts) |
-| `frontend/styles/fonts/season/` | T7 (delete) |
-| `frontend/styles/fonts/inter/` | T7 (delete) |
-| `frontend/components/ui/dialog.tsx` | T4 (z-index) |
-
----
-
-## Task 1: Fix Surface Token System (P1)
-
-**Files:**
-- Modify: `frontend/styles/globals.css:55-177`
-
-Remove duplicate token values and fill in the missing numbers. The goal: each `--surface-N` should be a distinct value, monotonically increasing in darkness (light mode) / depth (dark mode).
-
-- [ ] **Step 1: Replace the surface token block in `:root`/`.light`**
-
-In `frontend/styles/globals.css`, replace lines 58–70 (the Surfaces block inside `:root, .light`) with:
-
-```css
-    /* Surfaces - progressively darker grays */
-    --bg: #f4f5f7;
-    --surface-1: #f4f5f7;
-    --surface-2: #fafbfc;
-    --surface-3: #eef0f2;
-    --surface-4: #e8eaed;
-    --surface-5: #e2e4e8;
-    --surface-6: #dcdfe4;
-    --surface-7: #d5d8dc;
-    --surface-8: #cdd0d6;
-    --surface-9: #c6c9cf;
-    --surface-10: #bfc2c8;
-    --surface-11: #b8bbc1;
-    --surface-12: #adb0b7;
-    --surface-elevated: #fafbfc;
-```
-
-- [ ] **Step 2: Replace the surface token block in `.dark`**
-
-In `frontend/styles/globals.css`, replace lines 121–132 (the Surfaces block inside `.dark`) with:
-
-```css
-    /* Surfaces - progressively deeper navy */
-    --bg: #0f1419;
-    --surface-1: #141a21;
-    --surface-2: #1a222b;
-    --surface-3: #1f2933;
-    --surface-4: #212b36;
-    --surface-5: #283341;
-    --surface-6: #2e3a4a;
-    --surface-7: #334252;
-    --surface-8: #3a4a5c;
-    --surface-9: #405263;
-    --surface-10: #475a6b;
-    --surface-11: #4f6273;
-    --surface-12: #576a7c;
-    --surface-elevated: #1a222b;
-```
-
-- [ ] **Step 3: Verify no visual regressions**
-
-Start dev server (`cd frontend && npm run dev`) and check that Chat, Workspace, and Settings pages render correctly with no obvious color breaks.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/styles/globals.css
-git commit -m "fix: repair surface token system - remove duplicates, fill gaps 6-10"
-```
-
----
-
-## Task 2: Fix Sidebar CSS Variable / Actual Width Mismatch (P0)
-
-**Files:**
-- Modify: `frontend/styles/globals.css:9`
-- Modify: `frontend/components/app-shell/index.tsx:44`
-
-The `--sidebar-width` CSS variable is `256px` but the AppShell renders `w-[140px]`. Align the CSS variable to match the actual rendered width so consuming code can rely on it.
-
-- [ ] **Step 1: Update `--sidebar-width` in globals.css**
-
-In `frontend/styles/globals.css`, line 9, change:
-```css
-  --sidebar-width: 256px;
-```
-to:
-```css
-  --sidebar-width: 140px;
-  --sidebar-width-collapsed: 64px;
-```
-
-- [ ] **Step 2: Use CSS variable in AppShell**
-
-In `frontend/components/app-shell/index.tsx`, replace lines 41–46:
-```tsx
-      <div
-        className={cn(
-          'flex-shrink-0 overflow-hidden transition-all duration-300 ease-in-out',
-          isAppSidebarCollapsed ? 'w-[64px]' : 'w-[140px]',
-        )}
-      >
-```
-with:
-```tsx
-      <div
-        style={{
-          width: isAppSidebarCollapsed
-            ? 'var(--sidebar-width-collapsed)'
-            : 'var(--sidebar-width)',
-        }}
-        className="flex-shrink-0 overflow-hidden transition-all duration-300 ease-in-out"
-      >
-```
-
-- [ ] **Step 3: Verify sidebar collapses/expands correctly**
-
-Navigate to `/chat` (expanded, 140px) and `/workspace/...` (collapsed, 64px). Confirm transitions work.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/styles/globals.css frontend/components/app-shell/index.tsx
-git commit -m "fix: align --sidebar-width CSS variable with actual rendered sidebar width"
-```
-
----
-
-## Task 3: Unify Primary Action Color (P0)
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-- Modify: `frontend/app/chat/components/ChatInput.tsx`
-- Modify: `frontend/app/skills/page.tsx`
-
-Replace all hardcoded `blue-600` / `emerald-600` primary action colors with the design system's `--brand-500` / `primary` color. The submit button, "New Skill" button, and agent mode toggle should all share the same visual language.
-
-- [ ] **Step 1: Fix send button in `ChatHome.tsx`**
-
-In `frontend/app/chat/components/ChatHome.tsx`, find the send button around line 521. Replace:
-```tsx
-                          ? 'bg-blue-600 hover:bg-blue-700'
-```
-with:
-```tsx
-                          ? 'bg-primary hover:bg-primary/90'
-```
-
-- [ ] **Step 2: Fix agent mode toggle in `ChatHome.tsx`**
-
-In `frontend/app/chat/components/ChatHome.tsx`, find the autoRedirect button around line 422–433. Replace:
-```tsx
-                        state.autoRedirect
-                            ? 'border-emerald-200 text-emerald-600 hover:border-emerald-300 hover:bg-emerald-50'
-```
-with:
-```tsx
-                        state.autoRedirect
-                            ? 'border-primary/30 text-primary hover:border-primary/50 hover:bg-primary/5'
-```
-
-- [ ] **Step 3: Fix drag-over color in `ChatInput.tsx`**
-
-In `frontend/app/chat/components/ChatInput.tsx`, line 143. Replace:
-```tsx
-          isDragOver && 'border-blue-400 bg-blue-50',
-```
-with:
-```tsx
-          isDragOver && 'border-primary/50 bg-primary/5',
-```
-
-- [ ] **Step 4: Fix send button in `ChatInput.tsx`**
-
-In `frontend/app/chat/components/ChatInput.tsx`, line 204. Replace:
-```tsx
-                    ? 'bg-blue-600 hover:bg-blue-700'
-```
-with:
-```tsx
-                    ? 'bg-primary hover:bg-primary/90'
-```
-
-- [ ] **Step 5: Fix "New Skill" button in `skills/page.tsx`**
-
-In `frontend/app/skills/page.tsx`, line 51. Replace:
-```tsx
-              className="flex items-center gap-1.5 rounded-lg bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition-colors hover:bg-emerald-700"
-```
-with:
-```tsx
-              className="flex items-center gap-1.5 rounded-lg bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground transition-colors hover:bg-primary/90"
-```
-
-- [ ] **Step 6: Fix active tab text color in `skills/page.tsx`**
-
-In `frontend/app/skills/page.tsx`, lines 36 and 44. Replace both occurrences of:
-```tsx
-data-[state=active]:text-emerald-600
-```
-with:
-```tsx
-data-[state=active]:text-primary
-```
-
-- [ ] **Step 7: Visual check**
-
-Open `/chat` and `/skills`. Verify all primary action buttons are now the same brand color (violet in light mode, sky blue in dark mode). Toggle dark mode and confirm the color shifts correctly.
-
-- [ ] **Step 8: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatHome.tsx \
-        frontend/app/chat/components/ChatInput.tsx \
-        frontend/app/skills/page.tsx
-git commit -m "fix: unify primary action color to design system --primary token"
-```
-
----
-
-## Task 4: Fix z-index Strategy (P2)
-
-**Files:**
-- Modify: `frontend/styles/globals.css:8-13`
-- Modify: `frontend/components/ui/dialog.tsx:25,55`
-
-Replace the `z-[10000000]` magic number with a defined CSS variable.
-
-- [ ] **Step 1: Add z-index variables to `globals.css`**
-
-In `frontend/styles/globals.css`, after the existing `:root` block (after line 13, before `.sidebar-container`), add:
-
-```css
-/* Z-index scale */
-:root {
-  --z-sidebar: 10;
-  --z-panel: 20;
-  --z-dropdown: 100;
-  --z-modal-overlay: 500;
-  --z-modal: 501;
-  --z-toast: 600;
-}
-```
-
-- [ ] **Step 2: Update `dialog.tsx` overlay z-index**
-
-In `frontend/components/ui/dialog.tsx`, line 25, replace:
-```tsx
-        'fixed inset-0 z-[10000000] bg-white/50 ...
-```
-with:
-```tsx
-        'fixed inset-0 z-[var(--z-modal-overlay)] bg-white/50 ...
-```
-
-- [ ] **Step 3: Update `dialog.tsx` content z-index**
-
-In `frontend/components/ui/dialog.tsx`, line 55, replace:
-```tsx
-          'fixed left-[50%] top-[50%] z-[10000000] grid ...
-```
-with:
-```tsx
-          'fixed left-[50%] top-[50%] z-[var(--z-modal)] grid ...
-```
-
-- [ ] **Step 4: Check dialogs still stack above ReactFlow canvas**
-
-Open `/workspace/...`, trigger any dialog (e.g., Run modal). Confirm dialog appears above the canvas nodes.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/styles/globals.css frontend/components/ui/dialog.tsx
-git commit -m "fix: replace z-[10000000] magic number with CSS variable z-index scale"
-```
-
----
-
-## Task 5: Chat Homepage Visual Upgrade (P1)
-
-**Files:**
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
-The chat home page has a weak visual presence. Upgrade: richer background, stronger heading, better mode card icons with semantic colors.
-
-- [ ] **Step 1: Upgrade the page background and heading**
-
-In `frontend/app/chat/components/ChatHome.tsx`, replace lines 341–348:
-```tsx
-    <div className="flex h-full w-full bg-gray-50">
-      <div className="relative flex flex-1 flex-col items-center justify-center p-8">
-        <div className="flex w-full max-w-3xl flex-col gap-8">
-          <div className="text-center">
-            <h1 className="mb-2 text-4xl font-light tracking-tight text-gray-900">
-              {t('chat.createSomethingAwesome')}
-            </h1>
-          </div>
-```
-with:
-```tsx
-    <div className="flex h-full w-full bg-[var(--bg)]">
-      <div className="relative flex flex-1 flex-col items-center justify-center p-8">
-        {/* Subtle radial gradient ambient */}
-        <div
-          className="pointer-events-none absolute inset-0 opacity-40"
-          style={{
-            background:
-              'radial-gradient(ellipse 60% 40% at 50% 0%, hsl(var(--primary) / 0.08) 0%, transparent 70%)',
-          }}
-        />
-        <div className="relative flex w-full max-w-3xl flex-col gap-8">
-          <div className="text-center">
-            <h1 className="mb-2 text-[32px] font-semibold tracking-tight text-[var(--text-primary)]">
-              {t('chat.createSomethingAwesome')}
-            </h1>
-          </div>
-```
-
-- [ ] **Step 2: Upgrade the input container**
-
-In `frontend/app/chat/components/ChatHome.tsx`, replace the rounded container class on line 351:
-```tsx
-            <div className="rounded-2xl border border-gray-200 bg-gray-50 transition-all">
-```
-with:
-```tsx
-            <div className="rounded-2xl border border-[var(--border)] bg-[var(--surface-2)] shadow-sm transition-all focus-within:border-[hsl(var(--primary)/0.4)] focus-within:shadow-md">
-```
-
-- [ ] **Step 3: Update textarea placeholder color to use token**
-
-In `frontend/app/chat/components/ChatHome.tsx`, find the textarea around line 405–414. Replace:
-```tsx
-                    className="max-h-[160px] min-h-[44px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-```
-with:
-```tsx
-                    className="max-h-[160px] min-h-[44px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm text-[var(--text-primary)] shadow-none placeholder:text-[var(--text-muted)] focus:outline-none focus-visible:ring-0"
-```
-
-- [ ] **Step 4: Upgrade mode cards to use semantic surface tokens**
-
-In `frontend/app/chat/components/ChatHome.tsx`, replace the mode card wrapper class on line 576–581:
-```tsx
-                    className={cn(
-                      'group flex cursor-pointer items-start gap-4 overflow-hidden rounded-xl border bg-white p-4 transition-all duration-200',
-                      isSelected
-                        ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-                        : 'border-gray-200 hover:border-blue-200 hover:shadow-lg',
-                    )}
-```
-with:
-```tsx
-                    className={cn(
-                      'group flex cursor-pointer items-start gap-4 overflow-hidden rounded-xl border bg-[var(--surface-2)] p-4 transition-all duration-200',
-                      isSelected
-                        ? 'border-[hsl(var(--primary)/0.5)] bg-[hsl(var(--primary)/0.05)] shadow-md ring-1 ring-[hsl(var(--primary)/0.15)]'
-                        : 'border-[var(--border)] hover:border-[hsl(var(--primary)/0.3)] hover:shadow-lg',
-                    )}
-```
-
-- [ ] **Step 5: Update mode card icon container**
-
-On line 583, replace:
-```tsx
-                    <div className="rounded-lg border border-blue-100 bg-blue-50 p-2">
-```
-with:
-```tsx
-                    <div className="rounded-lg border border-[hsl(var(--primary)/0.2)] bg-[hsl(var(--primary)/0.08)] p-2">
-```
-
-- [ ] **Step 6: Update mode card title color**
-
-On lines 591–594, replace:
-```tsx
-                          isSelected ? 'text-blue-700' : 'text-gray-800 group-hover:text-blue-700',
-```
-with:
-```tsx
-                          isSelected ? 'text-primary' : 'text-[var(--text-primary)] group-hover:text-primary',
-```
-
-- [ ] **Step 7: Update mode card description**
-
-On line 598, replace:
-```tsx
-                      <p className="mt-1 text-xs text-gray-500">{mode.description}</p>
-```
-with:
-```tsx
-                      <p className="mt-1 text-xs text-[var(--text-muted)]">{mode.description}</p>
-```
-
-- [ ] **Step 8: Visual check**
-
-Open `/chat`. The page should have a subtle brand-color glow at top, stronger heading, and input box with a focus ring in brand color when active.
-
-- [ ] **Step 9: Commit**
-
-```bash
-git add frontend/app/chat/components/ChatHome.tsx
-git commit -m "feat: upgrade Chat homepage - ambient gradient, stronger typography, semantic token colors"
-```
-
----
-
-## Task 6: Remove Unused Font Assets (P2)
-
-**Files:**
-- Modify: `frontend/app/layout.tsx` — remove Season Sans and Inter font imports
-- Delete: `frontend/styles/fonts/season/` directory
-- Delete: `frontend/styles/fonts/inter/` directory
-
-Season Sans is imported in `season.ts` but never passed to the root layout or used in any component. Inter is the same. Both waste bundle size (the woff2 files are included in the build).
-
-- [ ] **Step 1: Verify Season Sans is truly unused**
-
-```bash
-grep -r "season\|--font-season" frontend/app frontend/components --include="*.tsx" --include="*.ts" -l
-grep -r "inter\|--font-inter" frontend/app frontend/components --include="*.tsx" --include="*.ts" -l
-```
-
-Expected: no results in `app/` or `components/` (only results should be the font config files themselves and possibly `app/(auth)/layout.tsx` for soehne — that's fine).
-
-- [ ] **Step 2: Confirm `app/layout.tsx` does not import season or inter**
-
-Read `frontend/app/layout.tsx` — confirm the only font imports are `Geist` and `Geist_Mono`. The `soehne` font is used in `app/(auth)/layout.tsx` directly, which is correct.
-
-- [ ] **Step 3: Delete the Season Sans font directory**
-
-```bash
-rm -rf frontend/styles/fonts/season
-```
-
-- [ ] **Step 4: Delete the Inter font directory**
-
-```bash
-rm -rf frontend/styles/fonts/inter
-```
-
-- [ ] **Step 5: Verify build still works**
-
-```bash
-cd frontend && npm run build 2>&1 | tail -20
-```
-
-Expected: successful build, no errors about missing font files.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add -A
-git commit -m "chore: remove unused Season Sans and Inter font assets to reduce bundle size"
-```
-
----
-
-## Task 7: Add Framer Motion Entry Animations to Chat Messages (P3)
-
-**Files:**
-- Modify: `frontend/app/chat/components/MessageItem.tsx`
-
-Replace the CSS `animate-in` classes with Framer Motion variants for smoother, more polished message entry.
-
-- [ ] **Step 1: Add framer-motion import to `MessageItem.tsx`**
-
-In `frontend/app/chat/components/MessageItem.tsx`, add after line 6 (`import React...`):
-```tsx
-import { motion } from 'framer-motion'
-```
-
-- [ ] **Step 2: Add animation variants constant (after imports, before SANITIZE_CONFIG)**
-
-```tsx
-const messageVariants = {
-  hidden: { opacity: 0, y: 8 },
-  visible: { opacity: 1, y: 0, transition: { duration: 0.2, ease: 'easeOut' } },
-}
-```
-
-- [ ] **Step 3: Replace user message wrapper div with motion.div**
-
-In `frontend/app/chat/components/MessageItem.tsx`, around line 71, replace:
-```tsx
-    return (
-      <div className="mb-6 flex justify-end duration-200 animate-in fade-in slide-in-from-bottom-1">
-```
-with:
-```tsx
-    return (
-      <motion.div
-        className="mb-6 flex justify-end"
-        variants={messageVariants}
-        initial="hidden"
-        animate="visible"
-      >
-```
-
-And change the closing `</div>` to `</motion.div>`.
-
-- [ ] **Step 4: Replace assistant message wrapper div with motion.div**
-
-Find the assistant message return block (after the `if (isUser)` block). Wrap it similarly:
-```tsx
-  return (
-    <motion.div
-      className="mb-6 flex items-start gap-3"
-      variants={messageVariants}
-      initial="hidden"
-      animate="visible"
-    >
-```
-
-And change its closing `</div>` to `</motion.div>`.
-
-- [ ] **Step 5: Verify messages animate in smoothly**
-
-Open `/chat`, start a conversation, send a message. Both user bubble and assistant response should slide up gently on appearance.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/app/chat/components/MessageItem.tsx
-git commit -m "feat: add Framer Motion entry animations to chat messages"
-```
-
----
-
-## Verification Checklist
-
-After all tasks are complete:
-
-- [ ] `/chat` — brand color send button, ambient gradient, token-based mode cards
-- [ ] `/chat` (dark mode) — all surfaces use `--surface-*` tokens, brand color shifts to sky blue
-- [ ] `/skills` — "New Skill" button uses `--primary` color
-- [ ] `/workspace/...` — sidebar collapses to 64px, dialogs still appear above canvas
-- [ ] Chat messages — smooth slide-up animation on entry
-- [ ] `npm run build` — no font import errors, no TypeScript errors
diff --git a/docs/superpowers/plans/2026-03-25-websocket-robustness.md b/docs/superpowers/plans/2026-03-25-websocket-robustness.md
deleted file mode 100644
index 9ee130116..000000000
--- a/docs/superpowers/plans/2026-03-25-websocket-robustness.md
+++ /dev/null
@@ -1,515 +0,0 @@
-# WebSocket Robustness & Consistency Fixes
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Fix all WebSocket error handling inconsistencies across 3 frontend WS clients and 1 backend handler, unifying close-code handling, heartbeat detection, reconnection caps, and type safety.
-
-**Architecture:** Extract shared WS constants (close codes, heartbeat config) into a single source of truth. Add pong-timeout detection to Chat client. Unify close-code handling across all 3 frontend hooks. Fix type declarations. Add minimal logging for parse failures.
-
-**Tech Stack:** TypeScript, React hooks, FastAPI/Python (backend — OpenClaw handler only)
-
----
-
-## File Map
-
-| Action | File | Responsibility |
-|--------|------|----------------|
-| **Create** | `frontend/lib/ws/constants.ts` | Shared WS constants: close codes, heartbeat config, reconnect config |
-| **Modify** | `frontend/lib/ws/chat/types.ts` | Add `authExpired` to `ConnectionState` |
-| **Modify** | `frontend/lib/ws/chat/chatWsClient.ts` | Pong timeout detection, max reconnect limit, unrecoverable close-code handling, import shared constants |
-| **Modify** | `frontend/hooks/use-copilot-websocket.ts` | Unrecoverable close-code handling (4001/4003/4004), import shared constants |
-| **Modify** | `frontend/hooks/use-notification-websocket.ts` | Add `console.error` to `onerror`, add 4004 to no-reconnect codes, import shared constants |
-| **Modify** | `backend/app/websocket/openclaw_handler.py` | Add application-level ping/pong heartbeat |
-
----
-
-### Task 1: Create shared WS constants
-
-**Files:**
-- Create: `frontend/lib/ws/constants.ts`
-
-- [ ] **Step 1: Create the constants file**
-
-```ts
-/**
- * Shared WebSocket constants used by all WS clients/hooks.
- * Single source of truth for close codes, heartbeat, and reconnect config.
- */
-
-/** Backend-defined custom close codes (see backend/app/websocket/auth.py) */
-export const WS_CLOSE_CODE = {
-  NORMAL: 1000,
-  POLICY_VIOLATION: 1008,
-  INTERNAL_ERROR: 1011,
-  UNAUTHORIZED: 4001,
-  FORBIDDEN: 4003,
-  NOT_FOUND: 4004,
-} as const
-
-/**
- * Close codes that indicate unrecoverable errors — reconnecting is pointless.
- * 4001: auth expired/invalid
- * 4003: forbidden (user mismatch)
- * 4004: resource not found
- */
-export const UNRECOVERABLE_CLOSE_CODES = [
-  WS_CLOSE_CODE.UNAUTHORIZED,
-  WS_CLOSE_CODE.FORBIDDEN,
-  WS_CLOSE_CODE.NOT_FOUND,
-] as const
-
-/** Close codes where reconnection should be skipped (normal + unrecoverable) */
-export const NO_RECONNECT_CLOSE_CODES = [
-  WS_CLOSE_CODE.NORMAL,
-  ...UNRECOVERABLE_CLOSE_CODES,
-] as const
-
-/** Heartbeat configuration */
-export const HEARTBEAT = {
-  /** Interval between ping sends (ms) */
-  PING_INTERVAL_MS: 30_000,
-  /** Max time to wait for pong before considering connection dead (ms) */
-  PONG_TIMEOUT_MS: 60_000,
-} as const
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/lib/ws/constants.ts
-git commit -m "feat(ws): add shared WebSocket constants for close codes and heartbeat config"
-```
-
----
-
-### Task 2: Fix `ConnectionState` type and `authExpired` handling in Chat WS
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/types.ts:43-45`
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts:86-103` (onclose handler)
-
-- [ ] **Step 1: Add `authExpired` to `ConnectionState` in `types.ts`**
-
-In `frontend/lib/ws/chat/types.ts`, change:
-
-```ts
-export interface ConnectionState {
-  isConnected: boolean
-}
-```
-
-to:
-
-```ts
-export interface ConnectionState {
-  isConnected: boolean
-  authExpired?: boolean
-}
-```
-
-- [ ] **Step 2: Set `authExpired` in `chatWsClient.ts` onclose handler**
-
-In `frontend/lib/ws/chat/chatWsClient.ts`, in the `ws.onclose` handler, replace the close-code logic block (lines ~96-103):
-
-```ts
-// OLD:
-if (event.code === 1000 || this.isDisposed) {
-  return
-}
-
-this.rejectAllPending(
-  new ChatWsError('WS_CONNECTION_LOST', event.code === 4001 ? 'Authentication expired' : 'WebSocket disconnected'),
-)
-this.scheduleReconnect()
-```
-
-with (importing from constants):
-
-```ts
-import { NO_RECONNECT_CLOSE_CODES, WS_CLOSE_CODE, UNRECOVERABLE_CLOSE_CODES } from '../constants'
-
-// ... inside onclose:
-
-if (event.code === WS_CLOSE_CODE.UNAUTHORIZED) {
-  this.state = { isConnected: false, authExpired: true }
-  this.stateListeners.forEach((l) => l(this.state))
-  this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Authentication expired'))
-  return
-}
-
-if (event.code === WS_CLOSE_CODE.NORMAL || this.isDisposed) {
-  return
-}
-
-this.rejectAllPending(
-  new ChatWsError('WS_CONNECTION_LOST', 'WebSocket disconnected'),
-)
-
-if (UNRECOVERABLE_CLOSE_CODES.includes(event.code as any)) {
-  return  // Don't reconnect for 4003, 4004
-}
-
-this.scheduleReconnect()
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/ws/chat/types.ts frontend/lib/ws/chat/chatWsClient.ts
-git commit -m "fix(ws/chat): add authExpired to ConnectionState, stop reconnect on unrecoverable close codes"
-```
-
----
-
-### Task 3: Add pong timeout detection and max reconnect limit to Chat WS
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-
-- [ ] **Step 1: Add `lastPongTime` tracking and max reconnect**
-
-Add class fields:
-
-```ts
-private lastPongTime = Date.now()
-private static readonly MAX_RECONNECT_ATTEMPTS = 20
-```
-
-- [ ] **Step 2: Update `handleInboundMessage` to track pong time**
-
-Change:
-
-```ts
-if (!type || type === 'pong') return
-```
-
-to:
-
-```ts
-if (!type) return
-if (type === 'pong') {
-  this.lastPongTime = Date.now()
-  return
-}
-```
-
-- [ ] **Step 3: Update `startHeartbeat` to check pong timeout**
-
-Replace the `startHeartbeat` method:
-
-```ts
-private startHeartbeat() {
-  this.stopHeartbeat()
-  this.lastPongTime = Date.now()
-  this.heartbeatTimer = setInterval(() => {
-    if (this.ws?.readyState !== WebSocket.OPEN) return
-
-    if (Date.now() - this.lastPongTime > HEARTBEAT.PONG_TIMEOUT_MS) {
-      console.warn('[ChatWS] Heartbeat timeout — no pong in 60s, reconnecting')
-      // Force-close the dead socket; onclose will trigger reconnect
-      this.ws.close()
-      return
-    }
-
-    this.ws.send(JSON.stringify({ type: 'ping' }))
-  }, HEARTBEAT.PING_INTERVAL_MS)
-}
-```
-
-- [ ] **Step 4: Add max reconnect cap to `scheduleReconnect`**
-
-Replace:
-
-```ts
-private scheduleReconnect() {
-  if (this.isDisposed || this.reconnectTimer) return
-  const delay = Math.min(1000 * 2 ** this.reconnectAttempts, MAX_RECONNECT_DELAY_MS)
-  this.reconnectAttempts += 1
-  this.reconnectTimer = setTimeout(() => {
-    this.reconnectTimer = null
-    void this.connect().catch(() => {})
-  }, delay)
-}
-```
-
-with:
-
-```ts
-private scheduleReconnect() {
-  if (this.isDisposed || this.reconnectTimer) return
-
-  if (this.reconnectAttempts >= SharedChatWsClient.MAX_RECONNECT_ATTEMPTS) {
-    console.error('[ChatWS] Max reconnect attempts reached')
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Connection lost. Please refresh the page.'))
-    return
-  }
-
-  const delay = Math.min(1000 * 2 ** this.reconnectAttempts, MAX_RECONNECT_DELAY_MS)
-  this.reconnectAttempts += 1
-  this.reconnectTimer = setTimeout(() => {
-    this.reconnectTimer = null
-    void this.connect().catch(() => {})
-  }, delay)
-}
-```
-
-- [ ] **Step 5: Remove the module-level `HEARTBEAT_INTERVAL_MS` constant**
-
-Replace:
-
-```ts
-const HEARTBEAT_INTERVAL_MS = 30000
-```
-
-The file now imports `HEARTBEAT` from `../constants` instead.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/lib/ws/chat/chatWsClient.ts
-git commit -m "fix(ws/chat): add pong timeout detection and max reconnect limit"
-```
-
----
-
-### Task 4: Unify Copilot WS close-code handling
-
-**Files:**
-- Modify: `frontend/hooks/use-copilot-websocket.ts`
-
-- [ ] **Step 1: Import shared constants and replace inline `noReconnectCodes`**
-
-Add import at top:
-
-```ts
-import { NO_RECONNECT_CLOSE_CODES, WS_CLOSE_CODE } from '@/lib/ws/constants'
-```
-
-- [ ] **Step 2: Replace `noReconnectCodes` in `onclose`**
-
-Change:
-
-```ts
-const noReconnectCodes = [1000]
-```
-
-to:
-
-```ts
-const noReconnectCodes: readonly number[] = NO_RECONNECT_CLOSE_CODES
-```
-
-- [ ] **Step 3: Add auth-expired redirect for 4001**
-
-Add at the beginning of `ws.onclose` handler, before the reconnect logic:
-
-```ts
-if (event.code === WS_CLOSE_CODE.UNAUTHORIZED) {
-  cleanup()
-  window.location.assign('/signin')
-  return
-}
-```
-
-- [ ] **Step 4: Remove the duplicated `getWsBaseUrl` function**
-
-Replace the local `getWsBaseUrl()` function (lines 61-70) with an import from the shared module:
-
-```ts
-import { getWsBaseUrl } from '@/lib/utils/wsUrl'
-```
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/hooks/use-copilot-websocket.ts
-git commit -m "fix(ws/copilot): handle unrecoverable close codes, redirect on auth expiry"
-```
-
----
-
-### Task 5: Fix Notification WS — error logging, close codes, remove dup
-
-**Files:**
-- Modify: `frontend/hooks/use-notification-websocket.ts`
-
-- [ ] **Step 1: Import shared constants and replace `getWsBaseUrl`**
-
-Add imports:
-
-```ts
-import { NO_RECONNECT_CLOSE_CODES } from '@/lib/ws/constants'
-import { getWsBaseUrl } from '@/lib/utils/wsUrl'
-```
-
-Remove the local `getWsBaseUrl()` function (lines 27-36).
-
-- [ ] **Step 2: Replace `noReconnectCodes` in `onclose`**
-
-Change:
-
-```ts
-const noReconnectCodes = [1000, 4001, 4003]
-```
-
-to:
-
-```ts
-const noReconnectCodes: readonly number[] = NO_RECONNECT_CLOSE_CODES
-```
-
-This now also includes 4004.
-
-- [ ] **Step 3: Add console.error to `onerror`**
-
-Change:
-
-```ts
-ws.onerror = () => {}
-```
-
-to:
-
-```ts
-ws.onerror = (event) => {
-  console.error('[NotificationWS] Connection error:', event)
-}
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/hooks/use-notification-websocket.ts
-git commit -m "fix(ws/notification): add error logging, unify close codes, use shared getWsBaseUrl"
-```
-
----
-
-### Task 6: Add heartbeat to OpenClaw Bridge (backend)
-
-**Files:**
-- Modify: `backend/app/websocket/openclaw_handler.py`
-
-- [ ] **Step 1: Add periodic ping task to the bridge**
-
-Add a third concurrent task that sends a ping to the gateway every 30 seconds. Replace the two-task wait with a three-task wait:
-
-```python
-async def handle_bridge(self, ws: WebSocket, user_id: str) -> None:
-    # ... (existing code up to websockets.connect)
-
-    async with websockets.connect(...) as gw_ws:
-        client_to_gw = asyncio.create_task(self._forward_client_to_gateway(ws, gw_ws, user_id))
-        gw_to_client = asyncio.create_task(self._forward_gateway_to_client(ws, gw_ws, user_id))
-        heartbeat = asyncio.create_task(self._heartbeat(gw_ws, user_id))
-
-        done, pending = await asyncio.wait(
-            [client_to_gw, gw_to_client, heartbeat],
-            return_when=asyncio.FIRST_COMPLETED,
-        )
-        for t in pending:
-            t.cancel()
-            try:
-                await t
-            except (asyncio.CancelledError, Exception):
-                pass
-```
-
-Add the heartbeat method:
-
-```python
-async def _heartbeat(self, gw_ws, user_id: str) -> None:
-    """Send periodic pings to detect dead upstream connections."""
-    try:
-        while True:
-            await asyncio.sleep(30)
-            await gw_ws.ping()
-    except Exception as e:
-        logger.debug(f"Heartbeat ended for user={user_id}: {e}")
-```
-
-The `websockets` library handles pong timeout automatically — `gw_ws.ping()` raises `ConnectionClosed` if the peer doesn't respond within the library's default timeout (20s).
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/websocket/openclaw_handler.py
-git commit -m "fix(ws/openclaw): add heartbeat ping to detect dead upstream connections"
-```
-
----
-
-### Task 7: Add JSON parse failure counter to Chat WS client
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-
-- [ ] **Step 1: Add parse failure counter and threshold**
-
-Add class field:
-
-```ts
-private consecutiveParseFailures = 0
-private static readonly MAX_PARSE_FAILURES = 10
-```
-
-- [ ] **Step 2: Update `onmessage` handler to count failures**
-
-Replace:
-
-```ts
-ws.onmessage = (event) => {
-  try {
-    this.handleInboundMessage(JSON.parse(event.data) as IncomingChatWsEvent)
-  } catch {
-    // Ignore malformed frames from the server.
-  }
-}
-```
-
-with:
-
-```ts
-ws.onmessage = (event) => {
-  try {
-    const parsed = JSON.parse(event.data) as IncomingChatWsEvent
-    this.consecutiveParseFailures = 0
-    this.handleInboundMessage(parsed)
-  } catch {
-    this.consecutiveParseFailures++
-    console.warn(`[ChatWS] Malformed frame (${this.consecutiveParseFailures} consecutive)`)
-    if (this.consecutiveParseFailures >= SharedChatWsClient.MAX_PARSE_FAILURES) {
-      console.error('[ChatWS] Too many consecutive parse failures, reconnecting')
-      this.consecutiveParseFailures = 0
-      this.ws?.close()
-    }
-  }
-}
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/ws/chat/chatWsClient.ts
-git commit -m "fix(ws/chat): add parse failure counter, reconnect after 10 consecutive bad frames"
-```
-
----
-
-### Task 8: Verify and smoke test
-
-- [ ] **Step 1: Verify TypeScript compilation**
-
-```bash
-cd frontend && npx tsc --noEmit
-```
-
-Expected: no errors.
-
-- [ ] **Step 2: Run existing tests if any**
-
-```bash
-cd frontend && npm test -- --passWithNoTests 2>&1 | head -50
-```
-
-- [ ] **Step 3: Final commit if any lint/type fixes needed**
diff --git a/docs/superpowers/plans/2026-03-26-chat-protocol-boundaries.md b/docs/superpowers/plans/2026-03-26-chat-protocol-boundaries.md
deleted file mode 100644
index 141d241c5..000000000
--- a/docs/superpowers/plans/2026-03-26-chat-protocol-boundaries.md
+++ /dev/null
@@ -1,750 +0,0 @@
-# Chat Protocol Boundaries Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Keep the Chat UI unified while refactoring `/ws/chat` so protocol control flow is explicit, `skill_creator` is isolated as an extension workflow, and stop/cancel is `request_id`-first.
-
-**Architecture:** Introduce a typed websocket transport layer (`chat.start` + optional `extension.kind`), parse and validate frames before task creation, map parsed frames into explicit business commands, then move task lifecycle ownership into a supervisor so every request has a guaranteed terminal outcome. Frontend pages continue to share the chat UI, but they stop sending `metadata.mode` and instead build typed requests through the shared chat websocket client.
-
-**Tech Stack:** FastAPI WebSocket, Pydantic, asyncio tasks, existing LangGraph stream helpers, React hooks, TypeScript, Vitest, pytest
-
-**Spec:** `docs/superpowers/specs/2026-03-26-chat-protocol-boundaries-design.md`
-
----
-
-### Task 1: Add Typed Chat Transport Parsing
-
-**Files:**
-- Create: `backend/app/websocket/chat_protocol.py`
-- Test: `backend/tests/test_api/test_chat_protocol.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py`
-
-- [ ] **Step 1: Write the failing parser tests**
-
-```python
-from app.websocket.chat_protocol import (
-    ChatProtocolError,
-    parse_client_frame,
-    ParsedChatStartFrame,
-)
-
-
-def test_parse_standard_chat_start_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-1",
-            "thread_id": None,
-            "graph_id": None,
-            "input": {"message": "hello", "files": []},
-            "extension": None,
-            "metadata": {},
-        }
-    )
-
-    assert isinstance(parsed, ParsedChatStartFrame)
-    assert parsed.request_id == "req-1"
-    assert parsed.input.message == "hello"
-    assert parsed.extension is None
-
-
-def test_parse_skill_creator_extension_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-2",
-            "input": {"message": "build a skill", "files": []},
-            "extension": {
-                "kind": "skill_creator",
-                "run_id": "123e4567-e89b-12d3-a456-426614174000",
-                "edit_skill_id": "skill-42",
-            },
-            "metadata": {},
-        }
-    )
-
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "skill_creator"
-    assert parsed.extension.edit_skill_id == "skill-42"
-
-
-def test_reserved_metadata_control_keys_are_rejected():
-    try:
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-3",
-                "input": {"message": "hello"},
-                "extension": None,
-                "metadata": {"mode": "apk-vulnerability"},
-            }
-        )
-    except ChatProtocolError as exc:
-        assert exc.message == "reserved metadata keys are not allowed"
-        assert exc.request_id == "req-3"
-    else:
-        raise AssertionError("expected ChatProtocolError")
-```
-
-- [ ] **Step 2: Run the parser tests to verify they fail**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py -v
-```
-
-Expected: FAIL with `ModuleNotFoundError` for `app.websocket.chat_protocol` or missing parser symbols.
-
-- [ ] **Step 3: Implement `chat_protocol.py`**
-
-```python
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any, Literal
-
-
-RESERVED_METADATA_KEYS = {"mode", "run_id", "edit_skill_id", "extension", "kind"}
-
-
-@dataclass(frozen=True)
-class ChatProtocolError(Exception):
-    message: str
-    request_id: str | None = None
-
-
-@dataclass(frozen=True)
-class ParsedChatInput:
-    message: str
-    files: list[dict[str, Any]]
-
-
-@dataclass(frozen=True)
-class ParsedSkillCreatorExtension:
-    kind: Literal["skill_creator"]
-    run_id: str | None
-    edit_skill_id: str | None
-
-
-@dataclass(frozen=True)
-class ParsedChatStartFrame:
-    request_id: str
-    thread_id: str | None
-    graph_id: str | None
-    input: ParsedChatInput
-    extension: ParsedSkillCreatorExtension | None
-    metadata: dict[str, Any]
-
-
-def parse_client_frame(frame: dict[str, Any]) -> ParsedChatStartFrame | dict[str, Any]:
-    frame_type = str(frame.get("type") or "")
-    if frame_type not in {"chat.start", "chat.resume", "chat.stop", "chat"}:
-        raise ChatProtocolError(f"unknown frame type: {frame_type or '<missing>'}")
-    if frame_type in {"chat.start", "chat"}:
-        metadata = frame.get("metadata") if isinstance(frame.get("metadata"), dict) else {}
-        reserved = RESERVED_METADATA_KEYS.intersection(metadata.keys())
-        if reserved:
-            raise ChatProtocolError(
-                "reserved metadata keys are not allowed",
-                request_id=str(frame.get("request_id") or "") or None,
-            )
-        ...
-```
-
-- [ ] **Step 4: Run the parser tests to verify they pass**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py -v
-```
-
-Expected: PASS with 3 passing tests.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/websocket/chat_protocol.py backend/tests/test_api/test_chat_protocol.py backend/app/websocket/chat_ws_handler.py
-git commit -m "feat: add typed chat transport parser"
-```
-
-### Task 2: Map Parsed Frames Into Explicit Chat Commands
-
-**Files:**
-- Create: `backend/app/websocket/chat_commands.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py`
-- Modify: `backend/app/schemas/chat.py`
-- Test: `backend/tests/test_api/test_chat_ws_handler.py`
-- Test: `backend/tests/test_schemas/test_chat.py`
-
-- [ ] **Step 1: Write failing command-mapping tests**
-
-```python
-@pytest.mark.asyncio
-async def test_chat_start_with_non_skill_extension_data_is_rejected_before_task_creation() -> None:
-    handler, ws = make_handler()
-
-    await handler._handle_frame(
-        json.dumps(
-            {
-                "type": "chat.start",
-                "request_id": "req-invalid",
-                "input": {"message": "hello"},
-                "extension": {"kind": "unknown"},
-                "metadata": {},
-            }
-        )
-    )
-
-    assert ws.frames_of_type("ws_error") == [
-        {"type": "ws_error", "request_id": "req-invalid", "message": "invalid extension kind"}
-    ]
-    assert "req-invalid" not in handler._tasks
-
-
-@pytest.mark.asyncio
-async def test_legacy_skill_creator_metadata_maps_to_skill_creator_command() -> None:
-    handler, ws = make_handler()
-    captured_command = None
-
-    async def fake_run_chat_turn(*, request_id: str, payload) -> None:
-        nonlocal captured_command
-        captured_command = payload
-
-    with patch.object(handler, "_run_chat_turn", side_effect=fake_run_chat_turn):
-        await handler._handle_frame(
-            json.dumps(
-                {
-                    "type": "chat",
-                    "request_id": "req-legacy",
-                    "message": "build a skill",
-                    "metadata": {"mode": "skill_creator", "edit_skill_id": "skill-1"},
-                }
-            )
-        )
-        await handler._tasks["req-legacy"].task
-
-    assert captured_command.mode == "skill_creator"
-    assert captured_command.edit_skill_id == "skill-1"
-    assert ws.sent == []
-```
-
-- [ ] **Step 2: Run the handler tests to verify they fail**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py -k "invalid_extension or legacy_skill_creator" -v
-```
-
-Expected: FAIL because the handler still constructs `ChatRequest` directly from loose frame data.
-
-- [ ] **Step 3: Implement explicit command mapping**
-
-```python
-from dataclasses import dataclass
-from typing import Any
-
-
-@dataclass(frozen=True)
-class StandardChatTurnCommand:
-    request_id: str
-    message: str
-    thread_id: str | None
-    graph_id: str | None
-    files: list[dict[str, Any]]
-    metadata: dict[str, Any]
-
-
-@dataclass(frozen=True)
-class SkillCreatorTurnCommand(StandardChatTurnCommand):
-    run_id: str | None
-    edit_skill_id: str | None
-
-
-def build_chat_turn_command(parsed: ParsedChatStartFrame) -> StandardChatTurnCommand | SkillCreatorTurnCommand:
-    if parsed.extension is None:
-        return StandardChatTurnCommand(
-            request_id=parsed.request_id,
-            message=parsed.input.message,
-            thread_id=parsed.thread_id,
-            graph_id=parsed.graph_id,
-            files=parsed.input.files,
-            metadata=parsed.metadata,
-        )
-    return SkillCreatorTurnCommand(
-        request_id=parsed.request_id,
-        message=parsed.input.message,
-        thread_id=parsed.thread_id,
-        graph_id=parsed.graph_id,
-        files=parsed.input.files,
-        metadata=parsed.metadata,
-        run_id=parsed.extension.run_id,
-        edit_skill_id=parsed.extension.edit_skill_id,
-    )
-```
-
-- [ ] **Step 4: Keep `ChatRequest` generic during migration**
-
-```python
-class ChatRequest(PydanticBaseModel):
-    message: str = Field(..., description="用户消息")
-    thread_id: Optional[str] = Field(None, description="会话线程ID，不提供则创建新会话")
-    graph_id: Optional[uuid.UUID] = Field(None, description="图ID，使用指定的图进行对话")
-    metadata: dict[str, Any] = Field(default_factory=dict, description="元数据")
-```
-
-Use the command object, not `metadata`, to decide when to append `skill_creator` run state and edit context.
-
-- [ ] **Step 5: Run the handler and schema tests**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py backend/tests/test_schemas/test_chat.py -v
-```
-
-Expected: PASS for the new mapping tests and updated schema tests.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add backend/app/websocket/chat_commands.py backend/app/websocket/chat_ws_handler.py backend/app/schemas/chat.py backend/tests/test_api/test_chat_ws_handler.py backend/tests/test_schemas/test_chat.py
-git commit -m "refactor: isolate chat command mapping from metadata"
-```
-
-### Task 3: Extract Task Supervision And Guarantee Terminal Outcomes
-
-**Files:**
-- Create: `backend/app/websocket/chat_task_supervisor.py`
-- Create: `backend/app/websocket/chat_turn_executor.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py`
-- Test: `backend/tests/test_api/test_chat_ws_handler.py`
-
-- [ ] **Step 1: Write failing lifecycle tests**
-
-```python
-@pytest.mark.asyncio
-async def test_stop_by_request_id_cancels_turn_before_thread_assignment() -> None:
-    handler, ws = make_handler()
-    entered = asyncio.Event()
-    cancelled = asyncio.Event()
-
-    async def fake_run_chat_turn(*, request_id: str, payload) -> None:
-        entered.set()
-        try:
-            await asyncio.sleep(60)
-        except asyncio.CancelledError:
-            cancelled.set()
-            raise
-
-    with patch.object(handler, "_run_chat_turn", side_effect=fake_run_chat_turn):
-        await handler._handle_frame(
-            json.dumps(
-                {
-                    "type": "chat.start",
-                    "request_id": "req-stop-early",
-                    "input": {"message": "hello"},
-                    "extension": None,
-                    "metadata": {},
-                }
-            )
-        )
-        await entered.wait()
-        await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "req-stop-early"}))
-        await asyncio.sleep(0)
-
-    assert cancelled.is_set()
-
-
-@pytest.mark.asyncio
-async def test_protocol_error_does_not_register_task() -> None:
-    handler, ws = make_handler()
-
-    await handler._handle_frame(
-        json.dumps(
-            {
-                "type": "chat.start",
-                "request_id": "req-bad",
-                "input": {"message": ""},
-                "extension": None,
-                "metadata": {},
-            }
-        )
-    )
-
-    assert ws.frames_of_type("ws_error")
-    assert handler._tasks == {}
-```
-
-- [ ] **Step 2: Run the lifecycle tests to verify they fail**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py -k "stop_by_request_id or protocol_error_does_not_register_task" -v
-```
-
-Expected: FAIL because lifecycle logic is still embedded in `ChatWsHandler`.
-
-- [ ] **Step 3: Implement `ChatTaskSupervisor`**
-
-```python
-@dataclass
-class ChatTaskEntry:
-    request_id: str
-    thread_id: str | None
-    task: asyncio.Task[Any]
-    heartbeat_task: asyncio.Task[Any] | None = None
-    run_id: uuid_lib.UUID | None = None
-    persist_on_disconnect: bool = False
-
-
-class ChatTaskSupervisor:
-    def __init__(self) -> None:
-        self._tasks: dict[str, ChatTaskEntry] = {}
-        self._thread_to_request: dict[str, str] = {}
-
-    def register(self, entry: ChatTaskEntry) -> None:
-        self._tasks[entry.request_id] = entry
-        if entry.thread_id:
-            self._thread_to_request[entry.thread_id] = entry.request_id
-
-    async def stop_by_request_id(self, request_id: str) -> None:
-        entry = self._tasks.get(request_id)
-        if entry is None:
-            return
-        if entry.thread_id:
-            await task_manager.stop_task(entry.thread_id)
-        entry.task.cancel()
-
-    async def finalize(self, request_id: str) -> ChatTaskEntry | None:
-        entry = self._tasks.pop(request_id, None)
-        if entry and entry.thread_id:
-            self._thread_to_request.pop(entry.thread_id, None)
-        return entry
-```
-
-- [ ] **Step 4: Implement `ChatTurnExecutor` and wire it into the handler**
-
-```python
-class ChatTurnExecutor:
-    async def run_standard_turn(self, command: StandardChatTurnCommand) -> None:
-        ...
-
-    async def run_skill_creator_turn(self, command: SkillCreatorTurnCommand) -> None:
-        ...
-```
-
-`ChatWsHandler` should:
-
-- parse frame
-- build command
-- register a task through `ChatTaskSupervisor`
-- delegate actual turn execution to `ChatTurnExecutor`
-- funnel stop/disconnect/finalize through the supervisor
-
-- [ ] **Step 5: Run the full backend handler test file**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py -v
-```
-
-Expected: PASS, including the two existing cancellation tests that are red today:
-- `test_handle_stop_cancels_known_task`
-- `test_cancel_all_tasks_on_disconnect`
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add backend/app/websocket/chat_task_supervisor.py backend/app/websocket/chat_turn_executor.py backend/app/websocket/chat_ws_handler.py backend/tests/test_api/test_chat_ws_handler.py
-git commit -m "refactor: centralize chat task supervision"
-```
-
-### Task 4: Migrate Frontend Chat Transport To Explicit Requests
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/types.ts`
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-- Modify: `frontend/app/chat/hooks/useChatWebSocket.ts`
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-- Modify: `frontend/hooks/use-skill-creator-run.ts`
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/services/workspaceChatWsService.ts`
-- Test: `frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts`
-- Test: `frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts`
-
-- [ ] **Step 1: Write the failing frontend transport tests**
-
-```ts
-it('sendMessage sends chat.start without extension for standard chat', async () => {
-  const { utils, ws } = await renderConnectedHook()
-
-  void utils.result.current.sendMessage({
-    input: { message: 'hello' },
-    extension: null,
-  })
-  await Promise.resolve()
-
-  const frame = JSON.parse(ws.sent[ws.sent.length - 1])
-  expect(frame.type).toBe('chat.start')
-  expect(frame.extension).toBeNull()
-  expect(frame.metadata).toEqual({})
-})
-
-it('skill creator sends explicit skill_creator extension', async () => {
-  const client = getChatWsClient()
-  void client.sendChat({
-    input: { message: 'build a skill' },
-    extension: { kind: 'skill_creator', editSkillId: 'skill-7' },
-  })
-  await Promise.resolve()
-
-  const frame = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-  expect(frame.extension).toMatchObject({ kind: 'skill_creator', edit_skill_id: 'skill-7' })
-})
-
-it('stopMessage stops by requestId before threadId exists', async () => {
-  const { utils, ws } = await renderConnectedHook()
-
-  void utils.result.current.sendMessage({ input: { message: 'hello' }, extension: null })
-  await Promise.resolve()
-  const startFrame = JSON.parse(ws.sent[ws.sent.length - 1])
-
-  utils.result.current.stopMessage(startFrame.request_id)
-
-  const stopFrame = JSON.parse(ws.sent[ws.sent.length - 1])
-  expect(stopFrame).toMatchObject({ type: 'chat.stop', request_id: startFrame.request_id })
-})
-```
-
-- [ ] **Step 2: Run the frontend tests to verify they fail**
-
-Run:
-
-```bash
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm test -- app/chat/hooks/__tests__/useChatWebSocket.test.ts app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts
-```
-
-Expected: FAIL because the client still emits `type: "chat"` with top-level `message` and stop is still `threadId`-first.
-
-- [ ] **Step 3: Update chat websocket request types**
-
-```ts
-export interface ChatSendInput {
-  message: string
-  files?: Array<{ filename: string; path: string; size: number }>
-}
-
-export interface SkillCreatorExtension {
-  kind: 'skill_creator'
-  runId?: string | null
-  editSkillId?: string | null
-}
-
-export interface ChatSendParams {
-  requestId?: string
-  threadId?: string | null
-  graphId?: string | null
-  input: ChatSendInput
-  extension?: SkillCreatorExtension | null
-  metadata?: Record<string, unknown>
-  onEvent?: (evt: ChatStreamEvent) => void
-  onAccepted?: (evt: IncomingChatAcceptedEvent) => void
-}
-```
-
-- [ ] **Step 4: Update the shared client and hooks**
-
-```ts
-this.sendFrame({
-  type: 'chat.start',
-  request_id: requestId,
-  thread_id: params.threadId ?? null,
-  graph_id: params.graphId ?? null,
-  input: params.input,
-  extension: params.extension ?? null,
-  metadata: params.metadata ?? {},
-})
-```
-
-In `useChatWebSocket.ts`:
-
-```ts
-const activeRequestIdRef = useRef<string | null>(null)
-
-const stopMessage = useCallback((requestId: string | null) => {
-  if (!requestId) return
-  clientRef.current.stopByRequestId(requestId)
-}, [])
-```
-
-In `ChatLayout.tsx`, standard chat sends:
-
-```ts
-await stream.sendMessage({
-  input: {
-    message: text,
-    files: files?.map((f) => ({ filename: f.filename, path: f.path, size: f.size })),
-  },
-  threadId: messageOpts.threadId,
-  graphId: messageOpts.graphId,
-  extension: null,
-  metadata: {},
-})
-```
-
-In `use-skill-creator-run.ts`, skill creator sends:
-
-```ts
-await clientRef.current.sendChat({
-  requestId,
-  threadId: projection.thread_id,
-  graphId: graphId,
-  input: { message: userPrompt },
-  extension: {
-    kind: 'skill_creator',
-    runId: pendingRunId,
-    editSkillId: effectiveEditSkillId,
-  },
-  metadata: {},
-  onAccepted,
-  onEvent,
-})
-```
-
-- [ ] **Step 5: Run the frontend tests and type-check**
-
-Run:
-
-```bash
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm test -- app/chat/hooks/__tests__/useChatWebSocket.test.ts app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm type-check
-```
-
-Expected: PASS for both test files and `tsc --noEmit`.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/lib/ws/chat/types.ts frontend/lib/ws/chat/chatWsClient.ts frontend/app/chat/hooks/useChatWebSocket.ts frontend/app/chat/ChatLayout.tsx frontend/hooks/use-skill-creator-run.ts 'frontend/app/workspace/[workspaceId]/[agentId]/services/workspaceChatWsService.ts' frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts 'frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts'
-git commit -m "refactor: move chat websocket requests to explicit extensions"
-```
-
-### Task 5: Remove Compatibility Paths And Finalize The Contract
-
-**Files:**
-- Modify: `backend/app/websocket/chat_protocol.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py`
-- Modify: `backend/app/schemas/chat.py`
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-- Modify: `frontend/hooks/use-skill-creator-run.ts`
-- Test: `backend/tests/test_api/test_chat_protocol.py`
-- Test: `backend/tests/test_api/test_chat_ws_handler.py`
-- Test: `frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts`
-
-- [ ] **Step 1: Write the failing compatibility-removal tests**
-
-```python
-def test_legacy_metadata_mode_is_rejected_after_cutover():
-    with pytest.raises(ChatProtocolError) as exc_info:
-        parse_client_frame(
-            {
-                "type": "chat",
-                "request_id": "req-old",
-                "message": "hello",
-                "metadata": {"mode": "skill_creator"},
-            }
-        )
-
-    assert exc_info.value.message == "legacy metadata control fields are no longer supported"
-```
-
-```ts
-it('standard chat no longer sends metadata.mode after cutover', async () => {
-  const { utils, ws } = await renderConnectedHook()
-
-  void utils.result.current.sendMessage({
-    input: { message: 'hello' },
-    extension: null,
-    metadata: {},
-  })
-  await Promise.resolve()
-
-  const frame = JSON.parse(ws.sent[ws.sent.length - 1])
-  expect(frame.metadata.mode).toBeUndefined()
-})
-```
-
-- [ ] **Step 2: Run the targeted tests to verify they fail**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py backend/tests/test_api/test_chat_ws_handler.py -k "legacy_metadata" -v
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm test -- app/chat/hooks/__tests__/useChatWebSocket.test.ts
-```
-
-Expected: FAIL because legacy compatibility code still exists.
-
-- [ ] **Step 3: Delete the compatibility logic**
-
-```python
-if frame_type == "chat":
-    raise ChatProtocolError("legacy metadata control fields are no longer supported", request_id=request_id)
-```
-
-and remove:
-
-- any `metadata.mode` fallback
-- any `metadata.run_id` / `metadata.edit_skill_id` protocol mapping
-- any `ChatRequest` fields that only existed for compatibility
-
-- [ ] **Step 4: Run final verification**
-
-Run:
-
-```bash
-SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py backend/tests/test_api/test_chat_ws_handler.py backend/tests/test_schemas/test_chat.py -v
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm test -- app/chat/hooks/__tests__/useChatWebSocket.test.ts app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts
-cd frontend && PATH=/Users/yuzhenjiang1/.nvm/versions/node/v22.17.0/bin:$PATH pnpm type-check
-```
-
-Expected:
-- backend targeted suites PASS
-- frontend targeted suites PASS
-- frontend type-check PASS
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/websocket/chat_protocol.py backend/app/websocket/chat_ws_handler.py backend/app/schemas/chat.py backend/tests/test_api/test_chat_protocol.py backend/tests/test_api/test_chat_ws_handler.py backend/tests/test_schemas/test_chat.py frontend/app/chat/ChatLayout.tsx frontend/hooks/use-skill-creator-run.ts frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts
-git commit -m "refactor: finalize explicit chat protocol boundaries"
-```
-
-## Self-Review
-
-- Spec coverage:
-  - typed extension protocol: Tasks 1, 2, 4, 5
-  - backend parser / command factory / supervisor / executor split: Tasks 1, 2, 3
-  - `request_id`-first stop semantics: Tasks 3 and 4
-  - metadata control-field removal: Tasks 1 and 5
-  - compatibility rollout and cleanup: Tasks 2 and 5
-- Placeholder scan:
-  - no `TODO` / `TBD` placeholders remain
-  - every task has exact file paths, concrete tests, concrete commands
-- Type consistency:
-  - backend uses `ParsedChatStartFrame`, explicit command dataclasses, and `ChatTaskSupervisor`
-  - frontend uses `ChatSendParams.input` and `extension`, not top-level `message` + `metadata.mode`
-
-## Execution Handoff
-
-Plan complete and saved to `docs/superpowers/plans/2026-03-26-chat-protocol-boundaries.md`. Two execution options:
-
-**1. Subagent-Driven (recommended)** - I dispatch a fresh subagent per task, review between tasks, fast iteration
-
-**2. Inline Execution** - Execute tasks in this session using executing-plans, batch execution with checkpoints
-
-Which approach?
diff --git a/docs/superpowers/plans/2026-03-26-generic-agent-run-persistence.md b/docs/superpowers/plans/2026-03-26-generic-agent-run-persistence.md
deleted file mode 100644
index abb691d07..000000000
--- a/docs/superpowers/plans/2026-03-26-generic-agent-run-persistence.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generic Agent Run Persistence Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Generalize the run persistence system so all long-running Agent tasks use the same model, with an agent registry pattern and Run Center filtering by agent name, status, and title search.
-
-**Architecture:** Add `agent_name` column to `agent_runs`, introduce an `AgentRegistry` that maps agent names to reducers, generalize `RunService` and API endpoints to use the registry, and upgrade the Run Center UI with server-side filtering.
-
-**Tech Stack:** Python/FastAPI/SQLAlchemy (backend), Next.js/React/TypeScript (frontend), PostgreSQL, Redis, Alembic migrations, pytest (asyncio_mode=auto), vitest
-
-## File Map
-
-### Backend — new files
-- `backend/app/services/agent_registry.py` — `AgentDefinition` dataclass + `AgentRegistry` singleton
-- `backend/alembic/versions/20260326_000000_add_agent_name_column.py` — adds `agent_name` column + indexes
-- `backend/tests/test_services/test_agent_registry.py` — registry unit tests
-- `backend/tests/test_services/test_run_reducers.py` — reducer unit tests
-- `backend/tests/test_api/test_runs_api.py` — runs API unit tests
-
-### Backend — modified files
-- `backend/app/models/agent_run.py` — add `agent_name` column + index
-- `backend/app/repositories/agent_run.py` — add `agent_name` + `search` filters; add `find_latest_active_run` generic method
-- `backend/app/services/run_service.py` — use registry for reducer dispatch; add generic `create_run` + `find_latest_active_run`; keep old methods as aliases
-- `backend/app/services/run_reducers/__init__.py` — export registry after registration
-- `backend/app/services/run_reducers/skill_creator.py` — add `make_initial_projection` + register with `AgentRegistry`
-- `backend/app/schemas/runs.py` — add `agent_name` + `agent_display_name` to `RunSummary`; add `CreateRunRequest`; add `AgentDefinitionResponse` + `AgentListResponse`
-- `backend/app/api/v1/runs.py` — add `POST /v1/runs`, `GET /v1/runs/agents`, `GET /v1/runs/active`; add `agent_name` + `search` query params to `GET /v1/runs`; keep old endpoints as aliases
-
-### Frontend — modified files
-- `frontend/services/runService.ts` — add `agent_name`/`agent_display_name` to `RunSummary`; add `AgentDefinition` type; add `createRun`, `listAgents`, `findActiveRun`; keep old methods as aliases
-- `frontend/hooks/queries/runs.ts` — add `useAgents` hook; update `useRuns` to accept `agentName` + `search` filters; update `runKeys`
-- `frontend/lib/utils/runHelpers.ts` — update `buildRunHref` to use `agent_name`
-- `frontend/app/runs/page.tsx` — add agent filter chips, title search input, sync filters to URL params; move filtering server-side
-
----
diff --git a/docs/superpowers/plans/2026-03-26-typed-chat-parser-routing.md b/docs/superpowers/plans/2026-03-26-typed-chat-parser-routing.md
deleted file mode 100644
index 16957534a..000000000
--- a/docs/superpowers/plans/2026-03-26-typed-chat-parser-routing.md
+++ /dev/null
@@ -1,115 +0,0 @@
-# Typed Chat Parser Routing Fix Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task.
-
-**Goal:** Ensure the typed chat transport parser keeps skewed frames from falling through as unknown, while keeping ping/legacy resume/stop dispatch stable.
-
-**Architecture:** Normalize typed transport names inside `parse_client_frame`, validate `chat.start` unconditionally, and let `ChatWsHandler` dispatch both typed and legacy frames without regressing ping handling.
-
-**Tech Stack:** FastAPI WebSocket, asyncio, pytest, dataclasses.
-
----
-
-### Task 1: Parser validation and normalization
-
-**Files:** `backend/app/websocket/chat_protocol.py`, `backend/tests/test_api/test_chat_protocol.py`
-
-- [ ] **Step 1: Add parser regression tests**
-
-```python
-def test_parse_ping_frame_bypasses_error():
-    parsed = parse_client_frame({"type": "ping"})
-    assert isinstance(parsed, dict)
-    assert parsed["type"] == "ping"
-
-
-def test_parse_chat_start_without_input_raises():
-    with pytest.raises(ChatProtocolError) as exc:
-        parse_client_frame({"type": "chat.start", "request_id": "req-bad"})
-    assert "input" in exc.value.message.lower()
-
-
-def test_parse_chat_resume_and_stop_return_dicts():
-    assert parse_client_frame({"type": "chat.resume", "request_id": "req-r"}).get("type") == "chat.resume"
-    assert parse_client_frame({"type": "chat.stop", "request_id": "req-s"}).get("type") == "chat.stop"
-```
-
-- [ ] **Step 2: Run parser tests to capture failure**
-  Run: `SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py -k "parse_ping_frame_bypasses_error or parse_chat_start_without_input_raises" -v`
-  Expected: FAIL because `parse_client_frame` currently raises for ping or skips chat.start validation.
-
-- [ ] **Step 3: Implement parser normalization**
-
-```python
-if frame_type == "chat.start":
-    return _parse_chat_start_frame(frame)
-if frame_type == "chat.resume":
-    return frame
-if frame_type == "chat.stop":
-    return frame
-if frame_type == "ping":
-    return frame
-if frame_type == "chat" and isinstance(frame.get("input"), dict):
-    return _parse_chat_start_frame(frame)
-raise ChatProtocolError(...)
-```
-
-and update `_parse_chat_start_frame` to raise when the `input` envelope is missing or not a dict.
-
-- [ ] **Step 4: Re-run parser tests**
-  Run: `SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py -v` → expect PASS.
-
-### Task 2: Handler routing for typed frames
-
-**Files:** `backend/app/websocket/chat_ws_handler.py`, `backend/tests/test_api/test_chat_ws_handler.py`
-
-- [ ] **Step 1: Add handler tests for typed resume/stop routing**
-
-```python
-@pytest.mark.asyncio
-async def test_typed_resume_routes_to_resume_handler():
-    handler, _ = make_handler()
-    with patch.object(handler, "_handle_resume") as mock_resume:
-        await handler._handle_frame(json.dumps({"type": "chat.resume", "request_id": "req", "thread_id": "t", "command": {}}))
-    mock_resume.assert_awaited_once()
-
-
-@pytest.mark.asyncio
-async def test_typed_stop_routes_to_stop_handler():
-    handler, _ = make_handler()
-    with patch.object(handler, "_handle_stop") as mock_stop:
-        await handler._handle_frame(json.dumps({"type": "chat.stop", "request_id": "req"}))
-    mock_stop.assert_awaited_once()
-```
-
-- [ ] **Step 2: Run handler tests to see failure**
-  Run: `SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py -k "typed_resume_routes_to_resume_handler or typed_stop_routes_to_stop_handler" -v`
-  Expected: FAIL because typed frames currently hit the unknown-frame branch.
-
-- [ ] **Step 3: Update handler dispatch logic**
-
-```python
-frame_type = parsed_frame.get("type")
-if frame_type in {"chat.resume", "resume"}:
-    await self._handle_resume(parsed_frame)
-    return
-if frame_type in {"chat.stop", "stop"}:
-    await self._handle_stop(parsed_frame)
-    return
-if frame_type == "ping":
-    await self._send({"type": "pong"})
-    return
-```
-
-- [ ] **Step 4: Re-run handler tests**
-  Run: `SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_ws_handler.py::test_ping_returns_pong backend/tests/test_api/test_chat_ws_handler.py -v` → expect PASS.
-
-### Task 3: Cross-file verification
-
-**Files:** same as above
-
-- [ ] **Step 1: Run combined regression tests**
-  Run: `SECRET_KEY=test-secret backend/.venv/bin/pytest backend/tests/test_api/test_chat_protocol.py backend/tests/test_api/test_chat_ws_handler.py -v`
-  Expect: PASS.
-
-- [ ] **Step 2: Capture test output and note any new expectations for documentation or future follow-ups.
diff --git a/docs/superpowers/plans/2026-03-30-model-management-part1-layout-status-params.md b/docs/superpowers/plans/2026-03-30-model-management-part1-layout-status-params.md
deleted file mode 100644
index 8b2b92001..000000000
--- a/docs/superpowers/plans/2026-03-30-model-management-part1-layout-status-params.md
+++ /dev/null
@@ -1,600 +0,0 @@
-# 模型管理重构 Part 1：布局 + 状态 + 参数配置
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 将模型管理页面从纵向卡片列表重构为 Master-Detail 分栏布局，增加凭证健康状态展示、全局概览、模型参数配置（Provider 默认 + 模型覆盖）。
-
-**Architecture:** 前端全部重写 settings/models 页面及组件，后端重构 repositories/services/API 层以支持参数配置、概览聚合、unavailable_reason。保留 core/model 层和 credential service 不动。
-
-**Tech Stack:** Next.js 16 / React 19 / TypeScript / Tailwind / Radix UI (Tabs, Sheet) / React Query / FastAPI / SQLAlchemy async / Alembic
-
-**Spec:** `docs/superpowers/specs/2026-03-30-model-management-refactor-design.md`
-
-**子计划说明：** 本计划是 3 个子计划中的第 1 个。Part 2 = Playground，Part 3 = 使用量统计。
-
----
-
-## File Structure
-
-### 后端新增/修改
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Modify | `backend/app/models/model_provider.py` | 加 `default_parameters` 字段 |
-| Create | `backend/alembic/versions/20260330_000000_add_provider_default_parameters.py` | 迁移脚本 |
-| Rewrite | `backend/app/repositories/model_instance.py` | eager load、按 provider 过滤、简化优先级 |
-| Rewrite | `backend/app/repositories/model_provider.py` | 加过滤、统计、默认参数更新 |
-| Rewrite | `backend/app/services/model_provider_service.py` | 清理废弃代码、加 update_defaults、返回 default_parameters |
-| Rewrite | `backend/app/services/model_service.py` | 加 update_instance、get_overview、unavailable_reason |
-| Rewrite | `backend/app/api/v1/model_providers.py` | 恢复认证、加 PATCH defaults |
-| Rewrite | `backend/app/api/v1/models.py` | 加 PATCH instances/{id}、GET overview |
-
-### 前端新增/修改
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Delete | `frontend/app/settings/models/components/*.tsx` (8 files) | 旧组件全部删除 |
-| Rewrite | `frontend/app/settings/models/page.tsx` | Master-Detail 分栏入口 |
-| Create | `frontend/app/settings/models/components/provider-sidebar/provider-sidebar.tsx` | 左侧面板容器 |
-| Create | `frontend/app/settings/models/components/provider-sidebar/provider-item.tsx` | Provider 行 |
-| Create | `frontend/app/settings/models/components/provider-sidebar/provider-search.tsx` | 搜索框 |
-| Create | `frontend/app/settings/models/components/detail-panel/detail-panel.tsx` | 右侧面板 + Tab |
-| Create | `frontend/app/settings/models/components/detail-panel/overview-dashboard.tsx` | 全局概览 |
-| Create | `frontend/app/settings/models/components/detail-panel/provider-header.tsx` | Provider 头部 + 凭证状态 |
-| Create | `frontend/app/settings/models/components/detail-panel/model-list-tab/model-list-tab.tsx` | 模型列表 Tab |
-| Create | `frontend/app/settings/models/components/detail-panel/model-list-tab/model-row.tsx` | 模型行 |
-| Create | `frontend/app/settings/models/components/detail-panel/model-list-tab/param-drawer.tsx` | 参数编辑抽屉 |
-| Create | `frontend/app/settings/models/components/credential-dialog.tsx` | 凭证编辑弹窗（重写） |
-| Create | `frontend/app/settings/models/components/add-custom-model-dialog.tsx` | 添加自定义模型弹窗（重写） |
-| Modify | `frontend/hooks/queries/models.ts` | 新增 hooks |
-| Modify | `frontend/types/models.ts` | 新增类型 |
-
-### 测试文件
-
-| 文件 | 覆盖 |
-|------|------|
-| `backend/tests/test_model_providers_api.py` | PATCH defaults、认证恢复 |
-| `backend/tests/test_models_api.py` | PATCH instances、GET overview、unavailable_reason |
-| `frontend/app/settings/models/__tests__/provider-sidebar.test.tsx` | 列表渲染、搜索、选中 |
-| `frontend/app/settings/models/__tests__/detail-panel.test.tsx` | Tab 切换、概览 |
-| `frontend/app/settings/models/__tests__/model-list-tab.test.tsx` | 模型行、默认模型、参数抽屉 |
-
----
-
-## Task 1: Alembic 迁移 — model_provider 加 default_parameters 字段
-
-**Files:**
-- Modify: `backend/app/models/model_provider.py`
-- Create: `backend/alembic/versions/20260330_000000_add_provider_default_parameters.py`
-
-- [ ] **Step 1: 修改 ORM 模型**
-
-在 `backend/app/models/model_provider.py` 的 `is_enabled` 字段后加：
-
-```python
-# Provider 级默认参数
-default_parameters: Mapped[dict] = mapped_column(
-    JSON, nullable=False, default=dict, server_default="{}", comment="Provider 级默认参数"
-)
-```
-
-- [ ] **Step 2: 创建迁移脚本**
-
-创建 `backend/alembic/versions/20260330_000000_add_provider_default_parameters.py`，down_revision 指向当前最新 `add_agent_name_column`。
-
-- [ ] **Step 3: 运行迁移验证**
-
-Run: `cd backend && alembic upgrade head`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/models/model_provider.py backend/alembic/versions/20260330_000000_add_provider_default_parameters.py
-git commit -m "feat: add default_parameters field to model_provider"
-```
-
----
-
-## Task 2: 重写 model_instance repository
-
-**Files:**
-- Rewrite: `backend/app/repositories/model_instance.py`
-
-- [ ] **Step 1: 重写 repository**
-
-关键改动：
-- `list_all()` 加 `selectinload(ModelInstance.provider)` 解决 N+1
-- `get_best_instance()` 加 `selectinload`，简化优先级（全局模式，去掉 user_id 优先级）
-- 新增 `list_by_provider(provider_id, provider_name)` 按 provider 过滤
-- 新增 `count_by_provider(provider_id, provider_name)` 统计数量
-
-完整代码见 spec 中 repository 重写部分。所有 select 查询统一加 `options(selectinload(ModelInstance.provider))`。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/repositories/model_instance.py
-git commit -m "refactor: rewrite model_instance repo with eager load and provider filtering"
-```
-
----
-
-## Task 3: 重写 model_provider repository
-
-**Files:**
-- Rewrite: `backend/app/repositories/model_provider.py`
-
-- [ ] **Step 1: 重写 repository**
-
-保留 `get_by_name`、`list_enabled`，新增：
-- `list_by_type(provider_type: str)` 按类型过滤
-- `count_all()` 统计总数
-- `update_default_parameters(name, default_parameters)` 更新默认参数
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/repositories/model_provider.py
-git commit -m "refactor: rewrite model_provider repo with type filtering and defaults"
-```
-
----
-
-## Task 4: 重写 model_provider_service
-
-**Files:**
-- Rewrite: `backend/app/services/model_provider_service.py`
-
-- [ ] **Step 1: 重写 service**
-
-关键改动：
-- 删除 `_sync_credentials` 废弃方法
-- `get_all_providers` 和 `get_provider` 返回结构增加 `default_parameters` 字段
-- `get_all_providers` 中 `model_count` 改为从 `instance_repo.count_by_provider` 获取实际数量
-- 新增 `update_provider_defaults(provider_name, default_parameters)` 方法
-- 保留 `sync_all`、`sync_providers_from_factory`、`_ensure_model_instances_for_provider`、`_sync_models`、`delete_provider`（这些是功能性代码，不是废弃代码）
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/model_provider_service.py
-git commit -m "refactor: rewrite model_provider_service with defaults and cleanup"
-```
-
----
-
-## Task 5: 重写 model_service — update_instance + get_overview + unavailable_reason
-
-**Files:**
-- Rewrite: `backend/app/services/model_service.py`
-
-- [ ] **Step 1: 重写 service**
-
-关键改动：
-- `get_available_models` 增加 `unavailable_reason` 逻辑：
-  - 无凭证 → `no_credentials`
-  - 凭证无效 → `invalid_credentials`（需要额外查 credential.is_valid）
-  - 模型不在 provider model_list 中 → `model_not_found`
-- 新增 `update_model_instance(instance_id, model_parameters, is_default)` 方法
-- 新增 `get_overview()` 方法，返回 Provider 健康摘要、默认模型信息、最近凭证失败
-- 提取公共方法 `_resolve_model(provider_name, model_name, user_id)` 减少重复代码
-- 保留 `test_output`（Part 2 会改为流式，本阶段保持同步）
-- 保留 `get_model_instance`、`get_runtime_model_by_name`、`create_model_instance_config`、`list_model_instances`、`update_model_instance_default`
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/model_service.py
-git commit -m "refactor: rewrite model_service with overview, update_instance, unavailable_reason"
-```
-
----
-
-## Task 6: 重写 model_providers API
-
-**Files:**
-- Rewrite: `backend/app/api/v1/model_providers.py`
-- Test: `backend/tests/test_model_providers_api.py`
-
-- [ ] **Step 1: 写测试**
-
-创建 `backend/tests/test_model_providers_api.py`，测试：
-- `PATCH /v1/model-providers/{name}/defaults` 正常更新
-- `PATCH /v1/model-providers/{name}/defaults` 不存在的 provider 返回 404
-- 所有端点恢复认证（无 token 返回 401）
-
-- [ ] **Step 2: 重写 API**
-
-关键改动：
-- 所有端点恢复 `current_user: User = Depends(get_current_user)`
-- 新增 `PATCH /{provider_name}/defaults` 端点，请求体 `{ default_parameters: {} }`
-- 保留 `GET /`、`GET /{name}`、`POST /sync`、`DELETE /{name}`
-
-- [ ] **Step 3: 运行测试**
-
-Run: `cd backend && python -m pytest tests/test_model_providers_api.py -v`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/api/v1/model_providers.py backend/tests/test_model_providers_api.py
-git commit -m "refactor: rewrite model_providers API with auth and defaults endpoint"
-```
-
----
-
-## Task 7: 重写 models API
-
-**Files:**
-- Rewrite: `backend/app/api/v1/models.py`
-- Test: `backend/tests/test_models_api.py`
-
-- [ ] **Step 1: 写测试**
-
-创建 `backend/tests/test_models_api.py`，测试：
-- `PATCH /v1/models/instances/{id}` 更新参数
-- `PATCH /v1/models/instances/{id}` 不存在返回 404
-- `GET /v1/models/overview` 返回正确结构
-- `GET /v1/models` 响应包含 `unavailable_reason`
-
-- [ ] **Step 2: 重写 API**
-
-关键改动：
-- 新增 `PATCH /instances/{id}` 端点，请求体 `ModelInstanceUpdate(model_parameters, is_default)`
-- 新增 `GET /overview` 端点
-- `GET /` 响应增加 `unavailable_reason` 字段
-- 保留 `POST /instances`、`GET /instances`、`POST /test-output`、`PATCH /instances/default`
-
-- [ ] **Step 3: 运行测试**
-
-Run: `cd backend && python -m pytest tests/test_models_api.py -v`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/api/v1/models.py backend/tests/test_models_api.py
-git commit -m "refactor: rewrite models API with PATCH instance, overview, unavailable_reason"
-```
-
----
-
-## Task 8: 前端类型和 hooks 扩展
-
-**Files:**
-- Modify: `frontend/types/models.ts`
-- Modify: `frontend/hooks/queries/models.ts`
-
-- [ ] **Step 1: 扩展类型**
-
-在 `frontend/types/models.ts` 中新增：
-
-```typescript
-// ==================== Provider Defaults ====================
-
-export interface UpdateProviderDefaultsRequest {
-  default_parameters: Record<string, unknown>
-}
-
-// ==================== Update Model Instance ====================
-
-export interface UpdateModelInstanceRequest {
-  model_parameters?: Record<string, unknown>
-  is_default?: boolean
-}
-
-// ==================== Overview ====================
-
-export interface DefaultModelInfo {
-  provider_name: string
-  provider_display_name: string
-  model_name: string
-  model_parameters: Record<string, unknown>
-}
-
-export interface CredentialFailureInfo {
-  provider_name: string
-  provider_display_name: string
-  error: string
-  failed_at?: string
-}
-
-export interface ModelsOverview {
-  total_providers: number
-  healthy_providers: number
-  unhealthy_providers: number
-  unconfigured_providers: number
-  total_models: number
-  available_models: number
-  default_model?: DefaultModelInfo
-  recent_credential_failure?: CredentialFailureInfo
-}
-```
-
-在 `AvailableModel` 中增加：
-```typescript
-unavailable_reason?: 'no_credentials' | 'invalid_credentials' | 'model_not_found' | 'provider_error'
-```
-
-在 `ModelProvider` 中增加：
-```typescript
-default_parameters?: Record<string, unknown>
-```
-
-- [ ] **Step 2: 扩展 hooks**
-
-在 `frontend/hooks/queries/models.ts` 中新增：
-
-```typescript
-// Query keys 扩展
-overview: () => [...modelKeys.all, 'overview'] as const,
-
-// Hooks
-export function useModelsOverview() { ... }       // GET models/overview
-export function useUpdateModelInstance() { ... }   // PATCH models/instances/{id}
-export function useUpdateProviderDefaults() { ... } // PATCH model-providers/{name}/defaults
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/types/models.ts frontend/hooks/queries/models.ts
-git commit -m "feat: extend frontend types and hooks for overview, instance update, provider defaults"
-```
-
----
-
-## Task 9: 删除旧前端组件
-
-**Files:**
-- Delete: `frontend/app/settings/models/components/provider-added-card.tsx`
-- Delete: `frontend/app/settings/models/components/provider-card.tsx`
-- Delete: `frontend/app/settings/models/components/credential-dialog.tsx`
-- Delete: `frontend/app/settings/models/components/add-custom-model-dialog.tsx`
-- Delete: `frontend/app/settings/models/components/model-list.tsx`
-- Delete: `frontend/app/settings/models/components/model-list-item.tsx`
-- Delete: `frontend/app/settings/models/components/credential-panel.tsx`
-- Delete: `frontend/app/settings/models/components/provider-icon.tsx`
-
-- [ ] **Step 1: 删除所有旧组件**
-
-```bash
-rm frontend/app/settings/models/components/*.tsx
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add -A frontend/app/settings/models/components/
-git commit -m "chore: delete old model settings components for rewrite"
-```
-
----
-
-## Task 10: 创建 provider-sidebar 组件
-
-**Files:**
-- Create: `frontend/app/settings/models/components/provider-sidebar/provider-search.tsx`
-- Create: `frontend/app/settings/models/components/provider-sidebar/provider-item.tsx`
-- Create: `frontend/app/settings/models/components/provider-sidebar/provider-sidebar.tsx`
-
-- [ ] **Step 1: 创建 provider-search.tsx**
-
-简单的搜索输入框组件，接受 `value` 和 `onChange` props。使用 Lucide `Search` 图标 + `Input` 组件。
-
-- [ ] **Step 2: 创建 provider-item.tsx**
-
-单个 Provider 行组件，props：
-- `provider: ModelProvider`
-- `credential?: ModelCredential`
-- `isSelected: boolean`
-- `onClick: () => void`
-- `modelCount: number`
-
-展示：图标（首字母 fallback）、名称、状态指示灯（绿/红/灰，根据 credential.is_valid）、模型数量 badge。选中时高亮背景。
-
-- [ ] **Step 3: 创建 provider-sidebar.tsx**
-
-左侧面板容器，props：
-- `selectedProvider: string | null`
-- `onSelectProvider: (name: string | null) => void`
-
-内部使用 `useModelProviders` + `useModelCredentials` + `useModelProvidersByConfig`。顶部搜索框 + "添加模型"按钮，下方按"系统内置"/"自定义"分组渲染 `ProviderItem` 列表。搜索过滤按 display_name 匹配。
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/settings/models/components/provider-sidebar/
-git commit -m "feat: create provider-sidebar components"
-```
-
----
-
-## Task 11: 创建 detail-panel 骨架 + overview-dashboard
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/detail-panel.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/overview-dashboard.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/provider-header.tsx`
-
-- [ ] **Step 1: 创建 overview-dashboard.tsx**
-
-未选中 Provider 时的全局概览。使用 `useModelsOverview()` hook。展示：
-- Provider 健康摘要卡片（正常/异常/未配置数量）
-- 默认模型信息卡片
-- 最近凭证失败告警（如果有）
-
-- [ ] **Step 2: 创建 provider-header.tsx**
-
-Provider 详情顶部，props：
-- `provider: ModelProvider`
-- `credential?: ModelCredential`
-
-展示：Provider 图标 + 名称 + 凭证状态卡片（状态标签、最后验证时间、错误信息展开、重新验证按钮、编辑凭证按钮）。操作按钮：删除 Provider（仅自定义）。
-
-- [ ] **Step 3: 创建 detail-panel.tsx**
-
-右侧面板容器，props：
-- `selectedProvider: string | null`
-
-未选中时渲染 `OverviewDashboard`。选中时渲染 `ProviderHeader` + Radix `Tabs`（模型列表 / Playground / 统计）。Playground 和统计 Tab 暂时显示"Coming Soon"占位。
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/
-git commit -m "feat: create detail-panel skeleton with overview and provider header"
-```
-
----
-
-## Task 12: 创建 model-list-tab 组件
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/model-list-tab/model-row.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/model-list-tab/param-drawer.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/model-list-tab/model-list-tab.tsx`
-
-- [ ] **Step 1: 创建 model-row.tsx**
-
-单行模型组件，props：
-- `model: AvailableModel & { model_parameters?: Record<string, unknown> }`
-- `onEditParams: () => void`
-- `onSetDefault: () => void`
-
-展示：模型名称、可用性标签（含 unavailable_reason tooltip）、默认星标、参数摘要（折叠）、操作按钮。
-
-- [ ] **Step 2: 创建 param-drawer.tsx**
-
-参数编辑侧抽屉，使用 `Sheet` 组件（side="right"）。props：
-- `open: boolean`
-- `onOpenChange: (open: boolean) => void`
-- `model: ModelInstance`
-- `configSchema: Record<string, any> | null`
-- `providerDefaults: Record<string, unknown>`
-
-根据 configSchema 动态渲染参数表单。每个字段旁有"使用 Provider 默认"Switch，打开时显示 Provider 默认值（只读），关闭时可编辑。保存时调用 `useUpdateModelInstance`。
-
-- [ ] **Step 3: 创建 model-list-tab.tsx**
-
-模型列表 Tab 容器。使用 `useAvailableModels` + `useModelInstances` 获取数据，按当前选中 Provider 过滤。渲染 `ModelRow` 列表 + `ParamDrawer`。
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/model-list-tab/
-git commit -m "feat: create model-list-tab with param drawer"
-```
-
----
-
-## Task 13: 重写 credential-dialog 和 add-custom-model-dialog
-
-**Files:**
-- Create: `frontend/app/settings/models/components/credential-dialog.tsx`
-- Create: `frontend/app/settings/models/components/add-custom-model-dialog.tsx`
-
-- [ ] **Step 1: 重写 credential-dialog.tsx**
-
-从旧版提取 schema 驱动表单逻辑，适配新的触发方式（从 provider-header 中触发）。保持 Dialog 组件，但简化样式与新设计一致。
-
-- [ ] **Step 2: 重写 add-custom-model-dialog.tsx**
-
-从旧版提取表单逻辑，适配新的触发方式（从 provider-sidebar 的"添加模型"按钮触发）。
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/settings/models/components/credential-dialog.tsx frontend/app/settings/models/components/add-custom-model-dialog.tsx
-git commit -m "feat: rewrite credential and add-custom-model dialogs"
-```
-
----
-
-## Task 14: 重写 page.tsx — Master-Detail 入口
-
-**Files:**
-- Rewrite: `frontend/app/settings/models/page.tsx`
-
-- [ ] **Step 1: 重写 page.tsx**
-
-```typescript
-'use client'
-
-import { useState } from 'react'
-import { ProviderSidebar } from './components/provider-sidebar/provider-sidebar'
-import { DetailPanel } from './components/detail-panel/detail-panel'
-
-export default function ModelsPage() {
-  const [selectedProvider, setSelectedProvider] = useState<string | null>(null)
-
-  return (
-    <div className="flex h-full bg-[var(--surface-elevated)]">
-      <ProviderSidebar
-        selectedProvider={selectedProvider}
-        onSelectProvider={setSelectedProvider}
-      />
-      <DetailPanel selectedProvider={selectedProvider} />
-    </div>
-  )
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/settings/models/page.tsx
-git commit -m "feat: rewrite models page with Master-Detail layout"
-```
-
----
-
-## Task 15: 前端测试
-
-**Files:**
-- Create: `frontend/app/settings/models/__tests__/provider-sidebar.test.tsx`
-- Create: `frontend/app/settings/models/__tests__/detail-panel.test.tsx`
-- Create: `frontend/app/settings/models/__tests__/model-list-tab.test.tsx`
-
-- [ ] **Step 1: 写 provider-sidebar 测试**
-
-测试：渲染 Provider 列表、搜索过滤、点击选中、状态灯颜色映射（绿/红/灰）。Mock `useModelProviders` 和 `useModelCredentials`。
-
-- [ ] **Step 2: 写 detail-panel 测试**
-
-测试：未选中时显示概览、选中后显示 Tab、Tab 切换。Mock `useModelsOverview`。
-
-- [ ] **Step 3: 写 model-list-tab 测试**
-
-测试：模型行渲染、设置默认模型、打开参数抽屉、参数表单渲染。Mock `useAvailableModels` 和 `useModelInstances`。
-
-- [ ] **Step 4: 运行所有前端测试**
-
-Run: `cd frontend && npx vitest run app/settings/models/__tests__/ --reporter=verbose`
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/app/settings/models/__tests__/
-git commit -m "test: add frontend tests for model settings components"
-```
-
----
-
-## Task 16: 集成验证
-
-- [ ] **Step 1: 运行后端全量测试**
-
-Run: `cd backend && python -m pytest tests/ -v --tb=short`
-
-- [ ] **Step 2: 运行前端构建检查**
-
-Run: `cd frontend && npx next build`
-
-- [ ] **Step 3: 修复发现的问题（如有）**
-
-- [ ] **Step 4: 最终 Commit**
-
-```bash
-git add -A
-git commit -m "fix: resolve integration issues from model management refactor part 1"
-```
diff --git a/docs/superpowers/plans/2026-03-30-model-management-part2-playground.md b/docs/superpowers/plans/2026-03-30-model-management-part2-playground.md
deleted file mode 100644
index 05e36e5d7..000000000
--- a/docs/superpowers/plans/2026-03-30-model-management-part2-playground.md
+++ /dev/null
@@ -1,585 +0,0 @@
-# 模型管理重构 Part 2：Playground 模型测试
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 在模型管理详情面板中新增 Playground Tab，支持流式模型测试（SSE）、参数临时调节、性能指标展示（TTFT、token 用量、响应速度）。
-
-**Architecture:** 后端将 test-output 端点改为 SSE 流式响应（复用项目中已有的 StreamingResponse 模式），前端用 fetch + ReadableStream 消费。性能指标在后端计算后通过 SSE metrics 事件推送。
-
-**Tech Stack:** FastAPI StreamingResponse / SSE / React 19 / TypeScript / Tailwind
-
-**Spec:** `docs/superpowers/specs/2026-03-30-model-management-refactor-design.md` Section 3
-
-**前置依赖：** Part 1 计划完成（Master-Detail 布局 + detail-panel Tab 骨架已就位）
-
----
-
-## File Structure
-
-### 后端修改
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Modify | `backend/app/api/v1/models.py` | 改造 test-output 为 SSE 端点 |
-| Modify | `backend/app/services/model_service.py` | test_output 改为异步生成器 |
-
-### 前端新增
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Create | `frontend/app/settings/models/components/detail-panel/playground-tab/prompt-input.tsx` | 输入区（模型选择 + prompt + 参数面板） |
-| Create | `frontend/app/settings/models/components/detail-panel/playground-tab/output-display.tsx` | 输出区（流式内容 + 性能指标卡片） |
-| Create | `frontend/app/settings/models/components/detail-panel/playground-tab/test-history.tsx` | 测试历史列表 |
-| Create | `frontend/app/settings/models/components/detail-panel/playground-tab/playground-tab.tsx` | Playground Tab 容器 |
-| Modify | `frontend/hooks/queries/models.ts` | 新增 useTestModelStream hook |
-| Modify | `frontend/types/models.ts` | 新增 ModelTestMetrics 等类型 |
-
-### 测试
-
-| 文件 | 覆盖 |
-|------|------|
-| `backend/tests/test_models_sse.py` | SSE 流式响应、metrics 事件、错误处理 |
-| `frontend/app/settings/models/__tests__/playground-tab.test.tsx` | 模型选择、发送、流式渲染、性能指标 |
-
----
-
-## Task 1: 后端 — test_output 改为异步生成器
-
-**Files:**
-- Modify: `backend/app/services/model_service.py`
-
-- [ ] **Step 1: 新增 test_output_stream 方法**
-
-在 `ModelService` 中新增异步生成器方法，保留原 `test_output` 不动（向后兼容）：
-
-```python
-import time
-import json
-from typing import AsyncGenerator
-
-async def test_output_stream(
-    self,
-    user_id: str,
-    model_name: str,
-    input_text: str,
-    model_parameters: Optional[Dict[str, Any]] = None,
-) -> AsyncGenerator[str, None]:
-    """
-    流式测试模型输出，yield SSE 格式事件。
-    事件类型：token, metrics, error, done
-    """
-    instance = await self.repo.get_by_name(model_name)
-    if not instance:
-        yield f"event: error\ndata: {json.dumps({'error': f'模型实例不存在: {model_name}'})}\n\n"
-        return
-
-    provider_name = instance.resolved_provider_name
-    implementation_name = instance.resolved_implementation_name
-    model_type = ModelType.CHAT
-
-    credentials = await self.credential_service.get_current_credentials(
-        provider_name=provider_name,
-        model_type=model_type,
-        model_name=model_name,
-        user_id=user_id,
-    )
-
-    if not credentials:
-        yield f"event: error\ndata: {json.dumps({'error': f'未找到有效凭据: {provider_name}/{model_name}'})}\n\n"
-        return
-
-    # 合并参数：实例参数 < 临时覆盖参数
-    effective_params = {**(instance.model_parameters or {})}
-    if model_parameters:
-        effective_params.update(model_parameters)
-
-    model = create_model_instance(
-        implementation_name,
-        model_name,
-        model_type,
-        credentials,
-        effective_params,
-    )
-
-    start_time = time.monotonic()
-    first_token_time = None
-    output_tokens = 0
-    full_output = ""
-
-    try:
-        async for chunk in model.astream(input_text):
-            token = chunk.content if hasattr(chunk, "content") else str(chunk)
-            if isinstance(token, list):
-                token = "".join(str(t) for t in token)
-            if not token:
-                continue
-
-            if first_token_time is None:
-                first_token_time = time.monotonic()
-
-            output_tokens += 1
-            full_output += token
-            yield f"event: token\ndata: {json.dumps({'token': token})}\n\n"
-
-        total_time = time.monotonic() - start_time
-        ttft = (first_token_time - start_time) if first_token_time else total_time
-
-        # 估算 input tokens（简单按字符数 / 4 估算，精确值需要 tokenizer）
-        input_tokens_est = max(1, len(input_text) // 4)
-
-        metrics = {
-            "ttft_ms": round(ttft * 1000, 1),
-            "total_time_ms": round(total_time * 1000, 1),
-            "input_tokens": input_tokens_est,
-            "output_tokens": output_tokens,
-            "tokens_per_second": round(output_tokens / total_time, 1) if total_time > 0 else 0,
-        }
-        yield f"event: metrics\ndata: {json.dumps(metrics)}\n\n"
-        yield f"event: done\ndata: {json.dumps({'status': 'complete'})}\n\n"
-
-    except Exception as e:
-        yield f"event: error\ndata: {json.dumps({'error': str(e)})}\n\n"
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/model_service.py
-git commit -m "feat: add test_output_stream async generator for SSE"
-```
-
----
-
-## Task 2: 后端 — SSE 端点
-
-**Files:**
-- Modify: `backend/app/api/v1/models.py`
-- Test: `backend/tests/test_models_sse.py`
-
-- [ ] **Step 1: 写测试**
-
-创建 `backend/tests/test_models_sse.py`：
-
-```python
-import pytest
-from httpx import AsyncClient
-
-
-class TestModelTestOutputSSE:
-    """测试 SSE 流式 test-output 端点"""
-
-    @pytest.mark.asyncio
-    async def test_sse_content_type(self, client: AsyncClient, auth_headers):
-        """响应 Content-Type 应为 text/event-stream"""
-        response = await client.post(
-            "/api/v1/models/test-output-stream",
-            json={"model_name": "test-model", "input": "hello"},
-            headers=auth_headers,
-        )
-        assert response.headers.get("content-type", "").startswith("text/event-stream")
-
-    @pytest.mark.asyncio
-    async def test_sse_with_model_parameters(self, client: AsyncClient, auth_headers):
-        """请求体应接受可选的 model_parameters"""
-        response = await client.post(
-            "/api/v1/models/test-output-stream",
-            json={
-                "model_name": "test-model",
-                "input": "hello",
-                "model_parameters": {"temperature": 0.5},
-            },
-            headers=auth_headers,
-        )
-        # 即使模型不存在，也应返回 SSE 格式的 error 事件
-        assert response.status_code == 200
-```
-
-- [ ] **Step 2: 新增 SSE 端点**
-
-在 `backend/app/api/v1/models.py` 中新增：
-
-```python
-from fastapi.responses import StreamingResponse
-
-class ModelTestStreamRequest(BaseModel):
-    """流式测试模型输出请求"""
-    model_name: str = Field(description="模型名称")
-    input: str = Field(description="输入文本")
-    model_parameters: Optional[Dict[str, Any]] = Field(default=None, description="临时参数覆盖（不持久化）")
-
-
-@router.post("/test-output-stream")
-async def test_output_stream(
-    payload: ModelTestStreamRequest,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """流式测试模型输出（SSE）"""
-    service = ModelService(db)
-
-    async def event_generator():
-        async for event in service.test_output_stream(
-            user_id=current_user.id,
-            model_name=payload.model_name,
-            input_text=payload.input,
-            model_parameters=payload.model_parameters,
-        ):
-            yield event
-
-    return StreamingResponse(
-        event_generator(),
-        media_type="text/event-stream",
-        headers={
-            "Cache-Control": "no-cache",
-            "Connection": "keep-alive",
-            "X-Accel-Buffering": "no",
-        },
-    )
-```
-
-保留原 `POST /test-output` 端点不动（向后兼容）。
-
-- [ ] **Step 3: 运行测试**
-
-Run: `cd backend && python -m pytest tests/test_models_sse.py -v`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/api/v1/models.py backend/tests/test_models_sse.py
-git commit -m "feat: add SSE test-output-stream endpoint"
-```
-
----
-
-## Task 3: 前端类型扩展
-
-**Files:**
-- Modify: `frontend/types/models.ts`
-
-- [ ] **Step 1: 新增 Playground 相关类型**
-
-```typescript
-// ==================== Playground ====================
-
-export interface ModelTestStreamRequest {
-  model_name: string
-  input: string
-  model_parameters?: Record<string, unknown>
-}
-
-export interface ModelTestMetrics {
-  ttft_ms: number
-  total_time_ms: number
-  input_tokens: number
-  output_tokens: number
-  tokens_per_second: number
-}
-
-export interface TestHistoryItem {
-  id: string
-  model_name: string
-  input: string
-  output: string
-  metrics?: ModelTestMetrics
-  timestamp: number
-  status: 'success' | 'error'
-  error?: string
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/types/models.ts
-git commit -m "feat: add playground types for SSE streaming and metrics"
-```
-
----
-
-## Task 4: 前端 useTestModelStream hook
-
-**Files:**
-- Modify: `frontend/hooks/queries/models.ts`
-
-- [ ] **Step 1: 新增 SSE 消费 hook**
-
-在 `frontend/hooks/queries/models.ts` 中新增：
-
-```typescript
-import { useCallback, useRef, useState } from 'react'
-import type { ModelTestMetrics, ModelTestStreamRequest } from '@/types/models'
-
-interface StreamState {
-  isStreaming: boolean
-  output: string
-  metrics: ModelTestMetrics | null
-  error: string | null
-  ttftShown: boolean
-  ttftMs: number | null
-}
-
-export function useTestModelStream() {
-  const [state, setState] = useState<StreamState>({
-    isStreaming: false,
-    output: '',
-    metrics: null,
-    error: null,
-    ttftShown: false,
-    ttftMs: null,
-  })
-  const abortRef = useRef<AbortController | null>(null)
-
-  const startStream = useCallback(async (request: ModelTestStreamRequest) => {
-    // 中断上一次流
-    abortRef.current?.abort()
-    const controller = new AbortController()
-    abortRef.current = controller
-
-    setState({
-      isStreaming: true,
-      output: '',
-      metrics: null,
-      error: null,
-      ttftShown: false,
-      ttftMs: null,
-    })
-
-    try {
-      const token = localStorage.getItem('token') || ''
-      const response = await fetch('/api/v1/models/test-output-stream', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${token}`,
-        },
-        body: JSON.stringify(request),
-        signal: controller.signal,
-      })
-
-      if (!response.ok || !response.body) {
-        setState((s) => ({ ...s, isStreaming: false, error: `HTTP ${response.status}` }))
-        return
-      }
-
-      const reader = response.body.getReader()
-      const decoder = new TextDecoder()
-      let buffer = ''
-
-      while (true) {
-        const { done, value } = await reader.read()
-        if (done) break
-
-        buffer += decoder.decode(value, { stream: true })
-        const lines = buffer.split('\n')
-        buffer = lines.pop() || ''
-
-        let eventType = ''
-        for (const line of lines) {
-          if (line.startsWith('event: ')) {
-            eventType = line.slice(7)
-          } else if (line.startsWith('data: ') && eventType) {
-            const data = JSON.parse(line.slice(6))
-            if (eventType === 'token') {
-              setState((s) => ({
-                ...s,
-                output: s.output + data.token,
-                ttftShown: true,
-                ttftMs: s.ttftMs,
-              }))
-            } else if (eventType === 'metrics') {
-              setState((s) => ({
-                ...s,
-                metrics: data as ModelTestMetrics,
-                ttftMs: data.ttft_ms,
-              }))
-            } else if (eventType === 'error') {
-              setState((s) => ({ ...s, error: data.error }))
-            }
-            eventType = ''
-          }
-        }
-      }
-
-      setState((s) => ({ ...s, isStreaming: false }))
-    } catch (err) {
-      if ((err as Error).name !== 'AbortError') {
-        setState((s) => ({
-          ...s,
-          isStreaming: false,
-          error: (err as Error).message,
-        }))
-      }
-    }
-  }, [])
-
-  const stopStream = useCallback(() => {
-    abortRef.current?.abort()
-    setState((s) => ({ ...s, isStreaming: false }))
-  }, [])
-
-  return { ...state, startStream, stopStream }
-}
-```
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/hooks/queries/models.ts
-git commit -m "feat: add useTestModelStream hook for SSE consumption"
-```
-
----
-
-## Task 5: 前端 Playground 组件 — prompt-input
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/playground-tab/prompt-input.tsx`
-
-- [ ] **Step 1: 创建 prompt-input.tsx**
-
-Props:
-- `selectedProvider: string` — 当前 Provider
-- `modelName: string` — 选中的模型
-- `onModelChange: (name: string) => void`
-- `parameters: Record<string, unknown>` — 当前参数
-- `onParametersChange: (params: Record<string, unknown>) => void`
-- `onSend: (input: string) => void`
-- `onClear: () => void`
-- `isStreaming: boolean`
-- `configSchema: Record<string, any> | null`
-
-包含：
-- 模型选择器（下拉，使用 `useAvailableModels`，预选当前 Provider 下的模型）
-- 参数调节折叠面板（根据 configSchema 动态渲染 slider/input）
-- 多行 Prompt 输入框（Shift+Enter 换行，Enter 发送）
-- 发送按钮（streaming 时变为停止按钮）+ 清空按钮
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/playground-tab/prompt-input.tsx
-git commit -m "feat: create playground prompt-input component"
-```
-
----
-
-## Task 6: 前端 Playground 组件 — output-display
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/playground-tab/output-display.tsx`
-
-- [ ] **Step 1: 创建 output-display.tsx**
-
-Props:
-- `output: string`
-- `metrics: ModelTestMetrics | null`
-- `error: string | null`
-- `isStreaming: boolean`
-
-包含：
-- 模型响应内容区（流式逐字显示，streaming 时底部有闪烁光标）
-- 错误提示卡片（红色背景 + 重试按钮）
-- 性能指标卡片组（横向排列 5 个指标卡片：TTFT、总时间、输入 tokens、输出 tokens、速度）
-- 指标卡片在 metrics 为 null 时显示 skeleton loading
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/playground-tab/output-display.tsx
-git commit -m "feat: create playground output-display with metrics cards"
-```
-
----
-
-## Task 7: 前端 Playground 组件 — test-history + playground-tab
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/playground-tab/test-history.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/playground-tab/playground-tab.tsx`
-
-- [ ] **Step 1: 创建 test-history.tsx**
-
-Props:
-- `history: TestHistoryItem[]`
-- `onSelect: (item: TestHistoryItem) => void`
-
-简单的历史记录列表，每项显示：模型名、输入摘要（截断）、状态标签、时间戳。点击可回看。
-
-- [ ] **Step 2: 创建 playground-tab.tsx**
-
-Playground Tab 容器，管理所有状态：
-- 使用 `useTestModelStream` hook
-- 本地 state：selectedModel、parameters、history（TestHistoryItem[]）
-- 上方渲染 `PromptInput`，下方渲染 `OutputDisplay`
-- 底部可折叠的 `TestHistory`
-- 发送时调用 `startStream`，完成后将结果追加到 history
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/playground-tab/
-git commit -m "feat: create playground-tab with test history"
-```
-
----
-
-## Task 8: 集成 Playground Tab 到 detail-panel
-
-**Files:**
-- Modify: `frontend/app/settings/models/components/detail-panel/detail-panel.tsx`
-
-- [ ] **Step 1: 替换 Playground Tab 占位**
-
-将 detail-panel.tsx 中 Playground Tab 的 "Coming Soon" 占位替换为 `<PlaygroundTab selectedProvider={selectedProvider} />`。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/detail-panel.tsx
-git commit -m "feat: integrate playground tab into detail panel"
-```
-
----
-
-## Task 9: 前端测试
-
-**Files:**
-- Create: `frontend/app/settings/models/__tests__/playground-tab.test.tsx`
-
-- [ ] **Step 1: 写测试**
-
-测试：
-- 模型选择器渲染可用模型列表
-- 发送按钮触发 startStream
-- 流式输出逐步渲染到 output-display
-- 性能指标卡片在 metrics 到达后显示
-- 错误状态显示错误卡片
-- 停止按钮中断流
-
-Mock `fetch` + `ReadableStream` 模拟 SSE 事件序列。
-
-- [ ] **Step 2: 运行测试**
-
-Run: `cd frontend && npx vitest run app/settings/models/__tests__/playground-tab.test.tsx --reporter=verbose`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/settings/models/__tests__/playground-tab.test.tsx
-git commit -m "test: add playground tab tests with SSE mock"
-```
-
----
-
-## Task 10: 集成验证
-
-- [ ] **Step 1: 运行后端测试**
-
-Run: `cd backend && python -m pytest tests/ -v --tb=short`
-
-- [ ] **Step 2: 运行前端构建**
-
-Run: `cd frontend && npx next build`
-
-- [ ] **Step 3: 修复问题（如有）并 Commit**
diff --git a/docs/superpowers/plans/2026-03-30-model-management-part3-usage-stats.md b/docs/superpowers/plans/2026-03-30-model-management-part3-usage-stats.md
deleted file mode 100644
index fba21f4e5..000000000
--- a/docs/superpowers/plans/2026-03-30-model-management-part3-usage-stats.md
+++ /dev/null
@@ -1,867 +0,0 @@
-# 模型管理重构 Part 3：使用量统计系统
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 新增模型调用使用量统计系统，包括后端日志采集、聚合查询 API、前端统计 Tab（摘要卡片 + 趋势图 + 模型排行）。
-
-**Architecture:** 后端新增 model_usage_log 表 + Repository + Service + API。采集点在 ModelService 层显式调用，不侵入 core/model。前端新增 recharts 依赖用于趋势图。
-
-**Tech Stack:** FastAPI / SQLAlchemy async / Alembic / React 19 / TypeScript / recharts / Tailwind
-
-**Spec:** `docs/superpowers/specs/2026-03-30-model-management-refactor-design.md` Section 5
-
-**前置依赖：** Part 1 计划完成（Master-Detail 布局 + detail-panel Tab 骨架已就位）
-
----
-
-## File Structure
-
-### 后端新增
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Create | `backend/app/models/model_usage_log.py` | 使用量日志 ORM 模型 |
-| Create | `backend/alembic/versions/20260330_000001_add_model_usage_log.py` | 迁移脚本 |
-| Create | `backend/app/repositories/model_usage_log.py` | 日志 Repository（含聚合查询） |
-| Create | `backend/app/services/model_usage_service.py` | 采集 + 聚合 Service |
-| Create | `backend/app/api/v1/model_usage.py` | 使用量统计 API |
-| Modify | `backend/app/services/model_service.py` | 在调用链路中插入日志采集 |
-
-### 前端新增
-
-| 操作 | 文件 | 职责 |
-|------|------|------|
-| Create | `frontend/app/settings/models/components/detail-panel/stats-tab/summary-cards.tsx` | 摘要卡片行 |
-| Create | `frontend/app/settings/models/components/detail-panel/stats-tab/usage-chart.tsx` | 趋势图 + 模型排行 |
-| Create | `frontend/app/settings/models/components/detail-panel/stats-tab/stats-tab.tsx` | 统计 Tab 容器 |
-| Modify | `frontend/hooks/queries/models.ts` | 新增 useModelUsageStats hook |
-| Modify | `frontend/types/models.ts` | 新增统计相关类型 |
-
-### 测试
-
-| 文件 | 覆盖 |
-|------|------|
-| `backend/tests/test_model_usage_api.py` | 统计查询、过滤、空数据 |
-| `backend/tests/test_model_usage_service.py` | 日志采集、聚合计算 |
-| `frontend/app/settings/models/__tests__/stats-tab.test.tsx` | 空状态、摘要卡片、时间范围切换 |
-
----
-
-## Task 1: ORM 模型 + Alembic 迁移
-
-**Files:**
-- Create: `backend/app/models/model_usage_log.py`
-- Create: `backend/alembic/versions/20260330_000001_add_model_usage_log.py`
-
-- [ ] **Step 1: 创建 ORM 模型**
-
-创建 `backend/app/models/model_usage_log.py`：
-
-```python
-"""
-模型调用日志模型
-"""
-
-from typing import Optional
-
-from sqlalchemy import Float, ForeignKey, Index, Integer, String
-from sqlalchemy.orm import Mapped, mapped_column
-
-from .base import BaseModel
-
-
-class ModelUsageLog(BaseModel):
-    """模型调用日志表"""
-
-    __tablename__ = "model_usage_log"
-
-    provider_name: Mapped[str] = mapped_column(
-        String(100), nullable=False, comment="供应商名称"
-    )
-    model_name: Mapped[str] = mapped_column(
-        String(255), nullable=False, comment="模型名称"
-    )
-    model_type: Mapped[str] = mapped_column(
-        String(50), nullable=False, default="chat", comment="模型类型"
-    )
-    user_id: Mapped[Optional[str]] = mapped_column(
-        String(255),
-        ForeignKey("user.id", ondelete="SET NULL"),
-        nullable=True,
-        comment="调用用户",
-    )
-    input_tokens: Mapped[int] = mapped_column(
-        Integer, nullable=False, default=0, comment="输入 token 数"
-    )
-    output_tokens: Mapped[int] = mapped_column(
-        Integer, nullable=False, default=0, comment="输出 token 数"
-    )
-    total_time_ms: Mapped[float] = mapped_column(
-        Float, nullable=False, default=0.0, comment="总响应时间（毫秒）"
-    )
-    ttft_ms: Mapped[Optional[float]] = mapped_column(
-        Float, nullable=True, comment="首 token 延迟（毫秒）"
-    )
-    status: Mapped[str] = mapped_column(
-        String(20), nullable=False, default="success", comment="success / error"
-    )
-    error_message: Mapped[Optional[str]] = mapped_column(
-        String(2000), nullable=True, comment="错误信息"
-    )
-    source: Mapped[str] = mapped_column(
-        String(50), nullable=False, default="chat", comment="调用来源：playground / chat / agent"
-    )
-
-    __table_args__ = (
-        Index("model_usage_log_created_at_idx", "created_at"),
-        Index("model_usage_log_provider_model_idx", "provider_name", "model_name"),
-        Index("model_usage_log_composite_idx", "created_at", "provider_name", "model_name"),
-    )
-```
-
-- [ ] **Step 2: 在 models/__init__.py 中注册（如有）**
-
-检查 `backend/app/models/__init__.py`，如果有显式导入列表则加入 `ModelUsageLog`。
-
-- [ ] **Step 3: 创建迁移脚本**
-
-创建 `backend/alembic/versions/20260330_000001_add_model_usage_log.py`，down_revision 指向 Task 1 Part 1 的迁移 `j0k1l2m3n4o5`。
-
-```python
-"""add model_usage_log table
-
-Revision ID: k1l2m3n4o5p6
-Revises: j0k1l2m3n4o5
-Create Date: 2026-03-30
-"""
-from typing import Sequence, Union
-
-import sqlalchemy as sa
-from alembic import op
-
-revision: str = "k1l2m3n4o5p6"
-down_revision: Union[str, None] = "j0k1l2m3n4o5"
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    op.create_table(
-        "model_usage_log",
-        sa.Column("id", sa.dialects.postgresql.UUID(as_uuid=True), primary_key=True),
-        sa.Column("provider_name", sa.String(100), nullable=False),
-        sa.Column("model_name", sa.String(255), nullable=False),
-        sa.Column("model_type", sa.String(50), nullable=False, server_default="chat"),
-        sa.Column("user_id", sa.String(255), sa.ForeignKey("user.id", ondelete="SET NULL"), nullable=True),
-        sa.Column("input_tokens", sa.Integer, nullable=False, server_default="0"),
-        sa.Column("output_tokens", sa.Integer, nullable=False, server_default="0"),
-        sa.Column("total_time_ms", sa.Float, nullable=False, server_default="0"),
-        sa.Column("ttft_ms", sa.Float, nullable=True),
-        sa.Column("status", sa.String(20), nullable=False, server_default="success"),
-        sa.Column("error_message", sa.String(2000), nullable=True),
-        sa.Column("source", sa.String(50), nullable=False, server_default="chat"),
-        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
-        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
-    )
-    op.create_index("model_usage_log_created_at_idx", "model_usage_log", ["created_at"])
-    op.create_index("model_usage_log_provider_model_idx", "model_usage_log", ["provider_name", "model_name"])
-    op.create_index("model_usage_log_composite_idx", "model_usage_log", ["created_at", "provider_name", "model_name"])
-
-
-def downgrade() -> None:
-    op.drop_table("model_usage_log")
-```
-
-- [ ] **Step 4: 运行迁移**
-
-Run: `cd backend && alembic upgrade head`
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/models/model_usage_log.py backend/alembic/versions/20260330_000001_add_model_usage_log.py
-git commit -m "feat: add model_usage_log table and migration"
-```
-
----
-
-## Task 2: Repository — 日志写入 + 聚合查询
-
-**Files:**
-- Create: `backend/app/repositories/model_usage_log.py`
-
-- [ ] **Step 1: 创建 repository**
-
-```python
-"""
-ModelUsageLog Repository
-"""
-
-from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, List, Optional
-
-from sqlalchemy import and_, func, select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.model_usage_log import ModelUsageLog
-
-from .base import BaseRepository
-
-
-class ModelUsageLogRepository(BaseRepository[ModelUsageLog]):
-    def __init__(self, db: AsyncSession):
-        super().__init__(ModelUsageLog, db)
-
-    async def get_summary(
-        self,
-        since: datetime,
-        provider_name: Optional[str] = None,
-        model_name: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        """获取聚合摘要"""
-        conditions = [ModelUsageLog.created_at >= since]
-        if provider_name:
-            conditions.append(ModelUsageLog.provider_name == provider_name)
-        if model_name:
-            conditions.append(ModelUsageLog.model_name == model_name)
-
-        query = select(
-            func.count().label("total_calls"),
-            func.sum(ModelUsageLog.input_tokens).label("total_input_tokens"),
-            func.sum(ModelUsageLog.output_tokens).label("total_output_tokens"),
-            func.avg(ModelUsageLog.total_time_ms).label("avg_response_time_ms"),
-            func.sum(
-                func.cast(ModelUsageLog.status == "error", sa.Integer)
-            ).label("error_count"),
-        ).where(and_(*conditions))
-
-        result = await self.db.execute(query)
-        row = result.one()
-
-        total_calls = row.total_calls or 0
-        error_count = row.error_count or 0
-
-        return {
-            "total_calls": total_calls,
-            "total_input_tokens": row.total_input_tokens or 0,
-            "total_output_tokens": row.total_output_tokens or 0,
-            "avg_response_time_ms": round(row.avg_response_time_ms or 0, 1),
-            "error_rate": round(error_count / total_calls, 4) if total_calls > 0 else 0,
-        }
-
-    async def get_timeline(
-        self,
-        since: datetime,
-        granularity: str = "hour",
-        provider_name: Optional[str] = None,
-        model_name: Optional[str] = None,
-    ) -> List[Dict[str, Any]]:
-        """获取时序数据"""
-        conditions = [ModelUsageLog.created_at >= since]
-        if provider_name:
-            conditions.append(ModelUsageLog.provider_name == provider_name)
-        if model_name:
-            conditions.append(ModelUsageLog.model_name == model_name)
-
-        if granularity == "hour":
-            time_bucket = func.date_trunc("hour", ModelUsageLog.created_at)
-        else:
-            time_bucket = func.date_trunc("day", ModelUsageLog.created_at)
-
-        query = (
-            select(
-                time_bucket.label("timestamp"),
-                func.count().label("calls"),
-                func.sum(ModelUsageLog.input_tokens + ModelUsageLog.output_tokens).label("tokens"),
-                func.avg(ModelUsageLog.total_time_ms).label("avg_time_ms"),
-            )
-            .where(and_(*conditions))
-            .group_by(time_bucket)
-            .order_by(time_bucket)
-        )
-
-        result = await self.db.execute(query)
-        return [
-            {
-                "timestamp": row.timestamp.isoformat(),
-                "calls": row.calls,
-                "tokens": row.tokens or 0,
-                "avg_time_ms": round(row.avg_time_ms or 0, 1),
-            }
-            for row in result.all()
-        ]
-
-    async def get_by_model(
-        self,
-        since: datetime,
-        provider_name: Optional[str] = None,
-    ) -> List[Dict[str, Any]]:
-        """按模型分组统计"""
-        conditions = [ModelUsageLog.created_at >= since]
-        if provider_name:
-            conditions.append(ModelUsageLog.provider_name == provider_name)
-
-        query = (
-            select(
-                ModelUsageLog.model_name,
-                func.count().label("calls"),
-                func.sum(ModelUsageLog.input_tokens + ModelUsageLog.output_tokens).label("tokens"),
-            )
-            .where(and_(*conditions))
-            .group_by(ModelUsageLog.model_name)
-            .order_by(func.count().desc())
-        )
-
-        result = await self.db.execute(query)
-        return [
-            {
-                "model_name": row.model_name,
-                "calls": row.calls,
-                "tokens": row.tokens or 0,
-            }
-            for row in result.all()
-        ]
-
-    async def cleanup_old_logs(self, days: int = 90) -> int:
-        """清理过期日志，返回删除行数"""
-        cutoff = datetime.now(timezone.utc) - timedelta(days=days)
-        from sqlalchemy import delete
-
-        result = await self.db.execute(
-            delete(ModelUsageLog).where(ModelUsageLog.created_at < cutoff)
-        )
-        return result.rowcount
-```
-
-注意：`get_summary` 中的 `sa.Integer` 需要 `import sqlalchemy as sa`，在文件顶部加上。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/repositories/model_usage_log.py
-git commit -m "feat: add model_usage_log repository with aggregation queries"
-```
-
----
-
-## Task 3: Service — 采集 + 聚合
-
-**Files:**
-- Create: `backend/app/services/model_usage_service.py`
-- Test: `backend/tests/test_model_usage_service.py`
-
-- [ ] **Step 1: 创建 service**
-
-```python
-"""
-模型使用量统计服务
-"""
-
-from datetime import datetime, timedelta, timezone
-from typing import Any, Dict, Optional
-
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.repositories.model_usage_log import ModelUsageLogRepository
-
-from .base import BaseService
-
-
-class ModelUsageService(BaseService):
-    """模型使用量统计服务"""
-
-    def __init__(self, db: AsyncSession):
-        super().__init__(db)
-        self.repo = ModelUsageLogRepository(db)
-
-    async def log_usage(
-        self,
-        provider_name: str,
-        model_name: str,
-        input_tokens: int = 0,
-        output_tokens: int = 0,
-        total_time_ms: float = 0.0,
-        ttft_ms: Optional[float] = None,
-        status: str = "success",
-        error_message: Optional[str] = None,
-        source: str = "chat",
-        user_id: Optional[str] = None,
-        model_type: str = "chat",
-    ) -> None:
-        """记录一次模型调用日志。失败只记 warning，不抛异常。"""
-        try:
-            await self.repo.create(
-                {
-                    "provider_name": provider_name,
-                    "model_name": model_name,
-                    "model_type": model_type,
-                    "user_id": user_id,
-                    "input_tokens": input_tokens,
-                    "output_tokens": output_tokens,
-                    "total_time_ms": total_time_ms,
-                    "ttft_ms": ttft_ms,
-                    "status": status,
-                    "error_message": error_message,
-                    "source": source,
-                }
-            )
-            await self.commit()
-        except Exception as e:
-            from loguru import logger
-            logger.warning(f"Failed to log model usage: {e}")
-
-    async def get_stats(
-        self,
-        period: str = "24h",
-        granularity: str = "hour",
-        provider_name: Optional[str] = None,
-        model_name: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        """获取使用量统计"""
-        period_map = {
-            "24h": timedelta(hours=24),
-            "7d": timedelta(days=7),
-            "30d": timedelta(days=30),
-        }
-        delta = period_map.get(period, timedelta(hours=24))
-        since = datetime.now(timezone.utc) - delta
-
-        summary = await self.repo.get_summary(since, provider_name, model_name)
-        timeline = await self.repo.get_timeline(since, granularity, provider_name, model_name)
-        by_model = await self.repo.get_by_model(since, provider_name)
-
-        return {
-            "summary": summary,
-            "timeline": timeline,
-            "by_model": by_model,
-        }
-
-    async def cleanup(self, days: int = 90) -> int:
-        """清理过期日志"""
-        count = await self.repo.cleanup_old_logs(days)
-        await self.commit()
-        return count
-```
-
-- [ ] **Step 2: 写测试**
-
-创建 `backend/tests/test_model_usage_service.py`：
-
-```python
-import pytest
-
-
-class TestModelUsageService:
-    @pytest.mark.asyncio
-    async def test_log_usage_does_not_raise(self):
-        """log_usage 失败不应抛异常"""
-        from app.services.model_usage_service import ModelUsageService
-        assert hasattr(ModelUsageService, 'log_usage')
-
-    @pytest.mark.asyncio
-    async def test_get_stats_returns_structure(self):
-        """get_stats 应返回 summary + timeline + by_model"""
-        from app.services.model_usage_service import ModelUsageService
-        assert hasattr(ModelUsageService, 'get_stats')
-```
-
-- [ ] **Step 3: 运行测试**
-
-Run: `cd backend && python -m pytest tests/test_model_usage_service.py -v`
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/services/model_usage_service.py backend/tests/test_model_usage_service.py
-git commit -m "feat: add model_usage_service with logging and aggregation"
-```
-
----
-
-## Task 4: API 端点
-
-**Files:**
-- Create: `backend/app/api/v1/model_usage.py`
-- Test: `backend/tests/test_model_usage_api.py`
-
-- [ ] **Step 1: 创建 API**
-
-```python
-"""
-模型使用量统计 API
-"""
-
-from typing import Optional
-
-from fastapi import APIRouter, Depends, Query
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.common.dependencies import get_current_user
-from app.common.response import success_response
-from app.core.database import get_db
-from app.models.auth import AuthUser as User
-from app.services.model_usage_service import ModelUsageService
-
-router = APIRouter(prefix="/v1/models/usage", tags=["ModelUsage"])
-
-
-@router.get("/stats")
-async def get_usage_stats(
-    period: str = Query(default="24h", description="时间范围：24h / 7d / 30d"),
-    granularity: str = Query(default="hour", description="时间粒度：hour / day"),
-    provider_name: Optional[str] = Query(default=None, description="按供应商过滤"),
-    model_name: Optional[str] = Query(default=None, description="按模型过滤"),
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """获取模型使用量统计"""
-    service = ModelUsageService(db)
-    stats = await service.get_stats(
-        period=period,
-        granularity=granularity,
-        provider_name=provider_name,
-        model_name=model_name,
-    )
-    return success_response(data=stats, message="获取使用量统计成功")
-```
-
-- [ ] **Step 2: 注册路由**
-
-在 FastAPI app 的路由注册处（通常在 `backend/app/main.py` 或 `backend/app/api/__init__.py`）加入：
-
-```python
-from app.api.v1.model_usage import router as model_usage_router
-app.include_router(model_usage_router)
-```
-
-- [ ] **Step 3: 写测试**
-
-创建 `backend/tests/test_model_usage_api.py`：
-
-```python
-import pytest
-from httpx import AsyncClient
-
-
-class TestModelUsageAPI:
-    @pytest.mark.asyncio
-    async def test_get_stats_empty(self, client: AsyncClient, auth_headers):
-        """无数据时应返回空统计"""
-        response = await client.get(
-            "/api/v1/models/usage/stats?period=24h",
-            headers=auth_headers,
-        )
-        assert response.status_code == 200
-        data = response.json()["data"]
-        assert data["summary"]["total_calls"] == 0
-        assert data["timeline"] == []
-        assert data["by_model"] == []
-
-    @pytest.mark.asyncio
-    async def test_get_stats_with_filters(self, client: AsyncClient, auth_headers):
-        """带过滤参数应正常返回"""
-        response = await client.get(
-            "/api/v1/models/usage/stats?period=7d&granularity=day&provider_name=test",
-            headers=auth_headers,
-        )
-        assert response.status_code == 200
-
-    @pytest.mark.asyncio
-    async def test_get_stats_requires_auth(self, client: AsyncClient):
-        """无认证应返回 401"""
-        response = await client.get("/api/v1/models/usage/stats")
-        assert response.status_code == 401
-```
-
-- [ ] **Step 4: 运行测试**
-
-Run: `cd backend && python -m pytest tests/test_model_usage_api.py -v`
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/api/v1/model_usage.py backend/tests/test_model_usage_api.py
-git commit -m "feat: add model usage stats API endpoint"
-```
-
----
-
-## Task 5: 在 ModelService 中插入日志采集
-
-**Files:**
-- Modify: `backend/app/services/model_service.py`
-
-- [ ] **Step 1: 在 test_output 和 test_output_stream 中插入采集**
-
-在 `ModelService.__init__` 中加入：
-```python
-self.usage_service = ModelUsageService(db)
-```
-
-在 `test_output` 方法的 `model.ainvoke` 调用前后加入计时和日志：
-```python
-import time
-
-start = time.monotonic()
-try:
-    response = await model.ainvoke(input_text)
-    elapsed = (time.monotonic() - start) * 1000
-    content = response.content if hasattr(response, "content") else str(response)
-    await self.usage_service.log_usage(
-        provider_name=provider_name,
-        model_name=model_name,
-        total_time_ms=elapsed,
-        status="success",
-        source="playground",
-        user_id=user_id,
-    )
-    return str(content)
-except Exception as e:
-    elapsed = (time.monotonic() - start) * 1000
-    await self.usage_service.log_usage(
-        provider_name=provider_name,
-        model_name=model_name,
-        total_time_ms=elapsed,
-        status="error",
-        error_message=str(e),
-        source="playground",
-        user_id=user_id,
-    )
-    raise
-```
-
-在 `test_output_stream` 的 metrics 事件 yield 之前也加入日志采集（复用 metrics 数据）。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/services/model_service.py
-git commit -m "feat: integrate usage logging into model service"
-```
-
----
-
-## Task 6: 数据清理定时任务
-
-**Files:**
-- Modify: `backend/app/main.py`（或启动入口文件）
-
-- [ ] **Step 1: 注册启动清理任务**
-
-在 FastAPI app 的 `on_startup` 或 `lifespan` 中加入：
-
-```python
-import asyncio
-from app.core.database import get_db_session
-from app.services.model_usage_service import ModelUsageService
-
-async def usage_log_cleanup_loop():
-    """每 24 小时清理过期日志"""
-    while True:
-        try:
-            async with get_db_session() as db:
-                service = ModelUsageService(db)
-                count = await service.cleanup(days=90)
-                if count > 0:
-                    from loguru import logger
-                    logger.info(f"Cleaned up {count} old usage log entries")
-        except Exception as e:
-            from loguru import logger
-            logger.warning(f"Usage log cleanup failed: {e}")
-        await asyncio.sleep(86400)  # 24 hours
-```
-
-在 startup 中 `asyncio.create_task(usage_log_cleanup_loop())`。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add backend/app/main.py
-git commit -m "feat: add periodic usage log cleanup task"
-```
-
----
-
-## Task 7: 前端 — 安装 recharts + 类型扩展
-
-**Files:**
-- Modify: `frontend/package.json`
-- Modify: `frontend/types/models.ts`
-- Modify: `frontend/hooks/queries/models.ts`
-
-- [ ] **Step 1: 安装 recharts**
-
-Run: `cd frontend && npm install recharts`
-
-- [ ] **Step 2: 新增统计类型**
-
-在 `frontend/types/models.ts` 中新增：
-
-```typescript
-// ==================== Usage Stats ====================
-
-export interface UsageStatsSummary {
-  total_calls: number
-  total_input_tokens: number
-  total_output_tokens: number
-  avg_response_time_ms: number
-  error_rate: number
-}
-
-export interface UsageTimelinePoint {
-  timestamp: string
-  calls: number
-  tokens: number
-  avg_time_ms: number
-}
-
-export interface UsageByModel {
-  model_name: string
-  calls: number
-  tokens: number
-}
-
-export interface ModelUsageStats {
-  summary: UsageStatsSummary
-  timeline: UsageTimelinePoint[]
-  by_model: UsageByModel[]
-}
-```
-
-- [ ] **Step 3: 新增 useModelUsageStats hook**
-
-在 `frontend/hooks/queries/models.ts` 中新增：
-
-```typescript
-export function useModelUsageStats(params: {
-  period?: string
-  granularity?: string
-  provider_name?: string
-  model_name?: string
-  enabled?: boolean
-}) {
-  const searchParams = new URLSearchParams()
-  if (params.period) searchParams.set('period', params.period)
-  if (params.granularity) searchParams.set('granularity', params.granularity)
-  if (params.provider_name) searchParams.set('provider_name', params.provider_name)
-  if (params.model_name) searchParams.set('model_name', params.model_name)
-
-  return useQuery({
-    queryKey: [...modelKeys.all, 'usage', params],
-    queryFn: async (): Promise<ModelUsageStats> => {
-      return await apiGet<ModelUsageStats>(`models/usage/stats?${searchParams.toString()}`)
-    },
-    enabled: params.enabled !== false,
-    retry: false,
-    staleTime: STALE_TIME.SHORT,
-  })
-}
-```
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/package.json frontend/package-lock.json frontend/types/models.ts frontend/hooks/queries/models.ts
-git commit -m "feat: add recharts dependency and usage stats types/hooks"
-```
-
----
-
-## Task 8: 前端统计组件
-
-**Files:**
-- Create: `frontend/app/settings/models/components/detail-panel/stats-tab/summary-cards.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/stats-tab/usage-chart.tsx`
-- Create: `frontend/app/settings/models/components/detail-panel/stats-tab/stats-tab.tsx`
-
-- [ ] **Step 1: 创建 summary-cards.tsx**
-
-Props: `summary: UsageStatsSummary | undefined`
-
-横向排列 4 个摘要卡片：总调用次数、总 token 消耗（input + output）、平均响应时间、错误率。loading 时显示 skeleton。
-
-- [ ] **Step 2: 创建 usage-chart.tsx**
-
-Props:
-- `timeline: UsageTimelinePoint[]`
-- `byModel: UsageByModel[]`
-
-上方：recharts `LineChart` 展示调用量 + token 消耗趋势（双 Y 轴）。
-下方：简单表格展示按模型分组的调用排行。
-
-空数据时显示空状态插图 + "暂无调用数据"。
-
-- [ ] **Step 3: 创建 stats-tab.tsx**
-
-统计 Tab 容器。Props: `selectedProvider: string | null`
-
-顶部：时间范围选择器（24h / 7d / 30d 三个按钮），默认 24h。
-使用 `useModelUsageStats` hook，传入 period + provider_name。
-渲染 `SummaryCards` + `UsageChart`。
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/stats-tab/
-git commit -m "feat: create stats tab with summary cards and usage chart"
-```
-
----
-
-## Task 9: 集成统计 Tab 到 detail-panel
-
-**Files:**
-- Modify: `frontend/app/settings/models/components/detail-panel/detail-panel.tsx`
-
-- [ ] **Step 1: 替换统计 Tab 占位**
-
-将 detail-panel.tsx 中统计 Tab 的 "Coming Soon" 占位替换为 `<StatsTab selectedProvider={selectedProvider} />`。
-
-- [ ] **Step 2: Commit**
-
-```bash
-git add frontend/app/settings/models/components/detail-panel/detail-panel.tsx
-git commit -m "feat: integrate stats tab into detail panel"
-```
-
----
-
-## Task 10: 前端测试
-
-**Files:**
-- Create: `frontend/app/settings/models/__tests__/stats-tab.test.tsx`
-
-- [ ] **Step 1: 写测试**
-
-测试：
-- 空数据时显示空状态
-- 摘要卡片正确映射数据
-- 时间范围切换触发重新查询
-- 按 Provider 过滤
-
-Mock `useModelUsageStats` 返回不同数据。
-
-- [ ] **Step 2: 运行测试**
-
-Run: `cd frontend && npx vitest run app/settings/models/__tests__/stats-tab.test.tsx --reporter=verbose`
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/app/settings/models/__tests__/stats-tab.test.tsx
-git commit -m "test: add stats tab tests"
-```
-
----
-
-## Task 11: 集成验证
-
-- [ ] **Step 1: 运行后端全量测试**
-
-Run: `cd backend && python -m pytest tests/ -v --tb=short`
-
-- [ ] **Step 2: 运行前端构建**
-
-Run: `cd frontend && npx next build`
-
-- [ ] **Step 3: 修复问题（如有）并 Commit**
diff --git a/docs/superpowers/plans/2026-03-31-model-management-refactor.md b/docs/superpowers/plans/2026-03-31-model-management-refactor.md
deleted file mode 100644
index c3c127402..000000000
--- a/docs/superpowers/plans/2026-03-31-model-management-refactor.md
+++ /dev/null
@@ -1,1183 +0,0 @@
-# 模型管理功能重构 Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** 重构模型管理系统，划清 service 职责边界，清理垃圾逻辑，统一 API 语义，前后端对齐。
-
-**Architecture:** provider_service 管 provider 生命周期（含自定义 provider 创建），credential_service 只管认证 CRUD，model_service 管模型实例和运行时（含默认模型缓存）。API 层对应调整：自定义 provider 创建移到 provider 端点，credential 端点简化。前端同步更新 hooks/types/组件。
-
-**Tech Stack:** Python/FastAPI/SQLAlchemy (backend), TypeScript/React/Next.js/TanStack Query (frontend)
-
-**Spec:** `docs/superpowers/specs/2026-03-31-model-management-refactor-design.md`
-
-**关键约束：** 后端 API 变更和前端切换必须在同一批次完成（spec 6.6），避免中间态破坏。
-
----
-
-## File Structure
-
-### Backend — Modified
-- `backend/app/services/model_provider_service.py` — 新增 add_custom_provider，简化 get_all_providers/get_provider
-- `backend/app/services/model_credential_service.py` — 大幅简化，删除越界方法
-- `backend/app/services/model_service.py` — 提取 _resolve_and_create_model，移入缓存方法
-- `backend/app/api/v1/model_providers.py` — 新增 POST /custom 端点
-- `backend/app/api/v1/model_credentials.py` — 简化 schema，增加 DELETE 校验
-- `backend/app/main.py` — 替换 get_current_credentials 调用
-- `backend/app/core/model/utils/credential_resolver.py` — 替换 get_current_credentials 调用
-- `backend/app/api/v1/conversations.py` — 替换 get_current_credentials 调用
-
-### Frontend — Modified
-- `frontend/types/models.ts` — 新增 CreateCustomProviderRequest/Response，简化 CreateCredentialRequest
-- `frontend/hooks/queries/models.ts` — 新增 useCreateCustomProvider，简化 useCreateCredential，删除 templateProviders
-- `frontend/components/settings/models/add-custom-model-dialog.tsx` — 改用 useCreateCustomProvider
-- `frontend/components/settings/models/credential-dialog.tsx` — 增加清除认证按钮（仅内置 provider）
-- `frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx` — customProviders 也过滤 is_template
-- `frontend/components/settings/models/detail-panel/detail-panel.tsx` — 审查，确认无需改动
-- `frontend/components/settings/models-page.tsx` — 改用 useModelProvider('custom')
-
-
----
-
-### Task 1: 重构 ModelProviderService — 新增 add_custom_provider + 简化查询方法
-
-**Files:**
-- Modify: `backend/app/services/model_provider_service.py`
-
-- [ ] **Step 1: 添加 import**
-
-在文件顶部，将 `from typing import Any, Dict, List` 改为：
-```python
-import uuid
-from typing import Any, Dict, List, Optional
-```
-
-添加：
-```python
-from app.repositories.model_credential import ModelCredentialRepository
-```
-
-- [ ] **Step 2: 新增 _create_derived_provider 和 _get_first_model_name_for_provider**
-
-在 `delete_provider` 方法之前添加两个方法：
-
-```python
-async def _create_derived_provider(self, template: Any, name: str, display_name: str, template_name: str) -> Any:
-    """从模板创建派生 Provider DB 记录。"""
-    return await self.repo.create(
-        {
-            "name": name,
-            "display_name": display_name,
-            "supported_model_types": [mt.value for mt in template.get_supported_model_types()],
-            "credential_schema": template.get_credential_schema(),
-            "config_schema": None,
-            "is_template": False,
-            "provider_type": "custom",
-            "template_name": template_name,
-            "is_enabled": True,
-        }
-    )
-
-async def _get_first_model_name_for_provider(self, provider_id: uuid.UUID) -> Optional[str]:
-    """获取 Provider 下第一个模型实例的名称。"""
-    instances = await self.instance_repo.list_by_provider(provider_id=provider_id)
-    return instances[0].model_name if instances else None
-```
-
-- [ ] **Step 3: 新增 add_custom_provider 方法**
-
-在 `_get_first_model_name_for_provider` 之后添加：
-
-```python
-async def add_custom_provider(
-    self,
-    user_id: str,
-    credentials: Dict[str, Any],
-    model_name: str,
-    display_name: Optional[str] = None,
-    model_parameters: Optional[Dict[str, Any]] = None,
-    validate: bool = True,
-) -> Dict[str, Any]:
-    """一步添加自定义 provider：创建 provider + credential + model_instance。"""
-    import time
-    from app.core.model import validate_provider_credentials
-    from app.core.model.utils import encrypt_credentials
-
-    template = self.factory.get_provider("custom")
-    if not template:
-        raise NotFoundException("供应商不存在: custom")
-
-    is_valid = False
-    validation_error = None
-    if validate:
-        is_valid, validation_error = await validate_provider_credentials(
-            "custom", credentials, model_name=model_name
-        )
-
-    new_name = f"custom-{int(time.time())}"
-    display = (display_name or model_name).strip() or new_name
-    db_provider = await self._create_derived_provider(
-        template=template, name=new_name, display_name=display, template_name="custom"
-    )
-
-    from datetime import datetime, timezone
-    credential_repo = ModelCredentialRepository(self.db)
-    encrypted = encrypt_credentials(credentials)
-    now = datetime.now(timezone.utc) if is_valid else None
-    credential = await credential_repo.create(
-        {
-            "user_id": user_id,
-            "workspace_id": None,
-            "provider_id": db_provider.id,
-            "credentials": encrypted,
-            "is_valid": is_valid,
-            "last_validated_at": now,
-            "validation_error": validation_error,
-        }
-    )
-
-    await self.instance_repo.create(
-        {
-            "user_id": user_id,
-            "workspace_id": None,
-            "provider_id": db_provider.id,
-            "model_name": model_name,
-            "model_parameters": model_parameters or {},
-            "is_default": False,
-        }
-    )
-
-    await self.commit()
-
-    return {
-        "provider_name": new_name,
-        "display_name": display,
-        "credential_id": str(credential.id),
-        "is_valid": is_valid,
-        "validation_error": validation_error,
-    }
-```
-
-- [ ] **Step 4: 简化 get_all_providers — 合并两个分支 + 过滤 is_template**
-
-替换整个 `get_all_providers` 方法为：
-
-```python
-async def get_all_providers(self) -> List[Dict[str, Any]]:
-    """获取所有供应商信息（过滤掉 is_template=True 的模板 provider）"""
-    db_providers = await self.repo.find()
-    model_counts = await self.instance_repo.count_grouped_by_provider()
-
-    result = []
-    for db_provider in db_providers:
-        if db_provider.is_template:
-            continue
-
-        factory_name = db_provider.template_name or db_provider.name
-        factory_provider = self.factory.get_provider(factory_name)
-        model_count = model_counts.get(db_provider.id, 0)
-
-        config_schemas: Dict[str, Any] = {}
-        if factory_provider:
-            for model_type in factory_provider.get_supported_model_types():
-                schema = factory_provider.get_config_schema(model_type)
-                if schema:
-                    config_schemas[model_type.value] = schema
-
-        provider_data: Dict[str, Any] = {
-            "provider_name": db_provider.name,
-            "display_name": db_provider.display_name or (
-                factory_provider.display_name if factory_provider else db_provider.name
-            ),
-            "supported_model_types": db_provider.supported_model_types or (
-                [mt.value for mt in factory_provider.get_supported_model_types()] if factory_provider else []
-            ),
-            "credential_schema": db_provider.credential_schema or (
-                factory_provider.get_credential_schema() if factory_provider else {}
-            ),
-            "config_schemas": config_schemas if factory_provider else (db_provider.config_schema or {}),
-            "model_count": model_count,
-            "default_parameters": db_provider.default_parameters or {},
-            "is_template": db_provider.is_template,
-            "provider_type": db_provider.provider_type,
-            "template_name": db_provider.template_name,
-            "is_enabled": db_provider.is_enabled,
-            "id": str(db_provider.id),
-        }
-
-        if db_provider.icon:
-            provider_data["icon"] = db_provider.icon
-        if db_provider.description:
-            provider_data["description"] = db_provider.description
-
-        result.append(provider_data)
-
-    result.sort(key=_provider_sort_key)
-    return result
-```
-
-- [ ] **Step 5: 简化 get_provider — 两段式逻辑**
-
-替换整个 `get_provider` 方法为：
-
-```python
-async def get_provider(self, provider_name: str) -> Dict[str, Any] | None:
-    """获取单个供应商信息（不过滤模板，允许查询 custom 等模板 provider）"""
-    db_provider = await self.repo.get_by_name(provider_name)
-    if not db_provider:
-        return None
-
-    factory_name = db_provider.template_name or db_provider.name
-    factory_provider = self.factory.get_provider(factory_name)
-    model_count = await self.instance_repo.count_by_provider(provider_id=db_provider.id)
-
-    config_schemas: Dict[str, Any] = {}
-    if factory_provider:
-        for model_type in factory_provider.get_supported_model_types():
-            schema = factory_provider.get_config_schema(model_type)
-            if schema:
-                config_schemas[model_type.value] = schema
-
-    provider_info: Dict[str, Any] = {
-        "provider_name": db_provider.name,
-        "display_name": db_provider.display_name or (
-            factory_provider.display_name if factory_provider else db_provider.name
-        ),
-        "supported_model_types": db_provider.supported_model_types or (
-            [mt.value for mt in factory_provider.get_supported_model_types()] if factory_provider else []
-        ),
-        "credential_schema": db_provider.credential_schema or (
-            factory_provider.get_credential_schema() if factory_provider else {}
-        ),
-        "config_schemas": config_schemas if factory_provider else (db_provider.config_schema or {}),
-        "model_count": model_count,
-        "default_parameters": db_provider.default_parameters or {},
-        "is_template": db_provider.is_template,
-        "provider_type": db_provider.provider_type,
-        "template_name": db_provider.template_name,
-        "is_enabled": db_provider.is_enabled,
-        "id": str(db_provider.id),
-    }
-
-    if db_provider.icon:
-        provider_info["icon"] = db_provider.icon
-    if db_provider.description:
-        provider_info["description"] = db_provider.description
-
-    return provider_info
-```
-
-- [ ] **Step 6: 更新 delete_provider — 增加缓存清理（spec 6.1）**
-
-在 `delete_provider` 方法中，找到 `logger.info(f"已自动重新分配默认模型: {new_default.model_name}")`，在其后添加：
-
-```python
-                try:
-                    from app.core.settings import set_default_model_config
-                    from app.core.model.utils import decrypt_credentials
-                    cred_repo = ModelCredentialRepository(self.db)
-                    cred = await cred_repo.get_by_provider(new_default.provider_id)
-                    if cred and cred.is_valid:
-                        decrypted = decrypt_credentials(cred.credentials)
-                        params = new_default.model_parameters or {}
-                        set_default_model_config({
-                            "model": new_default.model_name,
-                            "api_key": decrypted.get("api_key", ""),
-                            "base_url": decrypted.get("base_url"),
-                            "timeout": params.get("timeout", 30),
-                        })
-                except Exception as e:
-                    logger.warning(f"更新默认模型缓存失败: {e}")
-```
-
-在 `if remaining_models:` 块之后添加 else 分支：
-
-```python
-            else:
-                try:
-                    from app.core.settings import clear_default_model_config
-                    clear_default_model_config()
-                except Exception:
-                    pass
-```
-
-- [ ] **Step 7: 验证语法**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "import ast; ast.parse(open('app/services/model_provider_service.py').read()); print('OK')"`
-
-- [ ] **Step 8: Commit**
-
-```bash
-git add backend/app/services/model_provider_service.py
-git commit -m "refactor: add add_custom_provider to provider_service, simplify get_all_providers/get_provider"
-```
-
----
-
-### Task 2: 重构 ModelCredentialService + API 层（同批次避免中间态破坏）
-
-**Files:**
-- Modify: `backend/app/services/model_credential_service.py`
-- Modify: `backend/app/api/v1/model_credentials.py`
-
-注意：service 方法重命名和 API 调用方必须在同一 commit，否则中间态会破坏运行时。
-
-- [ ] **Step 1: 删除越界的内部方法**
-
-在 `model_credential_service.py` 中删除以下方法（整个方法体）：
-- `_get_first_model_name_for_provider`（~L38-41）
-- `_create_derived_provider`（~L43-57）
-- `_add_one_custom_model`（~L176-237）
-- `_ensure_model_instances` 及其调用（搜索 `_ensure_model_instances`）
-- `_update_default_model_cache`（~L341-365）
-- `_update_default_model_cache_if_needed`（~L366-381）
-- `get_current_credentials`（~L327-335）
-
-同时删除 `__init__` 中的 `self.factory = get_factory()` 和文件顶部的 `from app.core.model.factory import get_factory`。
-
-- [ ] **Step 2: 将 create_or_update_credential 重命名为 upsert_credential 并简化**
-
-替换整个方法为：
-
-```python
-async def upsert_credential(
-    self,
-    user_id: str,
-    provider_name: str,
-    credentials: Dict[str, Any],
-    validate: bool = True,
-) -> Dict[str, Any]:
-    """
-    创建或更新内置 provider 的凭据。
-    一个 provider 一条凭证，按 provider_id upsert。
-    """
-    provider = await self.provider_repo.get_by_name(provider_name)
-    if not provider:
-        raise NotFoundException(f"供应商不存在: {provider_name}")
-
-    is_valid = False
-    validation_error = None
-    if validate:
-        is_valid, validation_error = await self._validate_for_provider(provider, credentials, provider.id)
-
-    encrypted = encrypt_credentials(credentials)
-    credential = await self._upsert_credential(
-        provider_id=provider.id,
-        encrypted=encrypted,
-        is_valid=is_valid,
-        validation_error=validation_error,
-        user_id=user_id,
-    )
-
-    # 确保模型实例存在
-    from app.services.model_provider_service import ModelProviderService
-    provider_service = ModelProviderService(self.db)
-    await provider_service._ensure_model_instances_for_provider(provider)
-
-    await self.commit()
-
-    return {
-        "id": str(credential.id),
-        "provider_name": provider.name,
-        "is_valid": credential.is_valid,
-        "last_validated_at": credential.last_validated_at,
-        "validation_error": credential.validation_error,
-    }
-```
-
-- [ ] **Step 3: 修改 delete_credential — 拒绝自定义 provider + 清除缓存（spec 6.2）**
-
-替换整个 `delete_credential` 方法为：
-
-```python
-async def delete_credential(self, credential_id: uuid.UUID) -> None:
-    """删除内置 provider 的凭据记录。自定义 provider 的凭据不允许单独删除。"""
-    from app.common.exceptions import BadRequestException
-
-    credential = await self.repo.get(credential_id, relations=["provider"])
-    if not credential:
-        raise NotFoundException("凭据不存在")
-
-    if (
-        credential.provider
-        and credential.provider.provider_type == "custom"
-        and not credential.provider.is_template
-    ):
-        raise BadRequestException(
-            f"自定义供应商的凭据不能单独删除，请通过 DELETE /model-providers/{credential.provider.name} 删除整个供应商"
-        )
-
-    provider_id = credential.provider_id
-    await self.repo.delete(credential_id)
-    await self.commit()
-
-    # spec 6.2: 如果默认模型属于该 provider，清除缓存
-    if provider_id:
-        try:
-            from app.core.settings import clear_default_model_config
-            repo = ModelInstanceRepository(self.db)
-            default_instance = await repo.get_default()
-            if default_instance and default_instance.provider_id == provider_id:
-                clear_default_model_config()
-        except Exception:
-            pass
-```
-
-- [ ] **Step 4: 同步更新 API 层 — 简化 CredentialCreate schema**
-
-在 `model_credentials.py` 中，将 `CredentialCreate` class 替换为：
-
-```python
-class CredentialCreate(BaseModel):
-    """创建/更新凭据请求（仅限内置 provider）"""
-
-    provider_name: str = Field(description="供应商名称", examples=["openaiapicompatible"])
-    credentials: Dict[str, Any] = Field(..., description="凭据字典（明文）")
-    should_validate: bool = Field(default=True, alias="validate", description="是否验证凭据")
-```
-
-删除 `CredentialValidateResponse` class（如果未被其他地方引用）。
-删除 `Optional` import（如果不再使用）。
-
-- [ ] **Step 5: 同步更新 API 层 — 更新端点调用**
-
-替换 `create_or_update_credential` 端点为：
-
-```python
-@router.post("")
-async def create_or_update_credential(
-    payload: CredentialCreate,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """创建或更新内置 provider 的凭据"""
-    service = ModelCredentialService(db)
-    credential = await service.upsert_credential(
-        user_id=current_user.id,
-        provider_name=payload.provider_name,
-        credentials=payload.credentials,
-        validate=payload.should_validate,
-    )
-    return success_response(data=credential, message="创建/更新凭据成功")
-```
-
-- [ ] **Step 6: 验证两个文件语法**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "import ast; [ast.parse(open(f).read()) for f in ['app/services/model_credential_service.py', 'app/api/v1/model_credentials.py']]; print('OK')"`
-
-- [ ] **Step 7: Commit（service + API 同批次）**
-
-```bash
-git add backend/app/services/model_credential_service.py backend/app/api/v1/model_credentials.py
-git commit -m "refactor: simplify credential_service and API — remove cross-cutting methods, add delete guard"
-```
-
----
-
-### Task 3: 重构 ModelService — 移入缓存方法 + 提取 _resolve_and_create_model
-
-**Files:**
-- Modify: `backend/app/services/model_service.py`
-
-- [ ] **Step 1: 添加 _update_default_model_cache 和 _update_default_model_cache_if_needed**
-
-在 `_build_provider_credentials_context` 方法之后添加：
-
-```python
-async def _update_default_model_cache(
-    self,
-    provider_name: str,
-    model_name: str,
-    model_type: str = "chat",
-    model_parameters: Optional[Dict[str, Any]] = None,
-) -> None:
-    """更新默认模型缓存。"""
-    try:
-        from app.core.settings import set_default_model_config
-
-        credentials = await self.credential_service.get_decrypted_credentials(provider_name)
-        if credentials:
-            params = model_parameters or {}
-            set_default_model_config(
-                {
-                    "model": model_name,
-                    "api_key": credentials.get("api_key", ""),
-                    "base_url": credentials.get("base_url"),
-                    "timeout": params.get("timeout", 30),
-                }
-            )
-    except Exception as e:
-        print(f"Warning: Failed to update default model cache: {e}")
-
-async def _update_default_model_cache_if_needed(self, provider_name: str) -> None:
-    """如果当前默认模型属于该 provider，则刷新缓存。"""
-    try:
-        default_instance = await self.repo.get_default()
-        if not default_instance or not default_instance.provider:
-            return
-        if default_instance.provider.name == provider_name:
-            await self._update_default_model_cache(
-                provider_name=provider_name,
-                model_name=default_instance.model_name,
-                model_type="chat",
-                model_parameters=default_instance.model_parameters,
-            )
-    except Exception as e:
-        print(f"Warning: Failed to check/update default model cache: {e}")
-```
-
-- [ ] **Step 2: 添加 _resolve_and_create_model**
-
-在 `_update_default_model_cache_if_needed` 之后添加：
-
-```python
-async def _resolve_and_create_model(
-    self, model_name: str, user_id: Optional[str] = None
-) -> tuple:
-    """
-    统一 resolve provider -> get credential -> create model 逻辑。
-    返回 (model, provider_name, implementation_name, instance)。
-    """
-    instance = await self.repo.get_by_name(model_name)
-    if not instance:
-        raise NotFoundException(f"模型实例不存在: {model_name}")
-
-    provider_name = instance.resolved_provider_name
-    implementation_name = instance.resolved_implementation_name
-
-    credentials = await self.credential_service.get_decrypted_credentials(provider_name)
-    if not credentials:
-        raise NotFoundException(f"未找到模型 {provider_name}/{model_name} 的有效凭据")
-
-    model = create_model_instance(
-        implementation_name,
-        model_name,
-        ModelType.CHAT,
-        credentials,
-        instance.model_parameters or {},
-    )
-
-    return model, provider_name, implementation_name, instance
-```
-
-- [ ] **Step 3: 替换所有 credential_service._update_default_model_cache 调用**
-
-搜索 `self.credential_service._update_default_model_cache`，全部替换为 `self._update_default_model_cache`。共 3 处：
-- `update_model_instance` 方法中
-- `create_model_instance_config` 方法中
-- `update_model_instance_default` 方法中
-
-- [ ] **Step 4: 替换 get_model_instance 中的 get_current_credentials 调用**
-
-在 `get_model_instance` 方法中，将：
-```python
-credentials = await self.credential_service.get_current_credentials(
-    provider_name=provider_name,
-    model_type=model_type,
-    model_name=model_name,
-    user_id=user_id,
-)
-```
-替换为：
-```python
-credentials = await self.credential_service.get_decrypted_credentials(provider_name)
-```
-
-- [ ] **Step 5: 简化 _build_provider_credentials_context**
-
-替换整个方法为：
-
-```python
-async def _build_provider_credentials_context(self, provider_ids: set) -> Dict[Any, Dict[str, Any]]:
-    """一次性构建 provider 凭证上下文。Keyed by provider_id。"""
-    from app.core.model.utils import decrypt_credentials
-
-    all_credentials = await self.credential_repo.list_all()
-
-    # 一个 provider 一条凭证，直接按 provider_id 取
-    cred_by_id: Dict[Any, Any] = {}
-    for c in all_credentials:
-        pid = c.provider_id
-        if pid is not None and pid in provider_ids and pid not in cred_by_id:
-            cred_by_id[pid] = c
-
-    result: Dict[Any, Dict[str, Any]] = {}
-    for pid in provider_ids:
-        cred = cred_by_id.get(pid)
-        if cred is None:
-            result[pid] = {"decrypted": None, "is_valid": False, "error": "no_credentials"}
-        elif not cred.is_valid:
-            result[pid] = {
-                "decrypted": None,
-                "is_valid": False,
-                "error": cred.validation_error or "invalid_credentials",
-            }
-        else:
-            try:
-                decrypted = decrypt_credentials(cred.credentials)
-                result[pid] = {"decrypted": decrypted, "is_valid": True, "error": None}
-            except Exception:
-                result[pid] = {"decrypted": None, "is_valid": False, "error": "decrypt_failed"}
-
-    return result
-```
-
-- [ ] **Step 6: 验证语法**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "import ast; ast.parse(open('app/services/model_service.py').read()); print('OK')"`
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add backend/app/services/model_service.py
-git commit -m "refactor: move cache methods into model_service, extract _resolve_and_create_model"
-```
-
----
-
-### Task 4: 更新周边文件 + 新增 POST /custom 端点（同批次）
-
-**Files:**
-- Modify: `backend/app/main.py`
-- Modify: `backend/app/core/model/utils/credential_resolver.py`
-- Modify: `backend/app/api/v1/conversations.py`
-- Modify: `backend/app/api/v1/model_providers.py`
-
-注意：所有引用 `get_current_credentials` 的文件必须在同一 commit 更新，因为 Task 2 已经删除了该方法。同时新增 POST /custom 端点，为前端切换做准备。
-
-- [ ] **Step 1: 更新 main.py**
-
-在 `main.py` 的 lifespan 函数中（~L193），将：
-```python
-credentials = await credential_service.get_current_credentials(
-    provider_name=default_provider_name,
-    model_type="chat",
-    model_name=default_instance.model_name,
-)
-```
-替换为：
-```python
-credentials = await credential_service.get_decrypted_credentials(default_provider_name)
-```
-
-- [ ] **Step 2: 更新 credential_resolver.py — 第一处调用（~L68）**
-
-在 `get_credentials` 方法中，将：
-```python
-credentials = await credential_service.get_current_credentials(
-    provider_name=provider_name or "",
-    model_type=model_type,
-    model_name=model_name or "",
-    user_id=user_id,
-)
-```
-替换为：
-```python
-credentials = await credential_service.get_decrypted_credentials(provider_name or "")
-```
-
-- [ ] **Step 3: 更新 credential_resolver.py — 第二处调用（~L95）**
-
-注意此处实际变量名是 `provider_name` 或 `provider_name_from_cred`，需要按实际代码确认。当前代码（~L128）使用的是 `provider_name`（可能已被赋值为 `provider_name_from_cred` 的值）。将：
-```python
-credentials = await credential_service.get_current_credentials(
-    provider_name=provider_name or provider_name_from_cred,
-    model_type=model_type,
-    model_name=model_name or "",
-    user_id=user_id,
-)
-```
-替换为：
-```python
-credentials = await credential_service.get_decrypted_credentials(provider_name or provider_name_from_cred)
-```
-
-按实际代码中的变量名替换。关键是去掉 `model_type`、`model_name`、`user_id` 参数。
-
-- [ ] **Step 4: 更新 conversations.py — 两处调用**
-
-第一处（~L104），将：
-```python
-credentials = await credential_service.get_current_credentials(
-    provider_name=str(provider_name),
-    model_type=model_type,
-    model_name=model_name,
-)
-```
-替换为：
-```python
-credentials = await credential_service.get_decrypted_credentials(str(provider_name))
-```
-
-第二处（~L128），将：
-```python
-credentials = await credential_service.get_current_credentials(
-    provider_name=provider_name,
-    model_type=model_type,
-    model_name=model_name,
-)
-```
-替换为：
-```python
-credentials = await credential_service.get_decrypted_credentials(provider_name)
-```
-
-- [ ] **Step 5: 新增 POST /custom 端点到 model_providers.py**
-
-在 `model_providers.py` 中，在文件顶部添加 `from typing import Any, Dict, Optional`（如果还没有 Optional）。
-
-在 `ProviderDefaultsUpdate` class 之后添加新 schema：
-
-```python
-class CustomProviderCreate(BaseModel):
-    """添加自定义 Provider 请求"""
-
-    model_name: str = Field(description="模型名称", examples=["gpt-4o"])
-    credentials: Dict[str, Any] = Field(description="凭据字典（明文）")
-    display_name: Optional[str] = Field(default=None, description="自定义显示名称")
-    model_parameters: Optional[Dict[str, Any]] = Field(default=None, description="模型参数")
-    validate: bool = Field(default=True, description="是否验证凭据")
-```
-
-在 `list_providers` 端点之后、`get_provider` 端点之前添加新端点（重要：必须在 `/{provider_name}` 之前，否则 FastAPI 会把 `custom` 当作 path parameter）：
-
-```python
-@router.post("/custom")
-async def add_custom_provider(
-    payload: CustomProviderCreate,
-    db: AsyncSession = Depends(get_db),
-    current_user: User = Depends(get_current_user),
-):
-    """添加自定义 Provider（一步创建 provider + credential + model_instance）"""
-    service = ModelProviderService(db)
-    result = await service.add_custom_provider(
-        user_id=current_user.id,
-        credentials=payload.credentials,
-        model_name=payload.model_name,
-        display_name=payload.display_name,
-        model_parameters=payload.model_parameters,
-        validate=payload.validate,
-    )
-    return success_response(data=result, message="添加自定义供应商成功")
-```
-
-- [ ] **Step 6: 验证所有文件语法**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "import ast; [ast.parse(open(f).read()) for f in ['app/main.py', 'app/core/model/utils/credential_resolver.py', 'app/api/v1/conversations.py', 'app/api/v1/model_providers.py']]; print('OK')"`
-
-- [ ] **Step 7: Commit**
-
-```bash
-git add backend/app/main.py backend/app/core/model/utils/credential_resolver.py backend/app/api/v1/conversations.py backend/app/api/v1/model_providers.py
-git commit -m "refactor: replace get_current_credentials calls, add POST /model-providers/custom endpoint"
-```
-
----
-
-### Task 5: 前端重构 — types + hooks + 组件（同批次，spec 6.6 要求）
-
-**Files:**
-- Modify: `frontend/types/models.ts`
-- Modify: `frontend/hooks/queries/models.ts`
-- Modify: `frontend/components/settings/models/add-custom-model-dialog.tsx`
-- Modify: `frontend/components/settings/models/credential-dialog.tsx`
-- Modify: `frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx`
-- Modify: `frontend/components/settings/models-page.tsx`
-
-注意：后端 API 变更（Task 2 删除 custom 分支 + Task 4 新增 POST /custom）和前端切换必须同批次完成。
-
-- [ ] **Step 1: 更新 types/models.ts — 简化 CreateCredentialRequest**
-
-将 `CreateCredentialRequest` 替换为：
-
-```typescript
-export interface CreateCredentialRequest {
-  provider_name: string
-  credentials: Record<string, any>
-  validate?: boolean
-}
-```
-
-删除 `providerDisplayName`、`model_name`、`model_parameters` 字段。
-
-- [ ] **Step 2: 更新 types/models.ts — 新增 CreateCustomProviderRequest/Response**
-
-在 `CreateCredentialRequest` 之后添加：
-
-```typescript
-/**
- * Create custom provider request (one-shot: provider + credential + model instance)
- */
-export interface CreateCustomProviderRequest {
-  model_name: string
-  credentials: Record<string, any>
-  display_name?: string
-  model_parameters?: Record<string, unknown>
-  validate?: boolean
-}
-
-/**
- * Create custom provider response
- */
-export interface CreateCustomProviderResponse {
-  provider_name: string
-  display_name: string
-  credential_id: string
-  is_valid: boolean
-  validation_error?: string
-}
-```
-
-- [ ] **Step 3: 更新 hooks/queries/models.ts — 简化 useCreateCredential**
-
-替换 `useCreateCredential` 为：
-
-```typescript
-export function useCreateCredential() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (request: CreateCredentialRequest) => {
-      const data = await apiPost<ModelCredential>(MODEL_CREDENTIALS_PATH, {
-        provider_name: request.provider_name,
-        credentials: request.credentials,
-        validate: request.validate !== false,
-      })
-      logger.info(`Created credential for provider: ${request.provider_name}`)
-      return data
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: modelKeys.credentials() })
-      queryClient.invalidateQueries({ queryKey: [...modelKeys.all, 'available'] })
-    },
-  })
-}
-```
-
-- [ ] **Step 4: 更新 hooks/queries/models.ts — 新增 useCreateCustomProvider**
-
-在 `useCreateCredential` 之后添加：
-
-```typescript
-export function useCreateCustomProvider() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (request: CreateCustomProviderRequest) => {
-      const data = await apiPost<CreateCustomProviderResponse>(
-        `${MODEL_PROVIDERS_PATH}/custom`,
-        request,
-      )
-      logger.info(`Created custom provider with model: ${request.model_name}`)
-      return data
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: modelKeys.providers() })
-      queryClient.invalidateQueries({ queryKey: modelKeys.credentials() })
-      queryClient.invalidateQueries({ queryKey: modelKeys.instances() })
-      queryClient.invalidateQueries({ queryKey: [...modelKeys.all, 'available'] })
-    },
-  })
-}
-```
-
-在文件顶部的 `import type` 中添加 `CreateCustomProviderRequest` 和 `CreateCustomProviderResponse`。
-在 `export type` 中也添加这两个类型。
-
-- [ ] **Step 5: 更新 hooks/queries/models.ts — 简化 useModelProvidersByConfig**
-
-替换 `ModelProvidersByConfigResult` interface 和 `useModelProvidersByConfig` 函数为：
-
-```typescript
-export interface ModelProvidersByConfigResult {
-  credentialsByProvider: Map<string, ModelCredential>
-  configuredProviders: ModelProvider[]
-  notConfiguredProviders: ModelProvider[]
-  noValidCredential: boolean
-}
-
-export function useModelProvidersByConfig(
-  providers: ModelProvider[],
-  credentials: ModelCredential[],
-): ModelProvidersByConfigResult {
-  const credentialsByProvider = useMemo(
-    () => buildCredentialsByProvider(credentials),
-    [credentials],
-  )
-
-  const [configuredProviders, notConfiguredProviders] = useMemo(() => {
-    const configured: ModelProvider[] = []
-    const notConfigured: ModelProvider[] = []
-
-    for (const provider of providers) {
-      if (provider.is_template) continue
-      if (credentialsByProvider.has(provider.provider_name)) {
-        configured.push(provider)
-      } else {
-        notConfigured.push(provider)
-      }
-    }
-
-    const sortProviders = (a: ModelProvider, b: ModelProvider) => {
-      if (a.provider_type !== b.provider_type) return a.provider_type === 'custom' ? 1 : -1
-      return a.display_name.localeCompare(b.display_name)
-    }
-
-    configured.sort(sortProviders)
-    notConfigured.sort(sortProviders)
-
-    return [configured, notConfigured]
-  }, [providers, credentialsByProvider])
-
-  const noValidCredential =
-    configuredProviders.length === 0 ||
-    configuredProviders.every((p) => !credentialsByProvider.get(p.provider_name)?.is_valid)
-
-  return {
-    credentialsByProvider,
-    configuredProviders,
-    notConfiguredProviders,
-    noValidCredential,
-  }
-}
-```
-
-- [ ] **Step 6: 更新 add-custom-model-dialog.tsx — 改用 useCreateCustomProvider**
-
-1. 将 import 改为：
-```typescript
-import { useCreateCustomProvider } from '@/hooks/queries/models'
-```
-
-2. 修改 props interface：
-```typescript
-interface AddCustomModelDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  credentialSchema?: Record<string, any>
-}
-```
-
-3. 更新组件签名和内部逻辑：
-```typescript
-export function AddCustomModelDialog({ open, onOpenChange, credentialSchema }: AddCustomModelDialogProps) {
-  const createCustomProvider = useCreateCustomProvider()
-  // ...
-
-  const formFields = useMemo(
-    () => parseJsonSchema(credentialSchema),
-    [credentialSchema],
-  )
-```
-
-4. 将 `handleAdd` 中的 mutateAsync 调用改为：
-```typescript
-await createCustomProvider.mutateAsync({
-  model_name: modelName.trim(),
-  credentials,
-  validate: true,
-})
-```
-
-5. 将所有 `createCredential.isPending` 改为 `createCustomProvider.isPending`
-
-6. 更新 DialogDescription 文本（不再引用 `provider.display_name`）：
-```tsx
-<DialogDescription>
-  添加一个新的自定义模型实例
-</DialogDescription>
-```
-
-7. 删除不再需要的 `import type { ModelProvider } from '@/types/models'`
-
-- [ ] **Step 7: 更新 credential-dialog.tsx — 增加清除认证按钮（spec 6.5）**
-
-1. 更新 import：
-```typescript
-import { useCreateCredential, useValidateCredential, useDeleteCredential } from '@/hooks/queries/models'
-```
-
-2. 在组件内添加：
-```typescript
-const deleteCredential = useDeleteCredential()
-```
-
-3. 添加清除认证处理函数（在 `handleValidate` 之后）：
-```typescript
-const handleClearCredential = async () => {
-  if (!existingCredential) return
-  try {
-    await deleteCredential.mutateAsync(existingCredential.id)
-    toast({ title: '凭证已清除' })
-    onOpenChange(false)
-  } catch (err) {
-    toast({
-      variant: 'destructive',
-      title: '清除凭证失败',
-      description: err instanceof Error ? err.message : '请稍后重试',
-    })
-  }
-}
-```
-
-4. 在 DialogFooter 中，将现有的"重新验证"按钮区域替换为：
-```tsx
-<div className="mr-auto flex gap-2">
-  {existingCredential && (
-    <Button
-      variant="outline"
-      onClick={handleValidate}
-      disabled={validating || isDirty}
-    >
-      {validating ? '验证中...' : '重新验证'}
-    </Button>
-  )}
-  {existingCredential && provider.provider_type !== 'custom' && (
-    <Button
-      variant="outline"
-      onClick={handleClearCredential}
-      disabled={deleteCredential.isPending}
-      className="text-red-600 hover:text-red-700"
-    >
-      {deleteCredential.isPending ? '清除中...' : '清除认证'}
-    </Button>
-  )}
-</div>
-```
-
-- [ ] **Step 8: 更新 provider-sidebar.tsx — customProviders 也过滤 is_template**
-
-在 `provider-sidebar.tsx` 中，将：
-```typescript
-const customProviders = filtered.filter((p) => p.provider_type === 'custom')
-```
-替换为：
-```typescript
-const customProviders = filtered.filter((p) => p.provider_type === 'custom' && !p.is_template)
-```
-
-- [ ] **Step 9: 更新 models-page.tsx — 改用 useModelProvider('custom')**
-
-替换整个文件内容为：
-
-```typescript
-import { useState } from 'react'
-
-import { AddCustomModelDialog } from '@/components/settings/models/add-custom-model-dialog'
-import { DetailPanel } from '@/components/settings/models/detail-panel/detail-panel'
-import { ProviderSidebar } from '@/components/settings/models/provider-sidebar/provider-sidebar'
-import { useModelProvider } from '@/hooks/queries/models'
-
-export function ModelsPage() {
-  const [selectedProvider, setSelectedProvider] = useState<string | null>(null)
-  const [showAddCustomModel, setShowAddCustomModel] = useState(false)
-  const { data: customTemplate } = useModelProvider('custom')
-
-  return (
-    <div className="flex h-full overflow-hidden">
-      <ProviderSidebar
-        selectedProvider={selectedProvider}
-        onSelectProvider={setSelectedProvider}
-        onAddCustomModel={() => setShowAddCustomModel(true)}
-      />
-
-      <DetailPanel selectedProvider={selectedProvider} />
-
-      <AddCustomModelDialog
-        open={showAddCustomModel}
-        onOpenChange={setShowAddCustomModel}
-        credentialSchema={customTemplate?.credential_schema}
-      />
-    </div>
-  )
-}
-```
-
-- [ ] **Step 10: 审查 detail-panel.tsx 和 provider-header.tsx**
-
-检查 `detail-panel.tsx`：当前已经通过 `provider.provider_type === 'custom'` 控制删除按钮显示，调用 `useDeleteModelProvider`。这与 spec 一致，无需改动。
-
-检查 `provider-header.tsx`：当前已经通过 `provider.provider_type === 'custom' && onDeleteProvider` 控制删除按钮。无需改动。
-
-- [ ] **Step 11: Commit（前端同批次）**
-
-```bash
-git add frontend/types/models.ts \
-       frontend/hooks/queries/models.ts \
-       frontend/components/settings/models/add-custom-model-dialog.tsx \
-       frontend/components/settings/models/credential-dialog.tsx \
-       frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx \
-       frontend/components/settings/models-page.tsx
-git commit -m "refactor: update frontend — custom provider API, credential clear button, template filtering"
-```
-
----
-
-### Task 6: 端到端验证
-
-- [ ] **Step 1: 后端语法验证**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "
-import ast
-files = [
-    'app/services/model_provider_service.py',
-    'app/services/model_credential_service.py',
-    'app/services/model_service.py',
-    'app/api/v1/model_providers.py',
-    'app/api/v1/model_credentials.py',
-    'app/main.py',
-    'app/core/model/utils/credential_resolver.py',
-    'app/api/v1/conversations.py',
-]
-for f in files:
-    ast.parse(open(f).read())
-    print(f'  OK: {f}')
-print('All files parsed successfully')
-"`
-
-- [ ] **Step 2: 后端 import 验证**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -c "
-from app.services.model_provider_service import ModelProviderService
-from app.services.model_credential_service import ModelCredentialService
-from app.services.model_service import ModelService
-print('All service imports OK')
-"`
-
-- [ ] **Step 3: 确认 get_current_credentials 已完全移除**
-
-使用 Grep 工具搜索 `get_current_credentials`，路径 `backend/app/`，glob `*.py`。
-Expected: 无匹配（或只在注释/文档中出现）。
-
-- [ ] **Step 4: 确认越界方法已从 credential_service 移除**
-
-使用 Grep 工具搜索 `_add_one_custom_model|_create_derived_provider|_ensure_model_instances|_update_default_model_cache`，路径 `backend/app/services/model_credential_service.py`。
-Expected: 无匹配。
-
-- [ ] **Step 5: 前端类型检查**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/frontend && npx tsc --noEmit 2>&1 | head -30`
-Expected: 无类型错误（或只有与本次重构无关的已有错误）。
-
-- [ ] **Step 6: 运行已有后端测试**
-
-Run: `cd /Users/yuzhenjiang1/Downloads/workspace/JoySafeter/backend && python -m pytest tests/test_models_api.py tests/test_model_providers_api.py -v 2>&1 | tail -30`
-Expected: 测试通过（可能需要根据 API 变更更新 mock — 如果测试失败，修复 mock 后重新运行）。
-
-- [ ] **Step 7: 验证 spec 边界情况覆盖**
-
-手动检查以下 spec 边界情况已实现：
-- spec 6.1: `delete_provider` 中有缓存清理逻辑（Task 1 Step 6）
-- spec 6.2: `delete_credential` 中有缓存清除逻辑（Task 2 Step 3）
-- spec 6.3: `get_provider` 不过滤模板（Task 1 Step 5）
-- spec 6.4: `add_custom_provider` 返回复合对象（Task 1 Step 3）
-- spec 6.5: credential-dialog 清除按钮只在内置 provider 显示（Task 5 Step 7）
-- spec 6.6: 前后端同批次切换（Task 5 整体）
-
-- [ ] **Step 8: 最终 Commit（如果有修复）**
-
-如果验证过程中发现问题并修复了：
-
-```bash
-git add -A
-git commit -m "fix: address issues found during end-to-end verification"
-```
diff --git a/docs/superpowers/plans/2026-04-06-chat-run-center-integration.md b/docs/superpowers/plans/2026-04-06-chat-run-center-integration.md
deleted file mode 100644
index d7f768a66..000000000
--- a/docs/superpowers/plans/2026-04-06-chat-run-center-integration.md
+++ /dev/null
@@ -1,1258 +0,0 @@
-# Chat Run Center Integration — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Integrate all Chat conversations into Run Center so every chat turn is a trackable, persist-on-disconnect run.
-
-**Architecture:** Extend the existing `extension` mechanism used by skill_creator. Frontend creates a run via `POST /v1/runs` before sending the WS frame, passes `run_id` via `extension: { kind: "chat" }`. Backend mirrors all stream events to durable storage. Chat agent registered alongside skill_creator in the agent registry.
-
-**Tech Stack:** Python/FastAPI (backend), React/Next.js + TanStack Query (frontend), PostgreSQL, Redis pub/sub, WebSocket
-
-**Spec:** `docs/superpowers/specs/2026-04-06-chat-run-center-integration-design.md`
-
----
-
-## File Structure
-
-### New files
-| File | Purpose |
-|---|---|
-| `backend/app/services/run_reducers/chat.py` | Chat agent definition, reducer, initial projection |
-| `backend/tests/test_services/test_chat_run_reducer.py` | Unit tests for chat reducer |
-| `backend/tests/test_api/test_chat_protocol_chat_extension.py` | Tests for new `chat` extension kind |
-| `backend/tests/test_api/test_chat_commands_chat_run.py` | Tests for `ChatRunTurnCommand` routing |
-
-### Modified files
-| File | Change |
-|---|---|
-| `backend/app/services/run_reducers/__init__.py` | Register chat agent |
-| `backend/app/websocket/chat_protocol.py` | Accept `extension.kind = "chat"`, add `ParsedChatExtension` |
-| `backend/app/websocket/chat_commands.py` | Add `ChatRunTurnCommand`, update union + routing |
-| `backend/app/websocket/chat_turn_executor.py` | Handle `ChatRunTurnCommand` in `prepare_standard_turn` |
-| `backend/app/websocket/chat_ws_handler.py` | Generalize "Skill Creator run failed" error message |
-| `backend/app/api/v1/runs.py` | Make `graph_id` optional on `GET /v1/runs/active` |
-| `backend/app/services/run_service.py` | Make `graph_id` optional in `find_latest_active_run` |
-| `backend/app/repositories/agent_run.py` | Make `graph_id` optional in repository query |
-| `frontend/lib/ws/chat/types.ts` | Add `ChatExtension` type, generalize extension union |
-| `frontend/lib/ws/chat/chatWsClient.ts` | Generalize `serializeExtension` for chat extension |
-| `frontend/app/chat/hooks/useChatWebSocket.ts` | Create run before WS frame, pass extension |
-| `frontend/app/chat/ChatProvider.tsx` | Add `runId` to stream context |
-| `frontend/lib/utils/runHelpers.ts` | Add `"chat"` case to `buildRunHref` |
-| `frontend/services/runService.ts` | Add `findActiveChatRun` convenience method |
-| `frontend/app/runs/[runId]/page.tsx` | Add Chat-specific Overview tab content |
-
----
-
-### Task 1: Chat Run Reducer + Agent Registration
-
-**Files:**
-- Create: `backend/app/services/run_reducers/chat.py`
-- Modify: `backend/app/services/run_reducers/__init__.py`
-- Test: `backend/tests/test_services/test_chat_run_reducer.py`
-
-- [ ] **Step 1: Write failing tests for chat reducer**
-
-Create `backend/tests/test_services/test_chat_run_reducer.py`:
-
-```python
-from app.services.agent_registry import agent_registry
-
-
-def test_chat_definition_registered() -> None:
-    definition = agent_registry.get("chat")
-    assert definition.agent_name == "chat"
-    assert definition.display_name == "Chat"
-    assert definition.run_type == "chat_turn"
-
-
-def test_chat_initial_projection() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection(
-        {"graph_id": "g-1", "thread_id": "t-1"},
-        status="queued",
-    )
-    assert projection["run_type"] == "chat_turn"
-    assert projection["status"] == "queued"
-    assert projection["graph_id"] == "g-1"
-    assert projection["thread_id"] == "t-1"
-    assert projection["user_message"] is None
-    assert projection["assistant_message"] is None
-    assert projection["file_tree"] == {}
-    assert projection["preview_data"] is None
-    assert projection["node_execution_log"] == []
-    assert projection["interrupt"] is None
-
-
-def test_chat_reducer_user_message_added() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="user_message_added",
-        payload={"message": {"content": "hello", "files": []}},
-        status="running",
-    )
-    assert result["user_message"] == {"content": "hello", "files": []}
-
-
-def test_chat_reducer_assistant_message_started() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="assistant_message_started",
-        payload={"message": {"id": "msg-1", "content": "", "tool_calls": []}},
-        status="running",
-    )
-    assert result["assistant_message"]["id"] == "msg-1"
-    assert result["assistant_message"]["content"] == ""
-
-
-def test_chat_reducer_content_delta() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    projection["assistant_message"] = {"id": "msg-1", "content": "hel", "tool_calls": []}
-    result = definition.reducer(
-        projection,
-        event_type="content_delta",
-        payload={"message_id": "msg-1", "delta": "lo"},
-        status="running",
-    )
-    assert result["assistant_message"]["content"] == "hello"
-
-
-def test_chat_reducer_tool_start() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    projection["assistant_message"] = {"id": "msg-1", "content": "", "tool_calls": []}
-    result = definition.reducer(
-        projection,
-        event_type="tool_start",
-        payload={
-            "message_id": "msg-1",
-            "tool": {"id": "t-1", "name": "search", "args": {}, "status": "running"},
-        },
-        status="running",
-    )
-    assert len(result["assistant_message"]["tool_calls"]) == 1
-    assert result["assistant_message"]["tool_calls"][0]["name"] == "search"
-
-
-def test_chat_reducer_tool_end_updates_tool_and_captures_preview() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    projection["assistant_message"] = {
-        "id": "msg-1",
-        "content": "",
-        "tool_calls": [{"id": "t-1", "name": "preview_skill", "args": {}, "status": "running"}],
-    }
-    result = definition.reducer(
-        projection,
-        event_type="tool_end",
-        payload={
-            "message_id": "msg-1",
-            "tool_id": "t-1",
-            "tool_name": "preview_skill",
-            "tool_output": {"html": "<p>preview</p>"},
-        },
-        status="running",
-    )
-    assert result["assistant_message"]["tool_calls"][0]["status"] == "completed"
-    assert result["preview_data"] == {"html": "<p>preview</p>"}
-
-
-def test_chat_reducer_file_event_create_and_delete() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="file_event",
-        payload={"path": "/tmp/a.txt", "action": "create", "size": 100},
-        status="running",
-    )
-    assert "/tmp/a.txt" in result["file_tree"]
-    result2 = definition.reducer(
-        result,
-        event_type="file_event",
-        payload={"path": "/tmp/a.txt", "action": "delete"},
-        status="running",
-    )
-    assert "/tmp/a.txt" not in result2["file_tree"]
-
-
-def test_chat_reducer_node_start_and_end() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="node_start",
-        payload={"node_name": "agent", "timestamp": 1000},
-        status="running",
-    )
-    assert len(result["node_execution_log"]) == 1
-    assert result["node_execution_log"][0]["node_name"] == "agent"
-    assert result["node_execution_log"][0]["status"] == "running"
-    result2 = definition.reducer(
-        result,
-        event_type="node_end",
-        payload={"node_name": "agent", "timestamp": 2000},
-        status="running",
-    )
-    assert result2["node_execution_log"][0]["status"] == "completed"
-
-
-def test_chat_reducer_interrupt() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="interrupt",
-        payload={"interrupt": {"type": "human_review", "data": {}}},
-        status="interrupt_wait",
-    )
-    assert result["interrupt"] == {"type": "human_review", "data": {}}
-
-
-def test_chat_reducer_error() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="error",
-        payload={"message": "something broke"},
-        status="failed",
-    )
-    assert result["meta"]["error"] == "something broke"
-
-
-def test_chat_reducer_done() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="done",
-        payload={},
-        status="completed",
-    )
-    assert result["meta"]["completed"] is True
-    assert result["status"] == "completed"
-
-
-def test_chat_reducer_status_message() -> None:
-    definition = agent_registry.get("chat")
-    projection = definition.make_initial_projection({}, status="running")
-    result = definition.reducer(
-        projection,
-        event_type="status",
-        payload={"message": "Thinking..."},
-        status="running",
-    )
-    assert result["meta"]["status_message"] == "Thinking..."
-
-
-def test_chat_reducer_run_initialized() -> None:
-    definition = agent_registry.get("chat")
-    result = definition.reducer(
-        None,
-        event_type="run_initialized",
-        payload={"graph_id": "g-1", "thread_id": "t-1"},
-        status="queued",
-    )
-    assert result["graph_id"] == "g-1"
-    assert result["thread_id"] == "t-1"
-    assert result["status"] == "queued"
-```
-
-- [ ] **Step 2: Run tests to verify they fail**
-
-Run: `cd backend && python -m pytest tests/test_services/test_chat_run_reducer.py -v`
-Expected: FAIL — `KeyError: 'Unknown agent definition: chat'`
-
-- [ ] **Step 3: Implement the chat reducer**
-
-Create `backend/app/services/run_reducers/chat.py`:
-
-```python
-"""
-Chat run projection reducer.
-"""
-
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-
-def _deepcopy_projection(projection: dict[str, Any] | None) -> dict[str, Any]:
-    if projection is not None:
-        return deepcopy(projection)
-    return {
-        "version": 1,
-        "run_type": "chat_turn",
-        "status": "queued",
-        "graph_id": None,
-        "thread_id": None,
-        "user_message": None,
-        "assistant_message": None,
-        "file_tree": {},
-        "preview_data": None,
-        "node_execution_log": [],
-        "interrupt": None,
-        "meta": {},
-    }
-
-
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    projection = _deepcopy_projection(None)
-    projection["status"] = status
-    projection["graph_id"] = payload.get("graph_id")
-    projection["thread_id"] = payload.get("thread_id")
-    return projection
-
-
-def apply_chat_event(
-    projection: dict[str, Any] | None,
-    *,
-    event_type: str,
-    payload: dict[str, Any],
-    status: str,
-) -> dict[str, Any]:
-    next_proj = _deepcopy_projection(projection)
-    next_proj["status"] = status
-
-    if event_type == "run_initialized":
-        return make_initial_projection(
-            {"graph_id": payload.get("graph_id"), "thread_id": payload.get("thread_id")},
-            status,
-        )
-
-    if event_type == "user_message_added":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_proj["user_message"] = message
-        return next_proj
-
-    if event_type == "assistant_message_started":
-        message = payload.get("message")
-        if isinstance(message, dict):
-            next_proj["assistant_message"] = message
-        return next_proj
-
-    if event_type == "content_delta":
-        msg = next_proj.get("assistant_message")
-        if msg and payload.get("message_id") == msg.get("id"):
-            msg["content"] = f"{msg.get('content', '')}{payload.get('delta', '')}"
-        return next_proj
-
-    if event_type == "tool_start":
-        msg = next_proj.get("assistant_message")
-        tool = payload.get("tool")
-        if msg and isinstance(tool, dict) and payload.get("message_id") == msg.get("id"):
-            msg.setdefault("tool_calls", []).append(tool)
-        return next_proj
-
-    if event_type == "tool_end":
-        msg = next_proj.get("assistant_message")
-        tool_id = payload.get("tool_id")
-        tool_name = payload.get("tool_name")
-        tool_output = payload.get("tool_output")
-        end_time = payload.get("end_time")
-        if msg and payload.get("message_id") == msg.get("id"):
-            for tool in msg.get("tool_calls", []):
-                if tool_id and tool.get("id") != tool_id:
-                    continue
-                if not tool_id and tool.get("status") != "running":
-                    continue
-                tool["status"] = "completed"
-                tool["result"] = tool_output
-                if end_time is not None:
-                    tool["endTime"] = end_time
-                break
-        if tool_name == "preview_skill" and tool_output is not None:
-            next_proj["preview_data"] = tool_output
-        return next_proj
-
-    if event_type == "file_event":
-        path = payload.get("path")
-        action = payload.get("action")
-        if not path or not action:
-            return next_proj
-        if action == "delete":
-            next_proj["file_tree"].pop(path, None)
-        else:
-            next_proj["file_tree"][path] = {
-                "action": action,
-                "size": payload.get("size"),
-                "timestamp": payload.get("timestamp"),
-            }
-        return next_proj
-
-    if event_type == "node_start":
-        next_proj["node_execution_log"].append({
-            "node_name": payload.get("node_name"),
-            "status": "running",
-            "start_time": payload.get("timestamp"),
-            "end_time": None,
-        })
-        return next_proj
-
-    if event_type == "node_end":
-        node_name = payload.get("node_name")
-        for entry in reversed(next_proj["node_execution_log"]):
-            if entry.get("node_name") == node_name and entry.get("status") == "running":
-                entry["status"] = "completed"
-                entry["end_time"] = payload.get("timestamp")
-                break
-        return next_proj
-
-    if event_type == "interrupt":
-        next_proj["interrupt"] = payload.get("interrupt")
-        return next_proj
-
-    if event_type == "error":
-        next_proj["meta"]["error"] = payload.get("message")
-        return next_proj
-
-    if event_type == "done":
-        next_proj["meta"]["completed"] = True
-        return next_proj
-
-    if event_type == "status":
-        next_proj["meta"]["status_message"] = payload.get("message")
-        return next_proj
-
-    return next_proj
-```
-
-- [ ] **Step 4: Register in `__init__.py`**
-
-Modify `backend/app/services/run_reducers/__init__.py` — add after the skill_creator registration:
-
-```python
-from .chat import apply_chat_event, make_initial_projection as chat_make_initial_projection
-
-agent_registry.register(
-    AgentDefinition(
-        agent_name="chat",
-        display_name="Chat",
-        run_type="chat_turn",
-        reducer=apply_chat_event,
-        make_initial_projection=chat_make_initial_projection,
-    )
-)
-```
-
-Update `__all__` to include the new exports.
-
-- [ ] **Step 5: Run tests to verify they pass**
-
-Run: `cd backend && python -m pytest tests/test_services/test_chat_run_reducer.py -v`
-Expected: All 14 tests PASS
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add backend/app/services/run_reducers/chat.py \
-        backend/app/services/run_reducers/__init__.py \
-        backend/tests/test_services/test_chat_run_reducer.py
-git commit -m "feat: add chat run reducer and agent registration"
-```
-
----
-
-### Task 2: Chat Protocol Extension + Command Routing
-
-**Files:**
-- Modify: `backend/app/websocket/chat_protocol.py`
-- Modify: `backend/app/websocket/chat_commands.py`
-- Test: `backend/tests/test_api/test_chat_protocol_chat_extension.py`
-- Test: `backend/tests/test_api/test_chat_commands_chat_run.py`
-
-- [ ] **Step 1: Write failing tests for chat extension parsing**
-
-Create `backend/tests/test_api/test_chat_protocol_chat_extension.py`:
-
-```python
-from app.websocket.chat_protocol import (
-    ParsedChatStartFrame,
-    parse_client_frame,
-)
-
-
-def test_parse_chat_extension_frame():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-chat-1",
-            "thread_id": "t-1",
-            "graph_id": None,
-            "input": {"message": "hello"},
-            "extension": {"kind": "chat", "run_id": "run-abc"},
-            "metadata": {},
-        }
-    )
-    assert isinstance(parsed, ParsedChatStartFrame)
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "chat"
-    assert parsed.extension.run_id == "run-abc"
-
-
-def test_parse_chat_extension_with_no_run_id():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-chat-2",
-            "input": {"message": "hi"},
-            "extension": {"kind": "chat"},
-            "metadata": {},
-        }
-    )
-    assert parsed.extension is not None
-    assert parsed.extension.kind == "chat"
-    assert parsed.extension.run_id is None
-
-
-def test_unsupported_extension_kind_still_rejected():
-    import pytest
-    from app.websocket.chat_protocol import ChatProtocolError
-
-    with pytest.raises(ChatProtocolError, match="unsupported extension kind"):
-        parse_client_frame(
-            {
-                "type": "chat.start",
-                "request_id": "req-bad",
-                "input": {"message": "hi"},
-                "extension": {"kind": "copilot"},
-                "metadata": {},
-            }
-        )
-```
-
-- [ ] **Step 2: Run tests to verify they fail**
-
-Run: `cd backend && python -m pytest tests/test_api/test_chat_protocol_chat_extension.py -v`
-Expected: FAIL — `ChatProtocolError: unsupported extension kind: chat`
-
-- [ ] **Step 3: Add `ParsedChatExtension` and update `_parse_extension`**
-
-In `backend/app/websocket/chat_protocol.py`:
-
-Add new dataclass after `ParsedSkillCreatorExtension`:
-
-```python
-@dataclass(frozen=True)
-class ParsedChatExtension:
-    """Extension payload for Chat run turns."""
-    kind: Literal["chat"]
-    run_id: str | None
-```
-
-Update `ParsedChatStartFrame.extension` type annotation:
-
-```python
-extension: ParsedSkillCreatorExtension | ParsedChatExtension | None
-```
-
-Replace `_parse_extension` body to handle both kinds:
-
-```python
-def _parse_extension(raw_extension: Any, request_id: str) -> ParsedSkillCreatorExtension | ParsedChatExtension | None:
-    if raw_extension is None:
-        return None
-    if not isinstance(raw_extension, dict):
-        raise ChatProtocolError("extension must be an object", request_id=request_id)
-
-    kind = raw_extension.get("kind")
-    run_id = _coerce_request_id(raw_extension.get("run_id"))
-
-    if kind == "skill_creator":
-        edit_skill_id = _coerce_request_id(raw_extension.get("edit_skill_id"))
-        return ParsedSkillCreatorExtension(kind="skill_creator", run_id=run_id, edit_skill_id=edit_skill_id)
-
-    if kind == "chat":
-        return ParsedChatExtension(kind="chat", run_id=run_id)
-
-    raise ChatProtocolError(
-        f"unsupported extension kind: {kind or '<missing>'}",
-        request_id=request_id,
-    )
-```
-
-- [ ] **Step 4: Run protocol tests**
-
-Run: `cd backend && python -m pytest tests/test_api/test_chat_protocol_chat_extension.py tests/test_api/test_chat_protocol.py -v`
-Expected: All PASS (new + existing tests)
-
-- [ ] **Step 5: Write failing tests for ChatRunTurnCommand**
-
-Create `backend/tests/test_api/test_chat_commands_chat_run.py`:
-
-```python
-from app.websocket.chat_commands import ChatRunTurnCommand, build_command_from_parsed_frame
-from app.websocket.chat_protocol import parse_client_frame
-
-
-def test_chat_extension_produces_chat_run_turn_command():
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-1",
-            "thread_id": "t-1",
-            "input": {"message": "hello"},
-            "extension": {"kind": "chat", "run_id": "run-xyz"},
-            "metadata": {},
-        }
-    )
-    command = build_command_from_parsed_frame(parsed)
-    assert isinstance(command, ChatRunTurnCommand)
-    assert command.run_id == "run-xyz"
-    assert command.message == "hello"
-
-
-def test_no_extension_still_produces_standard_command():
-    from app.websocket.chat_commands import StandardChatTurnCommand
-
-    parsed = parse_client_frame(
-        {
-            "type": "chat.start",
-            "request_id": "req-2",
-            "input": {"message": "hi"},
-            "extension": None,
-            "metadata": {},
-        }
-    )
-    command = build_command_from_parsed_frame(parsed)
-    assert isinstance(command, StandardChatTurnCommand)
-    assert not isinstance(command, ChatRunTurnCommand)
-```
-
-- [ ] **Step 6: Run to verify failure**
-
-Run: `cd backend && python -m pytest tests/test_api/test_chat_commands_chat_run.py -v`
-Expected: FAIL — `ChatRunTurnCommand` not defined
-
-- [ ] **Step 7: Add `ChatRunTurnCommand` and update routing**
-
-In `backend/app/websocket/chat_commands.py`:
-
-Add import:
-```python
-from app.websocket.chat_protocol import ParsedChatExtension, ParsedChatStartFrame
-```
-
-Add new command class after `SkillCreatorTurnCommand`:
-
-```python
-@dataclass(frozen=True)
-class ChatRunTurnCommand(StandardChatTurnCommand):
-    """Command for a Chat run turn, extending the standard command."""
-    run_id: str | None = None
-```
-
-Update union type:
-
-```python
-ChatTurnCommand = StandardChatTurnCommand | SkillCreatorTurnCommand | ChatRunTurnCommand
-```
-
-Update `build_command_from_parsed_frame` — replace the entire body after `_sanitize_metadata_files` with properly ordered `isinstance` checks. The **critical ordering** is: check `None` → check `ParsedChatExtension` → check `ParsedSkillCreatorExtension`. The chat branch MUST come before any `extension.edit_skill_id` access (line 53 of current code), otherwise `ParsedChatExtension` (which has no `edit_skill_id` attribute) will cause `AttributeError`.
-
-```python
-def build_command_from_parsed_frame(frame: ParsedChatStartFrame) -> ChatTurnCommand:
-    """Convert a validated ParsedChatStartFrame into a ChatTurnCommand."""
-    metadata, files = _sanitize_metadata_files(frame.metadata, frame.input.files)
-    model = frame.input.model
-
-    extension = frame.extension
-    if extension is None:
-        return StandardChatTurnCommand(
-            request_id=frame.request_id,
-            message=frame.input.message,
-            thread_id=frame.thread_id,
-            graph_id=frame.graph_id,
-            model=model,
-            metadata=metadata,
-            files=files,
-        )
-
-    if isinstance(extension, ParsedChatExtension):
-        return ChatRunTurnCommand(
-            request_id=frame.request_id,
-            message=frame.input.message,
-            thread_id=frame.thread_id,
-            graph_id=frame.graph_id,
-            model=model,
-            metadata=metadata,
-            files=files,
-            run_id=extension.run_id,
-        )
-
-    # skill_creator path
-    if extension.edit_skill_id:
-        metadata["edit_skill_id"] = extension.edit_skill_id
-
-    return SkillCreatorTurnCommand(
-        request_id=frame.request_id,
-        message=frame.input.message,
-        thread_id=frame.thread_id,
-        graph_id=frame.graph_id,
-        model=model,
-        metadata=metadata,
-        files=files,
-        run_id=extension.run_id,
-        edit_skill_id=extension.edit_skill_id,
-    )
-```
-
-- [ ] **Step 8: Run all command tests**
-
-Run: `cd backend && python -m pytest tests/test_api/test_chat_commands_chat_run.py tests/test_api/test_chat_protocol_chat_extension.py tests/test_api/test_chat_protocol.py -v`
-Expected: All PASS
-
-- [ ] **Step 9: Commit**
-
-```bash
-git add backend/app/websocket/chat_protocol.py \
-        backend/app/websocket/chat_commands.py \
-        backend/tests/test_api/test_chat_protocol_chat_extension.py \
-        backend/tests/test_api/test_chat_commands_chat_run.py
-git commit -m "feat: add chat extension kind and ChatRunTurnCommand"
-```
-
----
-
-### Task 3: Backend Executor + Handler — Persist Chat Runs
-
-**Files:**
-- Modify: `backend/app/websocket/chat_turn_executor.py:66-91`
-- Modify: `backend/app/websocket/chat_ws_handler.py:507-512`
-
-- [ ] **Step 1: Update `prepare_standard_turn` to handle `ChatRunTurnCommand`**
-
-In `backend/app/websocket/chat_turn_executor.py`, import the new command:
-
-```python
-from app.websocket.chat_commands import ChatTurnCommand, ChatRunTurnCommand, SkillCreatorTurnCommand
-```
-
-In `prepare_standard_turn`, after the `SkillCreatorTurnCommand` branch (line 74-78), add:
-
-```python
-        elif isinstance(command, ChatRunTurnCommand):
-            run_id = self._parse_uuid(command.run_id)
-            persist_on_disconnect = run_id is not None
-```
-
-This means `ChatRunTurnCommand` gets the same `persist_on_disconnect` and `run_id` behavior as `SkillCreatorTurnCommand`. The rest of the execution path (heartbeat, event mirroring, finalization) is driven by `task_entry.run_id` and `task_entry.persist_on_disconnect`, which are set from `PreparedStandardTurn`.
-
-- [ ] **Step 2: Wire resume turns to persist under the same `run_id`**
-
-Per spec Section 2.4, resume turns (`chat.resume` frames) must also be persisted under the same `run_id` from the original turn.
-
-In `backend/app/websocket/chat_ws_handler.py`, the `_handle_resume` method (around line 208) creates a task via `_task_supervisor.create_task(...)`. Currently, resume tasks do **not** set `persist_on_disconnect` or `run_id`.
-
-Update `_handle_resume` — before calling `_task_supervisor.create_task`, look up the existing task entry for the thread to get the `run_id`:
-
-```python
-        # Inherit run_id from the previous task entry for this thread (if persisted)
-        existing_entry = self._task_supervisor.get_by_thread(thread_id)
-        resume_run_id = existing_entry.run_id if existing_entry else None
-        resume_persist = existing_entry.persist_on_disconnect if existing_entry else False
-
-        self._task_supervisor.create_task(
-            request_id,
-            runner(),
-            name=f"chat-ws-resume:{request_id}",
-            thread_id=thread_id,
-            run_id=resume_run_id,
-            persist_on_disconnect=resume_persist,
-        )
-```
-
-Also verify `ChatTaskSupervisor.create_task` accepts `run_id` and `persist_on_disconnect` kwargs (it does for standard turns — check the `ChatTaskEntry` creation path). If `create_task` doesn't pass these through, update it to do so.
-
-In `backend/app/websocket/chat_turn_executor.py`, `execute_resume_turn` (or `run_resume_turn`) must also read `task_entry.run_id` and `task_entry.persist_on_disconnect` from the supervisor to set `tolerate_disconnect` and `agent_run_id`, the same way `execute_standard_turn` does at lines 121-123:
-
-```python
-        task_entry = handler._task_supervisor.get(request_id)
-        agent_run_id = task_entry.run_id if task_entry else None
-        tolerate_disconnect = bool(task_entry and task_entry.persist_on_disconnect)
-```
-
-This ensures the resume turn mirrors events to the durable run log and survives WS disconnects.
-
-- [ ] **Step 3: Generalize error message in `_finalize_task`**
-
-In `backend/app/websocket/chat_ws_handler.py`, find line 512:
-
-```python
-                    error_message="Skill Creator run failed",
-```
-
-Replace with:
-
-```python
-                    error_message="Agent run failed",
-```
-
-- [ ] **Step 3: Run existing tests to verify no regressions**
-
-Run: `cd backend && python -m pytest tests/test_api/test_chat_protocol.py tests/test_services/test_run_reducers.py tests/test_api/test_runs_api.py -v`
-Expected: All PASS
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add backend/app/websocket/chat_turn_executor.py \
-        backend/app/websocket/chat_ws_handler.py
-git commit -m "feat: persist chat runs — executor handles ChatRunTurnCommand"
-```
-
----
-
-### Task 4: Make `graph_id` Optional on Active Run Endpoint
-
-**Files:**
-- Modify: `backend/app/api/v1/runs.py:107`
-- Modify: `backend/app/services/run_service.py:286-310`
-- Modify: `backend/app/repositories/agent_run.py:72-90`
-
-- [ ] **Step 1: Update repository — make `graph_id` optional**
-
-In `backend/app/repositories/agent_run.py`, method `find_latest_active_run` (line 72):
-
-Change signature from:
-```python
-    async def find_latest_active_run(
-        self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: uuid.UUID,
-        thread_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-```
-
-To:
-```python
-    async def find_latest_active_run(
-        self,
-        *,
-        user_id: str,
-        agent_name: str,
-        graph_id: Optional[uuid.UUID] = None,
-        thread_id: Optional[str] = None,
-    ) -> Optional[AgentRun]:
-```
-
-Update query body — make `graph_id` filter conditional (line 81-85):
-
-```python
-        active_statuses = (AgentRunStatus.QUEUED, AgentRunStatus.RUNNING, AgentRunStatus.INTERRUPT_WAIT)
-        query = select(AgentRun).where(
-            AgentRun.user_id == user_id,
-            AgentRun.agent_name == agent_name,
-            AgentRun.status.in_(active_statuses),
-        )
-        if graph_id is not None:
-            query = query.where(AgentRun.graph_id == graph_id)
-        if thread_id:
-            query = query.where(AgentRun.thread_id == thread_id)
-```
-
-- [ ] **Step 2: Update service layer**
-
-In `backend/app/services/run_service.py`, method `find_latest_active_run` (line 286):
-
-Change `graph_id: uuid.UUID` to `graph_id: Optional[uuid.UUID] = None` in the signature.
-
-- [ ] **Step 3: Update API endpoint**
-
-In `backend/app/api/v1/runs.py`, endpoint `get_active_run` (line 107):
-
-Change:
-```python
-    graph_id: uuid.UUID = Query(...),
-```
-To:
-```python
-    graph_id: uuid.UUID | None = Query(None),
-```
-
-- [ ] **Step 4: Run existing tests**
-
-Run: `cd backend && python -m pytest tests/test_api/test_runs_api.py -v`
-Expected: All PASS
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/api/v1/runs.py \
-        backend/app/services/run_service.py \
-        backend/app/repositories/agent_run.py
-git commit -m "feat: make graph_id optional on GET /v1/runs/active"
-```
-
----
-
-### Task 5: Frontend — Chat Extension Types + WS Client
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/types.ts`
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-
-- [ ] **Step 1: Add `ChatExtension` type**
-
-In `frontend/lib/ws/chat/types.ts`, after `SkillCreatorExtension` (line 46):
-
-```typescript
-export interface ChatExtension {
-  kind: 'chat'
-  runId?: string | null
-}
-```
-
-Update `ChatSendParams.extension` type (line 53):
-
-```typescript
-  extension?: SkillCreatorExtension | ChatExtension | null
-```
-
-- [ ] **Step 2: Generalize `serializeExtension`**
-
-In `frontend/lib/ws/chat/chatWsClient.ts`, update the import to include `ChatExtension`:
-
-```typescript
-import type {
-  ChatExtension,
-  ChatResumeParams,
-  ChatSendParams,
-  ChatTerminalResult,
-  ChatWsClient,
-  ConnectionState,
-  IncomingChatAcceptedEvent,
-  IncomingChatWsEvent,
-  SkillCreatorExtension,
-} from './types'
-```
-
-Replace `serializeExtension` function (line 406-416):
-
-```typescript
-function serializeExtension(extension?: SkillCreatorExtension | ChatExtension | null): Record<string, unknown> | null {
-  if (!extension) {
-    return null
-  }
-
-  if (extension.kind === 'skill_creator') {
-    return {
-      kind: extension.kind,
-      run_id: (extension as SkillCreatorExtension).runId ?? null,
-      edit_skill_id: (extension as SkillCreatorExtension).editSkillId ?? null,
-    }
-  }
-
-  if (extension.kind === 'chat') {
-    return {
-      kind: extension.kind,
-      run_id: (extension as ChatExtension).runId ?? null,
-    }
-  }
-
-  return null
-}
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/ws/chat/types.ts \
-        frontend/lib/ws/chat/chatWsClient.ts
-git commit -m "feat: add ChatExtension type and generalize WS serialization"
-```
-
----
-
-### Task 6: Frontend — Chat Send Flow Creates Run
-
-**Files:**
-- Modify: `frontend/app/chat/hooks/useChatWebSocket.ts`
-- Modify: `frontend/app/chat/ChatProvider.tsx`
-- Modify: `frontend/services/runService.ts`
-
-- [ ] **Step 1: Add `findActiveChatRun` to runService**
-
-In `frontend/services/runService.ts`, after `findActiveSkillCreatorRun` (line 152):
-
-```typescript
-  async findActiveChatRun(params: { threadId: string }): Promise<RunSummary | null> {
-    return this.findActiveRun({
-      agentName: 'chat',
-      threadId: params.threadId,
-    })
-  },
-```
-
-Also update `findActiveRun` to handle optional `graphId` — change the params construction (line 138-142):
-
-```typescript
-  async findActiveRun(params: {
-    agentName: string
-    graphId?: string | null
-    threadId?: string | null
-  }): Promise<RunSummary | null> {
-    const query = new URLSearchParams({
-      agent_name: params.agentName,
-    })
-    if (params.graphId) query.set('graph_id', params.graphId)
-    if (params.threadId) query.set('thread_id', params.threadId)
-    return apiGet<RunSummary | null>(`${API_ENDPOINTS.runs}/active?${query.toString()}`)
-  },
-```
-
-- [ ] **Step 2: Update `useChatWebSocket` to create a run before sending**
-
-In `frontend/app/chat/hooks/useChatWebSocket.ts`, add import at top:
-
-```typescript
-import { runService } from '@/services/runService'
-import type { ChatExtension } from '@/lib/ws/chat/types'
-```
-
-In the `sendMessage` callback, before the `chatWs.sendChat(...)` call, add run creation logic. The `graphId` and `threadId` are available from the `sendMessage` function parameters (passed via opts from the session context), NOT from refs:
-
-```typescript
-// Inside sendMessage, after building requestId and before chatWs.sendChat:
-// graphId and threadId come from the sendMessage opts/params, not refs
-let chatRunId: string | null = null
-try {
-  if (graphId) {
-    const runResponse = await runService.createRun({
-      agent_name: 'chat',
-      graph_id: graphId,
-      message: input.message,
-      thread_id: threadId || undefined,
-    })
-    chatRunId = runResponse.run_id
-  }
-} catch (err) {
-  console.warn('[Chat] Failed to create chat run, proceeding without persistence', err)
-}
-```
-
-Then pass the extension in the `sendChat` params:
-
-```typescript
-const extension: ChatExtension | undefined = chatRunId
-  ? { kind: 'chat', runId: chatRunId }
-  : undefined
-
-await chatWs.sendChat({
-  requestId,
-  threadId,
-  graphId,
-  input,
-  extension,
-  metadata,
-  // ... existing onEvent and onAccepted callbacks
-})
-```
-
-- [ ] **Step 3: Add `runId` to ChatStreamContext**
-
-In `frontend/app/chat/ChatProvider.tsx`, add `runId` state to the stream context:
-
-In the `ChatStreamContextValue` interface (or wherever the stream context shape is defined), add:
-
-```typescript
-runId: string | null
-```
-
-Wire it from the `useChatWebSocket` hook (the hook should track the latest `chatRunId` in a ref and expose it). The simplest approach: add a `runIdRef` in the hook and expose `runId` via the return value.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/app/chat/hooks/useChatWebSocket.ts \
-        frontend/app/chat/ChatProvider.tsx \
-        frontend/services/runService.ts
-git commit -m "feat: chat send flow creates run and passes extension"
-```
-
----
-
-### Task 7: Frontend — Run Center UI Updates
-
-**Files:**
-- Modify: `frontend/lib/utils/runHelpers.ts:53-59`
-- Modify: `frontend/app/runs/[runId]/page.tsx`
-
-- [ ] **Step 1: Update `buildRunHref` for chat runs**
-
-In `frontend/lib/utils/runHelpers.ts`, replace the `buildRunHref` function body (lines 53-59):
-
-```typescript
-export function buildRunHref(run: { run_id: string; run_type?: string; agent_name?: string | null }): string {
-  if (run.agent_name === 'skill_creator' || run.run_type === 'skill_creator') {
-    return `/skills/creator?run=${encodeURIComponent(run.run_id)}`
-  }
-  if (run.agent_name === 'chat' || run.run_type === 'chat_turn') {
-    return `/runs/${encodeURIComponent(run.run_id)}`
-  }
-  return '#'
-}
-```
-
-- [ ] **Step 2: Add Chat Overview tab to Run Detail page**
-
-In `frontend/app/runs/[runId]/page.tsx`, the Overview tab currently shows generic run metadata. Add Chat-specific rendering when `agent_name === 'chat'`:
-
-Within the Overview `TabsContent`, add a conditional section:
-
-```tsx
-{projection?.run_type === 'chat_turn' && (
-  <div className="space-y-4">
-    {/* User message */}
-    {projection.user_message && (
-      <Card className="p-4">
-        <h4 className="text-sm font-medium text-muted-foreground mb-2">
-          {t('runs.userMessage', 'User Message')}
-        </h4>
-        <p className="text-sm whitespace-pre-wrap">{projection.user_message.content}</p>
-      </Card>
-    )}
-
-    {/* Assistant message */}
-    {projection.assistant_message && (
-      <Card className="p-4">
-        <h4 className="text-sm font-medium text-muted-foreground mb-2">
-          {t('runs.assistantMessage', 'Assistant Response')}
-        </h4>
-        <p className="text-sm whitespace-pre-wrap">{projection.assistant_message.content}</p>
-
-        {/* Tool calls */}
-        {projection.assistant_message.tool_calls?.length > 0 && (
-          <div className="mt-3 space-y-2">
-            <h5 className="text-xs font-medium text-muted-foreground">
-              {t('runs.toolCalls', 'Tool Calls')}
-            </h5>
-            {projection.assistant_message.tool_calls.map((tool: any, i: number) => (
-              <details key={tool.id || i} className="text-xs border rounded p-2">
-                <summary className="cursor-pointer font-medium">
-                  {tool.name} — {tool.status}
-                </summary>
-                {tool.args && (
-                  <pre className="mt-1 text-muted-foreground overflow-x-auto">
-                    {JSON.stringify(tool.args, null, 2)}
-                  </pre>
-                )}
-                {tool.result && (
-                  <pre className="mt-1 text-muted-foreground overflow-x-auto">
-                    {JSON.stringify(tool.result, null, 2)}
-                  </pre>
-                )}
-              </details>
-            ))}
-          </div>
-        )}
-      </Card>
-    )}
-
-    {/* File tree */}
-    {projection.file_tree && Object.keys(projection.file_tree).length > 0 && (
-      <Card className="p-4">
-        <h4 className="text-sm font-medium text-muted-foreground mb-2">
-          {t('runs.fileTree', 'Files')}
-        </h4>
-        <ul className="text-xs space-y-1">
-          {Object.entries(projection.file_tree).map(([path, info]: [string, any]) => (
-            <li key={path} className="flex items-center gap-2">
-              <Badge variant="outline" className="text-[10px]">{info.action}</Badge>
-              <span className="font-mono truncate">{path}</span>
-            </li>
-          ))}
-        </ul>
-      </Card>
-    )}
-
-    {/* Preview data */}
-    {projection.preview_data && (
-      <Card className="p-4">
-        <h4 className="text-sm font-medium text-muted-foreground mb-2">
-          {t('runs.previewData', 'Preview')}
-        </h4>
-        <pre className="text-xs overflow-x-auto">
-          {JSON.stringify(projection.preview_data, null, 2)}
-        </pre>
-      </Card>
-    )}
-
-    {/* Node execution log */}
-    {projection.node_execution_log?.length > 0 && (
-      <Card className="p-4">
-        <h4 className="text-sm font-medium text-muted-foreground mb-2">
-          {t('runs.nodeLog', 'Execution Log')}
-        </h4>
-        <ul className="text-xs space-y-1">
-          {projection.node_execution_log.map((entry: any, i: number) => (
-            <li key={i} className="flex items-center gap-2">
-              <Badge variant={entry.status === 'completed' ? 'default' : 'secondary'} className="text-[10px]">
-                {entry.status}
-              </Badge>
-              <span className="font-mono">{entry.node_name}</span>
-            </li>
-          ))}
-        </ul>
-      </Card>
-    )}
-  </div>
-)}
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/utils/runHelpers.ts \
-        frontend/app/runs/[runId]/page.tsx
-git commit -m "feat: Run Center shows chat runs with overview detail"
-```
-
----
-
-### Task 8: Smoke Test & Final Verification
-
-- [ ] **Step 1: Run all backend tests**
-
-```bash
-cd backend && python -m pytest tests/test_services/test_chat_run_reducer.py \
-    tests/test_services/test_run_reducers.py \
-    tests/test_api/test_chat_protocol.py \
-    tests/test_api/test_chat_protocol_chat_extension.py \
-    tests/test_api/test_chat_commands_chat_run.py \
-    tests/test_api/test_runs_api.py -v
-```
-
-Expected: All PASS
-
-- [ ] **Step 2: Run frontend type check**
-
-```bash
-cd frontend && npx tsc --noEmit
-```
-
-Expected: No type errors
-
-- [ ] **Step 3: Verify `GET /v1/runs/agents` returns Chat**
-
-After starting the backend, call:
-```bash
-curl -s http://localhost:8000/api/v1/runs/agents -H "Authorization: Bearer <token>" | jq
-```
-
-Expected: `items` array includes `{ "agent_name": "chat", "display_name": "Chat" }`
-
-- [ ] **Step 4: Final commit (if any fixes needed)**
-
-```bash
-git add -A && git commit -m "fix: address smoke test findings"
-```---
diff --git a/docs/superpowers/plans/2026-04-06-copilot-run-center-integration.md b/docs/superpowers/plans/2026-04-06-copilot-run-center-integration.md
deleted file mode 100644
index 74e28b038..000000000
--- a/docs/superpowers/plans/2026-04-06-copilot-run-center-integration.md
+++ /dev/null
@@ -1,2176 +0,0 @@
-# Phase 3: Copilot Run Center Integration — Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Unify Copilot into the shared Run Center model — replace Redis Pub/Sub + `/ws/copilot` with `agent_run_events` + `/ws/chat` turn executor + `/ws/runs` observation.
-
-**Architecture:** Frontend creates a run via REST, then sends `chat.start` with `extension: { kind: "copilot" }` through the shared chat WS. Backend dispatches to `execute_copilot_turn` which consumes `CopilotService._get_copilot_stream()` and emits events via `_emit_event`. Old Redis/copilot_chats/ws-copilot code is deleted entirely.
-
-**Tech Stack:** Python/FastAPI (backend), TypeScript/React/Next.js (frontend), SQLAlchemy (ORM), LangGraph (agent framework), WebSocket
-
-**Spec:** `docs/superpowers/specs/2026-04-06-copilot-run-center-integration-design.md`
-
----
-
-## File Structure
-
-### Backend — Create
-
-| File | Responsibility |
-|---|---|
-| `backend/app/services/run_reducers/copilot.py` | Copilot reducer + initial projection |
-| `backend/tests/test_services/test_copilot_run_reducer.py` | Reducer unit tests |
-| `backend/tests/test_api/test_chat_protocol_copilot_extension.py` | Protocol parsing tests |
-| `backend/tests/test_api/test_chat_commands_copilot.py` | Command dispatch tests |
-
-### Backend — Modify
-
-| File | Change |
-|---|---|
-| `backend/app/services/run_reducers/__init__.py` | Register copilot agent |
-| `backend/app/websocket/chat_protocol.py` | Add `ParsedCopilotExtension`, widen types |
-| `backend/app/websocket/chat_commands.py` | Add `CopilotTurnCommand`, dispatch branch |
-| `backend/app/websocket/chat_turn_executor.py` | Add `execute_copilot_turn`, copilot branch in `prepare_standard_turn` |
-| `backend/app/api/v1/graphs.py` | Rewrite history endpoints, delete old copilot endpoints |
-| `backend/app/repositories/agent_run.py` | Add `graph_id` filter to `list_recent_runs_for_user`, add `delete_runs_for_graph` |
-
-### Backend — Delete
-
-| File/Section | Reason |
-|---|---|
-| `backend/app/websocket/copilot_handler.py` | Entire file — replaced by chat WS |
-| `backend/app/repositories/copilot_chat_repository.py` | Entire file — copilot_chats removed |
-| `backend/app/models/chat.py` `CopilotChat` class | Model for deleted table |
-| `backend/app/main.py` `/ws/copilot` route | Route registration |
-| `backend/app/core/redis.py` copilot methods | ~12 Redis methods |
-| `backend/app/services/copilot_service.py` several methods | `generate_actions_async`, `_consume_stream_and_publish_to_redis`, `_persist_conversation`, `save_messages`, `save_conversation_from_stream` |
-| `backend/app/api/v1/graphs.py` endpoints | `POST /copilot/actions/create`, `POST /{graph_id}/copilot/messages`, `GET /copilot/sessions/{session_id}` |
-
-### Frontend — Modify
-
-| File | Change |
-|---|---|
-| `frontend/lib/ws/chat/types.ts` | Add `CopilotExtension`, widen union |
-| `frontend/lib/ws/chat/chatWsClient.ts` | `serializeExtension` copilot branch |
-| `frontend/hooks/copilot/useCopilotSession.ts` | session_id → run_id |
-| `frontend/app/workspace/.../hooks/useCopilotActions.ts` | Replace createCopilotTask → createRun + sendChat |
-| `frontend/app/workspace/.../hooks/useCopilotWebSocketHandler.ts` | Events from chat WS onEvent |
-| `frontend/app/workspace/.../hooks/useCopilotEffects.ts` | Recovery via runService |
-| `frontend/services/copilotService.ts` | Remove createCopilotTask, getSession |
-| `frontend/lib/utils/runHelpers.ts` | Add copilot_turn case |
-| `frontend/app/runs/[runId]/page.tsx` | Add CopilotTurnOverview |
-
-### Frontend — Delete
-
-| File | Reason |
-|---|---|
-| `frontend/hooks/use-copilot-websocket.ts` | Replaced by shared chat WS |
-
----
-
-## Tasks
-
-### Task 1: Copilot Reducer & Agent Registration
-
-**Files:**
-- Create: `backend/app/services/run_reducers/copilot.py`
-- Create: `backend/tests/test_services/test_copilot_run_reducer.py`
-- Modify: `backend/app/services/run_reducers/__init__.py`
-
-**Reference:** `backend/app/services/run_reducers/chat.py` for pattern.
-
-- [x] **Step 1: Write reducer tests**
-
-```python
-"""Tests for copilot run projection reducer."""
-import copy
-from app.services.run_reducers.copilot import apply_copilot_event, make_initial_projection
-
-
-def _base():
-    return make_initial_projection({"graph_id": "g1", "mode": "deepagents"}, "queued")
-
-
-def test_copilot_definition_registered():
-    from app.services.agent_registry import agent_registry
-    defn = agent_registry.get("copilot")
-    assert defn.agent_name == "copilot"
-    assert defn.run_type == "copilot_turn"
-
-
-def test_copilot_initial_projection():
-    p = _base()
-    assert p["run_type"] == "copilot_turn"
-    assert p["status"] == "queued"
-    assert p["graph_id"] == "g1"
-    assert p["mode"] == "deepagents"
-    assert p["content"] == ""
-    assert p["thought_steps"] == []
-
-
-def test_copilot_reducer_run_initialized():
-    p = apply_copilot_event(None, event_type="run_initialized", payload={"graph_id": "g2", "mode": "standard"}, status="running")
-    assert p["graph_id"] == "g2"
-    assert p["mode"] == "standard"
-
-
-def test_copilot_reducer_status():
-    p = apply_copilot_event(_base(), event_type="status", payload={"stage": "thinking", "message": "Thinking..."}, status="running")
-    assert p["stage"] == "thinking"
-
-
-def test_copilot_reducer_content_delta():
-    p = apply_copilot_event(_base(), event_type="content_delta", payload={"delta": "Hello "}, status="running")
-    p = apply_copilot_event(p, event_type="content_delta", payload={"delta": "world"}, status="running")
-    assert p["content"] == "Hello world"
-
-
-def test_copilot_reducer_thought_step():
-    p = apply_copilot_event(_base(), event_type="thought_step", payload={"step": {"index": 1, "content": "Analyzing"}}, status="running")
-    assert len(p["thought_steps"]) == 1
-    assert p["thought_steps"][0]["content"] == "Analyzing"
-
-
-def test_copilot_reducer_tool_call():
-    p = apply_copilot_event(_base(), event_type="tool_call", payload={"tool": "create_node", "input": {"type": "agent"}}, status="running")
-    assert len(p["tool_calls"]) == 1
-    assert p["tool_calls"][0]["tool"] == "create_node"
-
-
-def test_copilot_reducer_tool_result():
-    action = {"type": "CREATE_NODE", "payload": {"id": "n1"}, "reasoning": "Need agent"}
-    p = apply_copilot_event(_base(), event_type="tool_result", payload={"action": action}, status="running")
-    assert len(p["tool_results"]) == 1
-    assert p["tool_results"][0]["type"] == "CREATE_NODE"
-
-
-def test_copilot_reducer_result():
-    actions = [{"type": "CREATE_NODE", "payload": {"id": "n1"}, "reasoning": "test"}]
-    p = apply_copilot_event(_base(), event_type="result", payload={"message": "Done!", "actions": actions}, status="running")
-    assert p["result_message"] == "Done!"
-    assert len(p["result_actions"]) == 1
-
-
-def test_copilot_reducer_error():
-    p = apply_copilot_event(_base(), event_type="error", payload={"message": "LLM failed", "code": "AGENT_ERROR"}, status="failed")
-    assert p["status"] == "failed"
-    assert p["error"] == "LLM failed"
-
-
-def test_copilot_reducer_done():
-    p = apply_copilot_event(_base(), event_type="done", payload={}, status="completed")
-    assert p["status"] == "completed"
-
-
-def test_copilot_reducer_done_preserves_failed():
-    p = apply_copilot_event(_base(), event_type="error", payload={"message": "err"}, status="failed")
-    p = apply_copilot_event(p, event_type="done", payload={}, status="failed")
-    assert p["status"] == "failed"
-```
-
-- [x] **Step 2: Run tests — verify they fail**
-
-```bash
-cd backend && python -m pytest tests/test_services/test_copilot_run_reducer.py -v --no-header
-```
-
-Expected: `ModuleNotFoundError: No module named 'app.services.run_reducers.copilot'`
-
-- [x] **Step 3: Write copilot reducer**
-
-Create `backend/app/services/run_reducers/copilot.py`:
-
-```python
-"""
-Copilot run projection reducer.
-
-Each copilot turn is tracked as a single run projection containing
-streaming content, thought steps, tool calls/results, and final
-result message + graph actions.
-"""
-
-from __future__ import annotations
-
-from copy import deepcopy
-from typing import Any
-
-_INITIAL: dict[str, Any] = {
-    "version": 1,
-    "run_type": "copilot_turn",
-    "status": "queued",
-    "stage": None,
-    "content": "",
-    "thought_steps": [],
-    "tool_calls": [],
-    "tool_results": [],
-    "result_message": None,
-    "result_actions": [],
-    "error": None,
-    "graph_id": None,
-    "mode": None,
-}
-
-
-def _deepcopy_projection(projection: dict[str, Any] | None) -> dict[str, Any]:
-    if projection is not None:
-        return deepcopy(projection)
-    return deepcopy(_INITIAL)
-
-
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    projection = _deepcopy_projection(None)
-    projection["status"] = status
-    projection["graph_id"] = payload.get("graph_id")
-    projection["mode"] = payload.get("mode")
-    return projection
-
-
-def apply_copilot_event(
-    projection: dict[str, Any] | None,
-    *,
-    event_type: str,
-    payload: dict[str, Any],
-    status: str,
-) -> dict[str, Any]:
-    next_p = _deepcopy_projection(projection)
-    next_p["status"] = status
-
-    if event_type == "run_initialized":
-        return make_initial_projection(
-            {"graph_id": payload.get("graph_id"), "mode": payload.get("mode")},
-            status,
-        )
-
-    if event_type == "status":
-        next_p["stage"] = payload.get("stage")
-        return next_p
-
-    if event_type == "content_delta":
-        next_p["content"] += payload.get("delta", "")
-        return next_p
-
-    if event_type == "thought_step":
-        step = payload.get("step")
-        if step:
-            next_p["thought_steps"].append(step)
-        return next_p
-
-    if event_type == "tool_call":
-        next_p["tool_calls"].append({
-            "tool": payload.get("tool", ""),
-            "input": payload.get("input", {}),
-        })
-        return next_p
-
-    if event_type == "tool_result":
-        action = payload.get("action")
-        if action:
-            next_p["tool_results"].append(action)
-        return next_p
-
-    if event_type == "result":
-        next_p["result_message"] = payload.get("message", "")
-        next_p["result_actions"] = payload.get("actions", [])
-        return next_p
-
-    if event_type == "error":
-        next_p["status"] = "failed"
-        next_p["error"] = payload.get("message")
-        return next_p
-
-    if event_type == "done":
-        if next_p["status"] != "failed":
-            next_p["status"] = "completed"
-        return next_p
-
-    return next_p
-```
-
-- [x] **Step 4: Register in `__init__.py`**
-
-Add to `backend/app/services/run_reducers/__init__.py`:
-
-```python
-from .copilot import apply_copilot_event, make_initial_projection as copilot_make_initial_projection
-
-agent_registry.register(
-    AgentDefinition(
-        agent_name="copilot",
-        display_name="Copilot",
-        run_type="copilot_turn",
-        reducer=apply_copilot_event,
-        make_initial_projection=copilot_make_initial_projection,
-    )
-)
-```
-
-Add to `__all__`: `"apply_copilot_event"`, `"copilot_make_initial_projection"`.
-
-- [x] **Step 5: Run tests — verify they pass**
-
-```bash
-cd backend && python -m pytest tests/test_services/test_copilot_run_reducer.py -v --no-header
-```
-
-Expected: 12 passed
-
-- [x] **Step 6: Commit**
-
-```bash
-git add backend/app/services/run_reducers/copilot.py backend/app/services/run_reducers/__init__.py backend/tests/test_services/test_copilot_run_reducer.py
-git commit -m "feat: add copilot reducer and agent registry entry"
-```
-
----
-
-### Task 2: Protocol Extension — ParsedCopilotExtension
-
-**Files:**
-- Modify: `backend/app/websocket/chat_protocol.py`
-- Create: `backend/tests/test_api/test_chat_protocol_copilot_extension.py`
-
-**Reference:** Existing `ParsedChatExtension` and `ParsedSkillCreatorExtension` in `chat_protocol.py`.
-
-- [x] **Step 1: Write protocol tests**
-
-```python
-"""Tests for copilot extension parsing in chat protocol."""
-from app.websocket.chat_protocol import parse_client_frame, ChatProtocolError
-import pytest
-
-
-def _make_copilot_frame(*, graph_context=None, mode=None, run_id=None, conversation_history=None):
-    return {
-        "type": "chat.start",
-        "request_id": "req-1",
-        "graph_id": "00000000-0000-0000-0000-000000000001",
-        "input": {"message": "Build a RAG pipeline"},
-        "extension": {
-            "kind": "copilot",
-            "run_id": run_id,
-            "graph_context": graph_context if graph_context is not None else {"nodes": [], "edges": []},
-            "conversation_history": conversation_history or [],
-            "mode": mode or "deepagents",
-        },
-    }
-
-
-def test_parse_copilot_extension_frame():
-    result = parse_client_frame(_make_copilot_frame(run_id="run-abc"))
-    assert result.extension.kind == "copilot"
-    assert result.extension.run_id == "run-abc"
-    assert result.extension.graph_context == {"nodes": [], "edges": []}
-    assert result.extension.mode == "deepagents"
-    assert result.extension.conversation_history == []
-
-
-def test_parse_copilot_extension_defaults():
-    """mode defaults to deepagents, conversation_history defaults to []."""
-    frame = {
-        "type": "chat.start",
-        "request_id": "req-2",
-        "input": {"message": "test"},
-        "extension": {"kind": "copilot", "graph_context": {"nodes": []}},
-    }
-    result = parse_client_frame(frame)
-    assert result.extension.kind == "copilot"
-    assert result.extension.mode == "deepagents"
-    assert result.extension.conversation_history == []
-    assert result.extension.run_id is None
-
-
-def test_parse_copilot_extension_missing_graph_context():
-    """graph_context is required — missing it should raise."""
-    frame = {
-        "type": "chat.start",
-        "request_id": "req-3",
-        "input": {"message": "test"},
-        "extension": {"kind": "copilot"},
-    }
-    with pytest.raises(ChatProtocolError, match="graph_context"):
-        parse_client_frame(frame)
-
-
-def test_existing_extensions_still_work():
-    """Regression: skill_creator and chat extensions unchanged."""
-    sc_frame = {
-        "type": "chat.start",
-        "request_id": "req-4",
-        "input": {"message": "test"},
-        "extension": {"kind": "skill_creator", "run_id": "r1", "edit_skill_id": "s1"},
-    }
-    result = parse_client_frame(sc_frame)
-    assert result.extension.kind == "skill_creator"
-
-    chat_frame = {
-        "type": "chat.start",
-        "request_id": "req-5",
-        "input": {"message": "test"},
-        "extension": {"kind": "chat", "run_id": "r2"},
-    }
-    result = parse_client_frame(chat_frame)
-    assert result.extension.kind == "chat"
-```
-
-- [x] **Step 2: Run tests — verify they fail**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_chat_protocol_copilot_extension.py -v --no-header
-```
-
-Expected: FAIL — `ParsedCopilotExtension` not found, `kind == "copilot"` raises `unsupported extension kind`
-
-- [x] **Step 3: Add ParsedCopilotExtension to chat_protocol.py**
-
-After `ParsedChatExtension`, add:
-
-```python
-@dataclass(frozen=True)
-class ParsedCopilotExtension:
-    """Extension payload for Copilot turns."""
-
-    kind: Literal["copilot"]
-    run_id: str | None
-    graph_context: dict[str, Any]
-    conversation_history: list[dict[str, Any]]
-    mode: str
-```
-
-Widen `ParsedChatStartFrame.extension` type:
-
-```python
-extension: ParsedSkillCreatorExtension | ParsedChatExtension | ParsedCopilotExtension | None
-```
-
-Add copilot branch in `_parse_extension` **before** the final `raise`:
-
-```python
-if kind == "copilot":
-    graph_context = raw_extension.get("graph_context")
-    if not isinstance(graph_context, dict):
-        raise ChatProtocolError("copilot extension requires graph_context object", request_id=request_id)
-    conversation_history_raw = raw_extension.get("conversation_history")
-    conversation_history = conversation_history_raw if isinstance(conversation_history_raw, list) else []
-    mode = str(raw_extension.get("mode") or "deepagents")
-    return ParsedCopilotExtension(
-        kind="copilot",
-        run_id=run_id,
-        graph_context=graph_context,
-        conversation_history=conversation_history,
-        mode=mode,
-    )
-```
-
-Update `_parse_extension` return type annotation to include `ParsedCopilotExtension`.
-
-- [x] **Step 4: Run tests — verify they pass**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_chat_protocol_copilot_extension.py -v --no-header
-```
-
-Expected: 5 passed
-
-- [x] **Step 5: Commit**
-
-```bash
-git add backend/app/websocket/chat_protocol.py backend/tests/test_api/test_chat_protocol_copilot_extension.py
-git commit -m "feat: add ParsedCopilotExtension to chat protocol"
-```
-
----
-
-### Task 3: Command Dispatch — CopilotTurnCommand
-
-**Files:**
-- Modify: `backend/app/websocket/chat_commands.py`
-- Create: `backend/tests/test_api/test_chat_commands_copilot.py`
-
-**Reference:** Existing `ChatRunTurnCommand` and `build_command_from_parsed_frame` in `chat_commands.py`.
-
-- [x] **Step 1: Write command tests**
-
-```python
-"""Tests for copilot command dispatch."""
-from app.websocket.chat_commands import build_command_from_parsed_frame, CopilotTurnCommand, ChatRunTurnCommand, SkillCreatorTurnCommand
-from app.websocket.chat_protocol import ParsedChatStartFrame, ParsedChatInput, ParsedCopilotExtension
-
-
-def test_copilot_extension_produces_copilot_turn_command():
-    frame = ParsedChatStartFrame(
-        request_id="req-1",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="Build RAG", files=[], model=None),
-        extension=ParsedCopilotExtension(
-            kind="copilot",
-            run_id="run-123",
-            graph_context={"nodes": [], "edges": []},
-            conversation_history=[{"role": "user", "content": "hi"}],
-            mode="deepagents",
-        ),
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert isinstance(cmd, CopilotTurnCommand)
-    assert cmd.run_id == "run-123"
-    assert cmd.graph_context == {"nodes": [], "edges": []}
-    assert cmd.conversation_history == [{"role": "user", "content": "hi"}]
-    assert cmd.mode == "deepagents"
-    assert cmd.message == "Build RAG"
-
-
-def test_no_extension_still_standard():
-    frame = ParsedChatStartFrame(
-        request_id="req-2",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="hello", files=[], model=None),
-        extension=None,
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert not isinstance(cmd, CopilotTurnCommand)
-    assert not isinstance(cmd, SkillCreatorTurnCommand)
-
-
-def test_chat_extension_still_chat_run():
-    from app.websocket.chat_protocol import ParsedChatExtension
-    frame = ParsedChatStartFrame(
-        request_id="req-3",
-        thread_id=None,
-        graph_id=None,
-        input=ParsedChatInput(message="hello", files=[], model=None),
-        extension=ParsedChatExtension(kind="chat", run_id="r1"),
-        metadata={},
-    )
-    cmd = build_command_from_parsed_frame(frame)
-    assert isinstance(cmd, ChatRunTurnCommand)
-```
-
-- [x] **Step 2: Run tests — verify they fail**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_chat_commands_copilot.py -v --no-header
-```
-
-Expected: FAIL — `CopilotTurnCommand` not importable
-
-- [x] **Step 3: Add CopilotTurnCommand to chat_commands.py**
-
-Import `ParsedCopilotExtension` from `chat_protocol`:
-
-```python
-from app.websocket.chat_protocol import ParsedChatExtension, ParsedCopilotExtension, ParsedChatStartFrame
-```
-
-Add new command after `ChatRunTurnCommand`:
-
-```python
-@dataclass(frozen=True)
-class CopilotTurnCommand(StandardChatTurnCommand):
-    """Command for a Copilot turn, extending the standard command."""
-
-    run_id: str | None = None
-    graph_context: dict[str, Any] = field(default_factory=dict)
-    conversation_history: list[dict[str, Any]] = field(default_factory=list)
-    mode: str = "deepagents"
-```
-
-Add `field` to imports: `from dataclasses import dataclass, field`.
-
-Update union: `ChatTurnCommand = StandardChatTurnCommand | SkillCreatorTurnCommand | ChatRunTurnCommand | CopilotTurnCommand`
-
-Add branch in `build_command_from_parsed_frame` — **after** `extension is None` check, **before** `isinstance(extension, ParsedChatExtension)`:
-
-```python
-if isinstance(extension, ParsedCopilotExtension):
-    return CopilotTurnCommand(
-        request_id=frame.request_id,
-        message=frame.input.message,
-        thread_id=frame.thread_id,
-        graph_id=frame.graph_id,
-        model=model,
-        metadata=metadata,
-        files=files,
-        run_id=extension.run_id,
-        graph_context=extension.graph_context,
-        conversation_history=extension.conversation_history,
-        mode=extension.mode,
-    )
-```
-
-- [x] **Step 4: Run tests — verify they pass**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_chat_commands_copilot.py -v --no-header
-```
-
-Expected: 3 passed
-
-- [x] **Step 5: Commit**
-
-```bash
-git add backend/app/websocket/chat_commands.py backend/tests/test_api/test_chat_commands_copilot.py
-git commit -m "feat: add CopilotTurnCommand and dispatch branch"
-```
-
----
-
-### Task 4: Turn Executor — execute_copilot_turn
-
-**Files:**
-- Modify: `backend/app/websocket/chat_turn_executor.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py` (if routing is there)
-
-**Reference:** `execute_standard_turn` in `chat_turn_executor.py` for the event loop pattern. `CopilotService._get_copilot_stream` in `copilot_service.py:87-152` for the stream source. `_consume_stream_and_publish_to_redis` in `copilot_service.py:949-987` for the event collection logic.
-
-- [x] **Step 1: Add CopilotTurnCommand to prepare_standard_turn**
-
-In `chat_turn_executor.py`, import `CopilotTurnCommand`:
-
-```python
-from app.websocket.chat_commands import ChatRunTurnCommand, ChatTurnCommand, CopilotTurnCommand, SkillCreatorTurnCommand
-```
-
-Add branch in `prepare_standard_turn` after the `ChatRunTurnCommand` branch:
-
-```python
-elif isinstance(command, CopilotTurnCommand):
-    run_id = self._parse_uuid(command.run_id)
-    persist_on_disconnect = run_id is not None
-```
-
-- [x] **Step 2: Write execute_copilot_turn method**
-
-Add new method to `ChatTurnExecutor`. This is the core migration — it replaces `generate_actions_async` + Redis Pub/Sub with direct `_emit_event` calls.
-
-```python
-async def execute_copilot_turn(
-    self,
-    request_id: str,
-    payload: ChatRequest,
-    graph_context: dict[str, Any],
-    conversation_history: list[dict[str, Any]],
-    mode: str,
-) -> None:
-    """Execute a copilot turn: consume CopilotService stream and emit events."""
-    from app.core.trace_context import set_trace_id
-
-    set_trace_id(request_id)
-    handler = self._handler
-    module = self._module
-    thread_id: str | None = None
-    task_entry = handler._task_supervisor.get(request_id)
-    agent_run_id = task_entry.run_id if task_entry else None
-    tolerate_disconnect = bool(task_entry and task_entry.persist_on_disconnect)
-    assistant_message_id = f"msg-assistant-{uuid_lib.uuid4()}"
-
-    # Collection vars for graph persistence
-    final_message = ""
-    final_actions: list[dict[str, Any]] = []
-
-    try:
-        async with module.AsyncSessionLocal() as db:
-            # Get or create thread for this copilot turn
-            thread_id, _ = await module.get_or_create_conversation(
-                payload.thread_id,
-                payload.message,
-                handler.user_id,
-                payload.metadata,
-                db,
-            )
-            await module.save_user_message(thread_id, payload.message, payload.metadata, db)
-
-        current_task = asyncio.current_task()
-        if current_task is None:
-            raise RuntimeError("missing current asyncio task")
-        if handler._task_supervisor.get(request_id) is None:
-            from app.websocket.chat_task_supervisor import ChatTaskEntry
-            handler._task_supervisor.register(
-                request_id,
-                ChatTaskEntry(
-                    request_id=request_id,
-                    thread_id=thread_id,
-                    task=current_task,
-                    run_id=agent_run_id,
-                    persist_on_disconnect=tolerate_disconnect,
-                ),
-            )
-        else:
-            handler._task_supervisor.update(
-                request_id,
-                thread_id=thread_id,
-                task=current_task,
-                run_id=agent_run_id,
-                persist_on_disconnect=tolerate_disconnect,
-            )
-        await module.task_manager.register_task(thread_id, current_task)
-
-        # Start heartbeat if persisted run
-        if agent_run_id is not None:
-            await handler._mark_run_status(
-                run_id=agent_run_id,
-                status=AgentRunStatus.RUNNING,
-                runtime_owner_id=handler._runtime_owner_id,
-            )
-            heartbeat_task = asyncio.create_task(
-                handler._run_persisted_run_heartbeat(agent_run_id),
-                name=f"run-heartbeat:{agent_run_id}",
-            )
-            handler._task_supervisor.update(request_id, heartbeat_task=heartbeat_task)
-
-        # Emit accepted
-        await handler._send(
-            {
-                "type": "accepted",
-                "request_id": request_id,
-                "thread_id": thread_id,
-                "run_id": str(agent_run_id) if agent_run_id is not None else None,
-                "timestamp": int(time.time() * 1000),
-                "data": {"status": "accepted"},
-            },
-            tolerate_disconnect=tolerate_disconnect,
-        )
-
-        # Create CopilotService and get stream
-        from app.services.copilot_service import CopilotService
-        async with module.AsyncSessionLocal() as db:
-            # payload.model carries the frontend-selected model (e.g. "anthropic:claude-3-7-sonnet")
-            service = CopilotService(
-                user_id=handler.user_id,
-                llm_model=payload.model if hasattr(payload, "model") else None,
-                db=db,
-            )
-            stream = service._get_copilot_stream(
-                prompt=payload.message,
-                graph_context=graph_context,
-                conversation_history=conversation_history,
-                mode=mode,
-                graph_id=str(payload.graph_id) if payload.graph_id else None,
-            )
-
-            async for event in stream:
-                if await module.task_manager.is_stopped(thread_id):
-                    break
-
-                event_type = event.get("type", "")
-
-                # Collect for persistence
-                if event_type == "result":
-                    final_message = event.get("message", "")
-                    final_actions = event.get("actions", [])
-
-                # Emit to WS + run events
-                await handler._emit_event(
-                    {
-                        "type": event_type,
-                        "thread_id": thread_id,
-                        "node_name": "copilot",
-                        "timestamp": int(time.time() * 1000),
-                        "data": event,
-                    },
-                    request_id=request_id,
-                    tolerate_disconnect=tolerate_disconnect,
-                    agent_run_id=agent_run_id,
-                    assistant_message_id=assistant_message_id,
-                )
-
-        # Persist graph changes
-        # _persist_graph_from_actions creates its own DB session internally,
-        # so we only need user_id set on the service.
-        if payload.graph_id and final_actions:
-            persist_service = CopilotService(user_id=handler.user_id)
-            await persist_service._persist_graph_from_actions(
-                graph_id=str(payload.graph_id),
-                final_actions=final_actions,
-            )
-
-        # Emit done
-        await handler._emit_event(
-            {
-                "type": "done",
-                "thread_id": thread_id,
-                "node_name": "copilot",
-                "timestamp": int(time.time() * 1000),
-                "data": {},
-            },
-            request_id=request_id,
-            tolerate_disconnect=tolerate_disconnect,
-            agent_run_id=agent_run_id,
-            assistant_message_id=assistant_message_id,
-        )
-
-    except asyncio.CancelledError:
-        try:
-            await handler._emit_event(
-                {
-                    "type": "done",
-                    "thread_id": thread_id or "",
-                    "node_name": "copilot",
-                    "timestamp": int(time.time() * 1000),
-                    "data": {},
-                },
-                request_id=request_id,
-                tolerate_disconnect=tolerate_disconnect,
-                agent_run_id=agent_run_id,
-                assistant_message_id=assistant_message_id,
-            )
-        except Exception:
-            _logger.debug("error during copilot turn cleanup", exc_info=True)
-        raise
-    except Exception as exc:
-        error_data: dict[str, object] = {"message": str(exc)}
-        if isinstance(exc, ModelConfigError):
-            error_data["error_code"] = exc.error_code
-            error_data["params"] = exc.params
-        await handler._emit_event(
-            {
-                "type": "error",
-                "thread_id": thread_id or "",
-                "node_name": "copilot",
-                "timestamp": int(time.time() * 1000),
-                "data": error_data,
-            },
-            request_id=request_id,
-            tolerate_disconnect=tolerate_disconnect,
-            agent_run_id=agent_run_id,
-            assistant_message_id=assistant_message_id,
-        )
-        await handler._emit_event(
-            {
-                "type": "done",
-                "thread_id": thread_id or "",
-                "node_name": "copilot",
-                "timestamp": int(time.time() * 1000),
-                "data": {},
-            },
-            request_id=request_id,
-            tolerate_disconnect=tolerate_disconnect,
-            agent_run_id=agent_run_id,
-            assistant_message_id=assistant_message_id,
-        )
-    finally:
-        await handler._finalize_task(
-            request_id=request_id,
-            thread_id=thread_id,
-            state=None,
-            built_graph=None,
-            artifact_collector=None,
-            graph_id=str(payload.graph_id) if payload.graph_id else None,
-            workspace_id=None,
-            graph_name=None,
-        )
-```
-
-Note: Add required imports at the top: `from typing import Any` (if not present), ensure `asyncio`, `time`, `uuid_lib` are imported.
-
-- [x] **Step 3: Route CopilotTurnCommand in run_standard_turn or handler**
-
-In `ChatTurnExecutor.run_standard_turn`, add a check:
-
-```python
-async def run_standard_turn(self, prepared: PreparedStandardTurn) -> None:
-    run_chat_turn = getattr(self._handler, "_run_chat_turn", None)
-    if not callable(run_chat_turn):
-        run_chat_turn = self.execute_standard_turn
-    await run_chat_turn(request_id=prepared.request_id, payload=prepared.payload)
-```
-
-This method currently does not differentiate by command type. The routing needs to happen at the call site. Check `chat_ws_handler.py` for where `run_standard_turn` is called and add copilot dispatch there.
-
-In `chat_ws_handler.py`, find where `_turn_executor.run_standard_turn(prepared)` is called. Before that call, add:
-
-```python
-if isinstance(command, CopilotTurnCommand):
-    await self._turn_executor.execute_copilot_turn(
-        request_id=prepared.request_id,
-        payload=prepared.payload,
-        graph_context=command.graph_context,
-        conversation_history=command.conversation_history,
-        mode=command.mode,
-    )
-    return
-```
-
-Import `CopilotTurnCommand` in `chat_ws_handler.py`.
-
-- [x] **Step 4: Verify syntax**
-
-```bash
-cd backend && python -m py_compile app/websocket/chat_turn_executor.py && python -m py_compile app/websocket/chat_ws_handler.py && echo "OK"
-```
-
-Expected: OK
-
-- [x] **Step 5: Run all existing tests to verify no regressions**
-
-```bash
-cd backend && python -m pytest tests/test_services/test_copilot_run_reducer.py tests/test_api/test_chat_protocol_copilot_extension.py tests/test_api/test_chat_commands_copilot.py -v --no-header
-```
-
-Expected: All pass (20+)
-
-- [x] **Step 6: Commit**
-
-```bash
-git add backend/app/websocket/chat_turn_executor.py backend/app/websocket/chat_ws_handler.py
-git commit -m "feat: add execute_copilot_turn and WS handler routing"
-```
-
----
-
-### Task 5: Frontend Types & Serialization
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/types.ts`
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-
-- [x] **Step 1: Add CopilotExtension interface**
-
-In `frontend/lib/ws/chat/types.ts`, add after the `ChatExtension` interface:
-
-```typescript
-export interface CopilotExtension {
-  kind: 'copilot'
-  runId?: string | null
-  graphContext: Record<string, unknown>
-  conversationHistory: Array<Record<string, unknown>>
-  mode: string
-}
-```
-
-Widen the `ChatSendParams.extension` type:
-
-```typescript
-extension?: SkillCreatorExtension | ChatExtension | CopilotExtension | null
-```
-
-- [x] **Step 2: Add copilot branch in serializeExtension**
-
-In `frontend/lib/ws/chat/chatWsClient.ts`, import `CopilotExtension`:
-
-```typescript
-import type {
-  ChatExtension,
-  ChatResumeParams,
-  ChatSendParams,
-  ChatTerminalResult,
-  ChatWsClient,
-  ConnectionState,
-  CopilotExtension,
-  IncomingChatAcceptedEvent,
-  IncomingChatWsEvent,
-  SkillCreatorExtension,
-} from './types'
-```
-
-Update `serializeExtension` signature to include `CopilotExtension`:
-
-```typescript
-function serializeExtension(extension?: SkillCreatorExtension | ChatExtension | CopilotExtension | null): Record<string, unknown> | null {
-```
-
-Add copilot branch after the `chat` branch:
-
-```typescript
-  if (extension.kind === 'copilot') {
-    return {
-      kind: extension.kind,
-      run_id: extension.runId ?? null,
-      graph_context: extension.graphContext,
-      conversation_history: extension.conversationHistory,
-      mode: extension.mode,
-    }
-  }
-```
-
-- [x] **Step 3: Verify TypeScript compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30
-```
-
-Expected: No errors related to types.ts or chatWsClient.ts
-
-- [x] **Step 4: Commit**
-
-```bash
-git add frontend/lib/ws/chat/types.ts frontend/lib/ws/chat/chatWsClient.ts
-git commit -m "feat: add CopilotExtension type and WS serialization"
-```
-
----
-
-### Task 6: Frontend Copilot Hooks Migration
-
-**Files:**
-- Modify: `frontend/hooks/copilot/useCopilotSession.ts`
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotState.ts`
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotActions.ts`
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotWebSocketHandler.ts`
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotEffects.ts`
-
-**Reference:** Design spec section 4 (Frontend Changes). Existing `useChatWebSocket.ts:412-487` for the `sendMessage` pattern with `runService.createRun` + `getChatWsClient().sendChat`.
-
-#### 6a: Migrate useCopilotSession (session_id → run_id)
-
-- [x] **Step 1: Rename session to run in useCopilotSession**
-
-Replace `useCopilotSession` to use `run_id` instead of `session_id`. The localStorage key changes from `copilot_session_{graphId}` to `copilot_run_{graphId}`:
-
-```typescript
-import { useState, useEffect, useRef, useCallback } from 'react'
-
-export function useCopilotSession(graphId?: string) {
-  const [currentRunId, setCurrentRunId] = useState<string | null>(null)
-  const hasProcessedUrlInputRef = useRef(false)
-
-  useEffect(() => {
-    if (!graphId) return
-    const storedRunId = localStorage.getItem(`copilot_run_${graphId}`)
-    if (storedRunId) {
-      // eslint-disable-next-line react-hooks/set-state-in-effect
-      setCurrentRunId(storedRunId)
-    }
-  }, [graphId])
-
-  const setSession = useCallback(
-    (runId: string) => {
-      setCurrentRunId(runId)
-      if (graphId) {
-        localStorage.setItem(`copilot_run_${graphId}`, runId)
-      }
-    },
-    [graphId],
-  )
-
-  const clearSession = useCallback(() => {
-    setCurrentRunId(null)
-    if (graphId) {
-      localStorage.removeItem(`copilot_run_${graphId}`)
-    }
-  }, [graphId])
-
-  return {
-    currentRunId,
-    hasProcessedUrlInputRef,
-    setSession,
-    clearSession,
-  }
-}
-```
-
-Note: Downstream consumers that read `currentSessionId` must be updated to read `currentRunId`. Specifically, update `useCopilotState.ts`:
-
-In `frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotState.ts`:
-
-1. In the `CopilotState` interface, rename `currentSessionId: string | null` → `currentRunId: string | null`
-2. In the state assembly (where `currentSessionId: sessionHook.currentSessionId`), rename to `currentRunId: sessionHook.currentRunId`
-3. Update any component that destructures `currentSessionId` from state
-
-The property rename is `currentSessionId` → `currentRunId` throughout.
-
-- [x] **Step 2: Verify compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | grep -i "copilotSession\|currentSessionId\|copilot_session" | head -20
-```
-
-Fix any remaining references to `currentSessionId` in files that consume the hook.
-
-- [x] **Step 3: Commit**
-
-```bash
-git add frontend/hooks/copilot/useCopilotSession.ts
-git commit -m "refactor: rename copilot session_id to run_id in useCopilotSession"
-```
-
-#### 6b: Migrate useCopilotActions (createCopilotTask → runService + sendChat)
-
-- [x] **Step 4: Rewrite handleSendWithInput**
-
-In `useCopilotActions.ts`, replace `copilotService.createCopilotTask` with `runService.createRun` + `getChatWsClient().sendChat`. The key changes:
-
-1. Import `runService` and `getChatWsClient`:
-
-```typescript
-import { runService } from '@/services/runService'
-import { getChatWsClient } from '@/lib/ws/chat/chatWsClient'
-import type { CopilotExtension } from '@/lib/ws/chat/types'
-import type { ChatStreamEvent } from '@/services/chatBackend'
-```
-
-2. Remove `copilotService` import. Keep `copilotService.convertConversationHistory` import (it stays) or inline the import:
-
-```typescript
-import { copilotService } from '@/services/copilotService'
-```
-
-This import is still needed for `convertConversationHistory` and `clearHistory`.
-
-3. Add `onCopilotEvent` callback parameter to the hook options:
-
-```typescript
-interface UseCopilotActionsOptions {
-  state: CopilotState
-  actions: CopilotActions
-  refs: CopilotRefs
-  graphId?: string
-  copilotMode?: CopilotMode
-  selectedModel?: string
-  onCopilotEvent?: (evt: ChatStreamEvent) => void
-}
-```
-
-4. Rewrite `handleSendWithInput`:
-
-```typescript
-const handleSendWithInput = useCallback(
-  async (userText: string) => {
-    if (!userText.trim() || state.loading || !refs.isMountedRef.current) return
-
-    actions.setInput('')
-    actions.addMessage({ role: 'user', text: userText })
-
-    if (!refs.isMountedRef.current) return
-    actions.setLoading(true)
-    actions.clearStreaming()
-
-    refs.isCreatingSessionRef.current = true
-    actions.clearSession()
-
-    const graphContext = getGraphContext()
-    const storeGraphId = useBuilderStore.getState().graphId
-
-    if (!storeGraphId) {
-      console.error('[CopilotPanel] No graphId in store')
-      if (refs.isMountedRef.current) {
-        actions.setLoading(false)
-      }
-      return
-    }
-
-    try {
-      const historyMessages = copilotService.convertConversationHistory(state.messages)
-
-      // 1. Create run via Run Center
-      let runId: string | null = null
-      try {
-        const runResponse = await runService.createRun({
-          agent_name: 'copilot',
-          graph_id: graphId || storeGraphId,
-          message: userText,
-        })
-        runId = runResponse.run_id
-      } catch (err) {
-        console.warn('[Copilot] Failed to create run, proceeding without persistence', err)
-      }
-
-      if (!refs.isMountedRef.current) return
-
-      // Save run_id
-      if (runId) {
-        actions.setSession(runId)
-      }
-
-      actions.setCurrentStage({ stage: 'thinking', message: 'Connecting...' })
-      actions.setThinkingMessage()
-
-      // 2. Send via shared chat WS
-      const extension: CopilotExtension = {
-        kind: 'copilot',
-        runId,
-        graphContext,
-        conversationHistory: historyMessages as Array<Record<string, unknown>>,
-        mode: copilotMode,
-      }
-
-      await getChatWsClient().sendChat({
-        input: {
-          message: userText,
-          model: selectedModel,
-        },
-        graphId: graphId || storeGraphId,
-        extension,
-        onEvent: (evt) => onCopilotEvent?.(evt),
-      })
-    } catch (e: unknown) {
-      console.error('[CopilotPanel] Failed to send copilot message:', e)
-
-      if (!refs.isMountedRef.current) return
-
-      actions.setLoading(false)
-      actions.clearStreaming()
-
-      let errorMessage = t('workspace.couldNotProcessRequest')
-
-      if (e && typeof e === 'object') {
-        const error = e as { response?: { status?: number }; message?: string }
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          errorMessage = t('workspace.copilot.error.auth', {
-            defaultValue: 'Authentication error. Please check your credentials.',
-          })
-        } else if (error.message?.includes('fetch') || error.message?.includes('network')) {
-          errorMessage = t('workspace.copilot.error.network', {
-            defaultValue: 'Network error. Please check your connection and try again.',
-          })
-        }
-      }
-
-      actions.finalizeCurrentMessage(`${t('workspace.systemError')}: ${errorMessage}`)
-      refs.isCreatingSessionRef.current = false
-      actions.clearSession()
-    }
-  },
-  [state.loading, state.messages, actions, refs, graphId, copilotMode, selectedModel, getGraphContext, t, onCopilotEvent],
-)
-```
-
-5. Update `handleStop` to use chat WS stop:
-
-```typescript
-const handleStop = useCallback(() => {
-  // Stop via shared chat WS (requestId tracked internally by WS client)
-  // The WS client will emit done/error which triggers cleanup via onDone callback
-  actions.clearSession()
-
-  if (!refs.isMountedRef.current) return
-  actions.setLoading(false)
-  actions.clearStreaming()
-
-  refs.isCreatingSessionRef.current = false
-  actions.removeCurrentMessage()
-  actions.addMessage({ role: 'model', text: t('workspace.requestCancelled') })
-}, [actions, refs, t])
-```
-
-- [x] **Step 5: Verify compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | grep -i "copilotActions\|useCopilotActions" | head -20
-```
-
-- [x] **Step 6: Commit**
-
-```bash
-git add frontend/app/workspace/*/[agentId]/hooks/useCopilotActions.ts
-git commit -m "feat: migrate useCopilotActions to Run Center + chat WS"
-```
-
-#### 6c: Migrate useCopilotWebSocketHandler (receive from chat WS onEvent)
-
-- [x] **Step 7: Wire copilot callbacks to chat WS events**
-
-The `useCopilotWebSocketHandler` currently defines callbacks (`onStatus`, `onContent`, etc.) that are consumed by `use-copilot-websocket.ts`. After migration, these same callbacks are invoked by `handleCopilotEvent` which receives `ChatStreamEvent` from the chat WS `onEvent`.
-
-Add a new `handleCopilotEvent` function that the parent can pass as `onCopilotEvent` to `useCopilotActions`:
-
-```typescript
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-// Add to the returned object from useCopilotWebSocketHandler:
-const handleCopilotEvent = useCallback(
-  (evt: ChatStreamEvent) => {
-    const data = evt.data as Record<string, unknown> | undefined
-    if (!data) return
-    const type = data.type as string | undefined
-    if (!type) return
-
-    switch (type) {
-      case 'status':
-        callbacks.onStatus(data.stage as string, data.message as string)
-        break
-      case 'content':
-        callbacks.onContent(data.content as string)
-        break
-      case 'thought_step':
-        callbacks.onThoughtStep?.(data.step as { index: number; content: string })
-        break
-      case 'tool_call':
-        callbacks.onToolCall(data.tool as string, data.input as Record<string, unknown>)
-        break
-      case 'tool_result':
-        callbacks.onToolResult(data.action as { type: string; payload: Record<string, unknown>; reasoning?: string })
-        break
-      case 'result':
-        callbacks.onResult?.({
-          message: (data.message as string) ?? '',
-          actions: data.actions as Array<{ type: string; payload: Record<string, unknown>; reasoning?: string }> | undefined,
-        })
-        break
-      case 'error':
-        callbacks.onError((data.message as string) ?? 'Unknown error')
-        break
-      case 'done':
-        callbacks.onDone?.()
-        break
-    }
-  },
-  [callbacks],
-)
-
-// Return it alongside callbacks:
-return { ...callbacks, handleCopilotEvent }
-```
-
-- [x] **Step 8: Verify compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | grep -i "WebSocketHandler" | head -20
-```
-
-- [x] **Step 9: Commit**
-
-```bash
-git add frontend/app/workspace/*/[agentId]/hooks/useCopilotWebSocketHandler.ts
-git commit -m "feat: add handleCopilotEvent bridge in useCopilotWebSocketHandler"
-```
-
-#### 6d: Migrate useCopilotEffects (session recovery → run snapshot)
-
-- [x] **Step 10: Replace session recovery with run snapshot**
-
-In `useCopilotEffects.ts`, replace `copilotService.getSession(sessionId)` with `runService.getRunSnapshot(runId)`:
-
-```typescript
-import { runService } from '@/services/runService'
-```
-
-Remove `import { copilotService } from '@/services/copilotService'`.
-
-Replace the session recovery effect. The state now uses `currentRunId` (from step 1):
-
-```typescript
-// Session recovery: restore state from run snapshot when runId is restored
-useEffect(() => {
-  const currentRunId = state.currentRunId  // was state.currentSessionId
-  if (
-    !currentRunId ||
-    refs.isCreatingSessionRef.current ||
-    lastRestoredSessionIdRef.current === currentRunId
-  )
-    return
-
-  const restoreSession = async () => {
-    console.warn('[useCopilotEffects] Restoring from run snapshot:', currentRunId)
-    lastRestoredSessionIdRef.current = currentRunId
-
-    try {
-      actions.setLoading(true)
-      const snapshot = await runService.getRunSnapshot(currentRunId)
-      if (!refs.isMountedRef.current) return
-
-      if (!snapshot) {
-        actions.clearSession()
-        return
-      }
-
-      const projection = snapshot.projection as Record<string, unknown> | undefined
-      const status = snapshot.status as string
-
-      if (status === 'running' || status === 'queued') {
-        // Run still active — show last known state
-        if (projection) {
-          const content = projection.content as string | undefined
-          if (content) {
-            actions.setStreamingContent(content)
-          }
-          const stage = projection.stage as string | undefined
-          actions.setCurrentStage({ stage: (stage || 'processing') as any, message: 'Processing...' })
-          if (!hasCurrentMessage(state.messages, false)) actions.setThinkingMessage()
-        }
-        // TODO: subscribe to /ws/runs for live event replay (future enhancement)
-      } else if (status === 'completed') {
-        if (projection) {
-          const resultMessage = (projection.result_message as string) ?? ''
-          const resultActions = projection.result_actions as Array<Record<string, unknown>> | undefined
-          if (resultMessage || (resultActions && resultActions.length > 0)) {
-            actions.finalizeCurrentMessage(resultMessage, resultActions as any)
-          }
-        }
-        actions.clearSession()
-        actions.clearStreaming()
-      } else if (status === 'failed') {
-        toast({
-          title: 'Copilot task failed',
-          description: (projection?.error as string) || 'An error occurred during execution. Please retry.',
-          variant: 'destructive',
-        })
-        actions.clearSession()
-      }
-    } catch (error) {
-      console.warn('[CopilotPanel] Failed to restore from run snapshot:', error)
-    } finally {
-      if (refs.isMountedRef.current) actions.setLoading(false)
-    }
-  }
-
-  restoreSession()
-// eslint-disable-next-line react-hooks/exhaustive-deps
-}, [state.currentRunId, actions, refs])
-```
-
-Note: The `state.currentSessionId` reference must be updated to `state.currentRunId` — this depends on the `useCopilotState` type also being updated from step 1.
-
-- [x] **Step 11: Verify compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | grep -i "copilotEffects\|useCopilotEffects" | head -20
-```
-
-- [x] **Step 12: Commit**
-
-```bash
-git add frontend/app/workspace/*/[agentId]/hooks/useCopilotEffects.ts
-git commit -m "feat: migrate copilot session recovery to run snapshot"
-```
-
----
-
-### Task 7: History API Rewrite
-
-**Files:**
-- Modify: `backend/app/api/v1/graphs.py` (GET/DELETE copilot/history endpoints)
-- Modify: `backend/app/repositories/agent_run.py` (add graph_id filter + bulk delete)
-- Test: `backend/tests/test_api/test_copilot_history_from_runs.py`
-
-**Reference:** Design spec section 5 (History API Rewrite). Existing `agent_run.py:93-113` for `list_recent_runs_for_user`. The response format must match existing `CopilotHistoryResponse` so frontend `useCopilotHistory` is unchanged.
-
-- [x] **Step 1: Write the failing tests**
-
-Create `backend/tests/test_api/test_copilot_history_from_runs.py`:
-
-```python
-"""Tests for copilot history built from agent_run snapshots."""
-
-import pytest
-from unittest.mock import AsyncMock, MagicMock, patch
-from datetime import datetime, timezone
-import uuid
-
-
-def _make_run(*, graph_id: str, title: str, status: str = "completed") -> MagicMock:
-    run = MagicMock()
-    run.id = uuid.uuid4()
-    run.graph_id = uuid.UUID(graph_id)
-    run.title = title
-    run.status = status
-    run.created_at = datetime(2026, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
-    run.updated_at = datetime(2026, 1, 1, 0, 1, 0, tzinfo=timezone.utc)
-    return run
-
-
-def _make_snapshot(*, result_message: str, result_actions: list | None = None,
-                   thought_steps: list | None = None, tool_calls: list | None = None) -> MagicMock:
-    snap = MagicMock()
-    snap.projection = {
-        "result_message": result_message,
-        "result_actions": result_actions or [],
-        "content": "",
-        "thought_steps": thought_steps or [],
-        "tool_calls": tool_calls or [],
-    }
-    return snap
-
-
-def test_build_history_messages_from_runs():
-    """History messages are assembled from run title + snapshot projection."""
-    graph_id = str(uuid.uuid4())
-    runs = [
-        _make_run(graph_id=graph_id, title="Hello"),
-        _make_run(graph_id=graph_id, title="Build RAG"),
-    ]
-    snapshots = [
-        _make_snapshot(result_message="Hi! How can I help?"),
-        _make_snapshot(result_message="Here is your RAG pipeline.", result_actions=[{"type": "add_node", "payload": {}}]),
-    ]
-
-    # Build messages the same way the endpoint does
-    messages = []
-    for run, snap in zip(reversed(runs), reversed(snapshots)):
-        messages.append({
-            "role": "user",
-            "content": run.title or "",
-            "created_at": run.created_at.isoformat(),
-        })
-        p = snap.projection
-        messages.append({
-            "role": "assistant",
-            "content": p.get("result_message") or p.get("content", ""),
-            "created_at": run.updated_at.isoformat(),
-            "actions": p.get("result_actions", []),
-            "thought_steps": p.get("thought_steps", []),
-            "tool_calls": p.get("tool_calls", []),
-        })
-
-    assert len(messages) == 4
-    assert messages[0]["role"] == "user"
-    assert messages[0]["content"] == "Hello"
-    assert messages[1]["role"] == "assistant"
-    assert messages[1]["content"] == "Hi! How can I help?"
-    assert messages[2]["content"] == "Build RAG"
-    assert messages[3]["actions"] == [{"type": "add_node", "payload": {}}]
-
-
-def test_build_history_filters_by_graph_id():
-    """Only runs matching the requested graph_id are included."""
-    target_gid = str(uuid.uuid4())
-    other_gid = str(uuid.uuid4())
-    runs = [
-        _make_run(graph_id=target_gid, title="Match"),
-        _make_run(graph_id=other_gid, title="NoMatch"),
-    ]
-    filtered = [r for r in runs if str(r.graph_id) == target_gid]
-    assert len(filtered) == 1
-    assert filtered[0].title == "Match"
-
-
-def test_build_history_skips_runs_without_snapshot():
-    """Runs that have no snapshot are silently skipped."""
-    graph_id = str(uuid.uuid4())
-    runs = [_make_run(graph_id=graph_id, title="NoSnap")]
-    snapshot = None
-
-    messages = []
-    for run in reversed(runs):
-        if snapshot is None:
-            continue
-    assert len(messages) == 0
-```
-
-- [x] **Step 2: Run tests to verify they pass (unit logic)**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_copilot_history_from_runs.py -v --no-header
-```
-
-Expected: 3 passed
-
-- [x] **Step 3: Add graph_id filter to list_recent_runs_for_user**
-
-In `backend/app/repositories/agent_run.py`, add `graph_id` parameter to `list_recent_runs_for_user`:
-
-```python
-async def list_recent_runs_for_user(
-    self,
-    *,
-    user_id: str,
-    run_type: Optional[str] = None,
-    agent_name: Optional[str] = None,
-    status: Optional[str] = None,
-    search: Optional[str] = None,
-    graph_id: Optional[uuid.UUID] = None,
-    limit: int = 50,
-) -> Sequence[AgentRun]:
-    query = select(AgentRun).where(AgentRun.user_id == user_id)
-    if run_type:
-        query = query.where(AgentRun.run_type == run_type)
-    if agent_name:
-        query = query.where(AgentRun.agent_name == agent_name)
-    if status:
-        query = query.where(AgentRun.status == status)
-    if search:
-        query = query.where(AgentRun.title.ilike(f"%{search}%"))
-    if graph_id:
-        query = query.where(AgentRun.graph_id == graph_id)
-    result = await self.db.execute(query.order_by(desc(AgentRun.updated_at)).limit(limit))
-    return result.scalars().all()
-```
-
-- [x] **Step 4: Add delete_runs_for_graph method**
-
-In `backend/app/repositories/agent_run.py`, add a bulk delete method:
-
-```python
-from sqlalchemy import delete as sa_delete
-
-async def delete_runs_for_graph(
-    self,
-    *,
-    user_id: str,
-    agent_name: str,
-    graph_id: uuid.UUID,
-) -> int:
-    """Hard-delete all runs (and cascaded events/snapshots) for a graph."""
-    result = await self.db.execute(
-        sa_delete(AgentRun).where(
-            AgentRun.user_id == user_id,
-            AgentRun.agent_name == agent_name,
-            AgentRun.graph_id == graph_id,
-        )
-    )
-    await self.db.commit()
-    return result.rowcount
-```
-
-- [x] **Step 5: Rewrite GET copilot/history endpoint**
-
-In `backend/app/api/v1/graphs.py`, replace the `get_copilot_history` function body. The imports needed:
-
-```python
-from app.repositories.agent_run import AgentRunRepository
-```
-
-New implementation:
-
-```python
-@router.get("/{graph_id}/copilot/history")
-async def get_copilot_history(
-    request: Request,
-    graph_id: uuid.UUID,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-    log.info("copilot.history.get start")
-
-    graph_service = GraphService(db)
-    graph = await graph_service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-    await graph_service._ensure_access(graph, current_user, WorkspaceMemberRole.viewer)
-
-    repo = AgentRunRepository(db)
-    runs = await repo.list_recent_runs_for_user(
-        user_id=str(current_user.id),
-        agent_name="copilot",
-        graph_id=graph_id,
-        limit=100,
-    )
-
-    messages = []
-    for run in reversed(list(runs)):  # oldest first
-        snapshot = await repo.get_snapshot(run.id)
-        if not snapshot or not snapshot.projection:
-            continue
-        p = snapshot.projection
-        messages.append({
-            "role": "user",
-            "content": run.title or "",
-            "created_at": run.created_at.isoformat() if run.created_at else None,
-        })
-        messages.append({
-            "role": "assistant",
-            "content": p.get("result_message") or p.get("content", ""),
-            "created_at": run.updated_at.isoformat() if run.updated_at else None,
-            "actions": p.get("result_actions", []),
-            "thought_steps": p.get("thought_steps", []),
-            "tool_calls": p.get("tool_calls", []),
-        })
-
-    log.info(f"copilot.history.get success messages_count={len(messages)}")
-    return {"data": {"graph_id": str(graph_id), "messages": messages}}
-```
-
-- [x] **Step 6: Rewrite DELETE copilot/history endpoint**
-
-```python
-@router.delete("/{graph_id}/copilot/history")
-async def clear_copilot_history(
-    request: Request,
-    graph_id: uuid.UUID,
-    current_user: User = Depends(get_current_user),
-    db: AsyncSession = Depends(get_db),
-):
-    log = _bind_log(request, user_id=str(current_user.id), graph_id=str(graph_id))
-    log.info("copilot.history.clear start")
-
-    graph_service = GraphService(db)
-    graph = await graph_service.graph_repo.get(graph_id)
-    if not graph:
-        raise NotFoundException("Graph not found")
-    await graph_service._ensure_access(graph, current_user, WorkspaceMemberRole.member)
-
-    repo = AgentRunRepository(db)
-    deleted = await repo.delete_runs_for_graph(
-        user_id=str(current_user.id),
-        agent_name="copilot",
-        graph_id=graph_id,
-    )
-
-    log.info(f"copilot.history.clear success deleted={deleted}")
-    return {"success": True}
-```
-
-- [x] **Step 7: Verify syntax**
-
-```bash
-cd backend && python -m py_compile app/api/v1/graphs.py && python -m py_compile app/repositories/agent_run.py && echo "OK"
-```
-
-Expected: OK
-
-- [x] **Step 8: Run tests**
-
-```bash
-cd backend && python -m pytest tests/test_api/test_copilot_history_from_runs.py -v --no-header
-```
-
-Expected: 3 passed
-
-- [x] **Step 9: Commit**
-
-```bash
-git add backend/app/api/v1/graphs.py backend/app/repositories/agent_run.py backend/tests/test_api/test_copilot_history_from_runs.py
-git commit -m "feat: rewrite copilot history API to use agent_runs"
-```
-
----
-
-### Task 8: Run Center Visibility
-
-**Files:**
-- Modify: `frontend/lib/utils/runHelpers.ts`
-- Modify: `frontend/app/runs/[runId]/page.tsx`
-
-**Reference:** Design spec section 6 (Run Center Visibility). Existing `buildRunHref` in `runHelpers.ts:53-61` and `ChatTurnOverview` in `page.tsx`.
-
-- [x] **Step 1: Add copilot_turn case to buildRunHref**
-
-In `frontend/lib/utils/runHelpers.ts`, add a copilot branch before the fallback `return '#'`:
-
-```typescript
-export function buildRunHref(run: { run_id: string; run_type?: string; agent_name?: string | null }): string {
-  if (run.agent_name === 'skill_creator' || run.run_type === 'skill_creator') {
-    return `/skills/creator?run=${encodeURIComponent(run.run_id)}`
-  }
-  if (run.agent_name === 'chat' || run.run_type === 'chat_turn') {
-    return `/runs/${encodeURIComponent(run.run_id)}`
-  }
-  if (run.agent_name === 'copilot' || run.run_type === 'copilot_turn') {
-    return `/runs/${encodeURIComponent(run.run_id)}`
-  }
-  return '#'
-}
-```
-
-- [x] **Step 2: Add CopilotTurnOverview component**
-
-In `frontend/app/runs/[runId]/page.tsx`, add a `CopilotTurnOverview` component. This follows the same pattern as the existing `ChatTurnOverview`.
-
-Add the projection interface:
-
-```typescript
-interface CopilotTurnProjection {
-  run_type: string
-  status: string
-  stage?: string | null
-  content?: string
-  thought_steps?: Array<{ index: number; content: string }>
-  tool_calls?: Array<{ tool: string; input?: Record<string, unknown> }>
-  tool_results?: Array<{ type: string; payload: Record<string, unknown>; reasoning?: string }>
-  result_message?: string | null
-  result_actions?: Array<{ type: string; payload: Record<string, unknown>; reasoning?: string }>
-  error?: string | null
-  graph_id?: string | null
-  mode?: string | null
-}
-```
-
-Add the component:
-
-```typescript
-function CopilotTurnOverview({ projection, t }: { projection: CopilotTurnProjection; t: (key: string, fallback: string) => string }) {
-
-  return (
-    <div className="space-y-4">
-      {/* Stage indicator */}
-      {projection.stage && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.stage', 'Stage')}</p>
-          <p className="text-sm text-muted-foreground">{projection.stage}</p>
-        </div>
-      )}
-
-      {/* Mode */}
-      {projection.mode && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.mode', 'Mode')}</p>
-          <p className="text-sm text-muted-foreground">{projection.mode}</p>
-        </div>
-      )}
-
-      {/* Content */}
-      {projection.content && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.content', 'Content')}</p>
-          <p className="mt-1 whitespace-pre-wrap text-sm">{projection.content}</p>
-        </div>
-      )}
-
-      {/* Thought Steps (collapsible) */}
-      {projection.thought_steps && projection.thought_steps.length > 0 && (
-        <details className="rounded-md border p-3">
-          <summary className="cursor-pointer text-sm font-medium">
-            {t('runs.thoughtSteps', 'Thought Steps')} ({projection.thought_steps.length})
-          </summary>
-          <div className="mt-2 space-y-2">
-            {projection.thought_steps.map((step, i) => (
-              <div key={i} className="text-sm text-muted-foreground">
-                <span className="font-mono text-xs">#{step.index}</span> {step.content}
-              </div>
-            ))}
-          </div>
-        </details>
-      )}
-
-      {/* Tool Calls (collapsible) */}
-      {projection.tool_calls && projection.tool_calls.length > 0 && (
-        <details className="rounded-md border p-3">
-          <summary className="cursor-pointer text-sm font-medium">
-            {t('runs.toolCalls', 'Tool Calls')} ({projection.tool_calls.length})
-          </summary>
-          <div className="mt-2 space-y-2">
-            {projection.tool_calls.map((tc, i) => (
-              <div key={i} className="text-sm">
-                <span className="font-medium">{tc.tool}</span>
-                {tc.input && (
-                  <pre className="mt-1 overflow-x-auto text-xs text-muted-foreground">
-                    {JSON.stringify(tc.input, null, 2)}
-                  </pre>
-                )}
-              </div>
-            ))}
-          </div>
-        </details>
-      )}
-
-      {/* Result */}
-      {projection.result_message && (
-        <div className="rounded-md border border-green-200 bg-green-50 p-3 dark:border-green-800 dark:bg-green-950">
-          <p className="text-sm font-medium">{t('runs.result', 'Result')}</p>
-          <p className="mt-1 whitespace-pre-wrap text-sm">{projection.result_message}</p>
-          {projection.result_actions && projection.result_actions.length > 0 && (
-            <div className="mt-2">
-              <p className="text-xs font-medium text-muted-foreground">
-                {projection.result_actions.length} action(s)
-              </p>
-              {projection.result_actions.map((action, i) => (
-                <div key={i} className="mt-1 text-xs text-muted-foreground">
-                  {action.type}{action.reasoning ? ` — ${action.reasoning}` : ''}
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* Error */}
-      {projection.error && (
-        <div className="rounded-md border border-red-200 bg-red-50 p-3 dark:border-red-800 dark:bg-red-950">
-          <p className="text-sm font-medium text-red-700 dark:text-red-400">{t('runs.error', 'Error')}</p>
-          <p className="mt-1 text-sm text-red-600 dark:text-red-300">{projection.error}</p>
-        </div>
-      )}
-    </div>
-  )
-}
-```
-
-Then in the `RunDetailPage` component, add a `copilot_turn` branch alongside the existing `chat_turn` branch:
-
-```typescript
-{runType === 'copilot_turn' && projection && (
-  <CopilotTurnOverview projection={projection as CopilotTurnProjection} t={t} />
-)}
-```
-
-- [x] **Step 3: Verify TypeScript compilation**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30
-```
-
-Expected: No errors
-
-- [x] **Step 4: Commit**
-
-```bash
-git add frontend/lib/utils/runHelpers.ts frontend/app/runs/[runId]/page.tsx
-git commit -m "feat: add copilot_turn visibility in Run Center"
-```
-
----
-
-### Task 9: Delete Old Copilot Infrastructure
-
-**Files:**
-- Delete: `backend/app/websocket/copilot_handler.py`
-- Delete: `frontend/hooks/use-copilot-websocket.ts`
-- Modify: `backend/app/main.py` (remove `/ws/copilot` route + import)
-- Modify: `backend/app/core/redis.py` (remove ~12 copilot methods)
-- Modify: `backend/app/api/v1/graphs.py` (remove 3 endpoints)
-- Modify: `backend/app/services/copilot_service.py` (remove Redis/persist methods)
-- Modify: `frontend/services/copilotService.ts` (remove `createCopilotTask`, `getSession`)
-
-**Reference:** Design spec section 7 (Deleted Code).
-
-- [x] **Step 1: Delete copilot_handler.py**
-
-```bash
-rm backend/app/websocket/copilot_handler.py
-```
-
-- [x] **Step 2: Remove WS route from main.py**
-
-In `backend/app/main.py`, remove the import:
-
-```python
-from app.websocket.copilot_handler import copilot_handler
-```
-
-Remove the entire `/ws/copilot/{session_id}` endpoint (lines 340-357 approximately):
-
-```python
-@app.websocket("/ws/copilot/{session_id}")
-async def copilot_websocket_endpoint(websocket: WebSocket, session_id: str):
-    ...
-```
-
-- [x] **Step 3: Remove copilot Redis methods from redis.py**
-
-In `backend/app/core/redis.py`, delete the entire `# ==================== Copilot Session Methods ====================` block (lines 176-294 approximately). This removes:
-- `append_copilot_content`
-- `publish_copilot_event`
-- `set_copilot_status`
-- `set_copilot_error`
-- `get_copilot_status`
-- `get_copilot_error`
-- `get_copilot_content`
-- `set_copilot_result`
-- `get_copilot_result`
-- `get_copilot_session`
-- `cleanup_copilot_session`
-
-- [x] **Step 4: Remove old API endpoints from graphs.py**
-
-In `backend/app/api/v1/graphs.py`, delete these three endpoints entirely:
-- `POST /copilot/actions/create` (the `create_copilot_task` function)
-- `GET /copilot/sessions/{session_id}` (the `get_copilot_session` function)
-- `POST /{graph_id}/copilot/messages` (the `save_copilot_messages` function)
-
-Keep `POST /copilot/actions` (the sync non-streaming endpoint) — it's unchanged.
-Keep `GET /{graph_id}/copilot/history` and `DELETE /{graph_id}/copilot/history` — already rewritten in Task 7.
-
-Also remove now-unused imports: `BackgroundTasks`, `RedisClient` (if only used by copilot), `CopilotSessionStatus`, `CopilotRequest` etc. Check each import's usage before removing.
-
-- [x] **Step 5: Remove Redis/persist methods from copilot_service.py**
-
-In `backend/app/services/copilot_service.py`, delete these methods:
-- `generate_actions_async` (~160 lines)
-- `_consume_stream_and_publish_to_redis` (~40 lines)
-- `_persist_conversation` (if present)
-- `save_messages` (if present)
-- `save_conversation_from_stream` (if present)
-- `get_history_for_api` (now replaced by run-based history in graphs.py)
-- `clear_history` (now replaced by repo delete in graphs.py)
-
-Also remove imports used only by deleted methods: `RedisClient`, `CopilotSessionStatus`, `CopilotChatRepository`, etc.
-
-- [x] **Step 6: Delete frontend use-copilot-websocket.ts**
-
-```bash
-rm frontend/hooks/use-copilot-websocket.ts
-```
-
-Check for any remaining imports of `useCopilotWebSocket` or `use-copilot-websocket` and remove them:
-
-```bash
-cd frontend && grep -r "use-copilot-websocket\|useCopilotWebSocket" --include="*.ts" --include="*.tsx" -l
-```
-
-- [x] **Step 7: Remove createCopilotTask and getSession from copilotService.ts**
-
-In `frontend/services/copilotService.ts`, delete:
-- `createCopilotTask` method
-- `getSession` method
-
-Keep `clearHistory` and `convertConversationHistory` — they are still used.
-
-Remove now-unused imports (e.g., `apiGet` if only used by `getSession`).
-
-- [x] **Step 8: Verify syntax — backend**
-
-```bash
-cd backend && python -m py_compile app/main.py && python -m py_compile app/core/redis.py && python -m py_compile app/api/v1/graphs.py && python -m py_compile app/services/copilot_service.py && echo "OK"
-```
-
-Expected: OK
-
-- [x] **Step 9: Verify TypeScript — frontend**
-
-```bash
-cd frontend && npx tsc --noEmit --pretty 2>&1 | head -30
-```
-
-Expected: No errors
-
-- [x] **Step 10: Run all copilot tests**
-
-```bash
-cd backend && python -m pytest tests/ -k "copilot" -v --no-header
-```
-
-Expected: All pass (some old tests may need to be deleted — see step 11)
-
-- [x] **Step 11: Delete tests for removed code**
-
-Delete any test files that test removed functionality (copilot_handler tests, Redis copilot method tests, copilot_chat_repository tests). Grep for test files:
-
-```bash
-find backend/tests -name "*copilot*" -type f
-```
-
-Keep: `test_copilot_run_reducer.py`, `test_chat_protocol_copilot_extension.py`, `test_chat_commands_copilot.py`, `test_copilot_history_from_runs.py`.
-Delete any others that test removed Redis/WS/session code.
-
-- [x] **Step 12: Commit**
-
-```bash
-git add -A
-git commit -m "chore: delete old copilot infrastructure (Redis, WS handler, copilot_chats)"
-```
-
----
-
-### Task 10: Alembic Migration — Drop copilot_chats Table
-
-**Files:**
-- Create: `backend/alembic/versions/20260406_000000_drop_copilot_chats_table.py`
-- Modify: `backend/app/models/chat.py` (remove `CopilotChat` class)
-- Delete: `backend/app/repositories/copilot_chat_repository.py`
-
-**Reference:** Design spec section 7 (Deleted Code). Existing migration `20260405_000000_drop_graph_test_cases.py` for pattern.
-
-- [x] **Step 1: Delete CopilotChat model from chat.py**
-
-In `backend/app/models/chat.py`, remove the `CopilotChat` class definition (starting at line 50). Keep other models in the file.
-
-- [x] **Step 2: Delete copilot_chat_repository.py**
-
-```bash
-rm backend/app/repositories/copilot_chat_repository.py
-```
-
-Remove any imports of `CopilotChatRepository` from other files:
-
-```bash
-cd backend && grep -r "CopilotChatRepository\|copilot_chat_repository" --include="*.py" -l
-```
-
-Remove all found references.
-
-- [x] **Step 3: Create Alembic migration**
-
-Create `backend/alembic/versions/20260406_000000_drop_copilot_chats_table.py`:
-
-```python
-"""drop_copilot_chats_table
-
-Revision ID: a1b2c3d4e5f6
-Revises: 20260405_drop_graph_test_cases (find actual head)
-Create Date: 2026-04-06
-
-Drop the copilot_chats table. Copilot persistence is now handled by
-agent_runs / agent_run_events / agent_run_snapshots (Run Center).
-"""
-
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers — run `alembic heads` to get the correct down_revision
-revision: str = "a1b2c3d4e5f6"
-down_revision: Union[str, None] = None  # SET THIS from `alembic heads`
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    # Drop the index first (created by migration 000000000001)
-    op.drop_index("copilot_chats_agent_graph_id_idx", table_name="copilot_chats")
-    op.drop_table("copilot_chats")
-
-
-def downgrade() -> None:
-    # Recreate table for rollback
-    op.create_table(
-        "copilot_chats",
-        sa.Column("id", postgresql.UUID(as_uuid=True), primary_key=True),
-        sa.Column("user_id", sa.String, nullable=False),
-        sa.Column("agent_graph_id", sa.String, nullable=True),
-        sa.Column("messages", postgresql.JSONB, nullable=True, server_default="[]"),
-        sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.text("now()")),
-        sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.text("now()")),
-    )
-    op.create_index(
-        "copilot_chats_agent_graph_id_idx",
-        "copilot_chats",
-        ["agent_graph_id"],
-    )
-```
-
-**Important:** Before committing, run `alembic heads` to get the correct `down_revision` value and update it. Also verify the `copilot_chats` table columns match what's in the model — adjust the `downgrade` schema if needed.
-
-- [x] **Step 4: Generate correct revision chain**
-
-```bash
-cd backend && alembic heads
-```
-
-Set `down_revision` to the output head revision. Alternatively, auto-generate:
-
-```bash
-cd backend && alembic revision --autogenerate -m "drop_copilot_chats_table" --rev-id "a1b2c3d4e5f6"
-```
-
-If auto-generate works, use the generated file instead.
-
-- [x] **Step 5: Verify migration syntax**
-
-```bash
-cd backend && python -m py_compile alembic/versions/20260406_000000_drop_copilot_chats_table.py && echo "OK"
-```
-
-Expected: OK
-
-- [x] **Step 6: Verify the full model compiles**
-
-```bash
-cd backend && python -m py_compile app/models/chat.py && echo "OK"
-```
-
-Expected: OK
-
-- [x] **Step 7: Run all tests**
-
-```bash
-cd backend && python -m pytest tests/ -k "copilot" -v --no-header
-```
-
-Expected: All new tests pass, no old tests fail (they should have been deleted in Task 9)
-
-- [x] **Step 8: Commit**
-
-```bash
-git add -A
-git commit -m "chore: drop copilot_chats table via Alembic migration"
-```
-
----
-
-## Manual Verification Checklist
-
-After all tasks are completed, verify the following end-to-end:
-
-1. **Send copilot message** → Full event stream flows: status → content → thought_step → tool_call → result → done
-2. **Page refresh during execution** → Run snapshot restores last known state
-3. **Run Center `/runs`** → Copilot runs visible with `copilot_turn` type, clicking opens overview
-4. **`GET copilot/history`** → Returns history assembled from run snapshots
-5. **`DELETE copilot/history`** → Clears copilot runs for graph
-6. **Stop mid-execution** → `chat.stop` frame cleanly interrupts
-7. **No Redis dependency** → Copilot works even if Redis is down (run center uses PostgreSQL)
-8. **Old endpoints removed** → `POST /copilot/actions/create`, `GET /copilot/sessions/{id}`, `/ws/copilot/{id}` all return 404
diff --git a/docs/superpowers/plans/2026-04-06-ws-layer-cleanup-unification.md b/docs/superpowers/plans/2026-04-06-ws-layer-cleanup-unification.md
deleted file mode 100644
index 9fd65fbf5..000000000
--- a/docs/superpowers/plans/2026-04-06-ws-layer-cleanup-unification.md
+++ /dev/null
@@ -1,1269 +0,0 @@
-# WebSocket Layer Cleanup & Unification Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Unify frontend WS clients into a shared base class, clean up dead code, standardize auth and naming across the communication layer.
-
-**Architecture:** Extract `BaseWsClient` abstract class from duplicated chat/runs/notification WS clients. Migrate each client incrementally. Remove legacy backend endpoints and protocol tombstones. Unify auth to ws-token for all WS connections.
-
-**Tech Stack:** TypeScript (frontend), Python/FastAPI (backend), WebSocket
-
-**Spec:** `docs/superpowers/specs/2026-04-06-ws-layer-cleanup-unification-design.md`
-
----
-
-### Task 1: Add RECONNECT constants to shared constants file
-
-**Files:**
-- Modify: `frontend/lib/ws/constants.ts`
-
-- [ ] **Step 1: Add RECONNECT constants**
-
-```typescript
-// Add after the HEARTBEAT export in frontend/lib/ws/constants.ts
-
-/** Reconnect configuration */
-export const RECONNECT = {
-  /** Maximum delay between reconnect attempts (ms) */
-  MAX_DELAY_MS: 15_000,
-  /** Default max reconnect attempts before giving up */
-  DEFAULT_MAX_ATTEMPTS: 20,
-} as const
-```
-
-- [ ] **Step 2: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/ws/constants.ts
-git commit -m "refactor: add RECONNECT constants to shared WS constants"
-```
-
----
-
-### Task 2: Create BaseWsClient abstract class
-
-**Files:**
-- Create: `frontend/lib/ws/base/BaseWsClient.ts`
-
-- [ ] **Step 1: Create the base directory and file**
-
-Create `frontend/lib/ws/base/BaseWsClient.ts` with the full abstract class:
-
-```typescript
-'use client'
-
-import { HEARTBEAT, RECONNECT, UNRECOVERABLE_CLOSE_CODES, WS_CLOSE_CODE } from '../constants'
-
-export interface BaseConnectionState {
-  isConnected: boolean
-  authExpired?: boolean
-}
-
-export type ReconnectStrategy = 'exponential' | 'fixed'
-
-export interface WsClientConfig {
-  /** null = unlimited reconnect attempts */
-  maxReconnectAttempts: number | null
-  maxReconnectDelayMs: number
-  reconnectStrategy: ReconnectStrategy
-  /** Only used when reconnectStrategy='fixed' */
-  fixedReconnectIntervalMs: number
-  pingIntervalMs: number
-  pongTimeoutMs: number
-  /** Logging prefix, e.g. "[ChatWS]" */
-  name: string
-}
-
-const DEFAULT_CONFIG: WsClientConfig = {
-  maxReconnectAttempts: RECONNECT.DEFAULT_MAX_ATTEMPTS,
-  maxReconnectDelayMs: RECONNECT.MAX_DELAY_MS,
-  reconnectStrategy: 'exponential',
-  fixedReconnectIntervalMs: 3000,
-  pingIntervalMs: HEARTBEAT.PING_INTERVAL_MS,
-  pongTimeoutMs: HEARTBEAT.PONG_TIMEOUT_MS,
-  name: '[WS]',
-}
-
-export abstract class BaseWsClient<TState extends BaseConnectionState = BaseConnectionState> {
-  protected ws: WebSocket | null = null
-  private connectPromise: Promise<void> | null = null
-  private reconnectTimer: ReturnType<typeof setTimeout> | null = null
-  private heartbeatTimer: ReturnType<typeof setInterval> | null = null
-  private reconnectAttempts = 0
-  private lastPongTime = Date.now()
-  protected isDisposed = false
-  private state: TState
-  private stateListeners = new Set<(state: TState) => void>()
-  protected readonly config: WsClientConfig
-
-  constructor(config?: Partial<WsClientConfig>) {
-    this.config = { ...DEFAULT_CONFIG, ...config }
-    this.state = this.createInitialState()
-  }
-
-  async connect(): Promise<void> {
-    if (this.isDisposed) {
-      this.isDisposed = false
-    }
-    if (this.ws?.readyState === WebSocket.OPEN) {
-      return Promise.resolve()
-    }
-    if (this.connectPromise) {
-      return this.connectPromise
-    }
-
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer)
-      this.reconnectTimer = null
-    }
-
-    this.connectPromise = this.getWsUrl()
-      .then(
-        (wsUrl) =>
-          new Promise<void>((resolve, reject) => {
-            const ws = new WebSocket(wsUrl)
-            this.ws = ws
-
-            ws.onopen = () => {
-              this.reconnectAttempts = 0
-              this.setConnectionState(true)
-              this.startHeartbeat()
-              this.connectPromise = null
-              resolve()
-            }
-
-            ws.onmessage = (event) => {
-              try {
-                const parsed = JSON.parse(event.data)
-                if (parsed.type === 'pong') {
-                  this.lastPongTime = Date.now()
-                  return
-                }
-                this.handleMessage(parsed)
-              } catch {
-                this.onParseError()
-              }
-            }
-
-            ws.onerror = () => {
-              this.setConnectionState(false)
-              if (this.connectPromise) {
-                this.connectPromise = null
-                reject(this.createConnectionError('WebSocket connection failed'))
-              }
-            }
-
-            ws.onclose = (event) => {
-              this.stopHeartbeat()
-              this.ws = null
-
-              if (this.connectPromise) {
-                this.connectPromise = null
-                reject(this.createConnectionError(`WebSocket connection failed (${event.code})`))
-              }
-
-              if (event.code === WS_CLOSE_CODE.UNAUTHORIZED) {
-                this.state = { ...this.state, isConnected: false, authExpired: true }
-                this.stateListeners.forEach((l) => l(this.state))
-                this.onAuthExpired()
-                return
-              }
-
-              this.setConnectionState(false)
-
-              if (event.code === WS_CLOSE_CODE.NORMAL || this.isDisposed) {
-                return
-              }
-
-              this.onUnexpectedClose()
-
-              if (UNRECOVERABLE_CLOSE_CODES.includes(event.code as (typeof UNRECOVERABLE_CLOSE_CODES)[number])) {
-                return
-              }
-
-              this.scheduleReconnect()
-            }
-          }),
-      )
-      .catch((err) => {
-        this.connectPromise = null
-        throw err
-      })
-
-    return this.connectPromise
-  }
-
-  disconnect(): void {
-    this.isDisposed = true
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer)
-      this.reconnectTimer = null
-    }
-    this.stopHeartbeat()
-    if (this.ws) {
-      this.ws.onopen = null
-      this.ws.onmessage = null
-      this.ws.onerror = null
-      this.ws.onclose = null
-      if (this.ws.readyState === WebSocket.OPEN || this.ws.readyState === WebSocket.CONNECTING) {
-        this.ws.close()
-      }
-      this.ws = null
-    }
-    this.connectPromise = null
-    this.setConnectionState(false)
-    this.onDispose()
-  }
-
-  getConnectionState(): TState {
-    return this.state
-  }
-
-  subscribeConnectionState(listener: (state: TState) => void): () => void {
-    this.stateListeners.add(listener)
-    listener(this.state)
-    return () => {
-      this.stateListeners.delete(listener)
-    }
-  }
-
-  protected sendFrame(payload: Record<string, unknown>): void {
-    if (this.ws?.readyState !== WebSocket.OPEN) {
-      throw this.createConnectionError('WebSocket not connected')
-    }
-    this.ws.send(JSON.stringify(payload))
-  }
-
-  protected setConnectionState(isConnected: boolean, extra?: Partial<TState>): void {
-    this.state = { ...this.state, isConnected, ...extra }
-    this.stateListeners.forEach((listener) => listener(this.state))
-  }
-
-  // === Abstract methods — subclasses MUST implement ===
-
-  protected abstract getWsUrl(): Promise<string>
-  protected abstract handleMessage(data: unknown): void
-  protected abstract createInitialState(): TState
-
-  // === Optional hooks — subclasses MAY override ===
-
-  /** Called after a successful reconnect. Use to re-subscribe, etc. */
-  protected onReconnected(): void {}
-  /** Called when max reconnect attempts are exhausted. */
-  protected onReconnectExhausted(): void {}
-  /** Called during disconnect() for subclass cleanup. */
-  protected onDispose(): void {}
-  /** Called on auth expiry (close code 4001). */
-  protected onAuthExpired(): void {}
-  /** Called on unexpected close before reconnect scheduling. */
-  protected onUnexpectedClose(): void {}
-  /** Called when a message fails to parse. */
-  protected onParseError(): void {}
-  /** Override to return typed errors (e.g. ChatWsError). */
-  protected createConnectionError(message: string): Error {
-    return new Error(message)
-  }
-
-  // === Private internals ===
-
-  private startHeartbeat(): void {
-    this.stopHeartbeat()
-    this.lastPongTime = Date.now()
-    this.heartbeatTimer = setInterval(() => {
-      if (this.ws?.readyState !== WebSocket.OPEN) return
-      if (Date.now() - this.lastPongTime > this.config.pongTimeoutMs) {
-        console.warn(`${this.config.name} Heartbeat timeout — no pong in ${this.config.pongTimeoutMs}ms, reconnecting`)
-        this.ws.close()
-        return
-      }
-      this.ws.send(JSON.stringify({ type: 'ping' }))
-    }, this.config.pingIntervalMs)
-  }
-
-  private stopHeartbeat(): void {
-    if (this.heartbeatTimer) {
-      clearInterval(this.heartbeatTimer)
-      this.heartbeatTimer = null
-    }
-  }
-
-  private scheduleReconnect(): void {
-    if (this.isDisposed || this.reconnectTimer) return
-
-    if (
-      this.config.maxReconnectAttempts !== null &&
-      this.reconnectAttempts >= this.config.maxReconnectAttempts
-    ) {
-      console.error(`${this.config.name} Max reconnect attempts reached`)
-      this.onReconnectExhausted()
-      return
-    }
-
-    const delay =
-      this.config.reconnectStrategy === 'fixed'
-        ? this.config.fixedReconnectIntervalMs
-        : Math.min(1000 * 2 ** this.reconnectAttempts, this.config.maxReconnectDelayMs)
-
-    this.reconnectAttempts += 1
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = null
-      void this.connect()
-        .then(() => this.onReconnected())
-        .catch(() => {})
-    }, delay)
-  }
-}
-```
-
-- [ ] **Step 2: Export from an index file**
-
-Create `frontend/lib/ws/base/index.ts`:
-
-```typescript
-export { BaseWsClient } from './BaseWsClient'
-export type { BaseConnectionState, WsClientConfig, ReconnectStrategy } from './BaseWsClient'
-```
-
-- [ ] **Step 3: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/lib/ws/base/
-git commit -m "feat: add BaseWsClient abstract class for shared WS lifecycle"
-```
-
----
-
-### Task 3: Migrate ChatWsClient to extend BaseWsClient
-
-**Files:**
-- Modify: `frontend/lib/ws/chat/chatWsClient.ts`
-- Modify: `frontend/lib/ws/chat/types.ts` (rename `dispose` → `disconnect`)
-- Modify: `frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts` (update `.dispose()` → `.disconnect()`)
-- Modify: `frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts` (update `.dispose()` → `.disconnect()`)
-
-- [ ] **Step 1: Update ChatWsClient interface — rename dispose to disconnect**
-
-In `frontend/lib/ws/chat/types.ts`, change line 101:
-
-```typescript
-// Old:
-  dispose(): void
-// New:
-  disconnect(): void
-```
-
-- [ ] **Step 2: Rewrite SharedChatWsClient to extend BaseWsClient**
-
-Replace the entire `frontend/lib/ws/chat/chatWsClient.ts` with:
-
-```typescript
-'use client'
-
-import { generateUUID } from '@/lib/utils/uuid'
-import { getWsChatUrl } from '@/lib/utils/wsUrl'
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-import { BaseWsClient } from '../base'
-import type { BaseConnectionState } from '../base'
-import { ChatWsError } from './errors'
-import type {
-  ChatExtension,
-  ChatResumeParams,
-  ChatSendParams,
-  ChatTerminalResult,
-  ChatWsClient,
-  ConnectionState,
-  CopilotExtension,
-  IncomingChatAcceptedEvent,
-  IncomingChatWsEvent,
-  SkillCreatorExtension,
-} from './types'
-
-interface PendingRequest {
-  requestId: string
-  threadId?: string
-  onEvent?: (evt: ChatStreamEvent) => void
-  onAccepted?: (evt: IncomingChatAcceptedEvent) => void
-  resolve: (value: ChatTerminalResult) => void
-  reject: (error: Error) => void
-}
-
-class SharedChatWsClient extends BaseWsClient<ConnectionState> implements ChatWsClient {
-  private static readonly MAX_PARSE_FAILURES = 10
-  private consecutiveParseFailures = 0
-  private pending = new Map<string, PendingRequest>()
-  private threadToRequest = new Map<string, string>()
-
-  constructor() {
-    super({
-      maxReconnectAttempts: 20,
-      name: '[ChatWS]',
-    })
-  }
-
-  protected createInitialState(): ConnectionState {
-    return { isConnected: false }
-  }
-
-  protected async getWsUrl(): Promise<string> {
-    return getWsChatUrl()
-  }
-
-  protected handleMessage(evt: IncomingChatWsEvent): void {
-    this.consecutiveParseFailures = 0
-    this.handleInboundMessage(evt)
-  }
-
-  protected override onParseError(): void {
-    this.consecutiveParseFailures++
-    console.warn(`[ChatWS] Malformed frame (${this.consecutiveParseFailures} consecutive)`)
-    if (this.consecutiveParseFailures >= SharedChatWsClient.MAX_PARSE_FAILURES) {
-      console.error('[ChatWS] Too many consecutive parse failures, reconnecting')
-      this.consecutiveParseFailures = 0
-      this.ws?.close()
-    }
-  }
-
-  protected override onAuthExpired(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Authentication expired'))
-  }
-
-  protected override onUnexpectedClose(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'WebSocket disconnected'))
-  }
-
-  protected override onReconnectExhausted(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Connection lost. Please refresh the page.'))
-  }
-
-  protected override onDispose(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Chat session closed'))
-  }
-
-  protected override createConnectionError(message: string): Error {
-    return new ChatWsError('WS_CONNECTION_FAILED', message)
-  }
-
-  // === Chat-specific public API ===
-
-  async sendChat(params: ChatSendParams): Promise<ChatTerminalResult> {
-    const message = params.input.message
-    if (!message.trim()) {
-      throw new Error('Message cannot be empty')
-    }
-    await this.connect()
-    const requestId = params.requestId || generateUUID()
-    return new Promise((resolve, reject) => {
-      this.pending.set(requestId, {
-        requestId,
-        threadId: params.threadId || undefined,
-        onEvent: params.onEvent,
-        onAccepted: params.onAccepted,
-        resolve,
-        reject,
-      })
-      if (params.threadId) {
-        this.threadToRequest.set(params.threadId, requestId)
-      }
-
-      try {
-        this.sendFrame({
-          type: 'chat.start',
-          request_id: requestId,
-          thread_id: params.threadId || null,
-          graph_id: params.graphId || null,
-          input: serializeInput(params.input),
-          extension: serializeExtension(params.extension),
-          metadata: params.metadata || {},
-        })
-      } catch (error) {
-        this.clearPending(requestId)
-        reject(error instanceof Error ? error : new ChatWsError('WS_NOT_CONNECTED', 'WebSocket not connected'))
-      }
-    })
-  }
-
-  async sendResume(params: ChatResumeParams): Promise<ChatTerminalResult> {
-    await this.connect()
-    const requestId = params.requestId || generateUUID()
-
-    return new Promise((resolve, reject) => {
-      this.pending.set(requestId, {
-        requestId,
-        threadId: params.threadId,
-        onEvent: params.onEvent,
-        onAccepted: params.onAccepted,
-        resolve,
-        reject,
-      })
-      this.threadToRequest.set(params.threadId, requestId)
-
-      try {
-        this.sendFrame({
-          type: 'chat.resume',
-          request_id: requestId,
-          thread_id: params.threadId,
-          command: params.command,
-        })
-      } catch (error) {
-        this.clearPending(requestId)
-        reject(error instanceof Error ? error : new ChatWsError('WS_NOT_CONNECTED', 'WebSocket not connected'))
-      }
-    })
-  }
-
-  stopByThreadId(threadId: string): void {
-    const requestId = this.threadToRequest.get(threadId)
-    if (!requestId) return
-    this.stopByRequestId(requestId)
-  }
-
-  stopByRequestId(requestId: string): void {
-    if (!requestId) return
-    try {
-      this.sendFrame({ type: 'chat.stop', request_id: requestId })
-    } catch {
-      // Ignore stop failures
-    }
-  }
-
-  // === Private helpers ===
-
-  private handleInboundMessage(evt: IncomingChatWsEvent) {
-    const type: string | undefined = evt.type
-    if (!type) return
-
-    const requestId = evt.request_id
-    if (type === 'ws_error') {
-      if (requestId) {
-        this.rejectPending(
-          requestId,
-          new ChatWsError('WS_PROTOCOL_ERROR', evt.message || 'WebSocket protocol error', { evt }),
-        )
-      }
-      return
-    }
-
-    if (!requestId) return
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-
-    if (evt.thread_id) {
-      pending.threadId = evt.thread_id
-      this.threadToRequest.set(evt.thread_id, requestId)
-    }
-
-    if (type === 'accepted') {
-      pending.onAccepted?.(evt as IncomingChatAcceptedEvent)
-      return
-    }
-
-    pending.onEvent?.(evt as ChatStreamEvent)
-
-    if (type === 'interrupt') {
-      this.resolvePending(requestId, 'interrupt')
-      return
-    }
-    if (type === 'done') {
-      this.resolvePending(requestId, 'done')
-      return
-    }
-    if (type === 'error') {
-      const message = (evt.data as { message?: string } | undefined)?.message || 'Unknown error'
-      if (message === 'Stream stopped' || message.includes('stopped')) {
-        this.resolvePending(requestId, 'stopped')
-      } else {
-        this.rejectPending(requestId, new ChatWsError('CHAT_EXECUTION_ERROR', message, { evt }))
-      }
-    }
-  }
-
-  private resolvePending(requestId: string, terminal: ChatTerminalResult['terminal']) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.clearPending(requestId)
-    pending.resolve({ requestId, threadId: pending.threadId, terminal })
-  }
-
-  private rejectPending(requestId: string, error: Error) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.clearPending(requestId)
-    pending.reject(error)
-  }
-
-  private clearPending(requestId: string) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.pending.delete(requestId)
-    if (pending.threadId) {
-      this.threadToRequest.delete(pending.threadId)
-    }
-  }
-
-  private rejectAllPending(error: Error) {
-    const requestIds = Array.from(this.pending.keys())
-    requestIds.forEach((requestId) => this.rejectPending(requestId, error))
-  }
-}
-
-function serializeInput(input: ChatSendParams['input']): Record<string, unknown> {
-  const result: Record<string, unknown> = { message: input.message }
-  if (input.files && input.files.length > 0) {
-    result.files = input.files
-  }
-  if (input.model) {
-    result.model = input.model
-  }
-  return result
-}
-
-function serializeExtension(extension?: SkillCreatorExtension | ChatExtension | CopilotExtension | null): Record<string, unknown> | null {
-  if (!extension) return null
-  if (extension.kind === 'skill_creator') {
-    return { kind: extension.kind, run_id: extension.runId ?? null, edit_skill_id: extension.editSkillId ?? null }
-  }
-  if (extension.kind === 'chat') {
-    return { kind: extension.kind, run_id: extension.runId ?? null }
-  }
-  if (extension.kind === 'copilot') {
-    return {
-      kind: extension.kind, run_id: extension.runId ?? null,
-      graph_context: extension.graphContext,
-      conversation_history: extension.conversationHistory,
-      mode: extension.mode,
-    }
-  }
-  return null
-}
-
-let singleton: SharedChatWsClient | null = null
-
-export function getChatWsClient(): ChatWsClient {
-  if (!singleton) {
-    singleton = new SharedChatWsClient()
-  }
-  return singleton
-}
-```
-
-- [ ] **Step 3: Update test files — rename .dispose() to .disconnect()**
-
-In `frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts` line 94, change:
-```typescript
-// Old:
-getChatWsClient().dispose()
-// New:
-getChatWsClient().disconnect()
-```
-
-In `frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts` line 80, change:
-```typescript
-// Old:
-getChatWsClient().dispose()
-// New:
-getChatWsClient().disconnect()
-```
-
-- [ ] **Step 4: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 5: Run existing chat WS tests**
-
-Run: `cd frontend && npx jest --testPathPattern="useChatWebSocket|workspaceChatWsService" --no-coverage 2>&1 | tail -20`
-Expected: All tests pass
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/lib/ws/chat/ frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts "frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts"
-git commit -m "refactor: migrate ChatWsClient to extend BaseWsClient"
-```
-
----
-
-### Task 4: Migrate RunWsClient to extend BaseWsClient
-
-**Files:**
-- Modify: `frontend/lib/ws/runs/runWsClient.ts`
-
-- [ ] **Step 1: Rewrite SharedRunWsClient to extend BaseWsClient**
-
-Replace the entire `frontend/lib/ws/runs/runWsClient.ts` with:
-
-```typescript
-'use client'
-
-import { getWsRunsUrl } from '@/lib/utils/wsUrl'
-
-import { BaseWsClient } from '../base'
-import type {
-  IncomingRunWsFrame,
-  RunConnectionState,
-  RunSubscriptionCallbacks,
-  RunWsClient,
-} from './types'
-
-interface RunSubscriptionState {
-  afterSeq: number
-  callbacks: RunSubscriptionCallbacks
-}
-
-class SharedRunWsClient extends BaseWsClient<RunConnectionState> implements RunWsClient {
-  private subscriptions = new Map<string, RunSubscriptionState>()
-
-  constructor() {
-    super({
-      maxReconnectAttempts: null, // unlimited
-      name: '[RunsWS]',
-    })
-  }
-
-  protected createInitialState(): RunConnectionState {
-    return { isConnected: false }
-  }
-
-  protected async getWsUrl(): Promise<string> {
-    return getWsRunsUrl()
-  }
-
-  protected handleMessage(frame: IncomingRunWsFrame): void {
-    if (frame.type === 'ws_error') {
-      const targetRunId = 'run_id' in frame ? (frame as { run_id?: string }).run_id : undefined
-      if (targetRunId) {
-        const sub = this.subscriptions.get(targetRunId)
-        sub?.callbacks.onError?.(frame.message)
-      } else {
-        this.subscriptions.forEach(({ callbacks }) => callbacks.onError?.(frame.message))
-      }
-      return
-    }
-
-    const subscription = 'run_id' in frame ? this.subscriptions.get(frame.run_id) : undefined
-    if (!subscription) return
-    const { callbacks } = subscription
-
-    if (frame.type === 'snapshot') {
-      subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
-      callbacks.onSnapshot?.(frame)
-    }
-    if (frame.type === 'event') {
-      if (frame.seq <= subscription.afterSeq) return
-      subscription.afterSeq = frame.seq
-      callbacks.onEvent?.(frame)
-    }
-    if (frame.type === 'replay_done') {
-      subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
-      callbacks.onReplayDone?.(frame)
-    }
-    if (frame.type === 'run_status') callbacks.onStatus?.(frame)
-  }
-
-  protected override onReconnected(): void {
-    const current = Array.from(this.subscriptions.entries())
-    current.forEach(([runId, subscription]) => {
-      try {
-        this.sendFrame({
-          type: 'subscribe',
-          run_id: runId,
-          after_seq: subscription.afterSeq,
-        })
-      } catch {
-        // Next reconnect or caller recovery can re-subscribe.
-      }
-    })
-  }
-
-  // === Run-specific public API ===
-
-  async subscribe(runId: string, afterSeq: number, callbacks?: RunSubscriptionCallbacks): Promise<void> {
-    await this.connect()
-    const existing = this.subscriptions.get(runId)
-    const normalizedAfterSeq = existing ? Math.max(existing.afterSeq, afterSeq) : afterSeq
-    this.subscriptions.set(runId, {
-      afterSeq: normalizedAfterSeq,
-      callbacks: callbacks || {},
-    })
-    this.sendFrame({
-      type: 'subscribe',
-      run_id: runId,
-      after_seq: normalizedAfterSeq,
-    })
-  }
-
-  unsubscribe(runId: string): void {
-    this.subscriptions.delete(runId)
-    try {
-      this.sendFrame({ type: 'unsubscribe', run_id: runId })
-    } catch {
-      // Ignore connection errors on unsubscribe.
-    }
-  }
-}
-
-let singleton: SharedRunWsClient | null = null
-
-export function getRunWsClient(): RunWsClient {
-  if (!singleton) {
-    singleton = new SharedRunWsClient()
-  }
-  return singleton
-}
-```
-
-- [ ] **Step 2: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/ws/runs/runWsClient.ts
-git commit -m "refactor: migrate RunWsClient to extend BaseWsClient"
-```
-
----
-
-### Task 5: Migrate NotificationWsClient to extend BaseWsClient + unify auth
-
-**Files:**
-- Create: `frontend/lib/ws/notifications/NotificationWsClient.ts`
-- Modify: `frontend/hooks/use-notification-websocket.ts`
-- Modify: `frontend/lib/utils/wsUrl.ts` (add `getWsNotificationUrl`)
-
-**Prerequisites:** Verify backend notification endpoint responds to pings with pongs. Check `backend/app/main.py` `_run_notification_loop` — confirmed: lines 310-314 handle `"ping"` → sends `PONG`. No backend changes needed.
-
-**Behavioral note:** The `autoReconnect`, `reconnectInterval`, `maxReconnectAttempts` options are dropped — reconnection is now always enabled via `NotificationWsClient`'s fixed config. Verify no caller passes `autoReconnect: false` before proceeding:
-
-Run: `cd frontend && grep -rn "autoReconnect" --include="*.ts" --include="*.tsx" .`
-
-- [ ] **Step 1: Add getWsNotificationUrl to wsUrl.ts**
-
-Add at the end of `frontend/lib/utils/wsUrl.ts`:
-
-```typescript
-/** Fetch a short-lived WS token from the backend and return a ready-to-use notification WS URL. */
-export async function getWsNotificationUrl(): Promise<string> {
-  return getWsTokenUrl('/ws/notifications')
-}
-```
-
-- [ ] **Step 2: Create NotificationWsClient class**
-
-Create `frontend/lib/ws/notifications/NotificationWsClient.ts`:
-
-```typescript
-'use client'
-
-import { getWsNotificationUrl } from '@/lib/utils/wsUrl'
-
-import { BaseWsClient } from '../base'
-import type { BaseConnectionState } from '../base'
-
-export interface NotificationMessage {
-  type: string
-  data?: any
-  message?: string
-  timestamp?: string
-}
-
-export type NotificationHandler = (notification: NotificationMessage) => void
-
-export class NotificationWsClient extends BaseWsClient<BaseConnectionState> {
-  private notificationHandler: NotificationHandler | null = null
-
-  constructor() {
-    super({
-      maxReconnectAttempts: 10,
-      reconnectStrategy: 'fixed',
-      fixedReconnectIntervalMs: 3000,
-      name: '[NotifWS]',
-    })
-  }
-
-  protected createInitialState(): BaseConnectionState {
-    return { isConnected: false }
-  }
-
-  protected async getWsUrl(): Promise<string> {
-    return getWsNotificationUrl()
-  }
-
-  protected handleMessage(data: unknown): void {
-    const notification = data as NotificationMessage
-    this.notificationHandler?.(notification)
-  }
-
-  setNotificationHandler(handler: NotificationHandler | null): void {
-    this.notificationHandler = handler
-  }
-}
-```
-
-- [ ] **Step 3: Rewrite use-notification-websocket.ts to use NotificationWsClient**
-
-Replace the entire `frontend/hooks/use-notification-websocket.ts` with:
-
-```typescript
-'use client'
-
-import { useEffect, useRef, useCallback, useState } from 'react'
-
-import { NotificationWsClient } from '@/lib/ws/notifications/NotificationWsClient'
-import type { NotificationMessage } from '@/lib/ws/notifications/NotificationWsClient'
-
-export type { NotificationMessage } from '@/lib/ws/notifications/NotificationWsClient'
-
-export enum NotificationType {
-  PING = 'ping',
-  PONG = 'pong',
-  CONNECTED = 'connected',
-}
-
-export interface UseNotificationWebSocketOptions {
-  userId: string | null | undefined
-  onNotification?: (notification: NotificationMessage) => void
-  autoReconnect?: boolean
-  reconnectInterval?: number
-  maxReconnectAttempts?: number
-}
-
-export function useNotificationWebSocket(options: UseNotificationWebSocketOptions) {
-  const { userId, onNotification } = options
-  const clientRef = useRef<NotificationWsClient | null>(null)
-  const [isConnected, setIsConnected] = useState(false)
-  const [lastNotification, setLastNotification] = useState<NotificationMessage | null>(null)
-
-  const onNotificationRef = useRef(onNotification)
-  useEffect(() => {
-    onNotificationRef.current = onNotification
-  }, [onNotification])
-
-  const getClient = useCallback(() => {
-    if (!clientRef.current) {
-      clientRef.current = new NotificationWsClient()
-    }
-    return clientRef.current
-  }, [])
-
-  const cleanup = useCallback(() => {
-    if (clientRef.current) {
-      clientRef.current.disconnect()
-      clientRef.current = null
-    }
-    setIsConnected(false)
-  }, [])
-
-  const connect = useCallback(() => {
-    if (!userId) return
-    const client = getClient()
-
-    client.setNotificationHandler((notification) => {
-      setLastNotification(notification)
-      onNotificationRef.current?.(notification)
-    })
-
-    client.subscribeConnectionState((state) => {
-      setIsConnected(state.isConnected)
-    })
-
-    void client.connect().catch(() => {})
-  }, [userId, getClient])
-
-  useEffect(() => {
-    if (userId) {
-      connect()
-    } else {
-      cleanup()
-    }
-    return () => cleanup()
-  }, [userId, connect, cleanup])
-
-  useEffect(() => {
-    const handleVisibilityChange = () => {
-      if (document.visibilityState === 'visible' && userId) {
-        const client = clientRef.current
-        if (!client || !client.getConnectionState().isConnected) {
-          connect()
-        }
-      }
-    }
-
-    document.addEventListener('visibilitychange', handleVisibilityChange)
-    return () => document.removeEventListener('visibilitychange', handleVisibilityChange)
-  }, [userId, connect])
-
-  return {
-    isConnected,
-    lastNotification,
-    reconnect: connect,
-    disconnect: cleanup,
-  }
-}
-
-export default useNotificationWebSocket
-```
-
-**Note:** The hook no longer accepts `autoReconnect`, `reconnectInterval`, `maxReconnectAttempts` as config — these are now fixed in `NotificationWsClient`'s constructor. Check if any caller passes custom values; if so, adjust. The hook interface is preserved for backward compat (the params are in the options type but unused).
-
-- [ ] **Step 4: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/lib/ws/notifications/ frontend/hooks/use-notification-websocket.ts frontend/lib/utils/wsUrl.ts
-git commit -m "refactor: migrate NotificationWsClient to BaseWsClient + unify auth via ws-token"
-```
-
----
-
-### Task 6: Constants cleanup — remove duplicates and NO_RECONNECT_CLOSE_CODES
-
-**Files:**
-- Modify: `frontend/lib/ws/constants.ts` (delete `NO_RECONNECT_CLOSE_CODES`)
-
-Now that `use-notification-websocket.ts` no longer imports `NO_RECONNECT_CLOSE_CODES`, it's safe to remove.
-
-- [ ] **Step 1: Verify no remaining imports of NO_RECONNECT_CLOSE_CODES**
-
-Run: `cd frontend && grep -r "NO_RECONNECT_CLOSE_CODES" --include="*.ts" --include="*.tsx" .`
-Expected: Only `lib/ws/constants.ts` itself (the definition)
-
-- [ ] **Step 2: Remove NO_RECONNECT_CLOSE_CODES from constants.ts**
-
-Delete lines 28-32 from `frontend/lib/ws/constants.ts`:
-
-```typescript
-// DELETE THIS BLOCK:
-/** Close codes where reconnection should be skipped (normal + unrecoverable) */
-export const NO_RECONNECT_CLOSE_CODES = [
-  WS_CLOSE_CODE.NORMAL,
-  ...UNRECOVERABLE_CLOSE_CODES,
-] as const
-```
-
-- [ ] **Step 3: Verify TypeScript compiles**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Expected: No errors
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/lib/ws/constants.ts
-git commit -m "refactor: remove NO_RECONNECT_CLOSE_CODES (superseded by BaseWsClient)"
-```
-
----
-
-### Task 7: Remove dead `POST /copilot/actions` backend endpoint
-
-**Files:**
-- Modify: `backend/app/api/v1/graphs.py` (delete lines 649-683)
-
-- [ ] **Step 1: Verify no frontend callers exist**
-
-Run: `cd frontend && grep -r "copilot/actions" --include="*.ts" --include="*.tsx" .`
-Expected: No matches (confirmed: only WS path is used)
-
-- [ ] **Step 2: Delete the endpoint function**
-
-In `backend/app/api/v1/graphs.py`, delete the entire `generate_graph_actions` function (lines 649-683, the `@router.post("/copilot/actions", response_model=CopilotResponse)` endpoint).
-
-**Do NOT delete** the `CopilotResponse` import or model — it's still used by `CopilotService`.
-
-- [ ] **Step 3: Clean up unused imports**
-
-After deleting the endpoint, check if `CopilotRequest` is still imported and used elsewhere in the same file. If not, remove the `CopilotRequest` import from the `from app.core.copilot import (...)` block at lines 19-22. Keep `CopilotResponse` only if other code in the file uses it; otherwise remove it too from this file's imports (the model itself lives in `app.core.copilot` and is used by the service layer).
-
-- [ ] **Step 4: Verify backend starts**
-
-Run: `cd backend && python -c "from app.main import app; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add backend/app/api/v1/graphs.py
-git commit -m "fix: remove dead POST /copilot/actions endpoint (migrated to WS)"
-```
-
----
-
-### Task 8: Remove legacy protocol tombstones from chat_protocol.py
-
-**Files:**
-- Modify: `backend/app/websocket/chat_protocol.py`
-- Modify: `backend/app/websocket/chat_ws_handler.py` (remove `"resume"`/`"stop"` aliases)
-
-**Note:** Spec mentions simplifying `RESERVED_METADATA_KEYS` after removing `"chat"` — this is intentionally skipped because `RESERVED_METADATA_KEYS` is still used for validating `chat.start` frames (line 109 of `chat_protocol.py`), not just the `"chat"` tombstone.
-
-- [ ] **Step 1: Clean up ALLOWED_CLIENT_FRAME_TYPES**
-
-In `backend/app/websocket/chat_protocol.py`, replace the `ALLOWED_CLIENT_FRAME_TYPES` set (lines 10-18):
-
-```python
-# Old:
-ALLOWED_CLIENT_FRAME_TYPES = {
-    "ping",
-    "chat",
-    "chat.start",
-    "chat.resume",
-    "chat.stop",
-    "resume",
-    "stop",
-}
-
-# New:
-ALLOWED_CLIENT_FRAME_TYPES = {
-    "ping",
-    "chat.start",
-    "chat.resume",
-    "chat.stop",
-}
-```
-
-- [ ] **Step 2: Remove the "chat" tombstone rejection block**
-
-In `backend/app/websocket/chat_protocol.py`, delete lines 92-96:
-
-```python
-# DELETE:
-    if frame_type == "chat":
-        raise ChatProtocolError(
-            "legacy metadata control fields are no longer supported",
-            request_id=_coerce_request_id(frame.get("request_id")),
-        )
-```
-
-- [ ] **Step 3: Remove "resume"/"stop" aliases from chat_ws_handler.py**
-
-In `backend/app/websocket/chat_ws_handler.py`, find the dispatch around lines 126-131 and update:
-
-```python
-# Old:
-        if frame_type in {"chat.resume", "resume"}:
-            await self._handle_resume(parsed_frame)
-            return
-        if frame_type in {"chat.stop", "stop"}:
-            await self._handle_stop(parsed_frame)
-            return
-
-# New:
-        if frame_type == "chat.resume":
-            await self._handle_resume(parsed_frame)
-            return
-        if frame_type == "chat.stop":
-            await self._handle_stop(parsed_frame)
-            return
-```
-
-- [ ] **Step 4: Verify frontend only sends canonical frame types**
-
-Run: `cd frontend && grep -rn '"resume"\|"stop"\|type.*resume\|type.*stop' --include="*.ts" lib/ws/chat/`
-Expected: Only `chat.resume` and `chat.stop` — no bare `resume` or `stop`.
-
-- [ ] **Step 5: Verify backend starts**
-
-Run: `cd backend && python -c "from app.main import app; print('OK')"`
-Expected: `OK`
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add backend/app/websocket/chat_protocol.py backend/app/websocket/chat_ws_handler.py
-git commit -m "fix: remove legacy 'chat', 'resume', 'stop' frame type aliases from protocol"
-```
-
----
-
-### Task 9: Remove unused axios dependency
-
-**Files:**
-- Modify: `frontend/package.json`
-
-- [ ] **Step 1: Verify no imports of axios exist**
-
-Run: `cd frontend && grep -r "from 'axios'\|require.*axios\|import.*axios" --include="*.ts" --include="*.tsx" .`
-Expected: No matches
-
-- [ ] **Step 2: Remove axios**
-
-Run: `cd frontend && bun remove axios`
-(If bun is not available: `npm uninstall axios`)
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/package.json frontend/bun.lock
-git commit -m "chore: remove unused axios dependency"
-```
-
----
-
-### Task 10: Rename SSE-era identifiers to WS semantics
-
-**Files:**
-- Modify: `frontend/services/chatBackend.ts` (rename `StreamEventEnvelope` → `ChatWsFrame`)
-- Modify: `backend/app/websocket/chat_ws_handler.py` (rename `_parse_sse_event` → `_parse_stream_event`, `_send_event_from_sse` → `_send_stream_event`)
-- Modify: `backend/app/websocket/chat_turn_executor.py` (update call sites)
-
-- [ ] **Step 1: Rename StreamEventEnvelope in chatBackend.ts**
-
-In `frontend/services/chatBackend.ts`:
-- Find the type definition `export type StreamEventEnvelope = ...` (around line 243)
-- Rename to `export type ChatWsFrame = ...`
-- Find the re-alias `export type ChatStreamEvent = StreamEventEnvelope` (around line 272)
-- Change to `export type ChatStreamEvent = ChatWsFrame`
-- Search the same file for any other references to `StreamEventEnvelope` and rename them
-
-Verify no other frontend file imports `StreamEventEnvelope` directly:
-
-Run: `cd frontend && grep -r "StreamEventEnvelope" --include="*.ts" --include="*.tsx" .`
-Expected: Only `services/chatBackend.ts`
-
-- [ ] **Step 2: Rename backend methods in chat_ws_handler.py**
-
-In `backend/app/websocket/chat_ws_handler.py`:
-- Find `_send_event_from_sse` (around line 547) → rename to `_send_stream_event`
-- Find `_parse_sse_event` (around line 568) → rename to `_parse_stream_event`
-- Update the internal call from `_send_event_from_sse` to `_parse_sse_event` → `_send_stream_event` to `_parse_stream_event`
-- Update any SSE-referencing comments in these methods to say "stream event"
-
-- [ ] **Step 3: Update call sites in chat_turn_executor.py**
-
-In `backend/app/websocket/chat_turn_executor.py`, find and replace all occurrences:
-- `handler._send_event_from_sse` → `handler._send_stream_event` (at lines ~258, 289, 614, 628)
-- `handler._parse_sse_event` → `handler._parse_stream_event` (if any direct calls)
-
-Run: `cd backend && grep -rn "_send_event_from_sse\|_parse_sse_event" app/`
-Expected: No remaining references after the rename
-
-- [ ] **Step 4: Verify TypeScript and Python**
-
-Run: `cd frontend && npx tsc --noEmit --pretty 2>&1 | head -20`
-Run: `cd backend && python -c "from app.main import app; print('OK')"`
-Expected: Both pass
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/services/chatBackend.ts backend/app/websocket/chat_ws_handler.py backend/app/websocket/chat_turn_executor.py
-git commit -m "refactor: rename SSE-era identifiers to WS semantics (StreamEventEnvelope → ChatWsFrame, _parse_sse_event → _parse_stream_event)"
-```
diff --git a/docs/superpowers/plans/2026-04-07-dark-mode-preferences.md b/docs/superpowers/plans/2026-04-07-dark-mode-preferences.md
deleted file mode 100644
index ee1fc52ad..000000000
--- a/docs/superpowers/plans/2026-04-07-dark-mode-preferences.md
+++ /dev/null
@@ -1,505 +0,0 @@
-# Dark Mode & Preferences Implementation Plan
-
-> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
-
-**Goal:** Unlock dark mode and add a Preferences section (language + theme) to the Settings Profile page.
-
-**Architecture:** Remove the force-lock on next-themes, standardize theme sync through next-themes' `setTheme()`, add a Preferences UI block to the existing Profile page, and clean up the sidebar language switcher.
-
-**Tech Stack:** Next.js 16, React 19, next-themes, shadcn/ui (Radix), Tailwind CSS, Zustand, i18next
-
-**Spec:** `docs/superpowers/specs/2026-04-07-dark-mode-and-preferences-design.md`
-
-> All file paths are relative to `frontend/`.
-
----
-
-### Task 1: Unlock dark mode in ThemeProvider
-
-**Files:**
-- Modify: `providers/theme-provider.tsx`
-
-- [ ] **Step 1: Update ThemeProvider props**
-
-Remove `forcedTheme="light"`, set `enableSystem={true}`, change `defaultTheme` to `"system"`:
-
-```tsx
-export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
-  return (
-    <NextThemesProvider
-      attribute="class"
-      defaultTheme="system"
-      enableSystem
-      disableTransitionOnChange
-      storageKey="joysafeter-theme"
-      {...props}
-    >
-      {children}
-    </NextThemesProvider>
-  )
-}
-```
-
-- [ ] **Step 2: Verify the app loads without errors**
-
-Run: `cd frontend && bun run build`
-Expected: Build succeeds with no errors.
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/providers/theme-provider.tsx
-git commit -m "feat: unlock dark mode in ThemeProvider"
-```
-
----
-
-### Task 2: Fix Zustand store default and remove hardcoded theme
-
-**Files:**
-- Modify: `stores/settings/general/store.ts`
-- Modify: `hooks/queries/general-settings.ts`
-
-- [ ] **Step 1: Change Zustand store default theme from `'dark'` to `'system'`**
-
-In `stores/settings/general/store.ts`, change line 23:
-
-```ts
-// Before:
-theme: 'dark',
-// After:
-theme: 'system',
-```
-
-- [ ] **Step 2: Remove hardcoded theme in fetchGeneralSettings**
-
-In `hooks/queries/general-settings.ts`, change line 52:
-
-```ts
-// Before:
-theme: 'dark' as const,
-// After:
-theme: data.theme ?? 'system',
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/stores/settings/general/store.ts frontend/hooks/queries/general-settings.ts
-git commit -m "fix: use system as default theme, respect API response"
-```
-
----
-
-### Task 3: Refactor theme sync to work with unlocked next-themes
-
-**Files:**
-- Modify: `lib/core/utils/theme.ts`
-- Modify: `hooks/queries/general-settings.ts`
-
-**Note:** The spec says to use next-themes' `setTheme()` directly, but `syncThemeToNextThemes()` is called from `syncSettingsToZustand()` which runs outside a React component (no hook access). The pragmatic approach: write to localStorage and dispatch a StorageEvent so next-themes picks up the change. This achieves the same result without requiring a hook context.
-
-- [ ] **Step 1: Rewrite syncThemeToNextThemes to use localStorage + StorageEvent**
-
-The function currently manually toggles HTML classes. Since next-themes is now unlocked and listens to its `storageKey`, we only need to write to localStorage and dispatch a storage event — next-themes handles the rest. Replace the entire function:
-
-```ts
-/**
- * Sync theme to next-themes by updating localStorage.
- * next-themes listens for storage events and applies the class automatically.
- *
- * @param theme - The theme to set ('light' | 'dark' | 'system')
- */
-export function syncThemeToNextThemes(theme: 'light' | 'dark' | 'system'): void {
-  if (typeof window === 'undefined') {
-    return
-  }
-
-  try {
-    const storageKey = 'joysafeter-theme'
-
-    if (theme === 'system') {
-      localStorage.setItem(storageKey, 'system')
-    } else {
-      localStorage.setItem(storageKey, theme)
-    }
-
-    // Trigger next-themes to pick up the change
-    window.dispatchEvent(
-      new StorageEvent('storage', {
-        key: storageKey,
-        newValue: theme,
-        storageArea: localStorage,
-      }),
-    )
-  } catch (error) {
-    console.error('Failed to sync theme to next-themes:', error)
-  }
-}
-```
-
-- [ ] **Step 2: Update comment in syncSettingsToZustand**
-
-In `hooks/queries/general-settings.ts`, update the comment above `syncThemeToNextThemes` call (line 77) to clarify the mechanism:
-
-```ts
-// Before:
-  syncThemeToNextThemes(settings.theme)
-// After:
-  // Sync theme via localStorage — next-themes picks up the change automatically
-  syncThemeToNextThemes(settings.theme)
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/core/utils/theme.ts frontend/hooks/queries/general-settings.ts
-git commit -m "refactor: simplify theme sync to work with unlocked next-themes"
-```
-
----
-
-### Task 4: Add i18n translation keys
-
-**Files:**
-- Modify: `lib/i18n/locales/en.ts`
-- Modify: `lib/i18n/locales/zh.ts`
-
-- [ ] **Step 1: Add keys to en.ts**
-
-Inside the `settings` object (after the existing keys like `general`, around line 88), add:
-
-```ts
-preferences: 'Preferences',
-theme: 'Theme',
-themeLight: 'Light',
-themeDark: 'Dark',
-themeSystem: 'System',
-```
-
-- [ ] **Step 2: Add keys to zh.ts**
-
-Inside the `settings` object (same location), add:
-
-```ts
-preferences: '偏好设置',
-theme: '主题',
-themeLight: '浅色',
-themeDark: '深色',
-themeSystem: '跟随系统',
-```
-
-- [ ] **Step 3: Commit**
-
-```bash
-git add frontend/lib/i18n/locales/en.ts frontend/lib/i18n/locales/zh.ts
-git commit -m "feat: add i18n keys for preferences, theme"
-```
-
----
-
-### Task 5: Install toggle-group and create shadcn component
-
-**Files:**
-- Create: `components/ui/toggle-group.tsx`
-
-- [ ] **Step 1: Install @radix-ui/react-toggle-group**
-
-```bash
-cd frontend && bun add @radix-ui/react-toggle-group
-```
-
-- [ ] **Step 2: Create toggle-group.tsx**
-
-Create `components/ui/toggle-group.tsx` following the project's shadcn pattern (matching `toggle.tsx` style):
-
-```tsx
-'use client'
-
-import * as ToggleGroupPrimitive from '@radix-ui/react-toggle-group'
-import { type VariantProps } from 'class-variance-authority'
-import * as React from 'react'
-
-import { cn } from '@/lib/utils'
-
-import { toggleVariants } from './toggle'
-
-const ToggleGroupContext = React.createContext<VariantProps<typeof toggleVariants>>({
-  size: 'default',
-  variant: 'default',
-})
-
-const ToggleGroup = React.forwardRef<
-  React.ElementRef<typeof ToggleGroupPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Root> &
-    VariantProps<typeof toggleVariants>
->(({ className, variant, size, children, ...props }, ref) => (
-  <ToggleGroupPrimitive.Root
-    ref={ref}
-    className={cn('flex items-center justify-center gap-1', className)}
-    {...props}
-  >
-    <ToggleGroupContext.Provider value={{ variant, size }}>
-      {children}
-    </ToggleGroupContext.Provider>
-  </ToggleGroupPrimitive.Root>
-))
-ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName
-
-const ToggleGroupItem = React.forwardRef<
-  React.ElementRef<typeof ToggleGroupPrimitive.Item>,
-  React.ComponentPropsWithoutRef<typeof ToggleGroupPrimitive.Item> &
-    VariantProps<typeof toggleVariants>
->(({ className, children, variant, size, ...props }, ref) => {
-  const context = React.useContext(ToggleGroupContext)
-
-  return (
-    <ToggleGroupPrimitive.Item
-      ref={ref}
-      className={cn(
-        toggleVariants({
-          variant: variant || context.variant,
-          size: size || context.size,
-        }),
-        className,
-      )}
-      {...props}
-    >
-      {children}
-    </ToggleGroupPrimitive.Item>
-  )
-})
-ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName
-
-export { ToggleGroup, ToggleGroupItem }
-```
-
-- [ ] **Step 3: Verify build**
-
-Run: `cd frontend && bun run build`
-Expected: Build succeeds.
-
-- [ ] **Step 4: Commit**
-
-```bash
-git add frontend/components/ui/toggle-group.tsx frontend/package.json frontend/bun.lock
-git commit -m "feat: add toggle-group shadcn component"
-```
-
----
-
-### Task 6: Add Preferences section to Profile page
-
-**Files:**
-- Modify: `components/settings/profile-page.tsx`
-
-- [ ] **Step 1: Add imports**
-
-Add these imports at the top of `profile-page.tsx`:
-
-```tsx
-import { Sun, Moon, Monitor } from 'lucide-react'
-import { useTheme } from 'next-themes'
-
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select'
-import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group'
-```
-
-- [ ] **Step 2: Add theme hook and language handler inside ProfilePage component**
-
-After the existing state declarations (around line 105), add:
-
-```tsx
-const { theme, setTheme } = useTheme()
-const { i18n } = useTranslation() // already destructured t above, add i18n
-```
-
-Update the existing `useTranslation()` destructure to include `i18n`:
-
-```tsx
-// Before:
-const { t } = useTranslation()
-// After:
-const { t, i18n } = useTranslation()
-```
-
-- [ ] **Step 3: Add Preferences section JSX**
-
-After the `{/* Action Buttons */}` section's closing `</div>` (after line 314), add:
-
-```tsx
-{/* Preferences */}
-<div className="space-y-4 border-t border-border pt-6">
-  <h3 className="text-sm font-semibold text-[var(--text-primary)]">
-    {t('settings.preferences')}
-  </h3>
-  <div className="flex flex-wrap items-center gap-4">
-  <div className="flex items-center gap-3">
-    <span className="text-sm font-medium text-[var(--text-secondary)]">
-      {t('common.language')}
-    </span>
-    <Select value={i18n.language} onValueChange={(val) => i18n.changeLanguage(val)}>
-      <SelectTrigger className="w-[140px]">
-        <SelectValue />
-      </SelectTrigger>
-      <SelectContent>
-        <SelectItem value="en">English</SelectItem>
-        <SelectItem value="zh">中文</SelectItem>
-      </SelectContent>
-    </Select>
-  </div>
-
-  <div className="flex items-center gap-3">
-    <span className="text-sm font-medium text-[var(--text-secondary)]">
-      {t('settings.theme')}
-    </span>
-    <ToggleGroup
-      type="single"
-      value={theme}
-      onValueChange={(val) => { if (val) setTheme(val) }}
-      className="rounded-lg border border-[var(--border)] p-0.5"
-    >
-      <ToggleGroupItem value="light" aria-label={t('settings.themeLight')} className="gap-1.5 px-3 text-xs">
-        <Sun size={14} />
-        {t('settings.themeLight')}
-      </ToggleGroupItem>
-      <ToggleGroupItem value="dark" aria-label={t('settings.themeDark')} className="gap-1.5 px-3 text-xs">
-        <Moon size={14} />
-        {t('settings.themeDark')}
-      </ToggleGroupItem>
-      <ToggleGroupItem value="system" aria-label={t('settings.themeSystem')} className="gap-1.5 px-3 text-xs">
-        <Monitor size={14} />
-        {t('settings.themeSystem')}
-      </ToggleGroupItem>
-    </ToggleGroup>
-  </div>
-  </div>
-</div>
-```
-
-- [ ] **Step 4: Fix hardcoded light-mode colors in reset password dialog**
-
-In the reset password dialog icon container (around line 321), change:
-
-```tsx
-// Before:
-<div className="shrink-0 rounded-lg border border-[var(--surface-1)] bg-violet-50 p-1.5 text-violet-600 shadow-sm">
-// After:
-<div className="shrink-0 rounded-lg border border-[var(--surface-1)] bg-violet-50 p-1.5 text-violet-600 shadow-sm dark:bg-violet-900/30 dark:text-violet-400">
-```
-
-- [ ] **Step 5: Verify build**
-
-Run: `cd frontend && bun run build`
-Expected: Build succeeds.
-
-- [ ] **Step 6: Commit**
-
-```bash
-git add frontend/components/settings/profile-page.tsx
-git commit -m "feat: add language and theme preferences to profile page"
-```
-
----
-
-### Task 7: Remove language switcher from sidebar dropdown
-
-**Files:**
-- Modify: `components/app-sidebar/user-info.tsx`
-
-- [ ] **Step 1: Clean up imports**
-
-Remove unused imports:
-
-```tsx
-// Remove from lucide-react import:
-Languages, Check
-
-// Remove these dropdown imports:
-DropdownMenuSub,
-DropdownMenuSubContent,
-DropdownMenuSubTrigger,
-```
-
-Also remove the `useTranslation` destructure of `i18n` (keep only `t`):
-
-```tsx
-// Before:
-const { t, i18n } = useTranslation()
-// After:
-const { t } = useTranslation()
-```
-
-- [ ] **Step 2: Remove language-related code**
-
-Delete the `languages` array (lines 48-51):
-
-```tsx
-// DELETE:
-const languages = [
-  { code: 'en', label: 'English' },
-  { code: 'zh', label: '中文' },
-]
-```
-
-Delete `handleLanguageChange` function (lines 78-80):
-
-```tsx
-// DELETE:
-const handleLanguageChange = (langCode: string) => {
-  i18n.changeLanguage(langCode)
-}
-```
-
-- [ ] **Step 3: Remove language sub-menu from dropdown**
-
-Delete the entire `DropdownMenuSub` block (lines 131-154) and the `DropdownMenuSeparator` immediately after it (line 156). The dropdown should go directly from the user info section to the Settings item.
-
-- [ ] **Step 4: Verify build**
-
-Run: `cd frontend && bun run build`
-Expected: Build succeeds.
-
-- [ ] **Step 5: Commit**
-
-```bash
-git add frontend/components/app-sidebar/user-info.tsx
-git commit -m "refactor: remove language switcher from sidebar dropdown"
-```
-
----
-
-### Task 8: Final verification
-
-- [ ] **Step 1: Full build check**
-
-```bash
-cd frontend && bun run build
-```
-
-Expected: Build succeeds with no errors.
-
-- [ ] **Step 2: Lint check**
-
-```bash
-cd frontend && bun run lint
-```
-
-Expected: No lint errors.
-
-- [ ] **Step 3: Manual smoke test checklist**
-
-Verify in browser:
-- [ ] App loads in system theme by default
-- [ ] Settings → Profile shows Preferences section with Language and Theme
-- [ ] Theme toggle switches between Light / Dark / System instantly
-- [ ] Language selector switches between English / 中文
-- [ ] Sidebar dropdown no longer shows language sub-menu
-- [ ] Dark mode renders correctly (CSS variables switch, no broken colors)
-- [ ] Reset password dialog icon looks correct in both themes
diff --git a/docs/superpowers/plans/2026-04-30-agent-kind-refactor.md b/docs/superpowers/plans/2026-04-30-agent-kind-refactor.md
new file mode 100644
index 000000000..0f3e9042f
--- /dev/null
+++ b/docs/superpowers/plans/2026-04-30-agent-kind-refactor.md
@@ -0,0 +1,1337 @@
+# Agent Kind Refactor Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Replace `DefinitionKindLiteral`/`RuntimeKindLiteral`/`executor_kind` with two clean orthogonal axes: `EngineKind` (what kernel) and `RuntimeKind` (where it runs). Each CLI tool becomes its own first-class engine.
+
+**Architecture:** Contracts layer defines `EngineKind` (5 user-facing values + 1 internal) and `RuntimeKind` (sandbox/server). The engine registry maps `engine_kind` → `ExecutionEngine` 1:1. The `CLIEngine` + `RuntimeProviderRegistry` intermediate dispatch layer is eliminated — each CLI provider is promoted to a full `ExecutionEngine` implementation.
+
+**Tech Stack:** Python 3.12, SQLAlchemy 2, Pydantic v2, Alembic, TypeScript, Vitest
+
+---
+
+## File Structure
+
+### Backend — New/Renamed files
+
+| Action | Path | Responsibility |
+|---|---|---|
+| Rewrite | `backend/app/core/contracts/agent.py` | New `EngineKind`, `RuntimeKind`, `ENGINE_RUNTIME_MAP` |
+| Rewrite | `backend/app/core/contracts/__init__.py` | Updated re-exports |
+| Rename | `backend/app/core/engine/graph_engine.py` → keep file, rename class to `LangGraphVisualEngine` | Visual graph engine |
+| Rename | `backend/app/core/engine/code_engine.py` → keep file, rename class to `LangGraphCodeEngine` | Code graph engine |
+| Create | `backend/app/core/engine/claude_code_engine.py` | Claude Code engine (promoted from provider) |
+| Create | `backend/app/core/engine/codex_engine.py` | Codex engine (promoted from provider) |
+| Create | `backend/app/core/engine/openclaw_engine.py` | OpenClaw engine (promoted from provider) |
+| Delete | `backend/app/core/engine/cli_engine.py` | Replaced by 3 individual engines |
+| Rewrite | `backend/app/core/engine/__init__.py` | 6 engine registrations |
+| Modify | `backend/app/core/engine/registry.py` | `runtime_kind` → `engine_kind` in naming |
+| Modify | `backend/app/core/engine/protocol.py` | Update docstring |
+| Modify | `backend/app/models/agent.py` | `definition_kind` → `engine_kind`, remove `normalize_*` |
+| Modify | `backend/app/models/execution.py` | `executor_kind` → `engine_kind` |
+| Modify | `backend/app/schemas/agent.py` | `DefinitionKindLiteral` → `EngineKind`, `RuntimeKindLiteral` → `RuntimeKind` |
+| Modify | `backend/app/schemas/agent_version.py` | Same |
+| Modify | `backend/app/schemas/agent_release.py` | `RuntimeKindLiteral` → `RuntimeKind` |
+| Modify | `backend/app/services/agent_publish_service.py` | Use `ENGINE_RUNTIME_MAP`, remove `is_cli_definition_kind` |
+| Modify | `backend/app/services/execution_orchestrator.py` | Route by `engine_kind` directly, simplify overrides |
+| Create | `backend/alembic/versions/xxxx_refactor_agent_kinds.py` | Column rename + value migration |
+
+### Frontend — Modified files
+
+| Action | Path | Responsibility |
+|---|---|---|
+| Rewrite | `frontend/types/agent.ts` | New `ENGINE_KINDS`, `EngineKind`, `RUNTIME_KINDS`, `RuntimeKind` |
+| Modify | `frontend/types/agent-run.ts` | `executor_kind` → `engine_kind` |
+| Rewrite | `frontend/types/__tests__/architecture-contracts.test.ts` | Updated assertions |
+| Modify | `frontend/components/agents/agent-card.tsx` | Use new `EngineKind` labels |
+| Modify | `frontend/components/agents/agent-settings-tab.tsx` | Same |
+| Modify | `frontend/components/agents/agent-form-dialog.tsx` | `DefinitionKind` → `EngineKind` |
+| Modify | `frontend/components/agents/version-form-dialog.tsx` | Same |
+| Modify | `frontend/components/agents/agent-build/builder-surface-registry.ts` | `DefinitionKind` → `EngineKind` |
+| Modify | `frontend/lib/agents/agent-list-filters.ts` | `DefinitionKind` → `EngineKind` |
+| Modify | `frontend/lib/agents/agent-list-filters.test.ts` | Updated test data |
+| Modify | `frontend/components/agents/agent-build/__tests__/builder-surface-registry.test.ts` | Updated assertions |
+
+---
+
+### Task 1: Rewrite contracts layer (`core/contracts/agent.py` + `__init__.py`)
+
+**Files:**
+- Modify: `backend/app/core/contracts/agent.py`
+- Modify: `backend/app/core/contracts/__init__.py`
+
+- [ ] **Step 1: Rewrite `agent.py` with new types**
+
+Replace the entire file content:
+
+```python
+"""Canonical Agent engine/runtime kind contract values."""
+
+from __future__ import annotations
+
+from typing import Literal, Union
+
+from app.common.app_errors import InvalidRequestError
+
+EngineKind = Literal[
+    "langgraph_visual",
+    "langgraph_code",
+    "claude_code",
+    "codex",
+    "openclaw",
+]
+ENGINE_KINDS: set[str] = {"langgraph_visual", "langgraph_code", "claude_code", "codex", "openclaw"}
+
+InternalEngineKind = Literal["build_copilot"]
+INTERNAL_ENGINE_KINDS: set[str] = {"build_copilot"}
+
+AllEngineKind = Union[EngineKind, InternalEngineKind]
+ALL_ENGINE_KINDS: set[str] = ENGINE_KINDS | INTERNAL_ENGINE_KINDS
+
+RuntimeKind = Literal["sandbox", "server"]
+RUNTIME_KINDS: set[str] = {"sandbox", "server"}
+
+ENGINE_RUNTIME_MAP: dict[str, str] = {
+    "langgraph_visual": "server",
+    "langgraph_code": "server",
+    "claude_code": "sandbox",
+    "codex": "sandbox",
+    "openclaw": "sandbox",
+}
+
+CLI_ENGINE_KINDS: set[str] = {"claude_code", "codex", "openclaw"}
+
+
+def infer_runtime_kind(engine_kind: str) -> str:
+    runtime_kind = ENGINE_RUNTIME_MAP.get(engine_kind)
+    if not runtime_kind:
+        raise InvalidRequestError(
+            f"Unsupported engine_kind={engine_kind}",
+            code="AGENT_ENGINE_KIND_UNSUPPORTED",
+            data={"engine_kind": engine_kind},
+        )
+    return runtime_kind
+
+
+def is_cli_engine_kind(engine_kind: str) -> bool:
+    return engine_kind in CLI_ENGINE_KINDS
+
+
+def normalize_engine_kind(engine_kind: str | None) -> str | None:
+    return engine_kind if engine_kind in ENGINE_KINDS else None
+
+
+def normalize_runtime_kind(runtime_kind: str | None) -> str | None:
+    return runtime_kind if runtime_kind in RUNTIME_KINDS else None
+```
+
+- [ ] **Step 2: Update `__init__.py` re-exports**
+
+Replace the agent imports block in `__init__.py`:
+
+```python
+from app.core.contracts.agent import (
+    ALL_ENGINE_KINDS,
+    CLI_ENGINE_KINDS,
+    ENGINE_KINDS,
+    ENGINE_RUNTIME_MAP,
+    INTERNAL_ENGINE_KINDS,
+    RUNTIME_KINDS,
+    AllEngineKind,
+    EngineKind,
+    InternalEngineKind,
+    RuntimeKind,
+    infer_runtime_kind,
+    is_cli_engine_kind,
+    normalize_engine_kind,
+    normalize_runtime_kind,
+)
+```
+
+Update `__all__` to match — remove all old names (`DEFINITION_KINDS`, `CLI_DEFINITION_KINDS`, `DEFINITION_RUNTIME_KIND`, `DefinitionKindLiteral`, `RuntimeKindLiteral`, `is_cli_definition_kind`, `normalize_definition_kind`), add all new names.
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add backend/app/core/contracts/agent.py backend/app/core/contracts/__init__.py
+git commit -m "refactor: replace DefinitionKindLiteral/RuntimeKindLiteral with EngineKind/RuntimeKind in contracts"
+```
+
+---
+
+### Task 2: Rename engine classes and update registry
+
+**Files:**
+- Modify: `backend/app/core/engine/graph_engine.py`
+- Modify: `backend/app/core/engine/code_engine.py`
+- Modify: `backend/app/core/engine/registry.py`
+- Modify: `backend/app/core/engine/protocol.py`
+- Modify: `backend/app/core/engine/__init__.py`
+
+- [ ] **Step 1: Rename GraphEngine → LangGraphVisualEngine**
+
+In `backend/app/core/engine/graph_engine.py`:
+- Rename class `GraphEngine` → `LangGraphVisualEngine`
+- Change `engine_kind = "graph"` → `engine_kind = "langgraph_visual"`
+- Change the `definition_kind` validation: `if definition_kind != "graph":` → `if definition_kind != "langgraph_visual":`
+- Update error code: `GRAPH_DEFINITION_KIND_UNSUPPORTED` → `LANGGRAPH_VISUAL_ENGINE_KIND_MISMATCH`
+- Update all log prefixes `[GraphEngine]` → `[LangGraphVisualEngine]`
+
+- [ ] **Step 2: Rename CodeEngine → LangGraphCodeEngine**
+
+In `backend/app/core/engine/code_engine.py`:
+- Rename class `CodeEngine` → `LangGraphCodeEngine`
+- Change `engine_kind = "code"` → `engine_kind = "langgraph_code"`
+- Change validation: `if definition_kind != "code":` → `if definition_kind != "langgraph_code":`
+- Update error code: `CODE_DEFINITION_KIND_UNSUPPORTED` → `LANGGRAPH_CODE_ENGINE_KIND_MISMATCH`
+- Update all log prefixes `[CodeEngine]` → `[LangGraphCodeEngine]`
+
+- [ ] **Step 3: Update registry.py naming**
+
+In `backend/app/core/engine/registry.py`:
+- Rename parameter `runtime_kind` → `engine_kind` in all methods (`register`, `has`, `get`, `list_kinds`)
+- Update docstring and error messages: `"runtime_kind"` → `"engine_kind"`, `"available_runtime_kinds"` → `"available_engine_kinds"`
+- Update error code: `EXECUTION_ENGINE_NOT_REGISTERED` stays the same (still correct)
+
+```python
+class EngineRegistry:
+    """Singleton registry: engine_kind → ExecutionEngine."""
+
+    def __init__(self) -> None:
+        self._engines: dict[str, ExecutionEngine] = {}
+
+    def register(self, engine_kind: str, engine: ExecutionEngine) -> None:
+        self._engines[engine_kind] = engine
+
+    def has(self, engine_kind: str) -> bool:
+        return engine_kind in self._engines
+
+    def get(self, engine_kind: str) -> ExecutionEngine:
+        engine = self._engines.get(engine_kind)
+        if not engine:
+            available = ", ".join(self._engines.keys()) or "(none)"
+            raise NotFoundError(
+                "Execution engine is not registered",
+                code="EXECUTION_ENGINE_NOT_REGISTERED",
+                data={"engine_kind": engine_kind, "available_engine_kinds": available},
+            )
+        return engine
+
+    def list_kinds(self) -> list[str]:
+        return list(self._engines.keys())
+```
+
+- [ ] **Step 4: Update protocol.py docstring**
+
+In `backend/app/core/engine/protocol.py`:
+- Update the `ExecutionEngine` docstring to list the new engine names:
+
+```python
+@runtime_checkable
+class ExecutionEngine(Protocol):
+    """
+    Stable interface for all execution engines.
+
+    User-facing engines:
+      - LangGraphVisualEngine  (engine_kind: langgraph_visual)
+      - LangGraphCodeEngine    (engine_kind: langgraph_code)
+      - ClaudeCodeEngine       (engine_kind: claude_code)
+      - CodexEngine            (engine_kind: codex)
+      - OpenClawEngine         (engine_kind: openclaw)
+
+    Internal platform engines:
+      - CopilotEngine          (engine_kind: build_copilot)
+    """
+```
+
+- Change `definition_kind` parameter name in `start()` to `engine_kind`:
+
+```python
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+```
+
+- Update the docstring for the parameter: `engine_kind: "langgraph_visual" | "langgraph_code" | "claude_code" | "codex" | "openclaw"`
+
+- [ ] **Step 5: Update all engine start() signatures**
+
+In each engine file (`graph_engine.py`, `code_engine.py`, `copilot_engine.py`), rename the `definition_kind` parameter to `engine_kind` in the `start()` method signature and update any internal references to it.
+
+For `graph_engine.py`:
+```python
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        execution_id = context.execution_id
+        if engine_kind != "langgraph_visual":
+            error = InvalidRequestError(
+                f"LangGraphVisualEngine cannot handle engine_kind={engine_kind}",
+                ...
+```
+
+For `code_engine.py`:
+```python
+        if engine_kind != "langgraph_code":
+            error = InvalidRequestError(
+                f"LangGraphCodeEngine cannot handle engine_kind={engine_kind}",
+                ...
+```
+
+For `copilot_engine.py`: rename parameter `definition_kind` → `engine_kind` (no validation needed — copilot doesn't check it).
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add backend/app/core/engine/
+git commit -m "refactor: rename engine classes and update registry to use engine_kind"
+```
+
+---
+
+### Task 3: Create individual CLI engine implementations
+
+**Files:**
+- Create: `backend/app/core/engine/claude_code_engine.py`
+- Create: `backend/app/core/engine/codex_engine.py`
+- Create: `backend/app/core/engine/openclaw_engine.py`
+- Delete: `backend/app/core/engine/cli_engine.py`
+
+Each CLI engine follows the same pattern — they delegate to `ExecutionRunner` (which uses `RuntimeProviderRegistry` internally to get the right provider). The key difference from the old `CLIEngine` is that each engine sets its own `engine_kind` and the `runtime_type` is hardcoded rather than read from `release_runtime_binding`.
+
+- [ ] **Step 1: Create `claude_code_engine.py`**
+
+```python
+"""Claude Code Execution Engine.
+
+engine_kind: "claude_code"
+Docker + Claude Code CLI agent runtime.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from loguru import logger
+
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class ClaudeCodeEngine:
+    """Claude Code CLI execution engine."""
+
+    engine_kind = "claude_code"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=True,
+        supports_debug_observation=False,
+        supports_artifacts=True,
+        supports_approval=True,
+    )
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        from app.core.database import AsyncSessionLocal
+
+        execution_id = context.execution_id
+        logger.info(f"[ClaudeCodeEngine] Starting execution {execution_id}")
+
+        await context.update_status("running")
+        await context.emit(
+            ExecutionEventType.EXECUTION_STARTED,
+            {"engine": "claude_code"},
+        )
+
+        async with AsyncSessionLocal() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            await runner.run(
+                execution_id=execution_id,
+                prompt=prompt,
+                credentials=context.credentials or None,
+                collector=context.collector,
+            )
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.cancel()
+            logger.info(f"[ClaudeCodeEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.inject_message(message)
+```
+
+- [ ] **Step 2: Create `codex_engine.py`**
+
+Same as `claude_code_engine.py` but with:
+- Class name: `CodexEngine`
+- `engine_kind = "codex"`
+- Log prefix: `[CodexEngine]`
+- Emit payload: `{"engine": "codex"}`
+
+```python
+"""Codex Execution Engine.
+
+engine_kind: "codex"
+Docker + Codex CLI agent runtime.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from loguru import logger
+
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class CodexEngine:
+    """Codex CLI execution engine."""
+
+    engine_kind = "codex"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=True,
+        supports_debug_observation=False,
+        supports_artifacts=True,
+        supports_approval=True,
+    )
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        from app.core.database import AsyncSessionLocal
+
+        execution_id = context.execution_id
+        logger.info(f"[CodexEngine] Starting execution {execution_id}")
+
+        await context.update_status("running")
+        await context.emit(
+            ExecutionEventType.EXECUTION_STARTED,
+            {"engine": "codex"},
+        )
+
+        async with AsyncSessionLocal() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            await runner.run(
+                execution_id=execution_id,
+                prompt=prompt,
+                credentials=context.credentials or None,
+                collector=context.collector,
+            )
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.cancel()
+            logger.info(f"[CodexEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.inject_message(message)
+```
+
+- [ ] **Step 3: Create `openclaw_engine.py`**
+
+Same pattern:
+- Class name: `OpenClawEngine`
+- `engine_kind = "openclaw"`
+- Log prefix: `[OpenClawEngine]`
+- Emit payload: `{"engine": "openclaw"}`
+
+```python
+"""OpenClaw Execution Engine.
+
+engine_kind: "openclaw"
+Docker + OpenClaw CLI agent runtime.
+"""
+
+from __future__ import annotations
+
+import uuid
+from typing import Any
+
+from loguru import logger
+
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext
+from app.core.events.event_types import ExecutionEventType
+
+
+class OpenClawEngine:
+    """OpenClaw CLI execution engine."""
+
+    engine_kind = "openclaw"
+    capabilities = EngineCapabilities(
+        supports_cancel=True,
+        supports_message_injection=True,
+        supports_debug_observation=False,
+        supports_artifacts=True,
+        supports_approval=True,
+    )
+
+    async def start(
+        self,
+        context: ExecutionContext,
+        *,
+        release_runtime_binding: dict[str, Any],
+        engine_kind: str,
+        definition_payload: dict[str, Any],
+        prompt: str,
+    ) -> None:
+        from app.core.database import AsyncSessionLocal
+
+        execution_id = context.execution_id
+        logger.info(f"[OpenClawEngine] Starting execution {execution_id}")
+
+        await context.update_status("running")
+        await context.emit(
+            ExecutionEventType.EXECUTION_STARTED,
+            {"engine": "openclaw"},
+        )
+
+        async with AsyncSessionLocal() as db:
+            from app.services.runner_factory import create_execution_runner
+
+            runner = create_execution_runner(db)
+            await runner.run(
+                execution_id=execution_id,
+                prompt=prompt,
+                credentials=context.credentials or None,
+                collector=context.collector,
+            )
+
+    async def cancel(self, execution_id: uuid.UUID) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.cancel()
+            logger.info(f"[OpenClawEngine] Cancelled execution {execution_id}")
+
+    async def send_message(self, execution_id: uuid.UUID, message: str) -> None:
+        from app.core.agent.cli_backends.session_registry import session_registry
+
+        session = session_registry.get(execution_id)
+        if session:
+            await session.inject_message(message)
+```
+
+- [ ] **Step 4: Delete `cli_engine.py`**
+
+```bash
+git rm backend/app/core/engine/cli_engine.py
+```
+
+- [ ] **Step 5: Update `__init__.py` with new registrations**
+
+Replace the entire file:
+
+```python
+"""
+Engine package — unified execution engine abstraction.
+
+Registers all built-in engines at import time.
+"""
+
+from app.core.engine.claude_code_engine import ClaudeCodeEngine
+from app.core.engine.codex_engine import CodexEngine
+from app.core.engine.code_engine import LangGraphCodeEngine
+from app.core.engine.copilot_engine import CopilotEngine
+from app.core.engine.graph_engine import LangGraphVisualEngine
+from app.core.engine.openclaw_engine import OpenClawEngine
+from app.core.engine.protocol import EngineCapabilities, ExecutionContext, ExecutionEngine
+from app.core.engine.registry import engine_registry
+
+engine_registry.register("langgraph_visual", LangGraphVisualEngine())
+engine_registry.register("langgraph_code", LangGraphCodeEngine())
+engine_registry.register("claude_code", ClaudeCodeEngine())
+engine_registry.register("codex", CodexEngine())
+engine_registry.register("openclaw", OpenClawEngine())
+engine_registry.register("build_copilot", CopilotEngine())
+
+__all__ = [
+    "ExecutionContext",
+    "ExecutionEngine",
+    "EngineCapabilities",
+    "engine_registry",
+    "ClaudeCodeEngine",
+    "CodexEngine",
+    "CopilotEngine",
+    "LangGraphCodeEngine",
+    "LangGraphVisualEngine",
+    "OpenClawEngine",
+]
+```
+
+- [ ] **Step 6: Commit**
+
+```bash
+git add backend/app/core/engine/
+git commit -m "refactor: promote CLI providers to first-class engines, delete CLIEngine"
+```
+
+---
+
+### Task 4: Update models (`agent.py`, `execution.py`)
+
+**Files:**
+- Modify: `backend/app/models/agent.py`
+- Modify: `backend/app/models/execution.py`
+
+- [ ] **Step 1: Update `agent.py`**
+
+Change import:
+```python
+# Old
+from app.core.contracts.agent import normalize_definition_kind, normalize_runtime_kind
+# New
+from app.core.contracts.agent import normalize_engine_kind, normalize_runtime_kind
+```
+
+Rename `Agent.definition_kind` property to `Agent.engine_kind`:
+```python
+    @property
+    def engine_kind(self) -> Optional[str]:
+        if not self.current_draft_version:
+            return None
+        return normalize_engine_kind(self.current_draft_version.engine_kind)
+```
+
+Rename `AgentVersion.definition_kind` column to `engine_kind`:
+```python
+    engine_kind: Mapped[str] = mapped_column(String(20), nullable=False)
+```
+
+Note: The SQLAlchemy `mapped_column` name defaults to the attribute name. The actual DB column rename happens in the migration (Task 7). For now the Python attribute name drives the column expectation. This means the app code and the migration must be deployed together.
+
+- [ ] **Step 2: Update `execution.py`**
+
+Rename `Execution.executor_kind` to `Execution.engine_kind`:
+```python
+    engine_kind: Mapped[str] = mapped_column(String(20), nullable=False)
+```
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add backend/app/models/agent.py backend/app/models/execution.py
+git commit -m "refactor: rename definition_kind→engine_kind and executor_kind→engine_kind in models"
+```
+
+---
+
+### Task 5: Update schemas
+
+**Files:**
+- Modify: `backend/app/schemas/agent.py`
+- Modify: `backend/app/schemas/agent_version.py`
+- Modify: `backend/app/schemas/agent_release.py`
+
+- [ ] **Step 1: Update `schemas/agent.py`**
+
+Change import:
+```python
+# Old
+from app.core.contracts.agent import DefinitionKindLiteral, RuntimeKindLiteral
+# New
+from app.core.contracts.agent import EngineKind, RuntimeKind
+```
+
+Update `CreateAgentRequest`:
+```python
+    engine_kind: EngineKind = "langgraph_visual"
+```
+
+Update `AgentSummary` and `AgentResponse`:
+```python
+    engine_kind: Optional[EngineKind] = None
+    runtime_kind: Optional[RuntimeKind] = None
+```
+
+Remove `definition_kind` from both — the field is now `engine_kind`.
+
+- [ ] **Step 2: Update `schemas/agent_version.py`**
+
+Change import:
+```python
+# Old
+from app.schemas.agent import DefinitionKindLiteral
+# New
+from app.core.contracts.agent import EngineKind
+```
+
+Update `CreateAgentVersionRequest`:
+```python
+    engine_kind: EngineKind = "langgraph_visual"
+```
+
+Update response schemas — rename `definition_kind: str` → `engine_kind: str`.
+
+- [ ] **Step 3: Update `schemas/agent_release.py`**
+
+Change import:
+```python
+# Old
+from app.core.contracts.agent import RuntimeKindLiteral
+# New
+from app.core.contracts.agent import RuntimeKind
+```
+
+Update `CreateAgentReleaseRequest`:
+```python
+    runtime_kind: RuntimeKind
+```
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add backend/app/schemas/agent.py backend/app/schemas/agent_version.py backend/app/schemas/agent_release.py
+git commit -m "refactor: update schemas to use EngineKind/RuntimeKind"
+```
+
+---
+
+### Task 6: Update services
+
+**Files:**
+- Modify: `backend/app/services/agent_publish_service.py`
+- Modify: `backend/app/services/execution_orchestrator.py`
+- Modify: `backend/app/core/agent/cli_backends/execution_runner.py`
+
+- [ ] **Step 1: Update `agent_publish_service.py`**
+
+Change import:
+```python
+# Old
+from app.core.contracts.agent import infer_runtime_kind, is_cli_definition_kind
+# New
+from app.core.contracts.agent import ENGINE_RUNTIME_MAP, infer_runtime_kind
+```
+
+Update `publish()`:
+```python
+        runtime_kind = infer_runtime_kind(version.engine_kind)
+        release_data = CreateAgentReleaseRequest(
+            agent_version_id=version.id,
+            runtime_kind=runtime_kind,
+            runtime_binding={},
+        )
+```
+
+The `runtime_binding` no longer needs `runtime_type` — the engine registry routes directly by `engine_kind` now.
+
+Remove `_infer_runtime_kind` static method (just use `infer_runtime_kind` directly).
+
+- [ ] **Step 2: Update `execution_orchestrator.py`**
+
+Change import:
+```python
+# Old
+from app.core.contracts.agent import infer_runtime_kind, is_cli_definition_kind
+# New
+from app.core.contracts.agent import infer_runtime_kind
+```
+
+**Update `_resolve_engine`** — simplify to always use `engine_kind`:
+```python
+    def _resolve_engine(self, execution: Execution, release: AgentRelease):
+        return engine_registry.get(execution.engine_kind)
+```
+
+**Update `_resolve_draft_engine_kind`** — now just returns `engine_kind` directly:
+```python
+    def _resolve_draft_engine_kind(self, version: AgentVersion) -> str:
+        return version.engine_kind
+```
+
+**Update `_build_draft_runtime_binding`** — always empty now:
+```python
+    def _build_draft_runtime_binding(self, version: AgentVersion) -> dict:
+        return {}
+```
+
+**Update `_create_and_fire`** — change `executor_kind` to `engine_kind`:
+```python
+        execution = Execution(
+            run_id=run.id,
+            attempt_index=1,
+            engine_kind=executor_kind_override or version.engine_kind,
+            status="pending",
+        )
+```
+
+The current `_create_and_fire` reads `release` and then `version` from `release.agent_version_id` (line 549). The `executor_kind` assignment currently reads:
+
+```python
+executor_kind=executor_kind_override or release.runtime_binding.get("runtime_type", "claude_code"),
+```
+
+Since `runtime_binding` no longer has `runtime_type`, and we route by `engine_kind`, change to:
+
+```python
+            engine_kind=executor_kind_override or version.engine_kind,
+```
+
+**Update `_create_and_fire_draft`** — similar change:
+```python
+            engine_kind=executor_kind_override or version.engine_kind,
+```
+
+**Update `retry_run`** — change executor_kind assignment:
+```python
+        execution = Execution(
+            run_id=run_id,
+            attempt_index=max_attempt + 1,
+            engine_kind=version.engine_kind,
+            status="pending",
+        )
+```
+
+**Update `_fire_engine`** — simplify engine resolution:
+```python
+        engine = engine_registry.get(engine_kind_override or execution.engine_kind)
+```
+
+Remove the `resolved_runtime_kind` logic. The engine is now always resolved from `engine_kind`.
+
+Pass `engine_kind` instead of `definition_kind` to `engine.start()`:
+```python
+        await engine.start(
+            ctx,
+            release_runtime_binding=runtime_binding,
+            engine_kind=_def_kind,
+            definition_payload=_def_payload,
+            prompt=prompt,
+        )
+```
+
+**Update `send_message`** — change `execution.executor_kind` reference:
+```python
+                    "engine_kind": engine.engine_kind,
+```
+
+**Update `dispatch_copilot_draft`** — rename override params:
+```python
+        return await self._create_and_fire_draft(
+            ...
+            engine_kind_override="build_copilot",
+            definition_kind_override="build_copilot",
+            definition_payload_override=copilot_payload,
+            executor_kind_override="build_copilot",
+        )
+```
+
+These override parameter names stay the same for now (they're internal kwargs), but the `definition_kind_override` is now passed as `engine_kind` to `engine.start()`.
+
+**Update `_validate_draft_overrides`** — no changes needed, just validates they're all-or-nothing.
+
+- [ ] **Step 3: Update `execution_runner.py`**
+
+Change line 87 and 96 to use `engine_kind`:
+```python
+        logger.info(
+            f"[exec:{execution_id}] Starting execution "
+            f"(release={release.id if release else 'draft'}, "
+            f"engine={execution.engine_kind})"
+        )
+```
+
+Line 166:
+```python
+                    "engine_kind": execution.engine_kind,
+```
+
+Line 172 — the runner still uses `runtime_registry.get(execution.engine_kind)` to get the right provider. This is the key integration point: `execution.engine_kind` is now `"claude_code"` / `"codex"` / `"openclaw"` which matches the `provider_type` of each `RuntimeProvider`. So this line works as-is after the rename:
+```python
+            provider = runtime_registry.get(execution.engine_kind)
+```
+
+Line 196:
+```python
+            await self._drain_to_events(execution_id, collector=collector, executor_kind=execution.engine_kind)
+```
+
+Also rename the `executor_kind` parameter in `_drain_to_events` to `engine_kind`:
+```python
+        executor_kind: str = "cli",  # → engine_kind: str = "cli",
+```
+
+And update the caller in line 280:
+```python
+            root_span = collector.start_agent(name=f"cli:{engine_kind}")
+```
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add backend/app/services/agent_publish_service.py backend/app/services/execution_orchestrator.py backend/app/core/agent/cli_backends/execution_runner.py
+git commit -m "refactor: update services to route by engine_kind directly"
+```
+
+---
+
+### Task 7: Create Alembic migration
+
+**Files:**
+- Create: `backend/alembic/versions/xxxx_refactor_agent_kinds.py`
+
+- [ ] **Step 1: Generate migration revision ID**
+
+```bash
+cd backend && python -c "import uuid; print(uuid.uuid4().hex[:12])"
+```
+
+Use the output as the revision ID.
+
+- [ ] **Step 2: Write migration file**
+
+Create `backend/alembic/versions/<rev_id>_refactor_agent_kinds.py`:
+
+```python
+"""refactor_agent_kinds
+
+Revision ID: <rev_id>
+Revises: 1a2b3c4d5e6f
+Create Date: 2026-04-30
+
+Renames definition_kind→engine_kind, executor_kind→engine_kind.
+Remaps values: graph→langgraph_visual, code→langgraph_code,
+sandbox_cli→(split by runtime_binding), graph/code runtime→server.
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = '<rev_id>'
+down_revision = '1a2b3c4d5e6f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # 1. agent_versions: rename column + remap values
+    op.alter_column('agent_versions', 'definition_kind', new_column_name='engine_kind')
+    op.execute("UPDATE agent_versions SET engine_kind = 'langgraph_visual' WHERE engine_kind = 'graph'")
+    op.execute("UPDATE agent_versions SET engine_kind = 'langgraph_code' WHERE engine_kind = 'code'")
+    # sandbox_cli → split by runtime_binding from linked releases
+    op.execute("""
+        UPDATE agent_versions av
+        SET engine_kind = COALESCE(
+            (SELECT ar.runtime_binding->>'runtime_type'
+             FROM agent_releases ar
+             WHERE ar.agent_version_id = av.id
+             LIMIT 1),
+            'claude_code'
+        )
+        WHERE av.engine_kind = 'sandbox_cli'
+    """)
+
+    # 2. agent_releases: remap runtime_kind values
+    op.execute("UPDATE agent_releases SET runtime_kind = 'server' WHERE runtime_kind IN ('graph', 'code')")
+
+    # 3. executions: rename column (values already correct: claude_code, codex, openclaw, build_copilot)
+    op.alter_column('executions', 'executor_kind', new_column_name='engine_kind')
+
+
+def downgrade():
+    # 3. executions: restore column name
+    op.alter_column('executions', 'engine_kind', new_column_name='executor_kind')
+
+    # 2. agent_releases: restore runtime_kind values (best-effort)
+    # Cannot distinguish graph vs code from runtime_kind alone, default to graph
+    op.execute("UPDATE agent_releases SET runtime_kind = 'graph' WHERE runtime_kind = 'server'")
+
+    # 1. agent_versions: restore column name + remap values
+    op.execute("UPDATE agent_versions SET engine_kind = 'graph' WHERE engine_kind = 'langgraph_visual'")
+    op.execute("UPDATE agent_versions SET engine_kind = 'code' WHERE engine_kind = 'langgraph_code'")
+    op.execute("""
+        UPDATE agent_versions SET engine_kind = 'sandbox_cli'
+        WHERE engine_kind IN ('claude_code', 'codex', 'openclaw')
+    """)
+    op.alter_column('agent_versions', 'engine_kind', new_column_name='definition_kind')
+```
+
+- [ ] **Step 3: Commit**
+
+```bash
+git add backend/alembic/versions/
+git commit -m "feat: add migration to rename agent kind columns and remap values"
+```
+
+---
+
+### Task 8: Update frontend types
+
+**Files:**
+- Modify: `frontend/types/agent.ts`
+- Modify: `frontend/types/agent-run.ts`
+- Modify: `frontend/types/__tests__/architecture-contracts.test.ts`
+
+- [ ] **Step 1: Rewrite `frontend/types/agent.ts`**
+
+```typescript
+export const ENGINE_KINDS = [
+  'langgraph_visual',
+  'langgraph_code',
+  'claude_code',
+  'codex',
+  'openclaw',
+] as const
+
+export type EngineKind = (typeof ENGINE_KINDS)[number]
+
+export const RUNTIME_KINDS = ['sandbox', 'server'] as const
+
+export type RuntimeKind = (typeof RUNTIME_KINDS)[number]
+
+export function hasBuilderSupport(kind?: string): boolean {
+  return ENGINE_KINDS.includes(kind as EngineKind)
+}
+
+export interface Agent {
+  id: string
+  workspace_id: string
+  name: string
+  slug: string
+  description: string | null
+  avatar: string | null
+  status: 'draft' | 'active' | 'archived'
+  has_custom_env: boolean
+  current_draft_version_id: string | null
+  active_release_id: string | null
+  engine_kind: EngineKind | null
+  runtime_kind: RuntimeKind | null
+  created_by: string
+  created_at: string
+  updated_at: string
+}
+
+export interface CreateAgentRequest {
+  name: string
+  description?: string
+  avatar?: string
+  engine_kind: EngineKind
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+}
+
+export interface UpdateAgentRequest {
+  name?: string
+  description?: string
+  avatar?: string
+  status?: 'draft' | 'active' | 'archived'
+}
+
+export interface AgentVersion {
+  id: string
+  agent_id: string
+  version_number: number
+  status: 'draft' | 'frozen'
+  source_kind: string
+  engine_kind: EngineKind
+  definition_payload: Record<string, unknown>
+  capability_manifest: Record<string, unknown>
+  changelog: string | null
+  created_by: string
+  created_at: string
+}
+
+export interface CreateAgentVersionRequest {
+  source_kind?: string
+  engine_kind: EngineKind
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+  changelog?: string
+}
+
+export interface UpdateAgentVersionRequest {
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+  changelog?: string
+}
+```
+
+- [ ] **Step 2: Update `frontend/types/agent-run.ts`**
+
+Change `Execution.executor_kind` → `Execution.engine_kind`:
+```typescript
+export interface Execution {
+  id: string
+  run_id: string
+  parent_execution_id: string | null
+  attempt_index: number
+  engine_kind: string
+  ...
+}
+```
+
+- [ ] **Step 3: Rewrite contract test**
+
+In `frontend/types/__tests__/architecture-contracts.test.ts`:
+
+Update imports:
+```typescript
+import {
+  ENGINE_KINDS,
+  RUNTIME_KINDS,
+} from '../agent'
+```
+
+Update assertions:
+```typescript
+  it('exports engine kinds', () => {
+    expect([...ENGINE_KINDS].sort()).toEqual([
+      'claude_code',
+      'codex',
+      'langgraph_code',
+      'langgraph_visual',
+      'openclaw',
+    ])
+  })
+
+  it('exports runtime kinds', () => {
+    expect([...RUNTIME_KINDS].sort()).toEqual(['sandbox', 'server'])
+  })
+```
+
+Update the type derivation check:
+```typescript
+    expectTypeDerivedFromConstant(source, 'EngineKind', 'ENGINE_KINDS')
+    expectTypeDerivedFromConstant(source, 'RuntimeKind', 'RUNTIME_KINDS')
+```
+
+- [ ] **Step 4: Commit**
+
+```bash
+git add frontend/types/
+git commit -m "refactor: update frontend types to EngineKind/RuntimeKind"
+```
+
+---
+
+### Task 9: Update frontend components
+
+**Files:**
+- Modify: `frontend/components/agents/agent-card.tsx`
+- Modify: `frontend/components/agents/agent-settings-tab.tsx`
+- Modify: `frontend/components/agents/agent-form-dialog.tsx`
+- Modify: `frontend/components/agents/version-form-dialog.tsx`
+- Modify: `frontend/components/agents/agent-build/builder-surface-registry.ts`
+- Modify: `frontend/lib/agents/agent-list-filters.ts`
+- Modify: `frontend/lib/agents/agent-list-filters.test.ts`
+- Modify: `frontend/components/agents/agent-build/__tests__/builder-surface-registry.test.ts`
+- Modify: `frontend/components/agents/agent-overview-tab.tsx`
+- Modify: `frontend/components/editors/graph-builder/services/visualDefinitionAdapter.ts`
+
+- [ ] **Step 1: Update `agent-card.tsx`**
+
+Change `DEFINITION_LABEL_KEYS`:
+```typescript
+const DEFINITION_LABEL_KEYS: Record<string, { labelKey: string; defaultLabel: string }> = {
+  langgraph_visual: { labelKey: 'agents.graph.shortLabel', defaultLabel: 'Graph' },
+  langgraph_code: { labelKey: 'agents.code.shortLabel', defaultLabel: 'Code' },
+  claude_code: { labelKey: 'agents.claudeCode.shortLabel', defaultLabel: 'Claude Code' },
+  codex: { labelKey: 'agents.codex.shortLabel', defaultLabel: 'Codex' },
+  openclaw: { labelKey: 'agents.openclaw.shortLabel', defaultLabel: 'OpenClaw' },
+}
+```
+
+Change `agent.definition_kind` → `agent.engine_kind`:
+```typescript
+  const definitionLabel = agent.engine_kind ? DEFINITION_LABEL_KEYS[agent.engine_kind] : null
+```
+
+- [ ] **Step 2: Update `agent-settings-tab.tsx`**
+
+Change `DEFINITION_KIND_LABELS`:
+```typescript
+  const DEFINITION_KIND_LABELS: Record<string, string> = {
+    langgraph_visual: t('agents.graph.label'),
+    langgraph_code: t('agents.code.label'),
+    claude_code: t('agents.claudeCode.label'),
+    codex: t('agents.codex.label'),
+    openclaw: t('agents.openclaw.label'),
+  }
+```
+
+Change `draftVersion.definition_kind` → `draftVersion.engine_kind`.
+
+- [ ] **Step 3: Update `agent-form-dialog.tsx`**
+
+Change import: `DefinitionKind` → `EngineKind`.
+
+Update `BuildMethodOption`:
+```typescript
+interface BuildMethodOption {
+  value: EngineKind
+  ...
+}
+```
+
+Update `BUILD_METHOD_OPTIONS`:
+```typescript
+const BUILD_METHOD_OPTIONS: BuildMethodOption[] = [
+  { value: 'langgraph_visual', labelKey: 'agents.graph.label', descriptionKey: 'agents.graph.description', icon: GitBranch },
+  { value: 'langgraph_code', labelKey: 'agents.code.label', descriptionKey: 'agents.code.description', icon: Code2 },
+  { value: 'claude_code', labelKey: 'agents.claudeCode.label', descriptionKey: 'agents.claudeCode.description', icon: Terminal },
+  { value: 'codex', labelKey: 'agents.codex.label', descriptionKey: 'agents.codex.description', icon: Bot },
+  { value: 'openclaw', labelKey: 'agents.openclaw.label', descriptionKey: 'agents.openclaw.description', icon: Cog },
+]
+```
+
+Change state: `useState<DefinitionKind>('graph')` → `useState<EngineKind>('langgraph_visual')`.
+
+Change submit: `definition_kind: definitionKind` → `engine_kind: engineKind`.
+
+Reset: `setDefinitionKind('graph')` → `setEngineKind('langgraph_visual')`.
+
+- [ ] **Step 4: Update `version-form-dialog.tsx`**
+
+Change import: `DefinitionKind` → `EngineKind`.
+
+Change state and submit to use `engine_kind` and `EngineKind`.
+
+Default: `'graph'` → `'langgraph_visual'`.
+
+- [ ] **Step 5: Update `builder-surface-registry.ts`**
+
+```typescript
+import { ENGINE_KINDS } from '@/types/agent'
+import type { EngineKind } from '@/types/agent'
+
+const DEFINITION_TO_SURFACE: Record<EngineKind, BuilderSurfaceKind> = {
+  langgraph_visual: 'visual',
+  langgraph_code: 'code',
+  claude_code: 'cli',
+  codex: 'cli',
+  openclaw: 'cli',
+}
+
+function isEngineKind(engineKind: string | null | undefined): engineKind is EngineKind {
+  return ENGINE_KINDS.includes(engineKind as EngineKind)
+}
+```
+
+Update `resolveBuilderSurface` to use `isEngineKind`.
+
+- [ ] **Step 6: Update `agent-list-filters.ts`**
+
+Change imports and types: `DefinitionKind` → `EngineKind`, `AgentListDefinitionFilter` → `AgentListEngineFilter`.
+
+Change filter field: `agent.definition_kind` → `agent.engine_kind`.
+
+- [ ] **Step 7: Update `agent-list-filters.test.ts`**
+
+Change mock data: `definition_kind: 'graph'` → `engine_kind: 'langgraph_visual'`, etc.
+
+Change `runtime_kind: 'graph'` → `runtime_kind: 'server'`.
+
+- [ ] **Step 8: Update `agent-overview-tab.tsx`**
+
+Change: `draftVersion?.definition_kind` → `draftVersion?.engine_kind`.
+
+- [ ] **Step 9: Update `visualDefinitionAdapter.ts`**
+
+Change: `definition_kind: 'graph'` → `engine_kind: 'langgraph_visual'` in defaults and the `DefinitionKind` type references.
+
+Change: `version.definition_kind` → `version.engine_kind`.
+
+- [ ] **Step 10: Update remaining test files**
+
+- `builder-surface-registry.test.ts`: update imports from `BUILDER_DEFINITION_KINDS` → `ENGINE_KINDS`
+- `visualDefinitionAdapter.test.ts`: change `definition_kind: 'graph'` → `engine_kind: 'langgraph_visual'`, `definition_kind: 'code'` → `engine_kind: 'langgraph_code'`
+- `visual-test-lab-stage.test.tsx`: change `definition_kind: 'graph'` → `engine_kind: 'langgraph_visual'`
+- `agent-build-stages.test.tsx`: change `definition_kind: 'graph'` → `engine_kind: 'langgraph_visual'`
+
+- [ ] **Step 11: Commit**
+
+```bash
+git add frontend/
+git commit -m "refactor: update all frontend components to use EngineKind/RuntimeKind"
+```
+
+---
+
+### Task 10: Update existing migration and verify
+
+**Files:**
+- Modify: `backend/alembic/versions/1a2b3c4d5e6f_unify_agent_run_metadata.py`
+
+- [ ] **Step 1: Update old migration**
+
+The old migration at line 67 consolidates `claude_code`/`codex`/`openclaw` → `sandbox_cli`. Since our new migration reverses this, update the old migration to NOT do the consolidation (since the new migration will handle the full rename):
+
+Actually — the old migration has `down_revision = None` and is not wired into the chain yet. The new migration's `down_revision` should point to whatever the actual latest migration is, not `1a2b3c4d5e6f`. Check the alembic head:
+
+```bash
+cd backend && alembic heads
+```
+
+If the old migration (`1a2b3c4d5e6f`) is the current head, update line 67 to consolidate directly to per-tool values instead:
+
+```python
+# Line 67 — keep definition_kind at per-tool granularity (new migration will handle column rename)
+# Remove this line entirely since the new migration handles the full remap
+```
+
+Actually, it's simpler: since `1a2b3c4d5e6f` consolidates to `sandbox_cli` and our new migration splits `sandbox_cli` back out using `runtime_binding`, the two migrations compose correctly. Leave the old migration as-is.
+
+- [ ] **Step 2: Run full test suite to verify**
+
+```bash
+cd backend && python -m pytest --tb=short -q
+```
+
+```bash
+cd frontend && npx vitest run --reporter=verbose
+```
+
+- [ ] **Step 3: Final commit**
+
+```bash
+git add -A
+git commit -m "refactor: agent kind refactor complete — EngineKind + RuntimeKind"
+```
diff --git a/docs/superpowers/specs/2026-03-20-agent-file-preview-refactor-design.md b/docs/superpowers/specs/2026-03-20-agent-file-preview-refactor-design.md
deleted file mode 100644
index 7a573dacd..000000000
--- a/docs/superpowers/specs/2026-03-20-agent-file-preview-refactor-design.md
+++ /dev/null
@@ -1,259 +0,0 @@
-# Agent 文件 Preview 全流程重构设计
-
-**日期:** 2026-03-20
-**状态:** Draft
-**分支:** skill_add
-
-## 问题
-
-当前 Agent 执行过程中文件 preview 实现过于复杂：
-
-1. **两套数据路径** — 执行中用 `liveFiles`（从 `tool_end` SSE 的 `files_changed` 提取）+ sandbox live read；执行完用 artifact API（list + download）
-2. **依赖工具名匹配** — `_extract_files_changed()` 硬编码了 `save_file`、`write`、`edit` 等工具名，新增工具需手动维护
-3. **非增量** — `ArtifactCollector` 在运行结束后扫描整个目录写 manifest，与实时 preview 割裂
-
-## 目标
-
-1. **增量事件驱动** — 每个文件操作（create/edit/delete）作为独立 SSE `file_event` 推送，前端实时更新文件树
-2. **统一数据源** — 只使用 sandbox live read，消除 live/artifact 双路径
-3. **零工具名耦合** — 通过 Proxy 模式拦截所有 `SandboxBackendProtocol` 写操作，自动发事件
-
-## 架构
-
-### 数据流
-
-```
-Sandbox write/edit
-       │
-       ▼
-FileTrackingProxy (拦截写操作)
-       │
-       ▼
-FileEventEmitter (线程安全队列)
-       │
-       ▼
-chat.py SSE 循环 drain()
-       │
-       ▼
-SSE file_event 推送
-       │
-       ▼
-前端 useBackendChatStream 更新 fileTree
-       │
-       ▼
-ArtifactPanel 展示文件树 + sandbox live read 预览
-```
-
-### 组件设计
-
-#### 1. `FileEventEmitter`
-
-位置: `backend/app/utils/file_event_emitter.py`（新文件）
-
-```python
-@dataclass
-class FileEvent:
-    action: str        # "write" | "edit" | "delete"
-    path: str          # 文件相对路径
-    size: int | None = None
-    timestamp: float = field(default_factory=lambda: time.time())
-
-class FileEventEmitter:
-    """线程安全的文件事件收集器。Proxy 写入，SSE 循环消费。"""
-
-    def __init__(self):
-        self._queue: collections.deque[FileEvent] = collections.deque()
-
-    def emit(self, action: str, path: str, size: int | None = None):
-        self._queue.append(FileEvent(action=action, path=path, size=size))
-
-    def drain(self) -> list[FileEvent]:
-        """原子弹出所有待发送事件，供 SSE 循环调用。
-        使用 popleft 循环而非 list()+clear()，避免两步操作间的竞态。"""
-        events = []
-        while self._queue:
-            try:
-                events.append(self._queue.popleft())
-            except IndexError:
-                break
-        return events
-```
-
-**线程安全说明：** `deque.append()` 和 `deque.popleft()` 在 CPython 中是 GIL-atomic 的。
-`drain()` 使用 popleft 循环保证不会丢失 emit/drain 并发时的事件。
-
-#### 2. `FileTrackingProxy`
-
-位置: `backend/app/core/agent/backends/file_tracking_proxy.py`（新文件）
-
-```python
-class FileTrackingProxy(SandboxBackendProtocol):
-    """包装任何 SandboxBackendProtocol，拦截写操作发出文件事件。"""
-
-    def __init__(self, backend: SandboxBackendProtocol, emitter: FileEventEmitter):
-        self._backend = backend
-        self._emitter = emitter
-
-    def write(self, file_path, content) -> WriteResult:
-        result = self._backend.write(file_path, content)
-        if not result.error:
-            self._emitter.emit("write", file_path, len(content.encode("utf-8")))
-        return result
-
-    def write_overwrite(self, file_path, content) -> WriteResult:
-        result = self._backend.write_overwrite(file_path, content)
-        if not result.error:
-            # 统一用 "write" action，前端幂等处理（create 或 overwrite 均可）
-            self._emitter.emit("write", file_path, len(content.encode("utf-8")))
-        return result
-
-    def edit(self, file_path, old_string, new_string, replace_all=False) -> EditResult:
-        result = self._backend.edit(file_path, old_string, new_string, replace_all)
-        if not result.error:
-            self._emitter.emit("edit", file_path, None)
-        return result
-
-    # 其余方法全部 delegate 到 self._backend
-    def read(self, file_path, offset=0, limit=2000): return self._backend.read(file_path, offset, limit)
-    def ls_info(self, path): return self._backend.ls_info(path)
-    def execute(self, command): return self._backend.execute(command)
-    def grep_raw(self, pattern, path=None, glob=None): return self._backend.grep_raw(pattern, path, glob)
-    def glob_info(self, pattern, path="/"): return self._backend.glob_info(pattern, path)
-    def download_files(self, paths): return self._backend.download_files(paths)
-    def upload_files(self, files):
-        results = self._backend.upload_files(files)
-        for (path, _content), resp in zip(files, results):
-            if not resp.error:
-                self._emitter.emit("write", path, len(_content))
-        return results
-    # 透传生命周期和属性
-    @property
-    def id(self): return self._backend.id
-    def is_started(self): return self._backend.is_started()
-    def start(self): return self._backend.start()
-    def stop(self): return self._backend.stop()
-    def cleanup(self): return self._backend.cleanup()
-
-    def __getattr__(self, name):
-        """未显式代理的方法自动 delegate，保证协议扩展时前向兼容。"""
-        return getattr(self._backend, name)
-```
-
-设计原则：
-- **零侵入** — 不修改 `PydanticSandboxAdapter` 或 `FileTools` 任何代码
-- **透明代理** — 所有非写操作直接 delegate
-- **只拦截成功的写操作** — error 时不发事件
-
-#### 3. SSE 集成（`chat.py` 改动）
-
-**Proxy 注入点：** `chat.py` 中构建 graph 时通过 `GraphService` / `DeepAgentsBuilder` 获取 sandbox backend。
-在获取到 backend 实例后、传给 graph 之前，包装为 `FileTrackingProxy`。
-具体方式：`DeepAgentsBuilder.build()` 接受可选 `file_emitter: FileEventEmitter` 参数，
-在内部创建 backend 后用 `FileTrackingProxy(backend, file_emitter)` 包装，再传给工具层。
-
-在事件流循环中消费：
-
-```python
-# chat.py 构建时
-emitter = FileEventEmitter()
-graph = await builder.build(..., file_emitter=emitter)
-
-# SSE 循环中
-async for event in graph.astream_events(...):
-    yield handler.handle_xxx(event, state, ...)
-
-    # 消费文件事件
-    for file_evt in emitter.drain():
-        yield handler.format_sse("file_event", {
-            "action": file_evt.action,
-            "path": file_evt.path,
-            "size": file_evt.size,
-            "timestamp": file_evt.timestamp,
-        }, state.thread_id, state)
-```
-
-#### 4. 前端 `useBackendChatStream.ts` 改动
-
-新增 `file_event` 处理：
-
-```typescript
-if (type === 'file_event') {
-  const { action, path, size, timestamp } = data as {
-    action: string; path: string; size?: number; timestamp?: number
-  }
-  safeSetMessages(prev => prev.map(m => {
-    if (m.id !== aiMsgId) return m
-    const tree = { ...(m.metadata?.fileTree as Record<string, any> || {}) }
-    if (action === 'delete') {
-      delete tree[path]
-    } else {
-      tree[path] = { action, size, timestamp }
-    }
-    return { ...m, metadata: { ...m.metadata, fileTree: tree } }
-  }))
-  return
-}
-```
-
-删除 `tool_end` 中的 `liveFiles` 累积逻辑。
-
-#### 5. `ArtifactPanel.tsx` 简化
-
-Props 变更：
-
-```typescript
-interface ArtifactPanelProps {
-  threadId: string
-  fileTree?: Record<string, { action: string; size?: number; timestamp?: number }>
-  className?: string
-}
-```
-
-核心逻辑：
-- 从 `fileTree` 构建 `FileNode[]`（替代 `liveFilesToNodes`）
-- 文件内容始终通过 `artifactService.liveReadFile(threadId, path)` 获取
-- 删除 `runId`、`liveFiles` props
-- 删除 `isLiveMode` 判断和 artifact API 调用（`listRunFiles`、`downloadFile`）
-- 删除 `fileInfoToNode` 函数
-
-### 删除的代码
-
-| 文件 | 删除内容 |
-|------|---------|
-| `stream_event_handler.py` | `_FILE_WRITE_TOOLS`、`_extract_files_changed()` 函数、`handle_tool_end` 中的 `files_changed` 字段 |
-| `useBackendChatStream.ts` | `tool_end` 中 `liveFiles` 累积逻辑、`artifacts_ready` 处理 |
-| `ArtifactPanel.tsx` | `runId` / `liveFiles` props、`isLiveMode` 分支、artifact API 调用、`liveFilesToNodes`、`fileInfoToNode` |
-| `chat.py` | `finally` 块中的 `artifacts_ready` SSE yield（后端不再发送该事件） |
-
-### 保留的代码
-
-| 文件 | 保留原因 |
-|------|---------|
-| `ArtifactCollector` / `ArtifactResolver` | 可能被其他功能使用（如历史回看），本次不删 |
-| `artifacts.py` 的 `live_read_file` API | 仍然是文件内容预览的唯一来源 |
-| `artifactService.liveReadFile` | 前端唯一的文件读取方法 |
-
-## 已知限制
-
-1. **`execute()` 盲区** — Agent 可通过 `execute("echo 'x' > file.txt")` 写文件，Proxy 无法拦截。
-   这是已知限制，接受为 gap。若后续需覆盖，可在 `execute()` 返回后做 filesystem diff（性能代价大），
-   或约束 agent 工具集禁止通过 shell 写文件。
-2. **页面刷新丢失 fileTree** — SSE 事件是临时的，刷新后 fileTree 为空。
-   依赖 sandbox 容器仍在运行，可在重连时调用 sandbox `ls_info` 重建文件树（后续迭代）。
-
-## FileTools 覆盖
-
-`FileTools`（`backend/app/core/tools/buildin/file.py`）是另一条文件写入路径，用于非 sandbox 场景。需要同样的 Proxy 包装：
-
-- 如果 `FileTools` 作为 tool 注册到 agent，其 `save_file` / `replace_file_chunk` 写入的是本地文件系统
-- 在构建 graph 时，对 FileTools 实例也包装 Proxy（需要适配其接口，因为 `save_file` 签名不同于 `SandboxBackendProtocol.write`）
-- 或者：在 `_extract_files_changed` 删除后，如果 FileTools 写入的文件不需要前端 preview（非 sandbox 容器），可以不覆盖
-
-**决策：** 本次只覆盖 `SandboxBackendProtocol`（容器方案），`FileTools` 后续按需处理。
-
-## 测试策略
-
-1. **单元测试 `FileTrackingProxy`** — 验证写操作成功时 emit、失败时不 emit、读操作透传
-2. **单元测试 `FileEventEmitter`** — 验证 emit/drain 线程安全和幂等
-3. **集成测试** — 发送 chat 消息触发文件写入，验证 SSE 流中包含 `file_event`
-4. **前端测试** — 验证 `file_event` 正确更新 fileTree，ArtifactPanel 正确渲染
diff --git a/docs/superpowers/specs/2026-03-20-chat-interaction-refactor-design.md b/docs/superpowers/specs/2026-03-20-chat-interaction-refactor-design.md
deleted file mode 100644
index d503b1fa4..000000000
--- a/docs/superpowers/specs/2026-03-20-chat-interaction-refactor-design.md
+++ /dev/null
@@ -1,381 +0,0 @@
-# Chat Interaction Refactor Design
-
-Date: 2026-03-20
-Status: Draft
-
-## Problem Statement
-
-The current Chat implementation has a significantly inferior interaction experience compared to the Skill Creator. Key gaps:
-
-1. **No guided entry** — users face a blank input box after selecting a mode
-2. **Opaque tool calls** — raw tool names (`execute_code`, `write_file`) shown as badges, unintelligible to users
-3. **Passive artifact viewing** — Artifacts Drawer requires manual click to open, not proactive
-4. **No per-message actions** — only global Send/Stop, no Copy/Retry/Continue on individual messages
-5. **Monolithic architecture** — `ChatInterface.tsx` is 700+ lines with 14 `useState` calls, mixing layout, logic, and state
-
-## Goals
-
-- Bring Skill Creator's proven interaction patterns into Chat while preserving free-form conversation
-- Establish a shared component library so both Chat and Skill Creator maintain consistent UX
-- Refactor Chat architecture to support future interaction enhancements
-- Execute in two phases: architecture cleanup first, then interaction enhancement
-
-## Non-Goals
-
-- Converting Chat into a wizard/step-by-step flow
-- Building a plugin system for arbitrary mode customization
-- Rewriting the backend streaming protocol
-- Unifying Skill Creator's streaming logic with Chat's (Skill Creator has its own inline SSE handler with domain-specific interceptions like `preview_skill` parsing; this remains separate)
-
----
-
-## Architecture Overview
-
-### Existing State to Account For
-
-`ChatInterface.tsx` currently has 14 `useState` calls: `messages`, `localChatId`, `input`, `submitting`, `artifactDrawerOpen`, `sidebarVisible`, `toolPanelOpen`, `selectedTool`, `showNoDefaultModelNotice`, `currentMode`, `hasShownApkPrompt`, `currentGraphId`, plus derived state via `useRef`.
-
-Additionally, `useChatSession.ts` already implements a `useReducer`-based state for `ChatHome` (managing `input`, `files`, `mode`, `selectedAgentId`, `autoRedirect`, `isRedirecting`, `showCases`, `isUploading`). The new `useChatReducer` absorbs the conversation-related concerns; `useChatSession` is retained for `ChatHome`'s landing-screen-only form state (mode selection, agent picker, auto-redirect toggle). The boundary: `useChatSession` owns pre-conversation state, `useChatReducer` owns active-conversation state. `ChatHome.onStartChat()` dispatches to `useChatReducer` to transition.
-
-The `chat/services/` directory (`chatModeService.ts`, `copilotRedirectService.ts`, `graphResolutionService.ts`, `modeHandlers/*`) remains untouched. These services are called by `ChatHome` and `ConversationPanel` as before; they do not depend on state management internals.
-
-### Target Structure
-
-All paths below are relative to `frontend/app/`.
-
-Note: `conversation/`, `preview/`, `hooks/` directories under `chat/` are plain directories (no `page.tsx`), so Next.js App Router will not treat them as route segments.
-
-```
-chat/
-├── ChatPage.tsx                    # Route entry, passes chatId only
-├── ChatLayout.tsx                  # Layout skeleton: sidebar | conversation | preview
-├── ChatProvider.tsx                # Context + useReducer unified state
-│
-├── conversation/
-│   ├── ConversationPanel.tsx       # Message list + input container
-│   ├── MessageList.tsx             # Evolved from ThreadContent
-│   ├── MessageBubble.tsx           # Evolved from MessageItem
-│   └── ChatInput.tsx              # Moved from chat/components/ChatInput.tsx, minor adjustments
-│
-├── preview/
-│   ├── PreviewPanel.tsx            # Preview container, tab-based content switching
-│   └── FileTreePreview.tsx         # File tree + code preview (reuses ArtifactPanel logic)
-│
-└── hooks/
-    ├── useChatReducer.ts           # Replaces 14 useState
-    ├── useBackendChatStream.ts     # Retained, adapted to dispatch
-    ├── usePreviewTrigger.ts        # Auto-expand/collapse rules for preview panel
-    ├── usePreviewState.ts          # Preview panel state
-    └── useFileUpload.ts            # Retained
-
-shared/                              # Located at frontend/app/shared/ (not a route, no page.tsx)
-├── ToolCallDisplay/
-│   ├── ToolCallBadge.tsx           # Human-readable tool call display
-│   ├── ToolCallDetail.tsx          # Tool detail panel (generalized from ToolExecutionPanel)
-│   └── toolDisplayRegistry.ts     # Tool name → human-readable label registry
-├── StreamingContent/
-│   ├── StreamingText.tsx           # Streaming text rendering + cursor animation
-│   └── StreamingProgress.tsx       # Step-by-step progress indicator
-├── ActionBar/
-│   ├── ActionBar.tsx               # Per-message action button container
-│   └── actions/                    # Copy, Retry, Regenerate concrete actions
-└── StarterPrompts/
-    └── StarterPrompts.tsx          # Guided start with configurable prompt list
-```
-
-### State Management
-
-Replace 14 `useState` with a single `useReducer` + Context:
-
-```typescript
-interface ChatState {
-  messages: Message[]
-  threadId: string | null
-  input: string
-  streaming: {
-    isProcessing: boolean
-    isSubmitting: boolean        // optimistic "thinking" before SSE starts
-    text: string
-    nodeExecutionLog: NodeLogEntry[]  // accumulated across events within a request
-  }
-}
-
-interface NodeLogEntry {
-  type: 'command' | 'route_decision' | 'loop_iteration' | 'parallel_task' | 'state_update' | 'node_transition'
-  nodeName: string
-  timestamp: number
-  data?: Record<string, unknown>
-  }
-  preview: {
-    visible: boolean
-    fileTree: Record<string, FileInfo>
-    activeFile: string | null
-  }
-  ui: {
-    sidebarVisible: boolean
-    toolDetailOpen: boolean
-    selectedTool: ToolCall | null
-    showNoDefaultModelNotice: boolean
-  }
-  mode: {
-    currentMode: string | undefined
-    currentGraphId: string | null
-    hasShownApkPrompt: boolean   // mode-specific UX flag, reset on mode change
-  }
-}
-
-type ChatAction =
-  // Thread
-  | { type: 'SET_THREAD'; threadId: string }
-  | { type: 'RESET' }
-  // Messages
-  | { type: 'APPEND_MESSAGE'; message: Message }
-  | { type: 'UPDATE_MESSAGE'; id: string; patch: Partial<Message> }
-  | { type: 'SET_MESSAGES'; messages: Message[] }
-  // Input
-  | { type: 'SET_INPUT'; value: string }
-  // Streaming lifecycle
-  | { type: 'STREAM_START' }
-  | { type: 'STREAM_CONTENT'; delta: string }
-  | { type: 'STREAM_DONE' }
-  | { type: 'STREAM_ERROR'; error: string }
-  // File & tool events
-  | { type: 'FILE_EVENT'; path: string; info: FileInfo }
-  | { type: 'TOOL_START'; tool: ToolCall }
-  | { type: 'TOOL_END'; id: string; result: string }
-  // Node execution (agent mode)
-  | { type: 'NODE_START'; nodeId: string; label: string }
-  | { type: 'NODE_END'; nodeId: string }
-  | { type: 'NODE_LOG'; entry: NodeLogEntry }
-  // UI toggles
-  | { type: 'TOGGLE_SIDEBAR' }
-  | { type: 'SHOW_PREVIEW'; tab?: string }
-  | { type: 'HIDE_PREVIEW' }
-  | { type: 'SELECT_TOOL'; tool: ToolCall | null }
-  | { type: 'DISMISS_MODEL_NOTICE' }
-  // Mode
-  | { type: 'SET_MODE'; mode: string; graphId: string | null }
-  | { type: 'SET_APK_PROMPT_SHOWN' }
-```
-
-**Performance note**: To avoid streaming deltas re-rendering the entire tree, `ChatProvider` splits into two contexts:
-- `ChatStateContext` — full state (low-frequency: messages, UI, mode)
-- `ChatStreamContext` — streaming-specific state (high-frequency: `streaming.text`, `streaming.isProcessing`)
-
-Components subscribe only to the context they need. `MessageList` uses `ChatStateContext`; the streaming cursor/indicator uses `ChatStreamContext`.
-
----
-
-## Shared Component Library
-
-### 1. ToolCallDisplay — Human-Readable Tool Calls
-
-**Registry pattern** for extensible tool name mapping:
-
-```typescript
-interface ToolDisplayConfig {
-  label: string
-  icon?: React.ReactNode
-  formatArgs?: (args: any) => string   // Short summary, e.g. "main.py"
-  formatDetail?: (args: any) => string // Extended detail string (migrated from toolDisplayUtils.ts's detail field)
-  category: 'file' | 'code' | 'search' | 'network' | 'other'
-}
-
-// Built-in mappings
-const defaultRegistry: Record<string, ToolDisplayConfig> = {
-  'write_file':    { label: 'Writing file',    category: 'file',   formatArgs: a => a.path },
-  'read_file':     { label: 'Reading file',    category: 'file',   formatArgs: a => a.path },
-  'execute_code':  { label: 'Executing code',  category: 'code' },
-  'web_search':    { label: 'Searching web',   category: 'search' },
-  'preview_skill': { label: 'Deploying skill', category: 'other',  formatArgs: a => a.skill_name },
-}
-
-// Modules can extend
-registry.register('custom_tool', { label: 'Custom Action', category: 'other' })
-```
-
-`ToolCallBadge` renders in compact mode (inline in messages) and expanded mode (detail panel). Replaces current raw tool name badges with human-readable labels + progress indicator.
-
-### 2. StreamingContent — Enhanced Streaming Feedback
-
-`StreamingProgress` converts `node_start`/`node_end` SSE events into visible step progress:
-
-```typescript
-interface StepInfo {
-  id: string
-  label: string
-  status: 'pending' | 'active' | 'done'
-  startTime?: number
-}
-```
-
-Rendering logic:
-- 4 steps or fewer: horizontal step bar
-- More than 4 steps: vertical timeline showing current step +/- 1
-
-Serves both Chat agent mode (already has `node_start`/`node_end` events) and Skill Creator.
-
-### 3. ActionBar — Per-Message Actions
-
-Appears at the bottom of assistant messages:
-
-```typescript
-interface ActionBarProps {
-  messageId: string
-  actions: ActionConfig[]
-  layout: 'inline' | 'floating'
-}
-```
-
-Chat actions: Copy, Retry, Continue (last message only).
-Skill Creator actions: Copy, Regenerate, Save to Library (when valid).
-
-Interaction: hidden by default, fade in on hover. Last assistant message always shows actions.
-
-### 4. StarterPrompts — Guided Start
-
-Each mode registers its own starter prompts via `modeConfig`:
-
-```typescript
-interface ModeConfig {
-  // ... existing fields
-  starterPrompts?: StarterPrompt[]
-}
-```
-
-Click fills the input (does not auto-submit), allowing user modification before sending. On click: input receives focus, cursor positions at end, the clicked chip gets a brief highlight animation as visual feedback.
-
----
-
-## Layout Refactoring
-
-### Current Layout is Overlay-Based
-
-The current tool and artifact panels are absolutely-positioned floating overlays with fixed width (`SIDE_PANEL_WIDTH = 600`), not part of the `ResizablePanelGroup`. Migrating to a three-column `ResizablePanel` layout is a **breaking layout change** — the transition from overlay to grid requires restructuring the DOM hierarchy, not just swapping components.
-
-### Three-Column Layout
-
-```
-┌──────────┬────────────────────┬─────────────┐
-│ Sidebar  │   Conversation     │   Preview   │
-│          │  ┌──────────────┐  │  ┌─────────┐│
-│          │  │ Message List  │  │  │File Tree││
-│          │  │ · Readable    │  │  │         ││
-│          │  │   tool calls  │  │  ├─────────┤│
-│          │  │ · Progress    │  │  │Code View││
-│          │  │ · Actions     │  │  │         ││
-│          │  ├──────────────┤  │  │         ││
-│          │  │ Input         │  │  │         ││
-│          │  └──────────────┘  │  └─────────┘│
-└──────────┴────────────────────┴─────────────┘
-```
-
-The preview panel is a first-class layout citizen using `ResizablePanel`, not an afterthought drawer. Users can drag to resize.
-
-### Preview Panel
-
-Tab-based container switching between file preview and tool detail:
-
-- **Files tab**: appears when `fileTree` has entries, shows hierarchical file browser + code viewer
-- **Tool tab**: appears when user clicks a tool call badge, shows tool input/output detail
-
-### Auto-Expand Rules (PreviewTrigger)
-
-`PreviewTrigger` is a **custom hook** (`usePreviewTrigger`) located at `chat/hooks/usePreviewTrigger.ts`, consumed by `ChatLayout`. It subscribes to `ChatStreamContext` and dispatches `SHOW_PREVIEW`/`HIDE_PREVIEW` actions to the reducer.
-
-```typescript
-const defaultRules: TriggerRule[] = [
-  { event: 'file_event',  action: 'show',  tab: 'files' },
-  { event: 'tool_click',  action: 'show',  tab: 'tool' },
-  { event: 'stream_done', action: 'hide',
-    condition: (state: ChatState) => Object.keys(state.preview.fileTree).length === 0 },
-]
-```
-
-**Manual override behavior**: When the user manually closes the preview panel, a `userDismissed` flag is set for the current streaming session. Auto-expand rules are suppressed while this flag is active. The flag resets on the next user message submission (new streaming session starts).
-
-User can always manually close/reopen. On screens < 768px, preview falls back to overlay mode.
-
-### Skill Creator Migration
-
-After shared components are established:
-
-```
-SkillPreviewPanel (dedicated) → PreviewPanel (shared) + SkillValidation (dedicated slot)
-toolDisplayUtils.ts → shared toolDisplayRegistry
-```
-
----
-
-## Implementation Strategy
-
-### Phase 1: Architecture Cleanup (No Visible Changes)
-
-| Step | Action | Deliverable | Verification |
-|------|--------|-------------|-------------|
-| 1 | Create `useChatReducer.ts` | State reducer + ChatProvider context | 1:1 mapping of all existing useState, TypeScript strict types |
-| 2 | Extract `ChatLayout.tsx` | Layout skeleton | Render output identical |
-| 3 | Extract `ConversationPanel.tsx` | Message list + input container | Send messages, streaming works |
-| 4 | Adapt sidebar to Context | ChatSidebar reads from Context | Switch conversations works |
-| 5 | Adapt `useBackendChatStream` | dispatch-based event handling | Full streaming flow works |
-| 6 | Wrap tool/artifact panels | `PreviewPanel.tsx` with old logic | Click tool/file still works |
-
-**Completion criteria**: `ChatInterface.tsx` is renamed to `ChatPage.tsx` (the route entry) and reduced to < 50 lines — it renders `ChatProvider` wrapping `ChatLayout`, nothing more. The current `page.tsx` is updated to import from `ChatPage`. All existing functionality unchanged.
-
-### Phase 2: Interaction Enhancement (Visible Improvements)
-
-Each step is independently deliverable:
-
-| Step | Feature | Files Changed | Dependencies |
-|------|---------|---------------|-------------|
-| 1 | Tool call readability | new `shared/ToolCallDisplay/*`, modify `MessageBubble` | None |
-| 2 | Persistent preview panel | new `preview/*`, modify `ChatLayout`, delete `ArtifactsDrawer` + `CompactArtifactStatus` | Phase 1 layout split |
-| 3 | Per-message action buttons | new `shared/ActionBar/*`, modify `MessageBubble` | None |
-| 4 | Starter prompts | new `shared/StarterPrompts/`, modify `modeConfig`, `ChatHome` | None |
-| 5 | Skill Creator migration | modify `skills/creator/*` to use shared components | Steps 1, 2 |
-
-### File Change Summary
-
-**New (~15 files)**:
-- `shared/ToolCallDisplay/` (3 files)
-- `shared/StreamingContent/` (2 files)
-- `shared/ActionBar/` (3 files)
-- `shared/StarterPrompts/` (1 file)
-- `chat/ChatLayout.tsx`
-- `chat/ChatProvider.tsx`
-- `chat/conversation/ConversationPanel.tsx`
-- `chat/preview/PreviewPanel.tsx`, `FileTreePreview.tsx`
-- `chat/hooks/useChatReducer.ts`, `usePreviewState.ts`, `usePreviewTrigger.ts`
-
-**Modified (~8 files)**:
-- `chat/ChatInterface.tsx` — renamed to `ChatPage.tsx`, reduced to Provider + Layout glue (< 50 lines)
-- `chat/components/MessageItem.tsx` → moved to `chat/conversation/MessageBubble.tsx`, integrates new components
-- `chat/components/ThreadContent.tsx` → moved to `chat/conversation/MessageList.tsx`, simplified
-- `chat/hooks/useBackendChatStream.ts` — adapted to dispatch (note: `nodeExecutionLog` moves from closure variable to `ChatState.streaming.nodeExecutionLog`, accumulated via `NODE_LOG` actions)
-- `chat/components/ChatInput.tsx` — moved to `chat/conversation/ChatInput.tsx`
-- `chat/config/modeConfig.ts` — add `starterPrompts` field
-- `chat/components/ChatHome.tsx` — integrate `StarterPrompts`
-- `chat/components/ArtifactPanel.tsx` — refactored into `chat/preview/FileTreePreview.tsx` (same logic, new location)
-- `skills/creator/*` — migrate to shared components (Phase 2 late)
-
-**Deleted (~4 files)**:
-- `chat/components/ArtifactsDrawer.tsx`
-- `chat/components/CompactArtifactStatus.tsx`
-- `chat/components/ToolExecutionPanel.tsx` — merged into PreviewPanel
-- `chat/components/CompactToolStatus.tsx` — replaced by ToolCallBadge
-
----
-
-## Risk Mitigation
-
-| Risk | Mitigation |
-|------|-----------|
-| Phase 1 regressions | Run full E2E after each extraction step: send message, streaming, switch conversation, tool/file viewing |
-| Preview panel squeezes conversation on small screens | Set `minSize` breakpoint; width < 768px falls back to overlay mode |
-| Shared component over-generalization | First version only extracts Chat + Skill Creator common parts, no premature abstraction |
-| useReducer migration misses state | 1:1 mapping of all 14 existing useState; TypeScript strict types catch omissions |
-| Skill Creator migration breaks existing flow | Phase 2 Step 5 is last; by then shared components are battle-tested in Chat |
-| Context re-renders on streaming deltas | Split into `ChatStateContext` (low-frequency) and `ChatStreamContext` (high-frequency); components subscribe only to what they need |
-| Two reducer scopes conflict (`useChatSession` + `useChatReducer`) | Clear boundary: `useChatSession` owns pre-conversation form state only, `useChatReducer` owns active conversation. `ChatHome.onStartChat()` is the handoff point |
-| Import path breakage from file moves | Use barrel exports (`index.ts`) in new directories; update imports in one pass with IDE refactoring tools |
-| Overlay-to-grid layout migration complexity | Phase 1 Step 6 wraps existing overlays as-is; the actual layout switch happens in Phase 2 Step 2, isolated from other changes |
diff --git a/docs/superpowers/specs/2026-03-20-skill-versioning-permissions-api-design.md b/docs/superpowers/specs/2026-03-20-skill-versioning-permissions-api-design.md
deleted file mode 100644
index e47db3b86..000000000
--- a/docs/superpowers/specs/2026-03-20-skill-versioning-permissions-api-design.md
+++ /dev/null
@@ -1,430 +0,0 @@
-# Skill 多版本管理、团队协作权限、通用 Token 鉴权 设计文档
-
-**日期**: 2026-03-20
-**状态**: 设计完成，待实现
-
-## 概述
-
-为 Skill 系统新增三大能力：
-
-1. **语义版本发布** — 发布后不可变，单 draft 编辑模式
-2. **团队协作权限** — Skill 独立协作者体系（viewer/editor/publisher/admin）
-3. **通用 Token 鉴权** — PlatformToken，支持 scope 控制，完整 CRUD + 发布 API
-
-## 设计原则
-
-- 现有 `skills` 和 `skill_files` 表零改动，已有数据自动成为 draft
-- Skill 独立于 workspace，不引入 workspace 关联
-- 新增表纯增量，Alembic migration 不影响线上数据
-- 现有 API 行为不变，新增端点扩展能力
-
----
-
-## 1. 数据模型
-
-### 1.1 SkillVersion 表（新增）
-
-存储已发布的不可变版本快照。
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| id | UUID | 主键 |
-| skill_id | UUID FK → skills.id | 所属 Skill |
-| version | String(20) | semver 版本号，仅 MAJOR.MINOR.PATCH 格式 |
-| release_notes | Text | 发布说明 / changelog |
-| skill_name | String(64) | 快照：发布时的 skill 名称 |
-| skill_description | String(1024) | 快照：发布时的 skill 描述 |
-| content | Text | 快照：skill body |
-| tags | JSONB | 快照 |
-| meta_data | JSONB | 快照 |
-| allowed_tools | JSONB | 快照 |
-| compatibility | String(500) | 快照 |
-| license | String(100) | 快照 |
-| published_by_id | String FK → user.id | 发布人 |
-| published_at | DateTime(tz) | 发布时间 |
-| created_at | DateTime(tz) | 继承自 BaseModel（updated_at 也会继承，值始终等于 created_at） |
-
-**约束**:
-- UniqueConstraint(`skill_id`, `version`)
-- Index on `skill_id`
-- Index on `published_at`
-
-**版本号规则**:
-- 仅接受 `MAJOR.MINOR.PATCH` 格式（如 `1.0.0`），不支持 pre-release 或 build metadata
-- 使用 `semver` PyPI 包进行解析和比较（避免字符串排序导致 `1.10.0 < 1.9.0` 的错误）
-- 新版本号必须大于已有最高版本
-
-### 1.2 SkillVersionFile 表（新增）
-
-版本文件快照，结构同 SkillFile，关联到 version。
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| id | UUID | 主键 |
-| version_id | UUID FK → skill_versions.id | 所属版本 |
-| path | String(512) | 相对路径 |
-| file_name | String(255) | 文件名 |
-| file_type | String(50) | 文件类型 |
-| content | Text | 文件内容 |
-| storage_type | String(20) | database/s3 |
-| storage_key | String(512) | 外部存储键（可选） |
-| size | Integer | 文件大小 |
-
-**约束**:
-- Index on `version_id`
-- Cascade delete with SkillVersion
-- 继承 BaseModel（获得 id/created_at/updated_at），updated_at 始终等于 created_at
-
-### 1.3 SkillCollaborator 表（新增）
-
-Skill 级别的协作者权限管理，独立于 workspace。
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| id | UUID | 主键 |
-| skill_id | UUID FK → skills.id | 所属 Skill |
-| user_id | String FK → user.id | 协作者 |
-| role | Enum | admin / publisher / editor / viewer |
-| invited_by | String FK → user.id | 邀请人 |
-| created_at | DateTime(tz) | 邀请时间 |
-
-**约束**:
-- UniqueConstraint(`skill_id`, `user_id`) — 自动创建 (skill_id, user_id) 复合索引
-- Index on (`user_id`, `skill_id`) — 用于反向查询（用户有权访问哪些 skill）
-- `invited_by` 字段 NOT NULL，始终设为执行操作的用户
-
-**角色权限矩阵**:
-
-| 操作 | owner | admin | publisher | editor | viewer |
-|------|-------|-------|-----------|--------|--------|
-| 查看 skill | Y | Y | Y | Y | Y |
-| 编辑 draft | Y | Y | Y | Y | - |
-| 发布版本 | Y | Y | Y | - | - |
-| 删除版本 | Y | Y | - | - | - |
-| 管理协作者 | Y | Y | - | - | - |
-| 删除 skill | Y | - | - | - | - |
-| 转让 ownership | Y | - | - | - | - |
-
-### 1.4 PlatformToken 表（新增）
-
-通用 Token 鉴权，支持多种资源类型，未来可扩展。
-
-| 字段 | 类型 | 说明 |
-|------|------|------|
-| id | UUID | 主键 |
-| user_id | String FK → user.id | Token 归属人 |
-| name | String(255) | 用户自定义名称 |
-| token_hash | String(64) | SHA-256 哈希值 |
-| token_prefix | String(12) | 如 "sk_abc1..." 用于识别 |
-| scopes | JSONB | ["skills:read", "skills:write", ...] |
-| resource_type | String(50) | 可选，如 "skill"/"workspace"/"graph" |
-| resource_id | UUID | 可选，绑定到特定资源实例 |
-| expires_at | DateTime(tz) | 过期时间（可选） |
-| last_used_at | DateTime(tz) | 最后使用时间 |
-| is_active | Boolean | 是否有效，default True |
-| created_at | DateTime(tz) | 创建时间 |
-
-**约束**:
-- Unique on `token_hash`
-- Index on `user_id`
-- Index on `token_hash`
-- Index on `is_active`
-
-**限制**:
-- 每用户最多 50 个 active token（创建时校验，达到上限返回 400）
-- 已撤销（is_active=False）的 token 不计入额度
-
-**与现有 ApiKey 的关系**: 并行存在，互不影响。现有 ApiKey 继续服务已有功能，未来可选迁移但不在本次范围。
-
----
-
-## 2. API 设计
-
-### 2.1 版本管理 API
-
-```
-POST   /v1/skills/{skill_id}/versions           # 发布新版本
-GET    /v1/skills/{skill_id}/versions           # 列出所有已发布版本
-GET    /v1/skills/{skill_id}/versions/latest    # 获取最新发布版本
-GET    /v1/skills/{skill_id}/versions/{version} # 获取特定版本详情
-DELETE /v1/skills/{skill_id}/versions/{version} # 删除版本（admin+）
-POST   /v1/skills/{skill_id}/restore            # 基于历史版本恢复 draft
-```
-
-**发布请求体**:
-```json
-{
-  "version": "1.2.0",
-  "release_notes": "新增 X 功能，修复 Y 问题"
-}
-```
-
-**恢复请求体**:
-```json
-{
-  "version": "1.0.0"
-}
-```
-
-**规则**:
-- 版本号需符合 semver `MAJOR.MINOR.PATCH` 格式（使用 `semver` 库解析），且大于已有最高版本
-- 发布时把当前 draft 的 content + name + description + files 完整快照
-- SkillVersion 创建后无 update 接口，天然不可变
-- 恢复操作覆盖 draft，不影响任何已发布版本
-- `GET /v1/skills/{id}` 增加 `latest_version` 字段指向最新已发布版本
-
-### 2.2 协作者管理 API
-
-```
-GET    /v1/skills/{skill_id}/collaborators              # 列出协作者
-POST   /v1/skills/{skill_id}/collaborators              # 添加协作者
-PUT    /v1/skills/{skill_id}/collaborators/{user_id}    # 修改角色
-DELETE /v1/skills/{skill_id}/collaborators/{user_id}    # 移除协作者
-POST   /v1/skills/{skill_id}/transfer                   # 转让 ownership
-```
-
-**添加协作者请求体**:
-```json
-{
-  "user_id": "xxx",
-  "role": "editor"
-}
-```
-
-**转让请求体**:
-```json
-{
-  "new_owner_id": "xxx"
-}
-```
-
-**转让规则**:
-- 仅 owner 可发起转让
-- 转让后旧 owner 自动成为 admin 协作者（不会失去访问权）
-- `created_by_id` 不变（保留创建历史）
-- 必须校验新 owner 是否已有同名 skill（`UniqueConstraint(owner_id, name)`），冲突时返回明确错误
-
-### 2.3 Token 管理 API
-
-```
-POST   /v1/tokens          # 创建 token（返回明文，仅此一次）
-GET    /v1/tokens          # 列出我的 tokens（不含明文，显示 prefix）
-DELETE /v1/tokens/{id}     # 撤销 token（soft delete: is_active = False）
-```
-
-**创建请求体**:
-```json
-{
-  "name": "CI deploy token",
-  "scopes": ["skills:read", "skills:write", "skills:publish"],
-  "resource_type": "skill",
-  "resource_id": "xxx-optional",
-  "expires_at": "2026-12-31T00:00:00Z"
-}
-```
-
-**创建响应**（仅此一次返回明文）:
-```json
-{
-  "id": "uuid",
-  "name": "CI deploy token",
-  "token": "sk_a1b2c3d4e5f6...",
-  "token_prefix": "sk_a1b2c3d4",
-  "scopes": ["skills:read", "skills:write", "skills:publish"],
-  "expires_at": "2026-12-31T00:00:00Z"
-}
-```
-
----
-
-## 3. 鉴权流程
-
-### 3.1 双模式鉴权 Dependency
-
-```
-请求进入
-  → get_current_user_or_token()
-      1. 检查 session cookie → 如有则返回 AuthUser (scopes=None，走角色权限)
-      2. 检查 Authorization: Bearer 头
-         ├── token 以 "sk_" 开头 → PlatformToken 路径
-         │     → sha256(token) → 查 platform_tokens.token_hash
-         │     → 校验 is_active + expires_at
-         │     → 异步更新 last_used_at（仅当距上次更新 >5 分钟时写入，减少 DB 压力）
-         │     → 返回 (AuthUser, scopes)
-         └── 否则 → 走现有 JWT/session token 解析流程
-```
-
-**关键规则**:
-- `sk_` 前缀是 PlatformToken 的唯一判定标识，与现有 JWT token 不会冲突
-- Token 管理 API（`POST/GET/DELETE /v1/tokens`）仅支持 session 鉴权，不允许用 PlatformToken 管理 PlatformToken
-- PlatformToken 访问 skill 版本时，必须同时满足 scope 和 is_public/collaborator 权限
-
-### 3.2 Skill 权限校验函数
-
-```python
-async def check_skill_access(
-    skill: Skill,
-    user_id: str,
-    min_role: CollaboratorRole,
-    token_scopes: Optional[List[str]] = None,
-    required_scope: Optional[str] = None,
-) -> None:
-    """
-    统一权限校验，替代现有 owner_id != current_user_id 硬编码。
-
-    逻辑:
-    1. 是 superuser → 通过（与现有 require_workspace_role 一致）
-    2. 是 owner → 通过
-    3. 查 SkillCollaborator → 角色 >= min_role → 通过
-    4. skill.is_public + min_role == viewer → 通过
-    5. 否则 → 403
-
-    如果是 token 请求，额外校验:
-    5. token_scopes 包含 required_scope → 通过
-    6. 否则 → 403
-    """
-```
-
-### 3.3 操作 → 角色 + Scope 映射
-
-| 操作 | 最低角色 | 所需 Scope |
-|------|---------|-----------|
-| 读取 skill / 版本列表 | viewer | `skills:read` |
-| 编辑 draft / 文件 | editor | `skills:write` |
-| 发布版本 | publisher | `skills:publish` |
-| 删除版本 | admin | `skills:admin` |
-| 管理协作者 | admin | `skills:admin` |
-| 删除 skill | owner | `skills:admin` |
-
----
-
-## 4. 版本发布流程
-
-### 4.1 发布
-
-```
-POST /v1/skills/{id}/versions  { version: "1.0.0", release_notes: "..." }
-    │
-    ├── 校验权限 >= publisher
-    ├── 校验 semver MAJOR.MINOR.PATCH 格式 & 大于最高已有版本（使用 semver 库比较）
-    ├── 创建 SkillVersion（快照 skill_name/skill_description/content/tags/metadata/allowed_tools/compatibility/license）
-    ├── 复制当前 SkillFile → SkillVersionFile（逐条复制内容）
-    └── 返回 SkillVersion 详情
-```
-
-- 发布后 draft 不清空，继续可编辑
-- SkillVersion 无 update 接口
-
-### 4.2 基于历史版本恢复 Draft
-
-```
-POST /v1/skills/{id}/restore  { version: "1.0.0" }
-    │
-    ├── 校验权限 >= publisher（恢复是破坏性操作，覆盖整个 draft）
-    ├── 读取 SkillVersion 的内容和文件
-    ├── 覆盖 Skill draft content + 删除旧 SkillFile + 写入版本文件
-    └── 返回更新后的 Skill（draft 状态）
-```
-
-### 4.3 版本消费
-
-- 外部使用者通过 API token 或商店获取的是已发布版本
-- PlatformToken 访问版本时需同时满足 scope (`skills:read`) 和 is_public/collaborator 权限
-- `GET /v1/skills/{id}` 继续返回 draft content（后向兼容），增加 `latest_version` 字段
-
-**分页**: 版本列表和协作者列表暂不分页（单个 skill 的版本/协作者数量预期有限）。如后续需要，按 `?page=1&page_size=20` 标准模式扩展。
-
-**resource_type/resource_id 作用域**: PlatformToken 的 `resource_type` + `resource_id` 字段在本期仅作为元数据存储，不在鉴权链中强制校验。用户可据此标记 token 用途，但不影响实际权限（权限完全由 scope + collaborator 角色决定）。未来迭代可选择启用 resource 级 token 隔离。
-- Draft 内容对 viewer 继续可见（兼容现有行为），未来可通过 query param `?version=1.0.0` 获取指定版本内容
-
----
-
-## 5. Token 生命周期
-
-### 5.1 创建
-
-```
-生成 token: "sk_" + 48 字符随机串 (secrets.token_urlsafe)
-存储: token_prefix = 前 12 字符, token_hash = sha256(full_token)
-返回明文 token（仅此一次，不落库）
-```
-
-### 5.2 使用
-
-```
-请求头: Authorization: Bearer sk_xxxxxxxxx
-后端: sha256(token) → 查 platform_tokens.token_hash
-校验: is_active + expires_at + scopes
-更新: last_used_at
-注入: user context 继续走权限链
-```
-
-### 5.3 撤销
-
-```
-DELETE /v1/tokens/{id}
-→ is_active = False（软删除，保留审计记录）
-```
-
----
-
-## 6. 迁移策略
-
-### 6.1 数据库迁移
-
-- 新增 4 张表: `skill_versions`, `skill_version_files`, `skill_collaborators`, `platform_tokens`
-- 现有 `skills`, `skill_files` 表零改动
-- 所有已有 Skill 数据自动成为 draft 状态
-- 现有 skill 的 `owner_id` 用户自动拥有 owner 权限，无需数据迁移
-
-**级联删除**: 删除 Skill 时级联删除其所有 `skill_versions`（及 `skill_version_files`）和 `skill_collaborators`。通过 ORM relationship `cascade="all, delete-orphan"` 和 FK `ondelete="CASCADE"` 双重保障。
-
-### 6.2 代码改动
-
-- `SkillService` 中所有 `owner_id != current_user_id` 硬编码替换为 `check_skill_access()` 调用
-- `SkillRepository.list_by_user()` 查询条件扩展：`OR skill_id IN (SELECT skill_id FROM skill_collaborators WHERE user_id = :user_id)`，确保协作者能看到被授权的私有 skill
-- 同步影响 `DatabaseSkillAdapter` 和 `skills_manager.py` 中的 skill 加载逻辑（它们都依赖 `list_skills()`）
-- 新增 `SkillVersionService` 处理版本 CRUD
-- 新增 `SkillCollaboratorService` 处理协作者管理
-- 新增 `PlatformTokenService` 处理 token 管理
-- 新增 FastAPI dependency `get_current_user_or_token()` 支持双模式鉴权
-- 新增 API 路由文件: `skill_versions.py`, `skill_collaborators.py`, `tokens.py`
-
-### 6.3 与现有 ApiKey 的关系
-
-- PlatformToken 与 ApiKey 并行，互不影响
-- 现有 ApiKey 继续服务已有功能
-- 不在本次范围内做迁移
-
----
-
-## 7. 影响范围
-
-### 新增文件
-- `backend/app/models/skill_version.py`
-- `backend/app/models/skill_collaborator.py`
-- `backend/app/models/platform_token.py`
-- `backend/app/schemas/skill_version.py`
-- `backend/app/schemas/skill_collaborator.py`
-- `backend/app/schemas/platform_token.py`
-- `backend/app/repositories/skill_version.py`
-- `backend/app/repositories/skill_collaborator.py`
-- `backend/app/repositories/platform_token.py`
-- `backend/app/services/skill_version_service.py`
-- `backend/app/services/skill_collaborator_service.py`
-- `backend/app/services/platform_token_service.py`
-- `backend/app/api/v1/skill_versions.py`
-- `backend/app/api/v1/skill_collaborators.py`
-- `backend/app/api/v1/tokens.py`
-- `backend/app/common/auth_dependency.py` (双模式鉴权)
-- `backend/app/common/skill_permissions.py` (统一权限校验)
-- Alembic migration 文件
-
-### 修改文件
-- `backend/app/services/skill_service.py` — 权限检查替换为 `check_skill_access()`
-- `backend/app/api/v1/skills.py` — 注入新鉴权 dependency
-- `backend/app/models/__init__.py` — 注册新模型
-- `backend/app/api/v1/__init__.py` — 注册新路由
-- `frontend/services/skillService.ts` — 新增版本/协作者/token API 调用
-- `frontend/app/skills/SkillsManager.tsx` — 版本管理 UI、协作者管理 UI
-- `backend/app/api/v1/skills.py` — OpenClaw sync：协作者编辑时，同步 owner 的容器（不仅是当前用户的）
diff --git a/docs/superpowers/specs/2026-03-21-chat-layout-interaction-alignment-design.md b/docs/superpowers/specs/2026-03-21-chat-layout-interaction-alignment-design.md
deleted file mode 100644
index 5608f0ce7..000000000
--- a/docs/superpowers/specs/2026-03-21-chat-layout-interaction-alignment-design.md
+++ /dev/null
@@ -1,310 +0,0 @@
-# Chat Layout & Interaction Alignment Design
-
-## Goal
-
-Align the Chat page's layout structure and interaction patterns with the Skill page by refactoring the sidebar, upgrading mode cards, and redesigning the input area.
-
-## Context
-
-After the visual beautification pass (colors, shadows, animations), the Chat page still has structural and interaction differences from the Skill page:
-
-1. ChatSidebar has ~260 lines of duplicated JSX across 3 conversation groups
-2. Sidebar toggle unmounts/mounts the entire panel with no animation (Skill page uses CSS transitions)
-3. Mode cards in ChatHome use a simpler design language than SkillCard
-4. Input area is oversized (min-h-[100px]/min-h-[120px] textareas) causing bottom overflow; Skill Creator uses a compact gray-bg pill
-
-## Non-Goals
-
-- No search/filter in ChatSidebar (explicitly excluded)
-- No changes to Skill page
-- No backend changes
-- No changes to chat logic, state management, or streaming
-- No dark mode
-- No mobile/responsive changes
-- No unification of ChatHome's inline input with ChatInput component (they remain separate implementations with aligned styling)
-
----
-
-## Area 1: ChatSidebar Conversation Row Deduplication
-
-**Problem**: `ChatSidebar.tsx` (~560 lines) has 3 nearly identical blocks for todayConvs, monthConvs, olderConvs — each ~130 lines of the same JSX (conversation row + delete dialog).
-
-### Solution
-
-Extract two components into a new file `app/chat/components/ConversationGroup.tsx`:
-
-**`ConversationItem`** (internal, only used by ConversationGroup):
-- Props: `conv: Conversation`, `isActive: boolean`, `isCollapsed: boolean`, `onSelect: (threadId: string) => void`, `onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void`, `formatTime: (date: string) => string`, `deleteConfirmOpen: boolean`, `conversationToDelete: { threadId: string; title: string } | null`, `onDeleteConfirmChange: (open: boolean) => void`, `onConfirmDelete: () => void`, `onCancelDelete: () => void`
-- Renders: icon + title + time + delete button with AlertDialog
-- Exact same markup as current rows (lines 204-297), just extracted
-- When `isCollapsed` is `true`, renders icon-only mode: hides title, time, and delete button; centers the `MessageSquare` icon
-- AlertDialog state is controlled from parent via props (open state driven by `deleteConfirmOpen && conversationToDelete?.threadId === conv.thread_id`)
-
-**Required imports for `ConversationGroup.tsx`**: `MessageSquare`, `Trash2`, `ChevronDown`, `ChevronRight` from `lucide-react`; `AlertDialog`, `AlertDialogAction`, `AlertDialogCancel`, `AlertDialogContent`, `AlertDialogDescription`, `AlertDialogFooter`, `AlertDialogHeader`, `AlertDialogTitle`, `AlertDialogTrigger` from `@/components/ui/alert-dialog`; `cn` from `@/lib/utils`; `useTranslation` from `@/lib/i18n`
-
-**`ConversationGroup`**:
-- Props: `label: string`, `conversations: Conversation[]`, `isExpanded: boolean`, `onToggleExpand: () => void`, `isCollapsed: boolean`, `currentThreadId: string | null`, `onSelectConversation: (threadId: string) => void`, `onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void`, `formatTime: (date: string) => string`, `maxItems?: number`, `deleteConfirmOpen: boolean`, `conversationToDelete: { threadId: string; title: string } | null`, `onDeleteConfirmChange: (open: boolean) => void`, `onConfirmDelete: () => void`, `onCancelDelete: () => void`
-- Renders: collapsible header button + `ConversationItem` list
-- `maxItems` used for olderConvs (currently hardcoded `.slice(0, 10)`)
-
-**ChatSidebar after refactor**: ~200 lines — renders header, loading skeleton, empty state, and 3 `<ConversationGroup>` calls with different props. Delete confirmation dialog state (`deleteConfirmOpen`, `conversationToDelete`) stays in ChatSidebar and is passed down as props.
-
-**Initial expand states**: todayConvs starts expanded (`true`), monthConvs starts expanded (`true`), olderConvs starts collapsed (`false`) — matching current behavior from the existing `isTodayCollapsed`, `isThisMonthCollapsed`, `isOlderCollapsed` state variables (inverted because ConversationGroup uses `isExpanded`).
-
-**Files**:
-- Create: `frontend/app/chat/components/ConversationGroup.tsx`
-- Modify: `frontend/app/chat/components/ChatSidebar.tsx`
-
----
-
-## Area 2: Sidebar Collapse Animation
-
-**Problem**: `ChatLayout.tsx:323` uses conditional rendering `{state.ui.sidebarVisible && (<ResizablePanel>...)}`. Toggling unmounts the entire sidebar DOM — no animation, loses scroll position.
-
-### Solution
-
-Use `ResizablePanel`'s built-in `collapsible` prop instead of conditional rendering.
-
-**ChatLayout changes** (`ChatLayout.tsx`):
-
-```
-// Before: conditional mount/unmount
-{state.ui.sidebarVisible && (
-  <>
-    <ResizablePanel defaultSize={12} minSize={10} maxSize={25} className="transition-all duration-300">
-      <ChatSidebar isCollapsed={false} ... />
-    </ResizablePanel>
-    <ResizableHandle className="w-px bg-gray-200" />
-  </>
-)}
-
-// After: always rendered, collapsible
-<ResizablePanel
-  ref={sidebarPanelRef}
-  defaultSize={12}
-  minSize={10}
-  maxSize={25}
-  collapsible
-  collapsedSize={0}
-  onCollapse={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: false })}
-  onExpand={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: true })}
-  className="overflow-hidden transition-all duration-300"
->
-  <ChatSidebar isCollapsed={!state.ui.sidebarVisible} ... />
-</ResizablePanel>
-<ResizableHandle className="w-px bg-gray-200" />
-```
-
-**Ref setup**: Add `const sidebarPanelRef = useRef<ImperativePanelHandle>(null)` and import `ImperativePanelHandle` from `react-resizable-panels`.
-
-**Header toggle button** (`ChatLayout.tsx:258`): Change `onClick` from `dispatch({ type: 'TOGGLE_SIDEBAR' })` to programmatic panel control:
-```tsx
-onClick={() => {
-  if (state.ui.sidebarVisible) {
-    sidebarPanelRef.current?.collapse()
-  } else {
-    sidebarPanelRef.current?.expand()
-  }
-}}
-```
-
-**Cmd+B shortcut** (`ChatLayout.tsx:52`): Change from `dispatch({ type: 'TOGGLE_SIDEBAR' })` to:
-```tsx
-if (state.ui.sidebarVisible) {
-  sidebarPanelRef.current?.collapse()
-} else {
-  sidebarPanelRef.current?.expand()
-}
-```
-Note: The `useEffect` dependency array must include `state.ui.sidebarVisible` and `sidebarPanelRef`.
-
-Key details:
-- `collapsedSize={0}` collapses to zero width
-- `onCollapse`/`onExpand` callbacks sync state with the panel's collapsed state via `SET_SIDEBAR_VISIBLE`
-- `sidebarPanelRef` (`useRef<ImperativePanelHandle>`) allows programmatic collapse/expand
-- ChatSidebar's existing `isCollapsed` prop now actually triggers (it was always `false` before) — renders icon-only mode (centers icons, hides titles/timestamps/delete buttons)
-- `overflow-hidden` on the panel prevents content overflow during animation
-- The `ResizableHandle` is always rendered (it becomes the panel edge when collapsed)
-- Note: `react-resizable-panels` uses CSS `flex-basis` for sizing, not width. The `transition-all` class on the panel may or may not produce a smooth animation depending on the library version. If the transition doesn't animate, the panel will still collapse/expand instantly — the functionality is correct either way. Test after implementation.
-
-**Reducer change** (`useChatReducer.ts`):
-- Add `SET_SIDEBAR_VISIBLE` action type to `ChatAction`: `| { type: 'SET_SIDEBAR_VISIBLE'; visible: boolean }`
-- Add reducer case: `case 'SET_SIDEBAR_VISIBLE': return { ...state, ui: { ...state.ui, sidebarVisible: action.visible } }`
-- `TOGGLE_SIDEBAR` remains in the reducer (still used as fallback) but primary toggle now goes through the panel ref
-
-**Files**:
-- Modify: `frontend/app/chat/ChatLayout.tsx`
-- Modify: `frontend/app/chat/hooks/useChatReducer.ts`
-
----
-
-## Area 3: Mode Card Beautification
-
-**Problem**: ChatHome mode cards use basic `rounded-xl border p-4` with conditional hover (`hover:border-blue-300 hover:shadow-md`). SkillCard uses `overflow-hidden transition-all duration-200 hover:border-emerald-200 hover:shadow-lg` with a structured icon container.
-
-### Solution
-
-Upgrade ChatHome mode card styling to match SkillCard's design language (adapted for blue brand):
-
-**Card container** (`ChatHome.tsx:644-648`, mode card `className`):
-
-```
-// Before:
-'group flex cursor-pointer items-start gap-4 rounded-xl border p-4 transition-all',
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-  : 'border-gray-200 bg-white hover:border-blue-300 hover:shadow-md'
-
-// After:
-'group flex cursor-pointer items-start gap-4 overflow-hidden rounded-xl border bg-white p-4 transition-all duration-200',
-isSelected
-  ? 'border-blue-500 bg-blue-50 shadow-md ring-1 ring-blue-100'
-  : 'border-gray-200 hover:border-blue-200 hover:shadow-lg'
-```
-
-**Icon container** (`ChatHome.tsx:651-654`, inside each card):
-
-```
-// Before:
-<div className={cn(
-  'rounded-lg p-2 transition-colors',
-  isSelected ? 'bg-blue-100' : 'bg-gray-50 group-hover:bg-blue-50',
-)}>
-
-// After:
-<div className="rounded-lg border border-blue-100 bg-blue-50 p-2">
-```
-
-Note: `ModeConfig` in `modeConfig.ts` does NOT have `bgColor`/`iconColor` fields. The current code uses inline conditional classes (`bg-blue-100`/`bg-gray-50`). After this change, all icons use the unified blue brand container regardless of selected state.
-
-**Title**: keep `text-sm font-medium` (already close to SkillCard's `font-semibold`)
-
-**Description**: keep `text-xs text-gray-500` + ensure `line-clamp-2`
-
-**Mode cards section**: `showCases` is already initialized to `true` (in `useChatSession.ts:54`), so no change needed for default expand state.
-
-**Files**:
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
----
-
-## Area 4: Input Area Alignment with Skill Creator
-
-**Problem**: ChatInput has `min-h-[100px]` textarea, ChatHome has `min-h-[120px]` textarea, both use `text-base`, heavy padding, and `shadow-md`/`shadow-sm` — far larger than Skill Creator's compact pill. Causes bottom overflow on small viewports.
-
-### Solution
-
-Align Chat input styling with Skill Creator's pattern: gray-bg pill, compact textarea, smaller buttons.
-
-### ConversationPanel input wrapper (`ConversationPanel.tsx:76`)
-
-```
-// Before:
-<div className="bg-white px-6 py-4 shadow-[0_-4px_24px_-4px_rgba(0,0,0,0.06)]">
-
-// After:
-<div className="border-t border-gray-100 bg-white p-4">
-```
-
-### ChatInput container (`ChatInput.tsx:132-134`)
-
-```
-// Before:
-'flex items-end gap-3 rounded-[24px] border border-gray-200 bg-white p-4 shadow-md transition-all',
-
-// After:
-'flex items-end gap-2 rounded-2xl border border-gray-200 bg-gray-50 px-4 py-3 transition-all',
-```
-
-### ChatInput textarea (`ChatInput.tsx:157`)
-
-```
-// Before:
-className="max-h-[200px] min-h-[100px] flex-1 resize-none overflow-y-auto border-none bg-transparent px-0.5 pb-6 pt-4 text-base shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-
-// After:
-className="max-h-[160px] min-h-[24px] flex-1 resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-```
-
-Note: `px-0.5`, `pb-6`, `pt-4` are intentionally removed — the new container's `px-4 py-3` provides sufficient padding. The textarea no longer needs its own internal padding.
-
-### ChatInput buttons
-
-| Button | Before | After |
-|--------|--------|-------|
-| Attach (`ChatInput.tsx:162-175`) | `h-10 w-10 rounded-2xl` | `h-8 w-8 rounded-xl` |
-| Send (`ChatInput.tsx:186-203`) | `h-10 w-10` | `h-8 w-8` |
-| Stop (`ChatInput.tsx:176-184`) | `h-10 w-10` | `h-8 w-8` |
-
-### ChatInput auto-resize cap (`ChatInput.tsx:58`)
-
-```
-// Before:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 200)}px`
-
-// After:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-```
-
-### ChatHome input (explicit before/after)
-
-ChatHome has its own input area (NOT the `ChatInput` component) with a two-level wrapper structure. Changes:
-
-**Outer container** (`ChatHome.tsx:419`):
-```
-// Before:
-<div className="rounded-[24px] border border-gray-200 bg-white shadow-sm transition-all">
-
-// After:
-<div className="rounded-2xl border border-gray-200 bg-gray-50 transition-all">
-```
-
-**Inner container** (`ChatHome.tsx:420`):
-```
-// Before:
-<div className="flex w-full flex-col gap-2 p-2 pb-3">
-
-// After:
-<div className="flex w-full flex-col gap-2 px-4 py-3">
-```
-
-**Textarea** (`ChatHome.tsx:480`):
-```
-// Before:
-className="max-h-[240px] min-h-[120px] w-full resize-none overflow-y-auto border-none bg-transparent px-1 pb-14 pt-5 text-base shadow-none transition-all duration-200 placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-
-// After:
-className="max-h-[160px] min-h-[24px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-gray-400 focus:outline-none focus-visible:ring-0"
-```
-
-Note: `pb-14` and `pt-5` are removed. The absolutely-positioned bottom buttons (`ChatHome.tsx:484`, `absolute bottom-2 left-1`) will need their position adjusted since the textarea is now shorter. Change to `absolute bottom-1 left-1` or remove absolute positioning if the textarea min-height no longer provides space for them. Test to verify buttons don't overlap text content.
-
-**Buttons** (`ChatHome.tsx:552-609`): Change all `h-10 w-10` to `h-8 w-8` (attach, stop, send buttons).
-
-**Auto-resize cap** (`ChatHome.tsx:137`):
-```
-// Before:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 200)}px`
-
-// After:
-textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-```
-
-**Files**:
-- Modify: `frontend/app/chat/conversation/ConversationPanel.tsx`
-- Modify: `frontend/app/chat/components/ChatInput.tsx`
-- Modify: `frontend/app/chat/components/ChatHome.tsx`
-
----
-
-## Files Affected (Summary)
-
-| File | Areas |
-|------|-------|
-| `app/chat/components/ConversationGroup.tsx` | 1 (new) |
-| `app/chat/components/ChatSidebar.tsx` | 1 |
-| `app/chat/ChatLayout.tsx` | 2 |
-| `app/chat/hooks/useChatReducer.ts` | 2 |
-| `app/chat/components/ChatHome.tsx` | 3, 4 |
-| `app/chat/conversation/ConversationPanel.tsx` | 4 |
-| `app/chat/components/ChatInput.tsx` | 4 |
diff --git a/docs/superpowers/specs/2026-03-21-chat-ui-beautification-design.md b/docs/superpowers/specs/2026-03-21-chat-ui-beautification-design.md
deleted file mode 100644
index 2b73d6dd0..000000000
--- a/docs/superpowers/specs/2026-03-21-chat-ui-beautification-design.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# Chat UI Beautification & Interaction Optimization
-
-## Goal
-
-Align the Chat page's visual quality with the Skill page by establishing a consistent blue brand color, improving surface depth, upgrading message bubbles, sidebar, header, empty/loading states, and standardizing animations.
-
-## Context
-
-The Skill page uses a cohesive emerald color system, layered surfaces (3-level depth), structured skeletons, rich card designs, and polished empty states. The Chat page currently has no unified accent color (mixes gray-900, blue-500, purple-600), flat surfaces (everything bg-gray-50), low-contrast user bubbles, and bare loading/empty states.
-
-## Brand Color Decision
-
-Chat uses **Blue** (blue-500/600/700) to differentiate from Skill's emerald while maintaining internal consistency.
-
----
-
-## Area 1: Brand Color Unification
-
-**Problem**: Interactive elements use 4+ different accent colors with no coherence.
-
-| Element | Current | Target |
-|---------|---------|--------|
-| Send button (`ChatInput.tsx:192`, `ChatHome.tsx:585`) | `bg-gray-900 hover:bg-gray-800` | `bg-blue-600 hover:bg-blue-700` |
-| Send button disabled | `bg-gray-100` (unchanged) | `bg-gray-100` (unchanged) |
-| AI avatar (`MessageItem.tsx:87`) | `from-blue-600 to-purple-600` | `from-blue-500 to-indigo-600` |
-| AI avatar in streaming (`ThreadContent.tsx:81`) | `from-blue-600 to-purple-600` | `from-blue-500 to-indigo-600` |
-| AI avatar in processing (`ThreadContent.tsx:112`) | `from-blue-600 to-purple-600` | `from-blue-500 to-indigo-600` |
-| Streaming cursor | `bg-blue-500` (unchanged) | `bg-blue-500` (unchanged) |
-| Sidebar selected item icon (`ChatSidebar.tsx:215`) | `text-blue-500` icon only | `text-blue-500` (unchanged, row gets ring treatment in Area 3) |
-| New conversation button (`ChatLayout.tsx:271`) | Ghost `Plus` icon `text-gray-600` | `Plus` icon with `bg-blue-600 text-white rounded-full h-9 w-9` |
-| ChatHome mode card selected (`ChatHome.tsx:647`) | `border-blue-500 bg-blue-50 shadow-md` | add `ring-1 ring-blue-100` to existing classes |
-| Drag-over state | `border-blue-400 bg-blue-50` (unchanged) | unchanged (already brand) |
-
-**Files**: `app/chat/components/ChatInput.tsx`, `app/chat/components/MessageItem.tsx`, `app/chat/components/ThreadContent.tsx`, `app/chat/components/ChatSidebar.tsx`, `app/chat/components/ChatHome.tsx`, `app/chat/ChatLayout.tsx`
-
----
-
-## Area 2: Message Bubble Redesign
-
-**Problem**: User messages `bg-gray-100` are nearly invisible against `bg-gray-50` background. AI messages have no container elevation.
-
-### User Message (`MessageItem.tsx:72`)
-- Background: `bg-gray-100 text-gray-900` -> `bg-gray-800 text-white shadow-sm`
-- Shape: `rounded-2xl rounded-tr-sm` (unchanged)
-- Text size: `text-[15px] leading-relaxed` (unchanged)
-- Note: User messages are plain text only (no markdown rendering), so no contrast issue with inline code on dark background.
-
-### AI Message (`MessageItem.tsx:86-128`)
-- Outer wrapper: add `rounded-2xl border border-gray-100 bg-white shadow-sm` container around the existing content div
-- AI label badge: `bg-gray-100 text-[10px] text-gray-400` -> `bg-blue-50 text-[10px] text-blue-500`
-- AI avatar gradient: `from-blue-600 to-purple-600` -> `from-blue-500 to-indigo-600` (same as Area 1)
-
-**Files**: `app/chat/components/MessageItem.tsx`
-
----
-
-## Area 3: Sidebar Upgrade
-
-**Problem**: Flat bg-gray-50 everywhere, selected item only bg-gray-100, no skeleton loading.
-
-### Structure
-- Sidebar overall (`ChatSidebar.tsx:143`): `bg-gray-50` -> `bg-gray-50/50` (lighter to sit behind white cards)
-- Sidebar header (`ChatSidebar.tsx:147`): `bg-gray-50` -> `bg-white` (keep existing `border-b border-gray-100` and conditional `isCollapsed ? 'px-2' : 'px-4'`)
-- Selected conversation row (`ChatSidebar.tsx:195-196`): `bg-gray-100 text-gray-900` -> `bg-white shadow-sm ring-1 ring-blue-50 text-gray-900` (keep existing `rounded-md`)
-- In collapsed mode, selected item: use `bg-white shadow-sm ring-1 ring-blue-50` (same treatment, ring works fine on small icon-only rows)
-- Unselected hover (`ChatSidebar.tsx:197`): `hover:bg-gray-50` -> `hover:bg-white/60` (keep existing `text-gray-600`)
-- Timestamp already exists at correct styling (`text-[10px] text-gray-400` at line 224) — no change needed.
-
-### Skeleton Loading (replace `ChatSidebar.tsx:166`)
-Replace `<div className="py-4 text-center text-xs text-gray-400">` with 3 skeleton items:
-```
-<div className="space-y-2 px-2 py-3">
-  {[0,1,2].map(i => (
-    <div key={i} className="flex items-center gap-2 rounded-md px-2 py-1.5">
-      <div className="h-4 w-4 flex-shrink-0 rounded bg-gray-200 animate-pulse" />
-      <div className="flex-1 space-y-1.5">
-        <div className="h-3 w-3/4 rounded bg-gray-200 animate-pulse" />
-        <div className="h-2.5 w-1/2 rounded bg-gray-100 animate-pulse" />
-      </div>
-    </div>
-  ))}
-</div>
-```
-
-### Empty Conversations State (replace `ChatSidebar.tsx:168`)
-Upgrade from plain text to:
-- Icon: `MessageSquare` in `rounded-full bg-gray-100 p-2` circle
-- Text: `text-xs text-gray-400` (keep current text)
-
-**Files**: `app/chat/components/ChatSidebar.tsx`
-
----
-
-## Area 4: Header Redesign
-
-**Problem**: `h-12 bg-gray-50` with three identical ghost icon buttons. No branding, no context.
-
-### Changes (`ChatLayout.tsx:248-310`)
-- Height: `h-12` -> `h-14`
-- Background: `bg-gray-50` -> `bg-white` (add `border-b border-gray-100` — this is a new addition, current header has no bottom border)
-- Left group:
-  - Sidebar toggle: keep ghost style, update to `hover:bg-gray-100 rounded-lg`
-  - New conversation: change from ghost icon to branded `bg-blue-600 hover:bg-blue-700 text-white rounded-full h-9 w-9 p-0`
-- Center: add conversation title from `state.currentTitle` or mode name from `state.mode.currentMode` (read from existing ChatProvider state — no new props needed, `renderHeader` is inside `ChatLayout` which already has `state` from `useChatState()`)
-  - Display: `text-sm font-medium text-gray-700 truncate`
-  - Show mode config label when no conversation title exists
-- Right: preview toggle keeps ghost style with `hover:bg-gray-100 rounded-lg`
-
-**Files**: `app/chat/ChatLayout.tsx`
-
----
-
-## Area 5: Surface Depth (3-Level Hierarchy)
-
-**Problem**: Everything is bg-gray-50, no depth differentiation.
-
-### Levels
-- **Level 1** (recessed): sidebar `bg-gray-50/50` — slightly lighter/more transparent than conversation area, creating subtle depth against the root `bg-gray-50`
-- **Level 2** (base): conversation area `bg-gray-50` (unchanged)
-- **Level 3** (elevated/floating):
-  - Header: `bg-white border-b border-gray-100` (as defined in Area 4)
-  - Input wrapper (`ConversationPanel.tsx:76`): upgrade `border-t border-gray-100 bg-white` to `bg-white shadow-[0_-4px_24px_-4px_rgba(0,0,0,0.06)]` (replace border-t with upward shadow for softer separation)
-  - Input container (`ChatInput.tsx:134`): keep existing `rounded-[24px] border border-gray-200 bg-white` shape, upgrade `shadow-sm` to `shadow-md`
-  - PreviewPanel header: already `bg-white`, no change
-
-**Files**: `app/chat/ChatLayout.tsx`, `app/chat/conversation/ConversationPanel.tsx`, `app/chat/components/ChatSidebar.tsx`, `app/chat/preview/PreviewPanel.tsx`
-
----
-
-## Area 6: Empty States & Loading States
-
-**Problem**: Empty conversation = one line of gray text. Sidebar loading = plain text.
-
-### Conversation Empty State (`ThreadContent.tsx:50-53`)
-Replace plain text with structured component:
-- Icon: `MessageSquare` in `rounded-full bg-blue-50 p-4` circle
-- Title: `text-base font-medium text-gray-600` — e.g. "Start a conversation"
-- Subtitle: `text-sm text-gray-400` — e.g. "Ask anything to get started"
-
-### Sidebar Loading & Empty States
-Covered in Area 3 (skeleton loading and empty conversations upgrade).
-
-### Processing Indicator Enhancement (`ThreadContent.tsx:106-108`)
-Add `backdrop-blur-sm` to existing `bg-white/90 border border-gray-200/80 shadow-sm` container for subtle glassmorphism.
-
-**Files**: `app/chat/components/ThreadContent.tsx`, `app/chat/components/ChatSidebar.tsx`
-
----
-
-## Area 7: Animation Standardization
-
-**Problem**: Animations exist but are inconsistent across components.
-
-### Rules
-- All hover transitions: `transition-all duration-200`
-- AI message entrance: keep existing `slide-in-from-bottom-2 duration-300 animate-in fade-in`
-- User message entrance: add `slide-in-from-bottom-1` to existing `duration-200 animate-in fade-in` (currently only fades, now also slides)
-- Sidebar item hover: add `transition-colors duration-150`
-- PreviewPanel tab active state: add `transition-all duration-200`
-
-**Files**: `app/chat/components/MessageItem.tsx`, `app/chat/components/ChatSidebar.tsx`, `app/chat/preview/PreviewPanel.tsx`
-
----
-
-## Files Affected (Summary)
-
-| File | Areas |
-|------|-------|
-| `app/chat/components/MessageItem.tsx` | 1, 2, 7 |
-| `app/chat/components/ThreadContent.tsx` | 1, 6 |
-| `app/chat/components/ChatSidebar.tsx` | 1, 3, 5, 6, 7 |
-| `app/chat/ChatLayout.tsx` | 1, 4, 5 |
-| `app/chat/conversation/ConversationPanel.tsx` | 5 |
-| `app/chat/components/ChatInput.tsx` | 1, 5 |
-| `app/chat/components/ChatHome.tsx` | 1 |
-| `app/chat/preview/PreviewPanel.tsx` | 5, 7 |
-
-## Non-Goals
-
-- No dark mode in this iteration
-- No responsive/mobile layout changes
-- No changes to Skill page styling
-- No new component library or design tokens system
-- No changes to chat message sending logic, state management, or API calls (layout restructuring in header is in scope, but no business logic changes)
-- No error state redesign (agent error UI remains as-is)
diff --git a/docs/superpowers/specs/2026-03-23-api-token-refactoring-design.md b/docs/superpowers/specs/2026-03-23-api-token-refactoring-design.md
deleted file mode 100644
index 3d3b49aa9..000000000
--- a/docs/superpowers/specs/2026-03-23-api-token-refactoring-design.md
+++ /dev/null
@@ -1,617 +0,0 @@
-# API Token System Refactoring Design
-
-**Date:** 2026-03-23
-**Status:** Draft
-**Author:** System Architecture Team
-
-## Executive Summary
-
-Refactor the API token system to unify two parallel token mechanisms (PlatformToken and ApiKey) into a single, secure, scalable system with high cohesion, low coupling, and intuitive user management UI.
-
-## Current State Analysis
-
-### Problems
-
-1. **Dual Token Systems** — PlatformToken (SHA-256 hashed, user-scoped) and ApiKey (plaintext stored, workspace-scoped) coexist with overlapping responsibilities
-2. **Inconsistent Scopes** — Global tokens use `skills:*` prefix, skill-specific tokens use `skill:execute` (singular vs plural)
-3. **Fragmented UI** — Token management scattered across 3 locations (Settings, SkillApiAccessDialog, ApiAccessDialog) with different interaction patterns
-4. **Client-Side Filtering** — Frontend fetches all tokens then filters by resource, inefficient
-5. **Security Risk** — ApiKey stores plaintext tokens in database
-
-### Existing Architecture
-
-**PlatformToken System (newer):**
-- Backend: `platform_tokens` table, SHA-256 hashed storage, scope-based permissions
-- Frontend: Settings TokensPage + Skill ApiTokensTab
-- Scopes: `skills:read/write/execute/publish/admin`, `skill:execute`
-
-**ApiKey System (legacy):**
-- Backend: `api_keys` table, plaintext storage, workspace-level access
-- Frontend: Workspace ApiAccessDialog
-- No scope system
-
-## Design Goals
-
-1. **Unify** — Single token system for all resources (skills, graphs, tools)
-2. **Secure** — SHA-256 hashed storage everywhere, no plaintext
-3. **Scalable** — Extensible scope system for future resource types
-4. **Intuitive** — Each context (Settings/Skill/Workspace) has complete CRUD, filtered to relevant tokens
-5. **Performant** — Backend filters by resource, no client-side filtering
-
-## Architecture Design
-
-### 0. Terminology Clarification
-
-**Workspace vs Graph:**
-- In this system, "workspace" and "graph" refer to the same entity
-- Legacy code uses "workspace" terminology
-- New unified system uses "graph" as the canonical resource type name
-- Migration maps `workspace_id` → `resource_type='graph', resource_id=str(workspace_id)`
-- This is a naming unification, not a structural change
-
-### 1. Unified Scope System
-
-**Three-tier resource types:**
-```
-skill | graph | tool
-```
-
-**Unified actions:**
-```
-read | write | execute | publish | admin
-```
-
-**Scope format:** `{resource}:{action}`
-
-**Defined scopes:**
-```typescript
-type Scope =
-  | 'skills:read' | 'skills:write' | 'skills:execute' | 'skills:publish' | 'skills:admin'
-  | 'graphs:read' | 'graphs:execute'
-  | 'tools:read' | 'tools:execute';
-```
-
-**Permission hierarchy:**
-```
-admin > publish > execute > write > read
-```
-
-**Resource binding:**
-- **Global token:** `resource_type = NULL, resource_id = NULL` — applies to all resources of that type
-- **Resource-bound token:** `resource_type = 'skill', resource_id = 'skill_123'` — applies only to that specific resource
-
-**Examples:**
-- Token A: `scopes=['skills:read']`, `resource_type=NULL` → can read all skills
-- Token B: `scopes=['skills:admin']`, `resource_type='skill', resource_id='skill_123'` → admin access only to skill_123
-
-### 2. Backend Architecture
-
-#### Data Model
-
-**Reuse existing `platform_tokens` table** — no schema changes needed:
-```sql
--- Existing columns already support the design:
--- scopes: JSONB array
--- resource_type: VARCHAR(50) | NULL
--- resource_id: UUID | NULL
-```
-
-> **Naming convention:** Scopes use *plural* resource names (`skills:read`, `graphs:execute`) while `resource_type` column uses *singular* (`skill`, `graph`, `tool`). These are compared independently — scopes match against other scopes, resource_type matches against resource_type.
->
-> **Pair constraint:** `resource_type` and `resource_id` must both be provided or both be NULL. A token with only one set is invalid.
-
-#### Repository Layer
-
-```python
-# backend/app/repositories/platform_token.py
-class PlatformTokenRepository:
-    async def list_by_user_and_resource(
-        self,
-        user_id: str,
-        resource_type: Optional[str] = None,
-        resource_id: Optional[uuid.UUID] = None
-    ) -> List[PlatformToken]:
-        """Query tokens with optional resource filtering"""
-        query = select(PlatformToken).where(
-            PlatformToken.user_id == user_id,
-            PlatformToken.is_active == True
-        )
-        if resource_type is not None:
-            query = query.where(PlatformToken.resource_type == resource_type)
-        if resource_id is not None:
-            query = query.where(PlatformToken.resource_id == resource_id)
-        query = query.order_by(PlatformToken.created_at.desc())
-        result = await self.db.execute(query)
-        return result.scalars().all()
-```
-
-#### Service Layer
-
-```python
-# backend/app/services/platform_token_service.py
-class PlatformTokenService:
-    MAX_ACTIVE_TOKENS_PER_USER = 50  # Configurable constant
-
-    VALID_SCOPES = {
-        'skills:read', 'skills:write', 'skills:execute', 'skills:publish', 'skills:admin',
-        'graphs:read', 'graphs:execute',
-        'tools:read', 'tools:execute'
-    }
-
-    VALID_RESOURCE_TYPES = {'skill', 'graph', 'tool'}
-
-    async def list_tokens(
-        self,
-        user_id: str,
-        resource_type: Optional[str] = None,
-        resource_id: Optional[uuid.UUID] = None
-    ) -> List[PlatformToken]:
-        return await self.repo.list_by_user_and_resource(
-            user_id, resource_type, resource_id
-        )
-
-    async def create_token(self, ..., scopes: List[str], ...) -> TokenCreateResponse:
-        # Validate scopes with hierarchy awareness
-        invalid = set(scopes) - self.VALID_SCOPES
-        if invalid:
-            raise BadRequestException(f"Invalid scopes: {invalid}")
-
-        # Validate resource_type/resource_id pair (both or neither)
-        if (resource_type is None) != (resource_id is None):
-            raise BadRequestException("resource_type and resource_id must both be provided or both be null")
-        if resource_type is not None and resource_type not in self.VALID_RESOURCE_TYPES:
-            raise BadRequestException(f"Invalid resource_type: {resource_type}")
-
-        # Check token limit
-        if await self.repo.count_active_by_user(user_id) >= self.MAX_ACTIVE_TOKENS_PER_USER:
-            raise BadRequestException(f"Maximum {self.MAX_ACTIVE_TOKENS_PER_USER} active tokens per user")
-
-        # ... rest of token generation unchanged
-
-    async def revoke_by_resource(self, resource_type: str, resource_id: str) -> int:
-        """Soft-delete all tokens bound to a resource (called on resource deletion)"""
-        count = await self.repo.deactivate_by_resource(resource_type, resource_id)
-        return count
-```
-
-#### API Layer
-
-```python
-# backend/app/api/v1/tokens.py
-@router.get("/v1/tokens")
-async def list_tokens(
-    resource_type: Optional[str] = Query(None),
-    resource_id: Optional[str] = Query(None),
-    current_user: User = Depends(get_current_user)
-):
-    """List tokens with optional resource filtering"""
-    tokens = await token_service.list_tokens(
-        current_user.id, resource_type, resource_id
-    )
-    return [TokenSchema.from_orm(t) for t in tokens]
-```
-
-#### Unified Permission Check
-
-```python
-# backend/app/common/permissions.py
-
-# Permission hierarchy: higher levels include all lower levels
-SCOPE_HIERARCHY = {
-    'skills': ['admin', 'publish', 'execute', 'write', 'read'],
-    'graphs': ['execute', 'read'],
-    'tools': ['execute', 'read']
-}
-
-def _scope_satisfies(token_scope: str, required_scope: str) -> bool:
-    """Check if token_scope satisfies required_scope via hierarchy"""
-    if token_scope == required_scope:
-        return True
-
-    # Parse resource:action
-    try:
-        token_resource, token_action = token_scope.split(':')
-        required_resource, required_action = required_scope.split(':')
-    except ValueError:
-        return False
-
-    if token_resource != required_resource:
-        return False
-
-    hierarchy = SCOPE_HIERARCHY.get(token_resource, [])
-    try:
-        token_level = hierarchy.index(token_action)
-        required_level = hierarchy.index(required_action)
-        return token_level <= required_level  # Lower index = higher permission
-    except ValueError:
-        return False
-
-def check_token_permission(
-    token_scopes: List[str],
-    required_scope: str,
-    resource_type: str,
-    resource_id: str,
-    token_resource_type: Optional[str],
-    token_resource_id: Optional[str]
-) -> bool:
-    """Unified permission check with hierarchical scope matching"""
-    # 1. Check scope presence (with hierarchy)
-    has_scope = any(_scope_satisfies(ts, required_scope) for ts in token_scopes)
-    if not has_scope:
-        return False
-
-    # 2. Check resource binding
-    if token_resource_type is None:
-        # Global token, pass
-        return True
-
-    if token_resource_type == resource_type and token_resource_id == resource_id:
-        # Bound to target resource, pass
-        return True
-
-    return False
-```
-
-**Integration point:** `check_token_permission` is called from `backend/app/common/skill_permissions.py` via `_check_token_scope()`, which is invoked by `check_skill_access()`. Endpoints using `get_current_user_or_token` (from `auth_dependency.py`) receive an `AuthContext` carrying `token_scopes`, `token_resource_type`, and `token_resource_id`, which are passed through to the permission check.
-
-### 3. Frontend Architecture
-
-#### Service Layer
-
-```typescript
-// frontend/services/platformTokenService.ts
-export interface TokenListParams {
-  resourceType?: 'skill' | 'graph' | 'tool';
-  resourceId?: string;
-}
-
-export const platformTokenService = {
-  listTokens: async (params?: TokenListParams): Promise<PlatformToken[]> => {
-    const queryParams = new URLSearchParams();
-    if (params?.resourceType) queryParams.set('resource_type', params.resourceType);
-    if (params?.resourceId) queryParams.set('resource_id', params.resourceId);
-
-    const url = `/api/v1/tokens${queryParams.toString() ? `?${queryParams}` : ''}`;
-    const response = await fetch(url);
-    return normalizeToCamelCase(await response.json());
-  },
-  // createToken, revokeToken unchanged
-};
-```
-
-#### Hooks Layer
-
-```typescript
-// frontend/hooks/queries/platformTokens.ts
-export function usePlatformTokens(params?: TokenListParams) {
-  return useQuery({
-    queryKey: ['platform-tokens', params?.resourceType, params?.resourceId],
-    queryFn: () => platformTokenService.listTokens(params),
-    staleTime: STALE_TIME.LONG
-  });
-}
-
-export function useRevokeToken() {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: platformTokenService.revokeToken,
-    onSuccess: (_, tokenId) => {
-      // Granular invalidation: invalidate all token queries
-      // (we don't know which resources this token was bound to)
-      queryClient.invalidateQueries({ queryKey: ['platform-tokens'] });
-    }
-  });
-}
-```
-
-#### Component Architecture
-
-**Three independent entry points sharing base components:**
-
-```
-TokensPage (Settings global management)
-  └─> TokenList (shared)
-       └─> TokenItem (shared)
-
-SkillApiTokensTab (Skill-specific management)
-  └─> TokenList (shared)
-       └─> TokenItem (shared)
-
-WorkspaceApiTokensDialog (Workspace-specific management)
-  └─> TokenList (shared)
-       └─> TokenItem (shared)
-```
-
-**Shared component design:**
-
-```typescript
-// frontend/components/tokens/TokenList.tsx
-interface TokenListProps {
-  resourceType?: 'skill' | 'graph' | 'tool';
-  resourceId?: string;
-  showCreateButton?: boolean;
-  createButtonScopes?: string[];
-}
-
-export function TokenList({
-  resourceType,
-  resourceId,
-  showCreateButton,
-  createButtonScopes
-}: TokenListProps) {
-  const { data: tokens } = usePlatformTokens({ resourceType, resourceId });
-  const { mutate: revoke } = useRevokeToken();
-
-  return (
-    <div>
-      {showCreateButton && <CreateTokenButton defaultScopes={createButtonScopes} />}
-      {tokens?.map(token => <TokenItem key={token.id} token={token} onRevoke={revoke} />)}
-    </div>
-  );
-}
-```
-
-**Three entry point implementations:**
-
-```typescript
-// 1. Settings global management
-// frontend/components/settings/tokens-page.tsx
-export function TokensPage() {
-  return <TokenList showCreateButton createButtonScopes={[]} />;
-}
-
-// 2. Skill-specific management
-// frontend/app/skills/[skillId]/components/ApiTokensTab.tsx
-export function ApiTokensTab({ skillId }: { skillId: string }) {
-  return (
-    <TokenList
-      resourceType="skill"
-      resourceId={skillId}
-      showCreateButton
-      createButtonScopes={['skills:execute']}
-    />
-  );
-}
-
-// 3. Workspace-specific management
-// frontend/app/workspace/[workspaceId]/components/WorkspaceApiTokensDialog.tsx
-export function WorkspaceApiTokensDialog({ workspaceId }: { workspaceId: string }) {
-  return (
-    <TokenList
-      resourceType="graph"
-      resourceId={workspaceId}
-      showCreateButton
-      createButtonScopes={['graphs:execute']}
-    />
-  );
-}
-```
-
-### 4. Migration Strategy
-
-#### Data Migration
-
-```python
-# backend/alembic/versions/20260323_migrate_apikey_to_platform_token.py
-async def upgrade():
-    # 1. Migrate active ApiKeys to PlatformTokens
-    # Note: ApiKey stores plaintext tokens, we hash them directly
-    api_keys = await db.execute(
-        select(ApiKey).where(ApiKey.is_active == True)
-    )
-
-    migrated_count = 0
-    for api_key in api_keys.scalars():
-        # Hash the existing plaintext token from ApiKey
-        # Prefix with 'sk_' if not already present
-        existing_token = api_key.key
-        if not existing_token.startswith('sk_'):
-            existing_token = f"sk_{existing_token}"
-
-        token_hash = hashlib.sha256(existing_token.encode()).hexdigest()
-
-        # Check for hash collision (extremely unlikely but handle it)
-        existing = await db.execute(
-            select(PlatformToken).where(PlatformToken.token_hash == token_hash)
-        )
-        if existing.scalar_one_or_none():
-            logger.warning(f"Hash collision for ApiKey {api_key.id}, skipping")
-            continue
-
-        platform_token = PlatformToken(
-            user_id=api_key.user_id,
-            name=f"Migrated: {api_key.name}",
-            token_hash=token_hash,
-            token_prefix=existing_token[:12],
-            scopes=['graphs:execute'],
-            resource_type='graph',
-            resource_id=api_key.workspace_id,  # UUID column, no str() conversion needed
-            expires_at=api_key.expires_at,
-            is_active=True
-        )
-        db.add(platform_token)
-        migrated_count += 1
-
-    await db.commit()
-
-    # 2. Verify migration
-    original_count = await db.scalar(select(func.count()).select_from(ApiKey).where(ApiKey.is_active == True))
-    if migrated_count != original_count:
-        raise Exception(f"Migration verification failed: {migrated_count} migrated vs {original_count} original")
-
-    logger.info(f"Successfully migrated {migrated_count} ApiKeys to PlatformTokens")
-
-    # 3. Rename api_keys table for 30-day verification period
-    op.rename_table('api_keys', 'api_keys_deprecated')
-    op.execute("COMMENT ON TABLE api_keys_deprecated IS 'Deprecated, safe to drop after 2026-04-23'")
-
-async def downgrade():
-    # Rollback: restore api_keys table
-    op.rename_table('api_keys_deprecated', 'api_keys')
-    # Delete migrated PlatformTokens
-    await db.execute(
-        delete(PlatformToken).where(PlatformToken.name.like('Migrated:%'))
-    )
-    await db.commit()
-```
-
-**Rollback Procedure (if migration issues detected):**
-1. Stop application servers
-2. Run `alembic downgrade -1` to execute downgrade script
-3. Verify `api_keys` table restored and migrated tokens deleted
-4. Restart application servers
-5. Investigate migration failure, fix script, retry
-
-#### Code Removal
-
-**Backend:**
-- Delete `models/api_key.py`
-- Delete `services/api_key_service.py`
-- Delete `repositories/api_key_repository.py`
-- Delete `api/v1/api_keys.py`
-
-**Frontend:**
-- Delete `components/workspace/ApiAccessDialog.tsx`
-- Delete `services/apiKeyService.ts`
-- Delete `hooks/queries/apiKeys.ts`
-
-### 5. Error Handling
-
-#### Backend Validation
-
-```python
-# 1. Invalid scopes
-if invalid_scopes:
-    raise ValidationException(f"Invalid scopes: {invalid_scopes}")
-
-# 2. Resource not found
-if resource_type == 'skill':
-    skill = await skill_repo.get(resource_id)
-    if not skill:
-        raise NotFoundException(f"Skill {resource_id} not found")
-
-# 3. No permission to bind resource
-if resource_type == 'skill':
-    has_access = await check_skill_access(user_id, resource_id, 'admin')
-    if not has_access:
-        raise ForbiddenException("No permission to create token for this skill")
-
-# 4. Token limit exceeded
-if await token_repo.count_active_by_user(user_id) >= 50:
-    raise ValidationException("Maximum 50 active tokens per user")
-```
-
-#### Frontend Error Handling
-
-```typescript
-const { mutate: createToken, error } = useCreateToken();
-
-if (error?.message.includes('Invalid scopes')) {
-  toast.error('Invalid scope selection');
-} else if (error?.message.includes('Maximum 50')) {
-  toast.error('Token limit reached (50 tokens max)');
-}
-```
-
-#### Edge Cases
-
-1. **Global vs resource token conflict** — Both allowed, permission check prioritizes resource-bound tokens
-2. **Resource deletion** — Cascade soft-delete bound tokens (`is_active=False`) via service layer hooks:
-   - `SkillService.delete()` calls `TokenService.revoke_by_resource('skill', skill_id)`
-   - `WorkspaceService.delete()` calls `TokenService.revoke_by_resource('graph', workspace_id)`
-3. **Expired tokens** — Auth checks `expires_at`, auto-reject if expired; list shows but marks as "Expired"
-4. **Workspace-to-Graph mapping** — In this system, workspace ID (UUID) directly maps to graph resource_id (1:1 relationship). Migration passes `api_key.workspace_id` (UUID) directly as `resource_id`.
-5. **resource_type/resource_id pair constraint** — Both must be provided together or both be NULL. Enforced at the service layer during token creation.
-
-## Implementation Plan
-
-### Phase 1: Backend Foundation
-1. Add database indexes on `resource_type` and `resource_id` columns
-2. Add `list_by_user_and_resource()` to repository
-3. Update service layer with scope validation, resource_type validation, and resource_type/resource_id pair constraint
-4. Add query parameters to API endpoint with UUID validation for `resource_id`
-5. Implement unified permission check function with hierarchy
-6. Write unit tests for hierarchical permission checking, pair validation, and resource filtering
-
-### Phase 2: Frontend Refactoring
-1. Update service layer with `TokenListParams`
-2. Adjust hooks to support filtering with granular invalidation
-3. Create shared `TokenList` and `TokenItem` components
-4. Refactor Settings TokensPage
-5. Refactor Skill ApiTokensTab
-6. Create Workspace WorkspaceApiTokensDialog
-
-### Phase 3: Migration & Cleanup
-1. Write and test migration script (preserves existing tokens)
-2. Run migration in staging, verify existing integrations still work
-3. Keep `api_keys_deprecated` table for 30 days
-4. Delete ApiKey backend code (keep models for migration reference)
-5. Delete ApiKey frontend code
-6. Update API documentation
-7. After 30-day verification: drop `api_keys_deprecated` table
-
-### Phase 4: Testing & Deployment
-1. Integration tests for all three entry points
-2. E2E tests for token creation/revocation flows
-3. Security audit
-4. Deploy to production
-5. Monitor for issues
-
-## File Change Summary
-
-### Backend Changes
-
-**Modified:**
-- `repositories/platform_token.py` — Add `list_by_user_and_resource()`
-- `services/platform_token_service.py` — Add scope validation, update `list_tokens()`
-- `api/v1/tokens.py` — Add query parameters
-
-**Added:**
-- `common/permissions.py` — Unified permission check
-- `alembic/versions/xxx_migrate_apikey.py` — Migration script
-
-**Deleted:**
-- `models/api_key.py`
-- `services/api_key_service.py`
-- `repositories/api_key_repository.py`
-- `api/v1/api_keys.py`
-
-### Frontend Changes
-
-**Modified:**
-- `services/platformTokenService.ts` — Add `TokenListParams`
-- `hooks/queries/platformTokens.ts` — Support filtering
-- `components/settings/tokens-page.tsx` — Use shared components
-- `app/skills/[skillId]/components/ApiTokensTab.tsx` — Refactor with shared components
-
-**Added:**
-- `components/tokens/TokenList.tsx` — Shared list component
-- `components/tokens/TokenItem.tsx` — Shared item component
-- `app/workspace/[workspaceId]/components/WorkspaceApiTokensDialog.tsx` — New workspace token management
-
-**Deleted:**
-- `components/workspace/ApiAccessDialog.tsx`
-- `services/apiKeyService.ts`
-- `hooks/queries/apiKeys.ts`
-
-## Success Metrics
-
-1. **Unification** — Zero ApiKey references in codebase
-2. **Security** — 100% tokens stored as SHA-256 hashes
-3. **Performance** — Token list queries filtered server-side, <100ms response time
-4. **Usability** — Each context (Settings/Skill/Workspace) shows only relevant tokens
-5. **Extensibility** — New resource types (memory, chat) can add scopes without refactoring
-
-## Risks & Mitigations
-
-| Risk | Mitigation |
-|------|------------|
-| Migration data loss | Preserve existing token values by hashing them; test migration script thoroughly in staging; keep `api_keys_deprecated` table for 30 days before hard delete |
-| Breaking existing integrations | Migration preserves existing token values, no integration changes needed |
-| Performance regression | Add database indexes on `resource_type` and `resource_id` columns in Phase 1 |
-| Scope confusion | Clear UI labels, inline help text explaining each scope |
-| Rate limiting attacks | Add rate limiting to token endpoints (100 req/min per user) |
-
-## Conclusion
-
-This refactoring unifies two parallel token systems into a single, secure, scalable architecture with intuitive UI. The design achieves high cohesion (single token system), low coupling (shared components, filtered queries), and extensibility (scope system supports future resource types).
diff --git a/docs/superpowers/specs/2026-03-23-skill-frontend-versioning-collab-token-design.md b/docs/superpowers/specs/2026-03-23-skill-frontend-versioning-collab-token-design.md
deleted file mode 100644
index 8351e1dfa..000000000
--- a/docs/superpowers/specs/2026-03-23-skill-frontend-versioning-collab-token-design.md
+++ /dev/null
@@ -1,448 +0,0 @@
-# Skill 前端：版本管理、协作者管理、Token 管理 设计文档
-
-**日期**: 2026-03-23
-**状态**: 设计完成，待实现
-**依赖**: `2026-03-20-skill-versioning-permissions-api-design.md`（后端已实现）
-
-## 概述
-
-为 Skill 系统前端新增三大功能的完整 UI 实现：
-
-1. **版本历史 Tab** — 在 Skill 编辑器内新增 Tab，支持发布版本、查看历史、恢复 draft、删除版本
-2. **协作者管理 Tab** — 在 Skill 编辑器内新增 Tab，支持添加/移除协作者、修改角色、转让所有权
-3. **API Tokens 页面** — 在全局 Settings 对话框中新增页签，支持创建/列出/撤销 Token
-
-## 设计原则
-
-- 遵循现有前端架构模式（React Query + Service Layer + shadcn/ui）
-- 版本和协作者属于 Skill 级别，UI 放在 SkillsManager 编辑区域
-- Token 属于用户级别，UI 放在全局 Settings 对话框
-- i18n 双语支持（en + zh）
-- 所有 API 调用通过 `@/lib/api-client` 的 `apiGet/apiPost/apiPut/apiDelete`
-
----
-
-## 1. UI 布局
-
-### 1.1 Skill 编辑器区域（SkillsManager）
-
-在现有编辑器区域上方新增 Tab 栏：
-
-```
-┌─────────────────────────────────────────────┐
-│ Skill Name        [Save] [Publish ▾]        │
-├─────────────────────────────────────────────┤
-│ [编辑器] [文件] [版本历史] [协作者]           │
-│ ─────────────────────────────────────────── │
-│ (Tab 对应的内容区)                           │
-└─────────────────────────────────────────────┘
-```
-
-- **编辑器 Tab**: 现有的代码编辑器（默认选中）
-- **文件 Tab**: 现有的文件树 + 编辑器布局
-- **版本历史 Tab**: 新增，展示版本列表和发布入口
-- **协作者 Tab**: 新增，展示协作者列表和管理操作
-
-**注意**: 当前 SkillsManager 为三栏布局（sidebar w-52 + file tree w-48 + editor flex-1）。新增的 Tab 栏只在编辑器区域（flex-1）切换内容，sidebar 和 file tree 不受影响。当用户切换到"版本历史"或"协作者" Tab 时，file tree 面板可保持显示但不强制（编辑器内容区替换为对应 Tab 内容）。
-
-### 1.2 Settings 对话框
-
-在 `settings-dialog.tsx` 的侧栏新增 "API Tokens" 菜单项：
-
-```
-Settings
-├── Profile
-├── Models
-├── Sandboxes
-└── API Tokens  ← 新增
-```
-
----
-
-## 2. 版本历史 Tab
-
-### 2.1 布局
-
-版本历史 Tab 内置发布入口（方案 B）：
-
-```
-┌──────────────────────────────────────┐
-│ [+ 发布新版本]                        │
-│ ┌ 版本号: [1.3.0]                    │
-│ │ Release Notes: [___________]       │
-│ └                    [发布]          │
-│ ────────────────────────────────────│
-│ v1.2.0  2026-03-20  by Alice        │
-│   新增 X 功能       [恢复] [删除]    │
-│ v1.1.0  2026-03-15  by Bob          │
-│   修复 Y 问题       [恢复] [删除]    │
-│ v1.0.0  2026-03-10  by Alice        │
-│   初始发布          [恢复] [删除]    │
-└──────────────────────────────────────┘
-```
-
-### 2.2 交互逻辑
-
-- **发布新版本**: 点击 "发布新版本" 按钮展开内联表单（版本号 input + release notes textarea）。表单使用 react-hook-form + Zod 校验版本号格式（`MAJOR.MINOR.PATCH`）。提交后调用 `POST /v1/skills/{skill_id}/versions`。
-- **版本列表**: 调用 `GET /v1/skills/{skill_id}/versions` 获取所有已发布版本，按 `published_at` 降序排列。每条显示版本号、发布时间、发布人、release notes。
-- **恢复 draft**: 点击 "恢复" 弹出确认 Dialog（"恢复将覆盖当前 draft，是否继续？"），确认后调用 `POST /v1/skills/{skill_id}/restore`。成功后 invalidate skill 查询，刷新编辑器内容。
-- **删除版本**: 点击 "删除" 弹出确认 Dialog（"删除版本不可恢复，是否继续？"），确认后调用 `DELETE /v1/skills/{skill_id}/versions/{version}`。
-- **权限控制**: 根据用户角色显示/隐藏操作按钮：
-
-| 角色 | 可见操作 |
-|------|---------|
-| viewer | 只读版本列表，无操作按钮 |
-| editor | 只读版本列表，无操作按钮 |
-| publisher | 发布新版本、恢复 draft（无删除） |
-| admin / owner | 发布、恢复、删除（全部操作） |
-
-### 2.3 数据模型（TypeScript）
-
-```typescript
-interface SkillVersion {
-  id: string
-  skillId: string
-  version: string
-  releaseNotes: string | null
-  skillName: string
-  skillDescription: string
-  content: string
-  tags: string[]
-  metadata: Record<string, unknown>
-  allowedTools: string[]
-  compatibility: string | null
-  license: string | null
-  publishedById: string
-  publishedAt: string | null
-  createdAt: string | null
-  files: SkillVersionFile[] | null
-}
-
-interface SkillVersionFile {
-  id: string
-  versionId: string
-  path: string
-  fileName: string
-  fileType: string
-  content: string | null
-  storageType: string
-  storageKey: string | null
-  size: number
-}
-
-// 列表接口使用轻量 summary（需扩展后端 VersionSummarySchema 以包含 published_by_id）
-interface SkillVersionSummary {
-  version: string
-  releaseNotes: string | null
-  publishedById: string
-  publishedAt: string | null
-}
-```
-
----
-
-## 3. 协作者管理 Tab
-
-### 3.1 布局
-
-内联列表 + 行内操作（方案 A）：
-
-```
-┌──────────────────────────────────────┐
-│ [+ 添加协作者]                        │
-│ ────────────────────────────────────│
-│ 👤 Alice (owner)                     │
-│ 👤 Bob     [editor ▾]          [✕]  │
-│ 👤 Carol   [viewer ▾]          [✕]  │
-│ ────────────────────────────────────│
-│              [🔄 转让所有权]          │
-└──────────────────────────────────────┘
-```
-
-### 3.2 交互逻辑
-
-- **添加协作者**: 点击 "添加协作者" 展开内联表单（用户 ID input + 角色 Select），提交调用 `POST /v1/skills/{skill_id}/collaborators`。v1 使用原始用户 ID 输入，后续迭代可升级为用户搜索/自动补全。
-- **修改角色**: 角色通过 Select 下拉框直接修改，onChange 调用 `PUT /v1/skills/{skill_id}/collaborators/{user_id}`。可选角色：viewer、editor、publisher、admin。
-- **移除协作者**: 点击 ✕ 弹出确认 Dialog，确认后调用 `DELETE /v1/skills/{skill_id}/collaborators/{user_id}`。
-- **转让所有权**: 点击 "转让所有权" 弹出 Dialog（选择目标用户），确认后调用 `POST /v1/skills/{skill_id}/transfer`。仅 owner 可见此按钮。转让后旧 owner 自动降为 admin。
-- **权限控制**: 仅 owner 和 admin 可见此 Tab 的管理操作。其他角色看到只读列表。
-- **Owner 行**: owner 不显示角色下拉框和删除按钮，仅显示 "(owner)" 标记。Owner 不在 `skill_collaborators` 表中，前端需从 `skill.owner_id` 读取并作为列表首行展示。
-
-### 3.3 数据模型（TypeScript）
-
-```typescript
-type CollaboratorRole = 'viewer' | 'editor' | 'publisher' | 'admin'
-
-interface SkillCollaborator {
-  id: string
-  skillId: string
-  userId: string
-  role: CollaboratorRole
-  invitedBy: string
-  createdAt: string | null
-}
-```
-
----
-
-## 4. API Tokens 页面
-
-### 4.1 布局
-
-卡片列表式（方案 A），放在 Settings 对话框内：
-
-```
-┌──────────────────────────────────────┐
-│ Settings > API Tokens                │
-│ ────────────────────────────────────│
-│ [+ Create Token]                     │
-│                                      │
-│ ┌──────────────────────────────────┐│
-│ │ CI deploy token        [Revoke] ││
-│ │ sk_a1b2c3d4                     ││
-│ │ [read] [write] [publish]        ││
-│ │ Expires: 2026-12-31             ││
-│ │ Last used: 2h ago               ││
-│ └──────────────────────────────────┘│
-│ ┌──────────────────────────────────┐│
-│ │ Local dev token        [Revoke] ││
-│ │ sk_x9y8z7w6                     ││
-│ │ [read]                          ││
-│ │ No expiry                       ││
-│ │ Last used: never                ││
-│ └──────────────────────────────────┘│
-└──────────────────────────────────────┘
-```
-
-### 4.2 交互逻辑
-
-- **创建 Token**: 点击 "Create Token" 弹出 Dialog（name input + scopes 多选 + expires_at 日期选择器）。提交调用 `POST /v1/tokens`。成功后弹出明文 token 显示 Dialog（带复制按钮），提示"此 token 仅显示一次，请妥善保管"。关闭后无法再次查看明文。**注意**: `resource_type` 和 `resource_id` 字段在 v1 不暴露到创建 UI，保留给未来资源级 token 隔离使用。
-- **Token 列表**: 调用 `GET /v1/tokens` 获取当前用户所有 token。每张卡片显示：name、token_prefix、scopes（Badge 标签）、expires_at（格式化为日期或 "No expiry"）、last_used_at（相对时间或 "never"）。
-- **撤销 Token**: 点击 "Revoke" 弹出确认 Dialog（"撤销后使用此 token 的 API 调用将立即失败"），确认后调用 `DELETE /v1/tokens/{id}`。
-- **可用 Scopes**: `skills:read`、`skills:write`、`skills:publish`、`skills:admin`。以 Checkbox 组形式展示在创建 Dialog 中。
-
-### 4.3 数据模型（TypeScript）
-
-```typescript
-interface PlatformToken {
-  id: string
-  name: string
-  tokenPrefix: string
-  scopes: string[]
-  resourceType: string | null
-  resourceId: string | null
-  expiresAt: string | null
-  lastUsedAt: string | null
-  isActive: boolean
-  createdAt: string | null
-}
-
-// 创建响应（含明文 token，仅返回一次）
-interface PlatformTokenCreateResponse {
-  id: string
-  name: string
-  token: string  // plaintext, shown only once
-  tokenPrefix: string
-  scopes: string[]
-  expiresAt: string | null
-}
-```
-
----
-
-## 5. Service Layer
-
-### 5.1 `services/skillVersionService.ts`（新增）
-
-```typescript
-export const skillVersionService = {
-  publishVersion(skillId: string, data: { version: string; release_notes?: string }),
-  listVersions(skillId: string): Promise<SkillVersionSummary[]>,
-  getVersion(skillId: string, version: string): Promise<SkillVersion>,
-  getLatestVersion(skillId: string): Promise<SkillVersion>,
-  deleteVersion(skillId: string, version: string),
-  restoreDraft(skillId: string, data: { version: string }): Promise<Skill>,  // returns updated draft Skill, not SkillVersion
-}
-```
-
-API 路径映射：
-| 方法 | 路径 |
-|------|------|
-| `publishVersion` | `POST /skills/{skill_id}/versions` |
-| `listVersions` | `GET /skills/{skill_id}/versions` |
-| `getVersion` | `GET /skills/{skill_id}/versions/{version}` |
-| `getLatestVersion` | `GET /skills/{skill_id}/versions/latest` |
-| `deleteVersion` | `DELETE /skills/{skill_id}/versions/{version}` |
-| `restoreDraft` | `POST /skills/{skill_id}/restore` |
-
-### 5.2 `services/skillCollaboratorService.ts`（新增）
-
-```typescript
-export const skillCollaboratorService = {
-  listCollaborators(skillId: string): Promise<SkillCollaborator[]>,
-  addCollaborator(skillId: string, data: { user_id: string; role: CollaboratorRole }),
-  updateRole(skillId: string, userId: string, data: { role: CollaboratorRole }),
-  removeCollaborator(skillId: string, userId: string),
-  transferOwnership(skillId: string, data: { new_owner_id: string }),
-}
-```
-
-API 路径映射：
-| 方法 | 路径 |
-|------|------|
-| `listCollaborators` | `GET /skills/{skill_id}/collaborators` |
-| `addCollaborator` | `POST /skills/{skill_id}/collaborators` |
-| `updateRole` | `PUT /skills/{skill_id}/collaborators/{user_id}` |
-| `removeCollaborator` | `DELETE /skills/{skill_id}/collaborators/{user_id}` |
-| `transferOwnership` | `POST /skills/{skill_id}/transfer` |
-
-### 5.3 `services/platformTokenService.ts`（新增）
-
-```typescript
-export const platformTokenService = {
-  createToken(data: TokenCreateRequest): Promise<PlatformTokenCreateResponse>,
-  listTokens(): Promise<PlatformToken[]>,
-  revokeToken(tokenId: string),
-}
-```
-
-API 路径映射：
-| 方法 | 路径 |
-|------|------|
-| `createToken` | `POST /tokens` |
-| `listTokens` | `GET /tokens` |
-| `revokeToken` | `DELETE /tokens/{id}` |
-
----
-
-## 6. React Query Hooks
-
-### 6.1 `hooks/queries/skillVersions.ts`（新增）
-
-```typescript
-export const skillVersionKeys = {
-  all: ['skill-versions'] as const,
-  list: (skillId: string) => [...skillVersionKeys.all, 'list', skillId] as const,
-  detail: (skillId: string, version: string) => [...skillVersionKeys.all, 'detail', skillId, version] as const,
-  latest: (skillId: string) => [...skillVersionKeys.all, 'latest', skillId] as const,
-}
-
-export function useSkillVersions(skillId: string)           // useQuery → listVersions
-export function useSkillVersion(skillId: string, v: string) // useQuery → getVersion
-export function usePublishVersion(skillId: string)          // useMutation → publishVersion, invalidates list
-export function useDeleteVersion(skillId: string)           // useMutation → deleteVersion, invalidates list
-export function useRestoreDraft(skillId: string)            // useMutation → restoreDraft, invalidates skill detail
-```
-
-### 6.2 `hooks/queries/skillCollaborators.ts`（新增）
-
-```typescript
-export const skillCollaboratorKeys = {
-  all: ['skill-collaborators'] as const,
-  list: (skillId: string) => [...skillCollaboratorKeys.all, 'list', skillId] as const,
-}
-
-export function useSkillCollaborators(skillId: string)        // useQuery → listCollaborators
-export function useAddCollaborator(skillId: string)           // useMutation → addCollaborator, invalidates list
-export function useUpdateCollaboratorRole(skillId: string)    // useMutation → updateRole, invalidates list
-export function useRemoveCollaborator(skillId: string)        // useMutation → removeCollaborator, invalidates list
-export function useTransferOwnership(skillId: string)         // useMutation → transferOwnership, invalidates list + skill detail
-```
-
-### 6.3 `hooks/queries/platformTokens.ts`（新增）
-
-```typescript
-export const platformTokenKeys = {
-  all: ['platform-tokens'] as const,
-  list: () => [...platformTokenKeys.all, 'list'] as const,
-}
-
-export function usePlatformTokens()     // useQuery → listTokens
-export function useCreateToken()        // useMutation → createToken, invalidates list
-export function useRevokeToken()        // useMutation → revokeToken, invalidates list
-```
-
----
-
-## 7. UI 组件
-
-### 7.1 新增组件
-
-| 组件 | 路径 | 说明 |
-|------|------|------|
-| `VersionHistoryTab` | `app/skills/components/VersionHistoryTab.tsx` | 版本历史 Tab 内容，含发布表单和版本列表 |
-| `CollaboratorsTab` | `app/skills/components/CollaboratorsTab.tsx` | 协作者管理 Tab 内容，含列表和内联操作 |
-| `TokensPage` | `components/settings/tokens-page.tsx` | Token 管理页面，Settings 内嵌 |
-| `CreateTokenDialog` | `components/settings/create-token-dialog.tsx` | 创建 Token Dialog（name + scopes + expiry） |
-| `TokenCreatedDialog` | `components/settings/token-created-dialog.tsx` | 显示明文 token（仅一次），带复制按钮 |
-
-### 7.2 修改组件
-
-| 组件 | 修改内容 |
-|------|---------|
-| `app/skills/SkillsManager.tsx` | 编辑区域添加 Tab 栏（编辑器/文件/版本历史/协作者），管理 activeTab state |
-| `components/settings/settings-dialog.tsx` | 侧栏新增 "API Tokens" MenuItem，内容区渲染 `TokensPage` |
-| `lib/i18n/locales/en.ts` | 新增 skill versions / collaborators / tokens 相关翻译 key |
-| `lib/i18n/locales/zh.ts` | 新增对应中文翻译 |
-
----
-
-## 8. snake_case ↔ camelCase 转换
-
-后端返回 snake_case（`skill_id`, `release_notes`, `published_at` 等），前端使用 camelCase。在 Service 层做转换：
-
-- **Service 发送请求**: 直接使用 snake_case key（与后端 schema 一致）
-- **Service 接收响应**: 用 normalizer helper 转为 camelCase（复用 `skillService.ts` 中已有的模式）
-- **API 路径**: Service 层使用相对路径（如 `skills/${skillId}/versions`），`apiGet/apiPost` 等方法会自动拼接 `${API_BASE}` 前缀
-- **metadata 字段**: 后端 Pydantic schema 使用 `validation_alias="meta_data"` + `populate_by_name=True`，序列化输出 key 为 `"metadata"`，与前端 camelCase 字段名一致
-
----
-
-## 9. 错误处理
-
-- 所有 mutation 使用 React Query 的 `onError` 回调，通过现有 toast 系统显示错误消息
-- 版本号冲突（409）：显示"此版本号已存在，请使用更高版本号"
-- 权限不足（403）：显示"您没有执行此操作的权限"
-- 转让所有权时目标用户有同名 skill（409）：显示后端返回的具体错误消息
-- Token 数量超限（400）：显示"已达 token 数量上限（50）"
-
----
-
-## 10. 空状态与加载
-
-- **版本列表为空**: 显示 "No versions published yet" 占位文本，引导用户发布第一个版本
-- **协作者列表为空**: 仅显示 owner 行和 "添加协作者" 按钮
-- **Token 列表为空**: 显示 "No API tokens created yet" 占位文本
-- **加载中**: 使用 skeleton 占位（复用项目现有的 skeleton 组件），版本/协作者/Token 列表加载时各显示 2-3 行 skeleton
-
----
-
-## 11. 后端适配（需同步修改）
-
-为支持前端版本列表显示 "by Alice"，需扩展后端 `VersionSummarySchema`：
-
-- `backend/app/schemas/skill_version.py` 的 `VersionSummarySchema` 新增 `published_by_id: str` 字段
-- 可选：新增 `published_by_name: Optional[str]` 通过 join 获取用户名，避免前端额外查询
-
----
-
-## 12. 文件清单
-
-### 新增文件（11 个）
-1. `frontend/services/skillVersionService.ts` — 版本 API 服务
-2. `frontend/services/skillCollaboratorService.ts` — 协作者 API 服务
-3. `frontend/services/platformTokenService.ts` — Token API 服务
-4. `frontend/hooks/queries/skillVersions.ts` — 版本 React Query hooks
-5. `frontend/hooks/queries/skillCollaborators.ts` — 协作者 React Query hooks
-6. `frontend/hooks/queries/platformTokens.ts` — Token React Query hooks
-7. `frontend/app/skills/components/VersionHistoryTab.tsx` — 版本历史 Tab UI
-8. `frontend/app/skills/components/CollaboratorsTab.tsx` — 协作者管理 Tab UI
-9. `frontend/components/settings/tokens-page.tsx` — Token 管理页面
-10. `frontend/components/settings/create-token-dialog.tsx` — 创建 Token Dialog
-11. `frontend/components/settings/token-created-dialog.tsx` — Token 明文展示 Dialog
-
-### 修改文件（4 个）
-1. `frontend/app/skills/SkillsManager.tsx` — 添加 Tab 栏和 Tab 内容切换
-2. `frontend/components/settings/settings-dialog.tsx` — 添加 API Tokens 菜单项和页面
-3. `frontend/lib/i18n/locales/en.ts` — 添加英文翻译
-4. `frontend/lib/i18n/locales/zh.ts` — 添加中文翻译
diff --git a/docs/superpowers/specs/2026-03-24-ws-chat-unification-design.md b/docs/superpowers/specs/2026-03-24-ws-chat-unification-design.md
deleted file mode 100644
index a150be121..000000000
--- a/docs/superpowers/specs/2026-03-24-ws-chat-unification-design.md
+++ /dev/null
@@ -1,335 +0,0 @@
-# WS Chat Unification Design
-
-## Goal
-
-Replace the current SSE-based chat streaming (`POST /v1/chat/stream`) with a persistent WebSocket connection, unify all real-time channels under a coherent WS architecture, and delete the orphaned legacy WS chat handler.
-
-> Status on 2026-03-24: Implemented. The chat business flows have been migrated to `WS /ws/chat`, the legacy `WS /ws/{session_id}` handler has been deleted, and the public `/v1/chat*` HTTP routes are no longer registered. `backend/app/api/v1/chat.py` now serves as a shared helper module for the WS handler.
-
-## Architecture
-
-A single persistent WS connection (`/ws/chat`) is established per user when the Chat page mounts. All chat turns (new thread, existing thread, resume-after-interrupt) are multiplexed over that connection using a `request_id`. Stop and resume operations are sent as frames on the same connection, eliminating the separate `POST /v1/chat/stop` and `POST /v1/chat/resume` HTTP endpoints. The three other WS channels (notifications, copilot, legacy session chat) are addressed independently: notifications and copilot are kept unchanged; the legacy session chat endpoint is deleted as dead code.
-
-## Tech Stack
-
-- **Backend:** FastAPI WebSocket, asyncio Tasks, existing LangGraph `astream_events` pipeline, existing `task_manager`, existing `authenticate_websocket`
-- **Frontend:** Browser `WebSocket` API, React hooks, existing `useChatReducer` dispatch
-
----
-
-## WS Endpoint Inventory (after migration)
-
-| Endpoint | Handler | Status |
-|---|---|---|
-| `WS /ws/chat` | `chat_ws_handler.py` (new) | **New** |
-| `WS /ws/notifications` | `notification_manager.py` | Keep |
-| `WS /ws/copilot/{session_id}` | `copilot_handler.py` | Keep |
-| `WS /ws/{session_id}` | `chat_handler.py` | **Delete** (no frontend callers) |
-
----
-
-## Message Protocol
-
-### Authentication
-
-The existing `authenticate_websocket(websocket)` first tries five cookie names; it falls back to the `?token=` query param only if all cookies are absent. For same-origin browser connections, the existing auth cookie is used automatically — no extra token-passing logic needed. The `?token=` fallback exists for non-browser or cross-origin clients.
-
-```
-# Browser (same-origin): cookies handled automatically by the browser
-wss://<host>/ws/chat
-
-# Non-browser / cross-origin fallback
-wss://<host>/ws/chat?token=<jwt>
-```
-
-No changes required to the auth layer.
-
-### Client → Server frames
-
-All frames are JSON objects sent via `websocket.send_text(json.dumps(...))`.
-
-```jsonc
-// Start a new chat turn
-{
-  "type": "chat",
-  "request_id": "<uuid>",      // client-generated; used to correlate all server events for this turn
-  "thread_id": "<str|null>",   // null = new conversation
-  "graph_id": "<uuid|null>",
-  "message": "<str>",
-  "metadata": {}               // files, edit_skill_id, etc. — same as current SSE payload
-}
-
-// Cancel a running turn
-{
-  "type": "stop",
-  "request_id": "<uuid>"       // request_id of the turn to stop
-}
-
-// Resume after interrupt
-{
-  "type": "resume",
-  "request_id": "<uuid>",      // new request_id for this resume turn
-  "thread_id": "<str>",
-  "command": { "update": {}, "goto": "<str|null>" }
-}
-
-// Keepalive
-{ "type": "ping" }
-```
-
-### Server → Client frames
-
-Same event envelope as the current SSE payload (`StreamEventEnvelope` in `chatBackend.ts`), but:
-- No `data: ` SSE framing
-- `request_id` field added to every event for multiplexing
-
-```jsonc
-{
-  "type": "content" | "tool_start" | "tool_end" | "node_start" | "node_end" |
-          "status" | "error" | "done" | "thread_id" | "interrupt" |
-          "file_event" | "command" | "route_decision" | ... ,
-  "request_id": "<uuid>",
-  "thread_id": "<str>",
-  "run_id": "<str>",
-  "node_name": "<str>",
-  "timestamp": <number>,
-  "data": {}
-}
-
-// Keepalive response
-{ "type": "pong" }
-
-// Protocol-level error (e.g. bad frame format, auth expired)
-{ "type": "ws_error", "message": "<str>" }
-```
-
----
-
-## Backend Design
-
-### New file: `backend/app/websocket/chat_ws_handler.py`
-
-**Responsibilities:**
-1. Accept an authenticated WS connection; hold it open until client disconnects.
-2. Read incoming frames in a loop and dispatch by `type`.
-3. For `chat` and `resume`: start an `asyncio.Task` that runs the existing LangGraph pipeline and streams events back over the WS. Register the task with `task_manager` keyed by `thread_id` (same as today).
-4. For `stop`: call `task_manager.stop_task(thread_id)` and cancel the corresponding task. The task's `finally` block sends a `done` frame.
-5. For `ping`: immediately send `pong`.
-6. On any `WebSocketDisconnect`: cancel all in-flight tasks for this connection, then exit.
-
-**Key class: `ChatWsHandler`**
-
-```python
-class ChatWsHandler:
-    def __init__(self, user_id: str, websocket: WebSocket):
-        self.user_id = user_id
-        self.websocket = websocket
-        # maps request_id → (thread_id, asyncio.Task)
-        self._tasks: dict[str, tuple[str, asyncio.Task]] = {}
-
-    async def run(self) -> None:
-        """Main loop — reads frames until disconnect."""
-
-    async def _handle_chat(self, frame: dict) -> None:
-        """Validate frame, start streaming Task."""
-
-    async def _handle_stop(self, frame: dict) -> None:
-        """
-        Cancel task and stop LangGraph run.
-        If request_id is not in _tasks (turn already finished), silently ignore.
-        Must NOT raise — an unhandled exception here disconnects the WS.
-
-        Implementation must do:
-            entry = self._tasks.get(frame.get("request_id"))
-            if entry is None:
-                return   # already done, ignore
-            thread_id, task = entry
-            await task_manager.stop_task(thread_id)
-            task.cancel()
-        """
-
-    async def _handle_resume(self, frame: dict) -> None:
-        """Start resume streaming Task."""
-
-    async def _stream_to_ws(
-        self,
-        request_id: str,
-        thread_id: str,
-        graph,
-        config,
-        input_messages,
-        file_emitter,
-    ) -> None:
-        """
-        Iterate astream_events, call _dispatch_stream_event() (imported from chat.py),
-        and send each SSE string as a WS frame after stripping 'data: ' prefix and
-        injecting request_id.
-        """
-
-    async def _send(self, event: dict) -> None:
-        """Safe send with disconnect handling."""
-```
-
-**Reuse strategy:** `_dispatch_stream_event()` and all helper functions (`save_user_message`, `save_assistant_message`, `_clear_interrupt_marker`, `_enrich_message`, `get_or_create_conversation`, `get_user_config`, `findOrCreateGraph`) are imported from `chat.py` unchanged. The only new logic is the WS framing layer.
-
-**SSE → WS event conversion:**
-
-`_dispatch_stream_event()` yields strings in `"data: {...}\n\n"` format, but several handler paths (e.g. `handle_chat_model_stream` when there is no delta, exception paths in `handle_chat_model_start`) return `None`, which is then yielded as `None`. The conversion loop **must** guard against `None` before stripping:
-
-```python
-async for sse_str in _dispatch_stream_event(event, handler, state, file_emitter):
-    if not sse_str:          # guard: None or empty string → skip
-        continue
-    payload_str = sse_str.lstrip("data:").strip()
-    if payload_str:
-        obj = json.loads(payload_str)
-        obj["request_id"] = request_id
-        await self._send(obj)
-```
-
-**Invariant:** every non-`None` value yielded by `_dispatch_stream_event` is a string of the form `"data: <json>\n\n"`. The `.lstrip("data:").strip()` pattern is correct for this format. The `on_chain_end` list path adds an extra `\n\n` via `event_str.strip() + "\n\n"`, but the outer `.strip()` call in the conversion loop normalises this harmlessly.
-
-### `main.py` changes
-
-```python
-# Add
-from app.websocket.chat_ws_handler import ChatWsHandler
-
-@app.websocket("/ws/chat")
-async def chat_websocket_endpoint(websocket: WebSocket):
-    is_authenticated, user_id = await authenticate_websocket(websocket)
-    if not is_authenticated or not user_id:
-        await reject_websocket(websocket, code=WebSocketCloseCode.UNAUTHORIZED, ...)
-        return
-    await websocket.accept()
-    handler = ChatWsHandler(user_id=str(user_id), websocket=websocket)
-    await handler.run()
-
-# Delete
-@app.websocket("/ws/{session_id}")   # ← remove
-```
-
-### Files to delete
-
-| File | Reason |
-|---|---|
-| `backend/app/websocket/chat_handler.py` | No frontend callers; replaced by `chat_ws_handler.py` |
-| `backend/app/websocket/connection_manager.py` | Only used by deleted `chat_handler.py` |
-
-### HTTP endpoints — final state
-
-The initial migration plan kept some `/v1/chat*` endpoints temporarily because workspace callers still depended on them. That transitional state is now complete:
-
-| Endpoint | Final status | Notes |
-|---|---|---|
-| `POST /v1/chat/stop` | Deleted from public API surface | Replaced by WS `stop` frame |
-| `POST /v1/chat/resume` | Deleted from public API surface | Replaced by WS `resume` frame |
-| `POST /v1/chat/stream` (SSE) | Deleted from public API surface | Replaced by `WS /ws/chat` |
-| `POST /v1/chat` (non-streaming) | Deleted from public API surface | No live callers remained |
-
-`backend/app/api/v1/chat.py` still exists because `chat_ws_handler.py` imports shared execution helpers from it.
-
----
-
-## Frontend Design
-
-### New file: `frontend/app/chat/hooks/useChatWebSocket.ts`
-
-**Responsibilities:**
-1. Open `WS /ws/chat?token=<jwt>` on mount; close on unmount.
-2. Auto-reconnect with exponential backoff (reuse pattern from `useNotificationWebSocket`).
-3. Expose `sendMessage(opts)` — generates `request_id`, sends `chat` frame, returns `request_id`.
-4. Expose `stopMessage(threadId)` — performs a `threadId → requestId` reverse lookup using an internal `activeByThread: Map<threadId, requestId>` map (maintained alongside `activeRequests`), then sends `{"type":"stop", "request_id": ...}`. If no active request exists for that thread, this is a no-op. The map stores only the most recent `request_id` per `thread_id`, so when a new turn starts on an existing thread the map entry is updated and the previous (already completed) `request_id` is discarded.
-5. Expose `resumeChat(opts)` — sends `resume` frame.
-6. On incoming message: parse JSON, dispatch to `useChatReducer` using the exact same event-handling logic currently in `useBackendChatStream.ts` `onEvent` callback.
-
-**Interface:**
-
-```typescript
-interface UseChatWebSocketReturn {
-  isConnected: boolean
-  sendMessage: (opts: SendMessageOpts) => Promise<{ requestId: string }>
-  stopMessage: (threadId: string) => void
-  resumeChat: (opts: ResumeOpts) => Promise<{ requestId: string }>
-}
-```
-
-**Concurrent turn policy:** If a `chat` frame arrives for a `thread_id` that already has an in-flight task, the handler sends `{"type":"ws_error", "message":"turn already in progress for thread_id"}` and does not start a second task. This prevents `task_manager.register_task(thread_id, ...)` from silently overwriting the first task entry. The `_tasks` map should be checked both by `request_id` (for stop) and by `thread_id` (for concurrency guard).
-
-```python
-# In _handle_chat:
-active_thread_ids = {tid for (tid, _) in self._tasks.values()}
-if thread_id and thread_id in active_thread_ids:
-    await self._send({"type": "ws_error", "message": "turn already in progress"})
-    return
-```
-
-**`STREAM_DONE` dispatch (frontend):** In `useBackendChatStream` the `STREAM_DONE` action is dispatched in a `finally` block wrapping the entire SSE promise — not in response to the `done` event (which is a no-op). In `useChatWebSocket` there is no wrapping promise per turn; `STREAM_DONE` must be dispatched when the server sends `{"type": "done", "request_id": ...}`, and also on `{"type": "error", ...}` (error ends the turn). The `onEvent` handler must be updated accordingly:
-
-```typescript
-if (type === 'done') {
-  dispatch({ type: 'STREAM_DONE', messageId: activeRequests[request_id].aiMsgId })
-  delete activeRequests[request_id]
-  return
-}
-if (type === 'error') {
-  // dispatch error, then finalize
-  dispatch({ type: 'STREAM_ERROR', error: errorData.message })
-  dispatch({ type: 'STREAM_DONE', messageId: activeRequests[request_id]?.aiMsgId })
-  delete activeRequests[request_id]
-  return
-}
-```
-
-**Connection lifecycle:** Opened in `ChatProvider` (already wraps the entire chat subtree), so the connection persists across conversation switches, mode changes, and navigating between threads.
-
-### `ChatProvider.tsx` changes
-
-- Instantiate `useChatWebSocket` at this level (not inside `ChatHome` or `ChatLayout`).
-- Add `isConnected`, `sendMessage`, `stopMessage`, `resumeChat` to the existing streaming context (`ChatStreamContext`).
-
-### `ChatLayout.tsx` / `ChatHome.tsx` changes
-
-- Replace `useBackendChatStream` calls with values from streaming context.
-- `handleSubmit` calls `sendMessage(opts)` instead of the SSE `sendMessage`.
-- Stop button calls `stopMessage(threadId)`.
-- Resume calls `resumeChat(opts)`.
-
-### Files to delete
-
-| File | Reason |
-|---|---|
-| `frontend/app/chat/hooks/useBackendChatStream.ts` | Replaced by `useChatWebSocket.ts` |
-| `frontend/services/chatBackend.ts` — `streamChat()` function and SSE parsing | Replaced; the file now only retains shared event type definitions used by the WS transport |
-
----
-
-## Error Handling
-
-| Scenario | Behavior |
-|---|---|
-| WS connect fails | `isConnected=false`; auto-reconnect with backoff; UI shows "Reconnecting…" |
-| Auth expired mid-session | Server closes WS with code 4001; frontend redirects to login |
-| LangGraph error during streaming | Server sends `{"type":"error", "request_id":...}`; frontend dispatches `STREAM_ERROR`; `done` frame follows |
-| Client disconnects mid-stream | `ChatWsHandler.run()` catches `WebSocketDisconnect`; cancels all in-flight tasks; `task_manager` cleanup runs in task `finally` |
-| `stop` frame arrives after task completes | Ignored (task no longer in `_tasks` map) |
-
----
-
-## Migration Sequence
-
-1. **Backend:** Implement `chat_ws_handler.py`; add `/ws/chat` endpoint; keep SSE endpoint live during cutover.
-2. **Frontend:** Implement `useChatWebSocket`; wire into `ChatProvider`; replace `useBackendChatStream`.
-3. **Verify:** Confirm the WS path works end-to-end and that the reused event envelope remains compatible.
-4. **Cutover:** Delete `POST /v1/chat/stream` SSE endpoint and `useBackendChatStream`.
-5. **Workspace migration:** Migrate `executionStore.ts`, `commandService.ts`, and Skill Creator transport to the same WS protocol.
-6. **Cleanup:** Delete `POST /v1/chat/stop`, `POST /v1/chat/resume`, `chat_handler.py`, `connection_manager.py`, and old `/ws/{session_id}` endpoint.
-
----
-
-## Testing
-
-- **Backend unit:** `chat_ws_handler.py` — mock WS, verify frame routing; verify task cancellation on `stop`; verify `WebSocketDisconnect` cleans up tasks.
-- **Backend integration:** Connect real WS to `/ws/chat`; send `chat` frame; assert `content` events arrive; assert `done` arrives; assert DB has saved messages.
-- **Frontend unit:** `useChatWebSocket` — mock `WebSocket`; assert `dispatch` called for each event type; assert reconnect fires after close.
-- **E2E:** Full chat turn over WS; stop mid-stream; resume after interrupt.
diff --git a/docs/superpowers/specs/2026-03-25-long-task-progress-persistence-design.md b/docs/superpowers/specs/2026-03-25-long-task-progress-persistence-design.md
deleted file mode 100644
index 5bb7016f3..000000000
--- a/docs/superpowers/specs/2026-03-25-long-task-progress-persistence-design.md
+++ /dev/null
@@ -1,665 +0,0 @@
-# Long-Task Progress Persistence Design
-
-## Goal
-
-Provide a production-grade architecture for long-running agent tasks so that:
-
-- a task keeps running when the user switches pages or refreshes the browser
-- the user can return later and still see prior progress
-- progress can be replayed and resumed reliably across reconnects
-- Chat, Skill Creator, Copilot, and workspace execution use the same underlying runtime model
-
-This design targets the current JoySafeter implementation and explicitly replaces the "page-local state + live WebSocket only" model where needed.
-
-## Status
-
-Proposed on 2026-03-25.
-
-## Problem
-
-The current codebase has three partially different real-time patterns:
-
-1. `WS /ws/chat` streams Chat and Skill Creator events directly from an in-process task.
-2. Copilot uses a session-oriented Redis Pub/Sub model with partial result recovery.
-3. Execution/trace APIs persist observations, but mainly as observability data rather than UI recovery state.
-
-This causes a production gap for long tasks:
-
-- if the UI component unmounts, local progress state is lost
-- if the WebSocket disconnects, the backend currently cancels Chat tasks
-- restoring the page can recover final history in some cases, but not in-progress state
-- Skill Creator preview/file-tree state is not durably recoverable
-- there is no single "run" abstraction shared by all long-running agent flows
-
-## Current State Analysis
-
-### Chat / Skill Creator
-
-`backend/app/websocket/chat_ws_handler.py` currently owns both transport and task lifetime:
-
-- the handler creates `asyncio.Task`s per request
-- on `WebSocketDisconnect`, `_cancel_all_tasks()` stops and cancels all running tasks
-- messages and trace data are persisted in `finally`, mostly after the turn completes
-
-This means transport loss is treated as task termination.
-
-Skill Creator in `frontend/app/skills/creator/page.tsx` keeps all progress in page-local React state:
-
-- `messages`
-- `isProcessing`
-- `threadId`
-- `previewData`
-- `fileTree`
-
-When the page is left and remounted, there is no durable source for the in-progress view.
-
-### Copilot
-
-Copilot is closer to the target model:
-
-- it has a durable history model
-- it caches results in Redis
-- it can reconnect and receive cached `result` + `done`
-
-But it still does not provide full event replay or a general long-task runtime usable by Chat and Skill Creator.
-
-### Trace / Execution
-
-The trace system already provides:
-
-- `trace_id`
-- `observation_id`
-- hierarchical observation structure
-- query APIs under `/v1/traces`
-
-This is valuable for observability and debugging, but it should not become the primary UI recovery store for product state such as:
-
-- streamed assistant message buffers
-- Skill preview payloads
-- file tree deltas
-- interrupt UI state
-- conversation-scoped "what the user last saw"
-
-## Design Principles
-
-1. Transport is not task ownership.
-2. A page is a subscriber, not the source of truth.
-3. Every long-running task has a stable `run_id`.
-4. Progress is recoverable through snapshot + replay.
-5. Redis may accelerate delivery, but the database is the durable source of truth.
-6. Trace/observation remains an observability layer, not the primary UI projection.
-
-## Target Architecture
-
-Introduce a new shared runtime layer: `Agent Run Center`.
-
-### Core concepts
-
-#### 1. Agent Run
-
-A long-running task entity with stable identity and lifecycle.
-
-Examples:
-
-- one Chat turn
-- one Skill Creator generation/regeneration turn
-- one Copilot generation session
-- one workspace graph execution
-
-Each run has:
-
-- `run_id`
-- owner and scope (`user_id`, optional `workspace_id`, optional `graph_id`, optional `thread_id`)
-- `run_type`
-- `status`
-- `started_at`, `finished_at`
-- current projection snapshot
-- terminal result or error metadata
-
-#### 2. Run Event Log
-
-An append-only ordered event stream for each run.
-
-Every user-visible progress update is written as a run event:
-
-- `content_delta`
-- `tool_start`
-- `tool_end`
-- `node_start`
-- `node_end`
-- `file_event`
-- `interrupt`
-- `preview_skill`
-- `status`
-- `error`
-- `done`
-
-Each event has a monotonically increasing `seq`.
-
-#### 3. Run Snapshot / Projection
-
-A denormalized current-state document derived from events.
-
-It exists to make page restoration fast and deterministic.
-
-The snapshot contains only UI-relevant aggregate state, for example:
-
-- current assistant message buffers
-- completed messages shown so far
-- tool-call states
-- active node list
-- interrupt payload
-- Skill Creator preview payload
-- file tree projection
-- latest terminal state
-- last emitted `seq`
-
-The UI restores from snapshot first, then replays any missing events after `last_seq`.
-
-## High-Level Flow
-
-### Start
-
-1. Frontend creates or resumes a page-level view.
-2. Frontend starts a task through an API or WS command.
-3. Backend creates `agent_runs` row and returns `run_id`.
-4. Runtime begins execution independently of the WebSocket connection.
-5. Runtime appends events to `agent_run_events`.
-6. Runtime updates `agent_run_snapshots`.
-7. Live subscribers receive events over WS.
-
-### Reconnect / Return to page
-
-1. Frontend loads run summary and snapshot by `run_id`.
-2. Frontend opens WS subscription with `after_seq=<snapshot.last_seq>`.
-3. Backend replays missing events from durable store.
-4. Backend then switches the subscriber to live event delivery.
-
-### Completion
-
-1. Runtime writes terminal event (`done` or `error` or `interrupted`).
-2. Snapshot status is finalized.
-3. Optional downstream persistence runs complete.
-4. Subscribers receive terminal frame.
-5. Future page loads restore from snapshot/history without requiring the original transport session.
-
-## Data Model
-
-Add three new tables.
-
-### `agent_runs`
-
-Primary run record.
-
-Suggested columns:
-
-- `id UUID PK`
-- `user_id VARCHAR NOT NULL`
-- `workspace_id UUID NULL`
-- `graph_id UUID NULL`
-- `thread_id VARCHAR NULL`
-- `run_type VARCHAR NOT NULL`
-- `source VARCHAR NOT NULL`
-- `status ENUM('queued','running','interrupt_wait','completed','failed','cancelled')`
-- `title VARCHAR NULL`
-- `request_payload JSONB NULL`
-- `result_summary JSONB NULL`
-- `error_code VARCHAR NULL`
-- `error_message TEXT NULL`
-- `trace_id UUID NULL`
-- `started_at TIMESTAMPTZ NOT NULL`
-- `finished_at TIMESTAMPTZ NULL`
-- `last_seq BIGINT NOT NULL DEFAULT 0`
-- `created_at TIMESTAMPTZ NOT NULL`
-- `updated_at TIMESTAMPTZ NOT NULL`
-
-Indexes:
-
-- `(user_id, created_at DESC)`
-- `(thread_id, created_at DESC)`
-- `(graph_id, created_at DESC)`
-- `(status, updated_at DESC)`
-
-### `agent_run_events`
-
-Append-only event log.
-
-Suggested columns:
-
-- `id UUID PK`
-- `run_id UUID NOT NULL FK agent_runs(id)`
-- `seq BIGINT NOT NULL`
-- `event_type VARCHAR NOT NULL`
-- `payload JSONB NOT NULL`
-- `trace_id UUID NULL`
-- `observation_id UUID NULL`
-- `parent_observation_id UUID NULL`
-- `created_at TIMESTAMPTZ NOT NULL`
-
-Constraints:
-
-- unique `(run_id, seq)`
-
-Indexes:
-
-- `(run_id, seq)`
-- `(run_id, created_at)`
-
-### `agent_run_snapshots`
-
-Latest UI projection.
-
-Suggested columns:
-
-- `run_id UUID PK FK agent_runs(id)`
-- `last_seq BIGINT NOT NULL`
-- `status VARCHAR NOT NULL`
-- `projection JSONB NOT NULL`
-- `updated_at TIMESTAMPTZ NOT NULL`
-
-`projection` is intentionally product-oriented, not event-normalized.
-
-## Snapshot Shape
-
-Recommended baseline shape:
-
-```json
-{
-  "version": 1,
-  "run_type": "skill_creator",
-  "status": "running",
-  "thread_id": "chat-thread-id",
-  "graph_id": "graph-id",
-  "messages": [
-    {
-      "id": "msg-1",
-      "role": "user",
-      "content": "Build a skill for ...",
-      "timestamp": 1740000000000
-    },
-    {
-      "id": "msg-2",
-      "role": "assistant",
-      "content": "I will create ...",
-      "is_streaming": true,
-      "tool_calls": []
-    }
-  ],
-  "current_assistant_message_id": "msg-2",
-  "active_tools": [],
-  "preview_data": null,
-  "file_tree": {},
-  "interrupt": null,
-  "meta": {
-    "last_node": "preview_skill"
-  }
-}
-```
-
-Skill Creator can extend this with:
-
-- `preview_data`
-- `validation`
-- `file_tree`
-
-Copilot can extend this with:
-
-- `thought_steps`
-- `actions`
-
-Workspace execution can extend this with:
-
-- `execution_tree`
-- `route_decisions`
-- `pending_interrupts`
-
-## Transport Design
-
-### New WS concept: run subscription
-
-Keep `WS /ws/chat` for command compatibility in the short term, but introduce a run-subscription protocol underneath.
-
-Recommended new endpoint:
-
-- `WS /ws/runs`
-
-Client frames:
-
-```json
-{ "type": "subscribe", "run_id": "<uuid>", "after_seq": 120 }
-{ "type": "unsubscribe", "run_id": "<uuid>" }
-{ "type": "ping" }
-```
-
-Server frames:
-
-```json
-{ "type": "snapshot", "run_id": "<uuid>", "last_seq": 120, "data": { ...projection... } }
-{ "type": "event", "run_id": "<uuid>", "seq": 121, "event_type": "content_delta", "data": { ... } }
-{ "type": "replay_done", "run_id": "<uuid>", "last_seq": 128 }
-{ "type": "run_status", "run_id": "<uuid>", "status": "running" }
-{ "type": "ws_error", "message": "..." }
-{ "type": "pong" }
-```
-
-Rules:
-
-1. On subscribe, server loads snapshot and sends it first.
-2. If `after_seq < snapshot.last_seq`, server replays events `(after_seq, snapshot.last_seq]`.
-3. Then server attaches subscriber to live delivery.
-4. Multiple subscribers may attach to the same run.
-5. Disconnecting a subscriber does not cancel the run.
-
-## Command / Start API
-
-Long-running tasks should be started through a create-run action that returns `run_id`.
-
-Recommended pattern:
-
-### Chat / Skill Creator
-
-Option A:
-
-- continue using `WS /ws/chat` for `chat` and `resume`
-- server immediately creates a run
-- first server event includes `run_id`
-- frontend stores `run_id` in route state / page state / local storage
-
-Option B:
-
-- add `POST /v1/runs/chat`
-- response returns `run_id`
-- runtime starts
-- frontend subscribes via `WS /ws/runs`
-
-Production recommendation: move to Option B. It separates command submission from event delivery cleanly.
-
-### Copilot
-
-- replace opaque `session_id` semantics with `run_id`
-- keep compatibility aliases temporarily if needed
-
-### Workspace execution
-
-- graph execution start API returns `run_id`
-- execution panel subscribes to that run
-
-## Runtime Ownership
-
-### Required change
-
-Do not let WebSocket handlers own task lifetime.
-
-Current `ChatWsHandler` behavior on disconnect should be changed:
-
-- disconnect should unregister the subscriber
-- it must not stop the underlying run unless the client explicitly sends cancel
-
-### Recommended execution model
-
-Short term:
-
-- keep in-process execution if necessary
-- move run ownership into a `RunRuntimeRegistry`
-- let WS handler call runtime service, not hold raw task maps as the source of truth
-
-Long term:
-
-- move long-running task execution into worker processes
-- use Redis streams / queue / task runner for dispatch
-- web nodes become stateless control + subscription servers
-
-Production recommendation:
-
-- web app may still publish live events
-- worker owns task execution
-- DB remains durable truth
-- Redis is the hot fan-out path
-
-## Event Write Path
-
-For each emitted internal event:
-
-1. normalize into canonical run event
-2. append to `agent_run_events`
-3. apply reducer to snapshot projection
-4. update `agent_run_snapshots`
-5. publish live event to Redis channel
-6. WS subscribers forward event to frontend
-
-This ordering ensures replay correctness.
-
-Optimization:
-
-- events may be batched in small transactions
-- snapshot writes may be throttled for high-frequency deltas
-- but terminal events must flush synchronously
-
-## Relationship With Trace System
-
-Do not replace traces.
-
-Instead:
-
-- keep `ExecutionTrace` and `ExecutionObservation` as observability records
-- link run events to traces using `trace_id`, `observation_id`, `parent_observation_id`
-- allow UI drill-down from run view into technical trace detail
-
-This preserves the value of the existing stream event handler while avoiding misuse of traces as the only product-state store.
-
-## Frontend Design
-
-Introduce a shared run-view model.
-
-### Shared hooks/services
-
-- `runService.getRun(runId)`
-- `runService.getSnapshot(runId)`
-- `runService.listRunEvents(runId, afterSeq)`
-- `useRunSubscription(runId, reducer)`
-- `useRunRecovery(runId, projectionAdapter)`
-
-### Page behavior
-
-When entering a page:
-
-1. load the latest active run for the page scope if one exists
-2. restore snapshot immediately
-3. subscribe from `snapshot.last_seq`
-4. show connection state separately from run state
-
-Important:
-
-- `isConnected` is transport state
-- `run.status === running` is business state
-
-These must not be conflated.
-
-### Skill Creator
-
-Skill Creator should no longer keep progress only in local `useState`.
-
-It should:
-
-- create or attach to a `run_id`
-- restore `messages`, `previewData`, and `fileTree` from snapshot
-- continue rendering live events from replay/live subscription
-
-### Chat
-
-Chat should separate:
-
-- durable conversation history
-- active run state for the current unfinished turn
-
-Completed messages may still load from conversation history, while unfinished turn state comes from active run snapshot.
-
-### Copilot
-
-Copilot should migrate from custom session recovery to the shared run layer:
-
-- `session_id` becomes compatibility wrapper around `run_id`
-- final action/result cache moves into snapshot/result summary
-
-### Workspace execution
-
-Execution panel should consume run snapshot + event replay rather than relying only on currently mounted store state.
-
-## Reducer Model
-
-Each product surface gets a projection reducer.
-
-Examples:
-
-- `chatRunReducer`
-- `skillCreatorRunReducer`
-- `copilotRunReducer`
-- `workspaceExecutionRunReducer`
-
-Each reducer:
-
-- consumes canonical run events
-- updates product snapshot
-- is deterministic and replay-safe
-
-This gives the system event-sourcing semantics without forcing the UI to render directly from raw event rows.
-
-## Compatibility / Migration Plan
-
-### Phase 1: Skill Creator first
-
-Why:
-
-- it has the weakest recovery model today
-- it is the clearest user-facing pain point
-- its projection shape is straightforward
-
-Deliverables:
-
-- new run tables
-- run snapshot/event services
-- Skill Creator creates run and stores preview/file-tree projection
-- page re-entry restores from run
-- disconnect no longer cancels Skill Creator task
-
-### Phase 2: Chat
-
-Deliverables:
-
-- Chat turns create `run_id`
-- active unfinished turn restored from run snapshot
-- `ChatWsHandler` disconnect no longer aborts task
-- stop/resume become explicit run commands
-
-### Phase 3: Copilot
-
-Deliverables:
-
-- unify session persistence under run model
-- keep existing history endpoint as compatibility view over run-derived data or existing chat table
-
-### Phase 4: Workspace execution
-
-Deliverables:
-
-- execution panel reads run snapshot and event replay
-- traces become linked technical detail, not the only way to inspect old progress
-
-## Failure Handling
-
-### WebSocket disconnect
-
-- subscriber detached
-- run continues
-- reconnect replays from `after_seq`
-
-### Browser refresh
-
-- page reloads
-- active run is rediscovered from route scope or active-run query
-- snapshot restored
-
-### Web node restart
-
-- live WS subscribers disconnect
-- workers continue if runtime is externalized
-- reconnect recovers from DB + Redis
-
-### Worker crash
-
-- run status transitions to `failed` or `queued_for_recovery`
-- terminal event written if possible
-- UI shows durable failure state
-
-### Duplicate event delivery
-
-- reducers must be idempotent by `(run_id, seq)`
-- frontend should ignore already-applied `seq`
-
-## Security / Access Control
-
-- all run queries must validate `user_id` ownership or workspace access
-- `run_id` must not be guessable enough to bypass auth; UUID is fine but auth is still mandatory
-- subscription endpoint must validate access per run
-- snapshots may contain file paths and tool outputs, so apply the same permission model as the originating graph/workspace
-
-## Testing Strategy
-
-### Backend unit
-
-- reducer updates snapshot correctly from canonical events
-- event append increments `seq` correctly under concurrency
-- replay returns ordered events
-- disconnect does not cancel run
-- explicit cancel does cancel run
-
-### Backend integration
-
-- create Skill Creator run, disconnect WS, reconnect, observe replayed progress
-- create Chat run, switch pages, reload, restore unfinished turn
-- verify terminal state flushes snapshot and events
-
-### Frontend unit
-
-- restoring from snapshot produces correct page state
-- replay after snapshot does not duplicate messages or tools
-- `isConnected` transitions do not erase business progress
-
-### E2E
-
-1. Start Skill Creator generation.
-2. Leave the page mid-run.
-3. Return after 10 seconds.
-4. Previously emitted progress is visible.
-5. New progress continues live.
-6. Final preview is still available.
-
-## Open Questions
-
-1. Should active runs be discoverable by scope (`thread_id`, `graph_id`) or only by direct `run_id`?
-Recommendation: support both. UI prefers scope lookup on fresh load and `run_id` on exact resume.
-
-2. Should message history be derived from run snapshots or remain in existing conversation tables?
-Recommendation: keep conversation tables for durable completed chat history; use run snapshot only for unfinished turns.
-
-3. Should snapshots be updated on every token delta?
-Recommendation: no. Batch high-frequency deltas in memory/Redis and flush snapshot periodically, but always flush on terminal events and major structural events.
-
-## Recommended First Implementation
-
-The first production-meaningful cut should be:
-
-- add `agent_runs`, `agent_run_events`, `agent_run_snapshots`
-- build a minimal `RunService`
-- migrate Skill Creator to create a run and persist:
-  - messages
-  - current streaming assistant content
-  - `preview_skill` output
-  - `file_event` projection
-- add `GET /v1/runs/{run_id}`
-- add `GET /v1/runs/{run_id}/snapshot`
-- add `GET /v1/runs/active?graph_id=...&thread_id=...`
-- add `WS /ws/runs` subscribe/replay
-- modify Chat/Skill execution runtime so WS disconnect detaches subscriber instead of cancelling the task
-
-This is the smallest slice that materially solves the user-facing problem while creating the correct long-term foundation.
diff --git a/docs/superpowers/specs/2026-03-25-skill-creator-run-persistence-phase1-design.md b/docs/superpowers/specs/2026-03-25-skill-creator-run-persistence-phase1-design.md
deleted file mode 100644
index c8321d32d..000000000
--- a/docs/superpowers/specs/2026-03-25-skill-creator-run-persistence-phase1-design.md
+++ /dev/null
@@ -1,1012 +0,0 @@
-# Skill Creator Run Persistence Phase 1 Design
-
-## Scope
-
-This document is the implementation-focused Phase 1 plan for the long-task persistence architecture.
-
-Phase 1 only migrates **Skill Creator** to the new `run_id + snapshot + replay` model.
-
-Out of scope for this phase:
-
-- full Chat migration
-- Copilot migration
-- workspace execution migration
-- external worker process migration
-- generic event-sourcing for every product surface
-
-The goal is to solve the user-facing problem first with the smallest architecture slice that is still production-correct.
-
-## Why Skill Creator First
-
-Skill Creator is the best first target because:
-
-1. It currently has the weakest recovery behavior.
-2. Its state shape is bounded and UI-specific.
-3. The product value is obvious: users often wait for a generated skill and want to leave the page without losing progress.
-4. It already reuses `WS /ws/chat`, so we can preserve the existing execution path while separating transport from UI recovery.
-
-## Target Outcome
-
-After Phase 1:
-
-- starting a Skill Creator generation creates a durable `run_id`
-- leaving `/skills/creator` does not lose progress
-- returning to `/skills/creator?run=<run_id>` restores:
-  - chat messages
-  - current streaming assistant buffer
-  - running/completed tool calls
-  - `preview_skill` result
-  - `file_event` projected file tree
-  - terminal status
-- WebSocket disconnect no longer cancels the underlying Skill Creator task
-- the current runtime may still be in-process, but transport is no longer the owner of task state
-
-## Non-Goals
-
-- no attempt to make ordinary Chat fully durable yet
-- no attempt to unify Copilot session/history in this phase
-- no attempt to move execution to Celery/RQ/Arq/Temporal yet
-- no attempt to persist every token delta forever without compaction
-
-## User Flow
-
-### New generation
-
-1. User opens `/skills/creator`.
-2. Frontend resolves the Skill Creator graph as today.
-3. User sends a prompt.
-4. Frontend calls a new create-run API.
-5. Backend creates a run and starts the task.
-6. Frontend subscribes to the run via `WS /ws/runs`.
-7. UI renders snapshot + live events.
-
-### Leave and return
-
-1. User leaves the page during execution.
-2. The run keeps executing.
-3. User returns via:
-   - the same page URL with `?run=<run_id>`, or
-   - active-run lookup by graph/thread scope
-4. Frontend loads snapshot and subscribes from `last_seq`.
-5. User sees previous progress and continues receiving live events.
-
-### Completed run
-
-1. Run finishes.
-2. Preview remains restorable from snapshot.
-3. User can still save to the skill library later, without relying on the original mounted page.
-
-## Architecture Choices for Phase 1
-
-### Choice 1: Reuse current `WS /ws/chat` execution path
-
-Phase 1 does **not** replace the current graph execution engine.
-
-It reuses:
-
-- `ChatWsHandler`
-- existing graph construction
-- existing stream event conversion
-- existing `preview_skill` tool flow
-
-But it adds a run persistence layer beside it.
-
-Reason:
-
-- minimal blast radius
-- faster delivery
-- lower risk than rewriting task orchestration immediately
-
-### Choice 2: Add a dedicated run subscription channel
-
-Phase 1 adds a new subscription-only WebSocket:
-
-- `WS /ws/runs`
-
-Reason:
-
-- keep `WS /ws/chat` as command/execution compatibility layer
-- avoid overloading the current request-oriented WS client with replay semantics
-- enable later migration of Chat and Copilot onto the same run-subscription transport
-
-### Choice 3: DB is durable truth, Redis is optional hot path
-
-Phase 1 stores durable run state in Postgres:
-
-- run metadata
-- event rows
-- snapshot rows
-
-Redis is optional acceleration for:
-
-- live fan-out
-- short-lived latest snapshot cache
-- "active run by scope" cache
-
-If Redis is unavailable, the feature still works through DB polling + replay.
-
-## Data Model
-
-Phase 1 adds three tables, exactly as defined in the broader design, but only uses the subset required by Skill Creator.
-
-### `agent_runs`
-
-Fields used in Phase 1:
-
-- `id`
-- `user_id`
-- `workspace_id`
-- `graph_id`
-- `thread_id`
-- `run_type` = `skill_creator`
-- `source` = `skills_creator_page`
-- `status`
-- `title`
-- `request_payload`
-- `result_summary`
-- `error_code`
-- `error_message`
-- `trace_id`
-- `started_at`
-- `finished_at`
-- `last_seq`
-- `created_at`
-- `updated_at`
-
-### `agent_run_events`
-
-Fields used in Phase 1:
-
-- `id`
-- `run_id`
-- `seq`
-- `event_type`
-- `payload`
-- `trace_id`
-- `observation_id`
-- `parent_observation_id`
-- `created_at`
-
-### `agent_run_snapshots`
-
-Fields used in Phase 1:
-
-- `run_id`
-- `last_seq`
-- `status`
-- `projection`
-- `updated_at`
-
-## Projection Shape for Skill Creator
-
-Phase 1 uses a Skill-Creator-specific projection reducer.
-
-```json
-{
-  "version": 1,
-  "run_type": "skill_creator",
-  "status": "running",
-  "graph_id": "uuid",
-  "thread_id": "thread-id",
-  "edit_skill_id": "optional-skill-id",
-  "messages": [
-    {
-      "id": "msg-user-1",
-      "role": "user",
-      "content": "Build a skill for ...",
-      "timestamp": 1740000000000
-    },
-    {
-      "id": "msg-ai-1",
-      "role": "assistant",
-      "content": "Working on it...",
-      "timestamp": 1740000001000,
-      "isStreaming": true,
-      "tool_calls": []
-    }
-  ],
-  "current_assistant_message_id": "msg-ai-1",
-  "preview_data": null,
-  "file_tree": {},
-  "interrupt": null,
-  "meta": {
-    "current_request_id": "legacy-request-id",
-    "last_node": "preview_skill"
-  }
-}
-```
-
-Notes:
-
-- `messages` is the UI-ready structure used by `frontend/app/skills/creator/page.tsx`
-- `file_tree` is the already-projected map currently built in local state
-- `preview_data` stores the parsed `preview_skill` payload
-- terminal status lives both in `agent_runs.status` and `snapshot.status`
-
-## Canonical Run Events for Phase 1
-
-Phase 1 only needs a small canonical event vocabulary.
-
-### Required event types
-
-- `user_message_added`
-- `assistant_message_started`
-- `content_delta`
-- `tool_start`
-- `tool_end`
-- `file_event`
-- `interrupt`
-- `error`
-- `done`
-- `status`
-
-### Canonical payload examples
-
-```json
-{
-  "event_type": "user_message_added",
-  "payload": {
-    "message": {
-      "id": "msg-user-1",
-      "role": "user",
-      "content": "Create a skill for ...",
-      "timestamp": 1740000000000
-    }
-  }
-}
-```
-
-```json
-{
-  "event_type": "assistant_message_started",
-  "payload": {
-    "message": {
-      "id": "msg-ai-1",
-      "role": "assistant",
-      "content": "",
-      "timestamp": 1740000001000,
-      "isStreaming": true,
-      "tool_calls": []
-    }
-  }
-}
-```
-
-```json
-{
-  "event_type": "content_delta",
-  "payload": {
-    "message_id": "msg-ai-1",
-    "delta": "I will scaffold the skill ..."
-  }
-}
-```
-
-```json
-{
-  "event_type": "tool_end",
-  "payload": {
-    "message_id": "msg-ai-1",
-    "tool_name": "preview_skill",
-    "tool_output": {
-      "skill_name": "my-skill",
-      "files": [],
-      "validation": { "valid": true, "errors": [], "warnings": [] }
-    }
-  }
-}
-```
-
-### Mapping from existing chat stream events
-
-Phase 1 will not invent a second internal event stream from the graph engine.
-
-Instead, when the current runtime emits chat WS events:
-
-- `content` -> `content_delta`
-- `tool_start` -> `tool_start`
-- `tool_end` -> `tool_end`
-- `file_event` -> `file_event`
-- `interrupt` -> `interrupt`
-- `error` -> `error`
-- `done` -> `done`
-- `status` -> `status`
-
-Additional synthetic events will be written for:
-
-- `user_message_added`
-- `assistant_message_started`
-
-These do not currently exist as transport events but are needed to reconstruct page state deterministically.
-
-## API Design
-
-Phase 1 adds a dedicated runs API.
-
-### `POST /api/v1/runs/skill-creator`
-
-Create a Skill Creator run and start execution.
-
-Request:
-
-```json
-{
-  "message": "Build a skill that ...",
-  "graph_id": "uuid",
-  "thread_id": null,
-  "edit_skill_id": "optional-skill-id"
-}
-```
-
-Response:
-
-```json
-{
-  "success": true,
-  "data": {
-    "run_id": "uuid",
-    "thread_id": "thread-id",
-    "status": "running"
-  }
-}
-```
-
-Backend behavior:
-
-1. Create `agent_runs` row.
-2. Create initial snapshot with empty assistant state.
-3. Start runtime task.
-4. Return `run_id`.
-
-### `GET /api/v1/runs/{run_id}`
-
-Returns run metadata.
-
-Used by the page to determine whether the run is still active and who owns it.
-
-### `GET /api/v1/runs/{run_id}/snapshot`
-
-Returns:
-
-```json
-{
-  "success": true,
-  "data": {
-    "run_id": "uuid",
-    "status": "running",
-    "last_seq": 42,
-    "projection": { "...": "..." }
-  }
-}
-```
-
-### `GET /api/v1/runs/{run_id}/events?after_seq=42&limit=500`
-
-Returns ordered replay events after the given sequence.
-
-This is needed both for:
-
-- WS replay fallback
-- debugging
-- future polling fallback if WS is unavailable
-
-### `GET /api/v1/runs/active/skill-creator?graph_id=<uuid>&thread_id=<id>`
-
-Returns the latest active Skill Creator run for the current user and scope.
-
-Used when:
-
-- page URL does not yet include `run`
-- browser is refreshed mid-task
-
-Response:
-
-- `null` if no active run exists
-- latest running or interrupt-wait run if found
-
-### `POST /api/v1/runs/{run_id}/cancel`
-
-Explicitly cancel the run.
-
-This replaces "disconnect means cancel" semantics for Skill Creator.
-
-## WebSocket Design
-
-### New endpoint
-
-- `WS /ws/runs`
-
-### Client frames
-
-```json
-{ "type": "subscribe", "run_id": "uuid", "after_seq": 0 }
-{ "type": "unsubscribe", "run_id": "uuid" }
-{ "type": "ping" }
-```
-
-### Server frames
-
-```json
-{
-  "type": "snapshot",
-  "run_id": "uuid",
-  "last_seq": 42,
-  "data": { "...projection..." }
-}
-```
-
-```json
-{
-  "type": "event",
-  "run_id": "uuid",
-  "seq": 43,
-  "event_type": "content_delta",
-  "data": { "message_id": "msg-ai-1", "delta": "..." }
-}
-```
-
-```json
-{ "type": "replay_done", "run_id": "uuid", "last_seq": 43 }
-{ "type": "run_status", "run_id": "uuid", "status": "running" }
-{ "type": "pong" }
-{ "type": "ws_error", "message": "..." }
-```
-
-### Replay semantics
-
-When the client subscribes:
-
-1. load snapshot
-2. send `snapshot`
-3. load and emit all events with `seq > after_seq`
-4. send `replay_done`
-5. attach subscriber to live event bus
-
-## Backend File Plan
-
-### New files
-
-#### Models
-
-- `backend/app/models/agent_run.py`
-
-Contains:
-
-- `AgentRun`
-- `AgentRunEvent`
-- `AgentRunSnapshot`
-- run status enum
-
-#### Repository
-
-- `backend/app/repositories/agent_run.py`
-
-Methods:
-
-- `create_run(...)`
-- `get_run(...)`
-- `get_snapshot(...)`
-- `append_event(...)`
-- `list_events_after(...)`
-- `update_snapshot(...)`
-- `find_latest_active_skill_creator_run(...)`
-- `mark_status(...)`
-
-#### Schemas
-
-- `backend/app/schemas/runs.py`
-
-Contains request/response models for:
-
-- create run
-- run detail
-- snapshot detail
-- event list
-
-#### Service
-
-- `backend/app/services/run_service.py`
-
-Responsibilities:
-
-- create run
-- append event with monotonically increasing `seq`
-- apply Skill Creator reducer
-- update snapshot
-- publish live event to Redis / subscriber manager
-- resolve active run by scope
-
-#### Reducer
-
-- `backend/app/services/run_reducers/skill_creator.py`
-
-Pure reducer:
-
-- `(projection, canonical_event) -> new_projection`
-
-#### WebSocket subscription handler
-
-- `backend/app/websocket/run_subscription_handler.py`
-
-Responsibilities:
-
-- authenticate subscriber
-- subscribe/unsubscribe by `run_id`
-- send snapshot
-- send replay
-- attach to live fan-out
-
-#### API router
-
-- `backend/app/api/v1/runs.py`
-
-### Files to modify
-
-#### `backend/app/models/__init__.py`
-
-Export new models.
-
-#### `backend/app/api/v1/__init__.py`
-
-Register `runs_router`.
-
-#### `backend/app/main.py`
-
-Add:
-
-- `@app.websocket("/ws/runs")`
-
-#### `backend/app/core/redis.py`
-
-Add generic run methods:
-
-- `publish_run_event(run_id, event)`
-- optional `set_run_snapshot_cache(run_id, snapshot)`
-- optional `get_run_snapshot_cache(run_id)`
-
-Do not create Skill-Creator-specific Redis methods.
-
-#### `backend/app/websocket/chat_ws_handler.py`
-
-Modify only the Skill Creator path in Phase 1:
-
-- do not own page recovery state
-- when metadata indicates Skill Creator mode, write canonical run events through `RunService`
-- on disconnect, do not cancel the underlying run if the task belongs to a persisted Skill Creator run
-
-Implementation note:
-
-The least disruptive approach is:
-
-- inject `run_id` into the execution path
-- wrap `_send_event_from_sse(...)` so that every outgoing event is also normalized and persisted
-
-#### `backend/app/api/v1/chat.py`
-
-No major API resurrection.
-
-Possible small changes:
-
-- expose helper(s) for event normalization if needed
-- leave message persistence logic intact for now
-
-### Migration
-
-Add Alembic migration:
-
-- `backend/alembic/versions/<timestamp>_add_agent_run_tables.py`
-
-## Backend Execution Strategy
-
-Phase 1 keeps execution in-process, but changes ownership semantics.
-
-### Required behavior change
-
-Current behavior:
-
-- `ChatWsHandler.run()` ends
-- `_cancel_all_tasks()` stops tasks on disconnect
-
-Phase 1 behavior for persisted Skill Creator runs:
-
-- disconnect detaches only the subscriber
-- the in-process task continues
-- task completion writes final snapshot and terminal event even if no subscriber is connected
-
-### Minimal implementation approach
-
-Add a process-local runtime registry:
-
-- `backend/app/services/run_runtime_registry.py`
-
-Stores:
-
-- `run_id -> asyncio.Task`
-- optional metadata such as `thread_id`, `user_id`, `run_type`
-
-`ChatWsHandler` no longer treats the socket as the owner of those tasks for persisted Skill Creator runs.
-
-This is not the final multi-worker design, but it is sufficient for Phase 1.
-
-## Frontend File Plan
-
-### New files
-
-#### API service
-
-- `frontend/services/runService.ts`
-
-Methods:
-
-- `createSkillCreatorRun(...)`
-- `getRun(runId)`
-- `getRunSnapshot(runId)`
-- `getRunEvents(runId, afterSeq)`
-- `findActiveSkillCreatorRun(graphId, threadId?)`
-- `cancelRun(runId)`
-
-#### WS client
-
-- `frontend/lib/ws/runs/runWsClient.ts`
-- `frontend/lib/ws/runs/types.ts`
-
-Capabilities:
-
-- connect/reconnect
-- subscribe by `run_id`
-- replay sequencing
-- connection-state listeners
-
-#### Hook
-
-- `frontend/app/skills/creator/hooks/useSkillCreatorRun.ts`
-
-Responsibilities:
-
-- create run
-- restore snapshot
-- subscribe to replay/live events
-- reduce canonical run events into local React state
-- expose `sendMessage`, `stopRun`, `resumeExistingRun`
-
-### Files to modify
-
-#### `frontend/lib/api-client.ts`
-
-Add:
-
-- `runs: 'runs'`
-
-#### `frontend/app/skills/creator/page.tsx`
-
-Major refactor:
-
-- stop owning the source of truth in raw `useState`
-- page becomes a thin composition over `useSkillCreatorRun`
-- read `run` from search params
-- if `run` exists, restore that run
-- otherwise, optionally resolve latest active run by scope
-
-Important:
-
-The page may still keep transient UI state like dialog visibility locally.
-It should not keep durable run state only in component memory.
-
-## Frontend State Model
-
-Phase 1 can preserve the current `Message` and `SkillPreviewData` UI shapes.
-
-The hook should expose:
-
-```ts
-interface SkillCreatorRunState {
-  runId: string | null
-  threadId: string | null
-  status: 'idle' | 'running' | 'interrupt_wait' | 'completed' | 'failed' | 'cancelled'
-  messages: Message[]
-  isProcessing: boolean
-  previewData: SkillPreviewData | null
-  fileTree: Record<string, { action: string; size?: number; timestamp?: number }>
-  isConnected: boolean
-  lastSeq: number
-}
-```
-
-`isProcessing` should derive from `status`, not be an independent truth source.
-
-## URL Strategy
-
-Phase 1 adds `run` query param:
-
-- `/skills/creator?run=<run_id>`
-- `/skills/creator?edit=<skill_id>&run=<run_id>`
-
-When a new run is created:
-
-- update the URL with `run=<run_id>` using `router.replace`
-
-This gives the browser a stable recovery pointer across refresh/navigation.
-
-## Reducer Rules
-
-### `user_message_added`
-
-- append user message
-
-### `assistant_message_started`
-
-- append assistant placeholder
-- set `current_assistant_message_id`
-- set `status=running`
-
-### `content_delta`
-
-- append delta to `current_assistant_message_id`
-
-### `tool_start`
-
-- append running tool call to current assistant message
-
-### `tool_end`
-
-- close most recent matching running tool
-- if tool is `preview_skill`, parse and set `preview_data`
-
-### `file_event`
-
-- update `file_tree`
-
-### `interrupt`
-
-- set `interrupt`
-- mark assistant message not streaming
-- set `status=interrupt_wait`
-
-### `error`
-
-- append error decoration if needed
-- set status `failed`
-- mark assistant message not streaming
-
-### `done`
-
-- mark assistant message not streaming
-- set status `completed`
-
-Reducers must be deterministic and idempotent under duplicate event delivery by `seq`.
-
-## Persistence Frequency
-
-### Event rows
-
-Persist every canonical event.
-
-### Snapshot writes
-
-Phase 1 policy:
-
-- flush snapshot immediately for structural events:
-  - `user_message_added`
-  - `assistant_message_started`
-  - `tool_start`
-  - `tool_end`
-  - `file_event`
-  - `interrupt`
-  - `error`
-  - `done`
-- for `content_delta`, buffer and flush snapshot at most every 500ms per run
-- always flush pending content before writing terminal events
-
-Reason:
-
-- enough durability for user-visible progress
-- avoids excessive DB writes per token
-
-## Redis Usage in Phase 1
-
-Redis is optional but recommended.
-
-### Use cases
-
-- publish live run events to WS subscribers
-- cache latest snapshot for fast reconnect
-- cache "latest active run by scope" lookup
-
-### Fallback
-
-If Redis is unavailable:
-
-- API still works
-- snapshot still restores state
-- WS replay still works from DB
-- live delivery can degrade to polling if necessary
-
-Phase 1 should not hard-require Redis.
-
-## Observability
-
-Whenever available, canonical run events should preserve:
-
-- `trace_id`
-- `observation_id`
-- `parent_observation_id`
-
-This is already present in the stream envelopes produced by `StreamEventHandler`.
-
-We should persist these fields into `agent_run_events` so later UI or admin tools can deep-link into:
-
-- `/api/v1/traces/{trace_id}`
-
-## Access Control
-
-All run operations require authenticated user access.
-
-Rules:
-
-- only owner can access personal Skill Creator runs
-- if a future workspace-shared Skill Creator exists, workspace access rules can be layered later
-
-Phase 1 can keep ownership model simple:
-
-- `AgentRun.user_id` must equal current user id
-
-## Detailed Implementation Sequence
-
-### Step 1
-
-Add DB models and migration.
-
-### Step 2
-
-Add repository + `RunService` + Skill Creator reducer.
-
-### Step 3
-
-Add runs API endpoints.
-
-### Step 4
-
-Add `WS /ws/runs` subscription handler with:
-
-- snapshot
-- replay
-- live fan-out
-
-### Step 5
-
-Refactor Skill Creator frontend to:
-
-- create run
-- store `run_id` in URL
-- restore snapshot
-- subscribe to run
-
-### Step 6
-
-Modify `ChatWsHandler` Skill Creator path so disconnect does not cancel the underlying run task.
-
-### Step 7
-
-Add tests and verify:
-
-- leave page -> return -> progress still visible
-- refresh page mid-run -> progress restored
-- finish run without active subscriber -> final preview restorable
-
-## Rollback Strategy
-
-Phase 1 is safe to rollback if we:
-
-- keep current Skill Creator execution path intact
-- add the run layer in parallel
-
-Rollback path:
-
-- stop creating persisted runs
-- revert frontend to old direct `sendChat` flow
-- leave run tables unused
-
-No existing user-facing APIs need to be removed in this phase.
-
-## Testing Plan
-
-### Backend unit
-
-- reducer correctness for every event type
-- sequence allocation correctness
-- active run lookup correctness
-
-### Backend integration
-
-- create run -> emit events -> snapshot updates correctly
-- subscribe with `after_seq=0` -> receive snapshot and replay
-- disconnect subscriber -> task continues
-- reconnect -> receive missing events
-
-### Frontend unit
-
-- snapshot restores `messages/preview/fileTree`
-- event replay updates state without duplication
-- query param `run` drives restoration
-
-### E2E
-
-1. Start Skill Creator generation.
-2. Wait until there is partial content and at least one tool call.
-3. Navigate away.
-4. Navigate back to `/skills/creator?run=<run_id>`.
-5. Confirm previous content and tool state are visible.
-6. Wait for `preview_skill`.
-7. Confirm preview is rendered.
-
-## Risks
-
-### Risk 1: In-process runtime still dies on server restart
-
-True. Phase 1 solves page-switch/reconnect recovery, not process crash recovery.
-
-Mitigation:
-
-- document this limitation
-- keep architecture aligned so Phase 2/3 can move execution to workers
-
-### Risk 2: Duplicate writes from old and new state paths
-
-Mitigation:
-
-- runs snapshot is the Skill Creator recovery source
-- current page-local state becomes render cache only
-- avoid parallel "manual reconstruction" paths once hook migration is complete
-
-### Risk 3: WS replay and live event race
-
-Mitigation:
-
-- subscription handler must:
-  - load snapshot
-  - replay through a fixed `last_seq`
-  - only then attach live subscriber
-
-## Exact File Checklist
-
-### Backend new
-
-- `backend/app/models/agent_run.py`
-- `backend/app/repositories/agent_run.py`
-- `backend/app/schemas/runs.py`
-- `backend/app/services/run_service.py`
-- `backend/app/services/run_runtime_registry.py`
-- `backend/app/services/run_reducers/skill_creator.py`
-- `backend/app/api/v1/runs.py`
-- `backend/app/websocket/run_subscription_handler.py`
-- `backend/alembic/versions/<new>_add_agent_run_tables.py`
-
-### Backend modify
-
-- `backend/app/models/__init__.py`
-- `backend/app/api/v1/__init__.py`
-- `backend/app/main.py`
-- `backend/app/core/redis.py`
-- `backend/app/websocket/chat_ws_handler.py`
-
-### Frontend new
-
-- `frontend/services/runService.ts`
-- `frontend/lib/ws/runs/types.ts`
-- `frontend/lib/ws/runs/runWsClient.ts`
-- `frontend/app/skills/creator/hooks/useSkillCreatorRun.ts`
-
-### Frontend modify
-
-- `frontend/lib/api-client.ts`
-- `frontend/app/skills/creator/page.tsx`
-
-## Success Criteria
-
-Phase 1 is successful if:
-
-- Skill Creator can be left and re-entered without losing prior visible progress
-- preview and file-tree state restore correctly
-- disconnecting the page no longer cancels the task
-- no existing Chat/Copilot behavior is broken
-- the new run primitives are reusable for later Chat/Copilot migration
diff --git a/docs/superpowers/specs/2026-03-26-chat-protocol-boundaries-design.md b/docs/superpowers/specs/2026-03-26-chat-protocol-boundaries-design.md
deleted file mode 100644
index 72099ecda..000000000
--- a/docs/superpowers/specs/2026-03-26-chat-protocol-boundaries-design.md
+++ /dev/null
@@ -1,312 +0,0 @@
-# Chat Protocol Boundaries Design
-
-## Goal
-
-Keep the Chat UI unified while separating protocol-level control flow from mode-specific business semantics. In particular, `skill_creator` should remain a first-class workflow, but it must no longer leak into the generic chat transport contract or share validation paths with unrelated chat modes.
-
-## Problem Summary
-
-The current `/ws/chat` protocol mixes three concerns in one payload:
-
-- generic turn transport (`request_id`, `thread_id`, `graph_id`, `message`)
-- mode-specific control fields (`mode`, `edit_skill_id`, `run_id`)
-- free-form metadata (`files`, UI context, tracing hints)
-
-That coupling caused a regression on 2026-03-26: frontend chat pages sent a general `metadata.mode` value such as `apk-vulnerability`, while the backend promoted that free-form value into `ChatRequest.mode`, whose schema only allowed `"skill_creator"`. The failure happened inside the async task setup path, so the client observed a hung request with no terminal event and no working cancel path.
-
-This is not a one-off bug. The structure is wrong:
-
-- `metadata` is being used as both extensible context and protocol control
-- generic chat request types include `skill_creator`-specific fields
-- validation occurs too late, after task creation begins
-- stop/cancel relies too heavily on `thread_id`, which may not exist yet
-
-## Design Principles
-
-- Generic chat transport must not know business-specific extension fields.
-- Mode-specific workflows must use explicit typed extensions, not `metadata` conventions.
-- All protocol validation must complete before creating an asyncio task.
-- Every accepted `request_id` must end in a terminal outcome visible to the client.
-- Cancel must work by `request_id` first and use `thread_id` only as a secondary mapping.
-
-## Target Protocol
-
-### Client-to-server start frame
-
-Replace the implicit `metadata.mode` contract with an explicit extension envelope.
-
-```jsonc
-{
-  "type": "chat.start",
-  "request_id": "<uuid>",
-  "thread_id": "<string|null>",
-  "graph_id": "<uuid|null>",
-  "input": {
-    "message": "<string>",
-    "files": [
-      {
-        "filename": "<string>",
-        "path": "<string>",
-        "size": 123
-      }
-    ]
-  },
-  "extension": null,
-  "metadata": {}
-}
-```
-
-For `skill_creator`:
-
-```jsonc
-{
-  "type": "chat.start",
-  "request_id": "<uuid>",
-  "thread_id": "<string|null>",
-  "graph_id": "<uuid|null>",
-  "input": {
-    "message": "<string>",
-    "files": []
-  },
-  "extension": {
-    "kind": "skill_creator",
-    "run_id": "<uuid|null>",
-    "edit_skill_id": "<string|null>"
-  },
-  "metadata": {}
-}
-```
-
-### Resume and stop frames
-
-Resume remains a separate frame. Stop continues to accept `request_id`, but the client must treat `request_id` as the primary handle for active turns.
-
-```jsonc
-{ "type": "chat.resume", "request_id": "<uuid>", "thread_id": "<string>", "command": {} }
-{ "type": "chat.stop", "request_id": "<uuid>" }
-```
-
-### Metadata rule
-
-`metadata` remains available for loose auxiliary data, but it is forbidden from carrying protocol control fields such as:
-
-- `mode`
-- `run_id`
-- `edit_skill_id`
-- extension kind selectors
-
-## Backend Architecture
-
-Split the current `chat_ws_handler.py` responsibilities into four layers.
-
-### 1. `ChatFrameParser`
-
-Responsibilities:
-
-- parse raw websocket JSON frames
-- validate the transport schema synchronously
-- reject invalid frames before creating tasks
-- output typed parsed frames
-
-Output types:
-
-- `ParsedChatStartFrame`
-- `ParsedChatResumeFrame`
-- `ParsedChatStopFrame`
-
-This layer owns protocol errors such as:
-
-- missing `request_id`
-- malformed `input`
-- invalid `extension.kind`
-- forbidden control fields inside `metadata`
-
-All such failures return `ws_error` immediately.
-
-### 2. `ChatCommandFactory`
-
-Responsibilities:
-
-- convert parsed transport frames into business commands
-- keep generic chat and `skill_creator` commands distinct
-
-Output command types:
-
-- `StandardChatTurnCommand`
-- `SkillCreatorTurnCommand`
-- `ResumeChatTurnCommand`
-
-This is the only layer that knows how an extension kind maps to business behavior.
-
-### 3. `ChatTaskSupervisor`
-
-Responsibilities:
-
-- create and register turn tasks
-- maintain `request_id -> task entry`
-- maintain `thread_id -> latest active request_id`
-- centralize stop, disconnect, and cleanup behavior
-- guarantee terminal cleanup for every request
-
-Task entry should contain at least:
-
-- `request_id`
-- `thread_id`
-- `task`
-- `run_id`
-- `heartbeat_task`
-- `persist_on_disconnect`
-
-Rules:
-
-- stop by `request_id` is the primary path
-- stop by `thread_id` is a compatibility helper, not the core contract
-- disconnect cleanup and explicit stop must both go through the same supervisor finalization path
-
-### 4. `ChatTurnExecutor`
-
-Responsibilities:
-
-- run the actual graph turn for a validated business command
-- stream normalized events back to the supervisor/emitter
-- keep standard chat and `skill_creator` execution branches separate
-
-The executor receives already-validated command objects. It must not infer workflow kind from loose metadata.
-
-## Frontend Architecture
-
-### Page and feature layer
-
-The page decides which workflow to invoke:
-
-- normal chat pages send no extension
-- skill creator pages send `extension.kind = "skill_creator"`
-
-Product mode names such as `default-chat` or `apk-vulnerability` remain a UI concern. They are not protocol-level workflow selectors.
-
-### Chat transport layer
-
-Replace the current `sendChat` request shape with a typed transport request:
-
-```ts
-type ChatSendRequest = {
-  threadId?: string | null
-  graphId?: string | null
-  input: {
-    message: string
-    files?: UploadedFileRef[]
-  }
-  extension?: {
-    kind: 'skill_creator'
-    runId?: string | null
-    editSkillId?: string | null
-  } | null
-  metadata?: Record<string, unknown>
-}
-```
-
-Client changes:
-
-- `useChatWebSocket` tracks `activeRequestId` and `activeThreadId` separately
-- stop uses `requestId` first
-- `threadId` is populated later from `accepted` and subsequent stream events
-- `metadata.mode` is removed from generic chat sends
-
-## Failure Semantics
-
-The websocket contract must guarantee one of two outcomes for every inbound start frame:
-
-1. synchronous rejection before task creation
-   - server sends `ws_error`
-   - no task is registered
-
-2. accepted task lifecycle
-   - server sends `accepted`
-   - task eventually yields `done`, `interrupt`, or `error`
-   - supervisor always clears active request bookkeeping
-
-This removes the current failure mode where a request appears active in the UI but no terminal event is ever emitted.
-
-## Migration Plan
-
-### Phase 1: Introduce typed transport without deleting old paths
-
-- add parser and typed start-frame schema
-- add `extension.kind = "skill_creator"` support
-- continue accepting legacy `type: "chat"` frames temporarily
-- continue tolerating old `metadata.mode` only for backwards compatibility
-
-Compatibility behavior in this phase:
-
-- legacy `metadata.mode == "skill_creator"` maps to the new extension
-- any other `metadata.mode` is ignored for protocol purposes
-
-### Phase 2: Frontend switches to explicit extension protocol
-
-- update chat client request types
-- update standard chat pages to stop sending `metadata.mode`
-- update skill creator pages to send `extension.kind = "skill_creator"`
-- move stop UI to `requestId`-first behavior
-
-### Phase 3: Remove metadata-driven control flow
-
-- delete backend code that derives protocol control fields from `metadata`
-- delete compatibility parsing for `metadata.mode`
-- forbid reserved control keys in `metadata`
-
-### Phase 4: Cleanup and consolidation
-
-- simplify `ChatRequest` into either:
-  - a generic turn input model with no extension-specific fields, or
-  - multiple explicit command models used after parsing
-- fold stop/disconnect cleanup into supervisor-owned finalization
-- refresh websocket protocol tests and documentation
-
-## Risks and Tradeoffs
-
-### Risk: temporary protocol duality
-
-During migration both old and new frame shapes may be supported. This increases short-term complexity, but it keeps rollout risk low and avoids hard-cutting the frontend and backend in one step.
-
-### Risk: hidden metadata consumers
-
-Existing code may rely on `metadata.mode`, `metadata.run_id`, or `metadata.edit_skill_id`. Before deleting compatibility behavior, all call sites must be identified and updated.
-
-### Risk: partial lifecycle refactor
-
-If parsing is separated but task supervision is not centralized, the codebase will keep the same failure semantics problems. The supervisor layer is not optional.
-
-## Testing Strategy
-
-### Backend
-
-- parser unit tests for valid and invalid start frames
-- command factory tests for standard chat vs `skill_creator`
-- websocket handler tests for:
-  - invalid frame rejected before task creation
-  - accepted start frame emits `accepted`
-  - non-`skill_creator` UI modes never touch extension validation
-  - stop by `request_id` works before `thread_id` is known
-  - disconnect finalization clears active tasks
-
-### Frontend
-
-- chat hook tests verifying:
-  - standard sends omit extension
-  - skill creator sends explicit extension
-  - stop uses `requestId`
-  - missing `threadId` does not block cancel
-- integration tests for request lifecycle:
-  - send -> accepted -> done
-  - send -> ws_error
-  - send -> stop before thread assignment
-
-## Acceptance Criteria
-
-- Generic chat no longer sends or depends on `metadata.mode`.
-- `skill_creator` workflow uses an explicit extension object.
-- Backend does not construct business semantics from free-form metadata.
-- Invalid protocol input fails synchronously with `ws_error`.
-- An active UI request is always represented by a `request_id`, even before `thread_id` exists.
-- Stop works reliably before `accepted.thread_id` arrives.
-- The regression where normal chat modes are rejected by `Literal["skill_creator"]` cannot recur by construction.
diff --git a/docs/superpowers/specs/2026-03-26-generic-agent-run-persistence-design.md b/docs/superpowers/specs/2026-03-26-generic-agent-run-persistence-design.md
deleted file mode 100644
index ce59b8ce2..000000000
--- a/docs/superpowers/specs/2026-03-26-generic-agent-run-persistence-design.md
+++ /dev/null
@@ -1,355 +0,0 @@
-# Generic Agent Run Persistence Design
-
-## Goal
-
-Generalize the run persistence system so that **all** long-running Agent tasks — not just Skill Creator — use the same `run_id + snapshot + replay` model. Add an agent registry pattern for pluggable agent types and upgrade the Run Center UI with agent name filtering, status filtering, and title search.
-
-## Status
-
-Proposed on 2026-03-26. Builds on the Phase 1 Skill Creator implementation (2026-03-25).
-
-## Context
-
-Phase 1 delivered Skill Creator run persistence:
-
-- `agent_runs`, `agent_run_events`, `agent_run_snapshots` tables
-- `WS /ws/runs` subscription endpoint
-- Run Center UI at `/runs`
-- Reducer-based snapshot system
-
-Everything is currently hardcoded to `run_type = "skill_creator"`. This design generalizes the system so Chat, Copilot, Workspace Execution, and any future agent can register and participate.
-
-## Scope
-
-**In scope:**
-
-- New `agent_name` column on `agent_runs`
-- Agent registry pattern with pluggable reducers
-- Generic create-run API
-- Run Center UI with agent filter, status filter, and title search
-- Fix schema drift (missing `runtime_owner_id`, `last_heartbeat_at` columns and index)
-- Backward compatibility for all existing Skill Creator code paths
-
-**Out of scope:**
-
-- Actually wiring Chat, Copilot, or Workspace Execution to emit run events (they can be added incrementally by registering a reducer)
-- Moving execution to external workers
-- Event compaction or archival
-
-## Data Model Changes
-
-### New column on `agent_runs`
-
-```sql
-agent_name  VARCHAR(100)  NOT NULL  DEFAULT 'skill_creator'
-```
-
-- `run_type` stays as-is — describes the kind of run ("generation", "turn", "execution")
-- `agent_name` identifies which agent produced the run ("skill_creator", "chat", "copilot", "workspace")
-- Default `'skill_creator'` for backward compatibility with existing rows
-
-### New indexes
-
-```sql
-CREATE INDEX agent_runs_user_agent_idx ON agent_runs (user_id, agent_name, created_at DESC);
-CREATE INDEX agent_runs_user_runtype_idx ON agent_runs (user_id, run_type, created_at DESC);
-```
-
-### Schema drift fix
-
-The ORM model defines `runtime_owner_id`, `last_heartbeat_at`, and `agent_runs_owner_status_idx` but the existing migration does not create them. This migration adds:
-
-```sql
-ALTER TABLE agent_runs ADD COLUMN runtime_owner_id VARCHAR(255);
-ALTER TABLE agent_runs ADD COLUMN last_heartbeat_at TIMESTAMPTZ;
-CREATE INDEX agent_runs_owner_status_idx ON agent_runs (runtime_owner_id, status);
-```
-
-## Agent Registry
-
-A simple Python registry — no metaclass magic, just a dict.
-
-### AgentDefinition
-
-```python
-@dataclass
-class AgentDefinition:
-    name: str                    # e.g. "skill_creator"
-    display_name: str            # e.g. "Skill Creator" (for UI)
-    default_run_type: str        # e.g. "generation"
-    reducer: Callable            # (projection, event_type, payload, status) -> projection
-    initial_projection: Callable # () -> dict (empty projection template)
-```
-
-### AgentRegistry
-
-```python
-class AgentRegistry:
-    _agents: dict[str, AgentDefinition] = {}
-
-    @classmethod
-    def register(cls, definition: AgentDefinition): ...
-
-    @classmethod
-    def get(cls, agent_name: str) -> AgentDefinition | None: ...
-
-    @classmethod
-    def list_all(cls) -> list[AgentDefinition]: ...
-```
-
-### Registration
-
-Each reducer module self-registers at import time:
-
-```python
-# backend/app/services/run_reducers/skill_creator.py (add at bottom)
-AgentRegistry.register(AgentDefinition(
-    name="skill_creator",
-    display_name="Skill Creator",
-    default_run_type="generation",
-    reducer=apply_skill_creator_event,
-    initial_projection=make_initial_projection,
-))
-```
-
-Future agents follow the same pattern — one file, one register call.
-
-### RunService integration
-
-- `create_run(agent_name, ...)` calls `definition.initial_projection()` to seed the snapshot, then appends a `run_initialized` event through the reducer (same pattern as current `create_skill_creator_run`)
-- `append_event` replaces `if run.run_type == "skill_creator"` with `AgentRegistry.get(run.agent_name).reducer`
-- `create_skill_creator_run(...)` stays as a thin wrapper calling `create_run("skill_creator", ...)`
-- `find_latest_active_run(agent_name, user_id, ...)` generalizes the current skill-creator-specific method
-
-### Response schema
-
-`RunSummary` (both Pydantic and frontend type) adds `agent_name: str` and `agent_display_name: str` fields. The API populates `agent_display_name` from the registry.
-
-### Frontend href routing
-
-Per-agent "Open" button routing stays in the frontend (`runHelpers.ts`) as a simple map on `agent_name`. The backend registry does not need to know about frontend routes.
-
-## API Changes
-
-### New generic create-run endpoint
-
-```
-POST /api/v1/runs
-{
-  "agent_name": "skill_creator",
-  "message": "Build a skill that ...",
-  "graph_id": "uuid",
-  "thread_id": null,
-  "config": {}
-}
-```
-
-Backend validates `agent_name` against `AgentRegistry`.
-
-### Existing endpoint preserved as alias
-
-```
-POST /api/v1/runs/skill-creator  →  delegates to POST /api/v1/runs with agent_name="skill_creator"
-```
-
-### Enhanced list endpoint
-
-```
-GET /api/v1/runs?agent_name=skill_creator&status=running&run_type=generation&search=weather&limit=50
-```
-
-New query params:
-
-- `agent_name` — filter by agent (exact match)
-- `search` — case-insensitive substring match on `title`
-
-### Agent metadata endpoint
-
-```
-GET /api/v1/runs/agents
-```
-
-Returns:
-
-```json
-{
-  "data": [
-    { "name": "skill_creator", "display_name": "Skill Creator" }
-  ]
-}
-```
-
-Frontend uses this to populate agent filter dropdown dynamically.
-
-### Generalized active run lookup
-
-```
-GET /api/v1/runs/active?agent_name=skill_creator&graph_id=...&thread_id=...
-```
-
-Replaces `GET /api/v1/runs/active/skill-creator`. Old endpoint stays as alias.
-
-## Run Center UI
-
-### Filter bar
-
-```
-┌─────────────────────────────────────────────────────────┐
-│  Run Center                                             │
-├─────────────────────────────────────────────────────────┤
-│  [🔍 Search by title...          ]                      │
-│                                                         │
-│  Agent:  [All ▾] [Skill Creator] [Chat] [Copilot] ...  │
-│  Status: [All] [Active] [Finished]                      │
-├─────────────────────────────────────────────────────────┤
-│  ● Running  │ Skill Creator │ Build weather skill │ 3m  │
-│  ● Running  │ Chat          │ Debug auth flow     │ 1m  │
-│  ○ Done     │ Skill Creator │ CSV parser skill    │ 12m │
-│  ✕ Failed   │ Copilot       │ Refactor utils      │ 25m │
-└─────────────────────────────────────────────────────────┘
-```
-
-### Implementation details
-
-- Agent filter chips populated from `GET /api/v1/runs/agents` — fully dynamic
-- All filters sent server-side as query params to `GET /api/v1/runs`
-- URL search params sync with filters: `/runs?agent_name=chat&status=running`
-- `useRuns` hook updated to accept all filter params, polls every 15s
-- Each `RunRow` shows `agent_name` as a colored badge using `display_name`
-- "Open" button logic: registry can provide a `buildRunHref(run)` per agent, or fallback to `/runs/{runId}`
-
-### No changes to
-
-- Run Detail page (`/runs/[runId]`) — already agent-agnostic
-- WS subscription logic — already generic by `run_id`
-
-## Frontend Service & Hook Changes
-
-### runService.ts
-
-```ts
-// New generic methods
-createRun(params: { agent_name: string; message: string; graph_id?: string; thread_id?: string; config?: Record<string, any> })
-listRuns(params?: { agentName?: string; status?: string; runType?: string; search?: string; limit?: number })
-findActiveRun(agentName: string, graphId?: string, threadId?: string)
-getAgents(): Promise<AgentDefinition[]>
-
-// Old methods stay as aliases
-createSkillCreatorRun(...)  →  calls createRun({ agent_name: "skill_creator", ... })
-findActiveSkillCreatorRun(...)  →  calls findActiveRun("skill_creator", ...)
-```
-
-### queries/runs.ts
-
-```ts
-// New hooks
-useAgents()           // GET /v1/runs/agents, cached (staleTime: Infinity)
-useRuns(filters)      // updated to pass agent_name, search, status, runType
-
-// Existing hooks stay, delegate internally
-useActiveSkillCreatorRun()  →  calls findActiveRun("skill_creator", ...)
-```
-
-### Skill Creator hook
-
-Minimal changes — calls `createSkillCreatorRun` (now an alias). Reducer logic unchanged.
-
-## Migration & Backward Compatibility
-
-### Alembic migration
-
-Single migration:
-
-1. Add `agent_name VARCHAR(100) NOT NULL DEFAULT 'skill_creator'` to `agent_runs`
-2. Backfill existing rows: `UPDATE agent_runs SET agent_name = 'skill_creator'`
-3. Add `runtime_owner_id VARCHAR(255)` and `last_heartbeat_at TIMESTAMPTZ` (schema drift fix)
-4. Create indexes: `agent_runs_user_agent_idx`, `agent_runs_user_runtype_idx`, `agent_runs_owner_status_idx`
-
-### Backward compatibility
-
-- All existing `skill_creator` runs get `agent_name='skill_creator'` via default
-- Old `POST /v1/runs/skill-creator` stays, delegates to generic
-- Old `GET /v1/runs/active/skill-creator` stays, delegates to generic
-- Frontend aliases keep Skill Creator page working without changes
-- Run Center works immediately — "Skill Creator" shows as only agent until others register
-
-## Implementation Sequence
-
-| Step | What | Files |
-|------|------|-------|
-| 1 | Migration + model update | `backend/app/models/agent_run.py`, new alembic migration |
-| 2 | Agent registry + register skill_creator | New `backend/app/services/agent_registry.py`, modify `backend/app/services/run_reducers/skill_creator.py` |
-| 3 | Generalize RunService | `backend/app/services/run_service.py`, `backend/app/repositories/agent_run.py` |
-| 4 | Generalize API endpoints | `backend/app/api/v1/runs.py`, `backend/app/schemas/runs.py` |
-| 5 | Frontend service & hooks | `frontend/services/runService.ts`, `frontend/hooks/queries/runs.ts` |
-| 6 | Run Center UI upgrade | `frontend/app/runs/page.tsx` |
-| 7 | Tests | Backend unit + frontend unit |
-
-## File Checklist
-
-### Backend new
-
-- `backend/app/services/agent_registry.py`
-- `backend/alembic/versions/<new>_add_agent_name_and_fix_drift.py`
-
-### Backend modify
-
-- `backend/app/models/agent_run.py` — add `agent_name` column
-- `backend/app/repositories/agent_run.py` — generalize queries
-- `backend/app/services/run_service.py` — use registry for reducer dispatch, add generic methods
-- `backend/app/services/run_reducers/skill_creator.py` — add registration call
-- `backend/app/api/v1/runs.py` — add generic endpoints, agents endpoint, search param
-- `backend/app/schemas/runs.py` — add new request/response schemas
-
-### Frontend modify
-
-- `frontend/services/runService.ts` — add generic methods, keep aliases
-- `frontend/hooks/queries/runs.ts` — add useAgents, update useRuns filters
-- `frontend/app/runs/page.tsx` — agent filter, status filter, title search
-
-## Rollback Strategy
-
-Safe — `agent_name` column with default means old code ignores it. Revert frontend to old filter UI. No data loss.
-
-## Testing Plan
-
-### Backend unit
-
-- Agent registry: register, get, list
-- Reducer dispatch via registry matches direct call
-- Repository: filter by `agent_name`, filter by `search` on title
-- Migration: backfill correctness
-
-### Backend integration
-
-- Create run via generic endpoint with `agent_name`
-- List runs filtered by `agent_name` returns only matching
-- List runs with `search` returns title matches
-- Old skill-creator alias endpoints still work
-- `GET /v1/runs/agents` returns registered agents
-
-### Frontend unit
-
-- `useAgents` populates filter chips
-- Filter state syncs with URL params
-- `useRuns` passes all filters to API
-- Skill Creator flow unchanged (alias path)
-
-### E2E
-
-1. Open Run Center
-2. Start a Skill Creator run
-3. Filter by "Skill Creator" — run visible
-4. Filter by "Chat" — run hidden
-5. Search by title substring — run visible/hidden correctly
-6. Combine agent + status filter — correct results
-
-## Success Criteria
-
-This phase is successful if:
-
-- Any agent can register by adding one reducer file + one register call
-- Run Center shows all runs and can filter by agent name, status, and title search
-- Existing Skill Creator flow has zero functional regression
-- API supports generic run creation with `agent_name` validation
-- Schema drift is resolved
diff --git a/docs/superpowers/specs/2026-03-30-model-management-refactor-design.md b/docs/superpowers/specs/2026-03-30-model-management-refactor-design.md
deleted file mode 100644
index bb082f4d3..000000000
--- a/docs/superpowers/specs/2026-03-30-model-management-refactor-design.md
+++ /dev/null
@@ -1,456 +0,0 @@
-# 模型管理模块全面重构设计
-
-## 概述
-
-对 settings/models 模型管理模块进行前后端全面重构，核心目标：
-
-- 页面布局从纵向卡片列表改为左右分栏 Master-Detail
-- 新增模型测试 Playground（流式输出 + 性能指标）
-- 新增 Provider 默认参数 + 模型级覆盖的参数配置体系
-- 新增凭证健康状态、模型可用性实时状态的直观展示
-- 新增使用量统计系统（采集、聚合、趋势图表）
-
-### 新增前端依赖
-
-- `recharts` — 使用量统计趋势图表（当前 package.json 中无图表库）
-
-## 1. 页面整体布局
-
-### 左侧面板（~280px 固定宽度）
-
-- 顶部：搜索框 + "添加模型"按钮
-- Provider 分组列表，按类型分组（系统内置 / 自定义）
-- 每个 Provider 项显示：图标、名称、凭证状态指示灯（绿/红/灰）、模型数量 badge
-- 点击 Provider 项选中，右侧展示详情
-- 当前选中项高亮
-
-### 右侧详情面板（flex-1 自适应）
-
-- 顶部：Provider 名称 + 图标 + 操作按钮（编辑凭证、删除 Provider）
-- 内容区域用 Tab 切换三个视图：
-  - **模型列表** — 该 Provider 下所有模型实例，含状态、默认标记、参数概览
-  - **Playground** — 模型测试交互区
-  - **统计** — 使用量数据与趋势图
-
-### 未选中状态
-
-右侧显示全局概览卡片（总 Provider 数、总模型数、默认模型信息、凭证健康摘要）
-
-### 数据流
-
-左侧列表复用现有 `useModelProviders` + `useModelCredentials`，右侧详情按选中的 Provider 加载对应数据。
-
-注意：当前 `useModelProviders` 返回的 `model_count` 来自 factory 预定义模型列表，自定义 Provider 的 `model_count` 为 0。需要修改后端 `get_all_providers` 和 `get_provider`，将 `model_count` 改为从 `model_instance` 表中按 provider 统计实际实例数量。
-
-## 2. 模型列表与参数配置
-
-### 模型列表 Tab
-
-选中 Provider 后，右侧默认展示该 Provider 下的模型实例列表，每行显示：
-
-- 模型名称 + 显示名称
-- 可用性状态标签（可用 / 不可用）
-- 默认模型标记（星标，点击可切换）
-- 参数摘要（如 `temperature: 0.7, max_tokens: 2000`，折叠显示）
-- 操作：编辑参数、测试（跳转 Playground 并预选该模型）、删除
-
-### 参数配置交互
-
-采用 Provider 默认 + 模型覆盖的两层模式：
-
-- **Provider 级别**：在 Provider 详情顶部区域可设置默认参数（temperature、max_tokens、top_p、frequency_penalty、presence_penalty、timeout、max_retries）
-- **模型级别**：点击模型行的"编辑参数"，弹出侧抽屉（Drawer），展示参数表单。每个字段旁有"使用 Provider 默认"开关，关闭后可自定义值
-- 参数表单根据后端 `get_config_schema()` 动态渲染，不同 Provider 可能有不同的参数集
-
-### 后端改动
-
-- 移除 `GET /v1/model-providers/{name}/config-schema` — 现有 `GET /v1/model-providers/{name}` 已返回 `config_schemas`，前端直接从 provider 详情中提取即可，无需单独端点
-- 新增 `PATCH /v1/models/instances/{id}` — 更新模型实例参数
-- 新增 `PATCH /v1/model-providers/{name}/defaults` — 更新 Provider 级默认参数
-- Provider 表新增 `default_parameters` 字段（JSON），存储 Provider 级默认参数
-
-#### `PATCH /v1/models/instances/{id}` 请求/响应定义
-
-```python
-class ModelInstanceUpdate(BaseModel):
-    """更新模型实例请求"""
-    model_parameters: Optional[Dict[str, Any]] = Field(default=None, description="模型参数覆盖值（仅包含用户显式设置的字段）")
-    is_default: Optional[bool] = Field(default=None, description="是否为默认模型")
-
-# 响应复用现有格式：
-# { id, provider_name, model_name, model_type, model_parameters, is_default }
-```
-
-#### `PATCH /v1/model-providers/{name}/defaults` 请求/响应定义
-
-```python
-class ProviderDefaultsUpdate(BaseModel):
-    """更新 Provider 默认参数请求"""
-    default_parameters: Dict[str, Any] = Field(description="Provider 级默认参数，如 {temperature: 0.7, max_tokens: 2000}")
-
-# 响应：更新后的 provider 完整信息（复用 get_provider 格式）
-```
-
-#### 参数合并语义
-
-采用写时合并（write-time merge）：当用户保存模型实例参数时，前端将 Provider 默认值与用户覆盖值合并后提交。`model_parameters` 存储的是最终生效值。
-
-这意味着修改 Provider 默认参数不会自动影响已有模型实例。如果需要批量更新，前端可提供"应用到所有模型"的可选操作（调用批量 PATCH）。
-
-## 3. Playground 模型测试
-
-### 交互设计
-
-Playground Tab 分为上下两个区域：
-
-**上方：输入区**
-- 模型选择器（下拉，预选当前 Provider 下的模型，也可切换到其他 Provider 的模型）
-- 参数调节面板（右侧折叠面板，可展开调整 temperature、max_tokens 等，默认继承该模型的已保存参数）
-- Prompt 输入框（多行文本，支持 Shift+Enter 换行）
-- 发送按钮 + 清空按钮
-
-**下方：输出区**
-- 模型响应内容（流式输出，逐字显示）
-- 性能指标卡片组，横向排列：
-  - 首 token 延迟（TTFT, Time To First Token）
-  - 总响应时间
-  - 输入 token 数
-  - 输出 token 数
-  - 输出速度（tokens/s）
-- 历史记录：本次会话内的测试记录列表，可回看对比
-
-### 后端改动
-
-当前 `POST /v1/models/test-output` 只返回 `{ output: string }`，需要增强：
-
-- 改为 SSE 流式响应（`text/event-stream`），支持逐 token 推送
-- 请求体增加可选的 `model_parameters` 字段，允许临时覆盖参数（不持久化）
-- 响应增加性能指标：
-
-```python
-class ModelTestMetrics(BaseModel):
-    ttft_ms: float          # 首 token 延迟（毫秒）
-    total_time_ms: float    # 总响应时间
-    input_tokens: int       # 输入 token 数
-    output_tokens: int      # 输出 token 数
-    tokens_per_second: float # 输出速度
-```
-
-- SSE 事件类型：`token`（逐个 token）、`metrics`（最终性能数据）、`error`（错误信息）、`done`（完成信号）
-
-#### SSE 认证方式
-
-现有项目使用 Bearer token 认证（`apiGet`/`apiPost` 自动附加 Authorization header）。SSE 通过 `fetch` + `ReadableStream` 消费，`fetch` 支持自定义 headers，因此认证方式与普通 API 一致，无需特殊处理。
-
-#### Playground 交互模式
-
-每次测试独立，不支持多轮对话。请求体只接受单个 `input` 字符串，不接受 `messages` 数组。Playground 的定位是快速验证模型可用性和参数效果，不是完整的对话体验（对话体验在 chat 模块中）。
-
-### 前端实现
-
-- 使用 `fetch` + `ReadableStream` 消费 SSE，通过 Authorization header 传递 token
-- 性能指标在流结束后渲染，TTFT 在收到第一个 token 时即时显示
-- 测试历史存在组件本地 state，不持久化
-
-## 4. 状态展示与凭证健康
-
-### 凭证健康状态
-
-左侧 Provider 列表中，每个 Provider 项右侧显示状态指示灯：
-- 绿色圆点：凭证有效
-- 红色圆点：凭证验证失败
-- 灰色圆点：未配置凭证
-
-右侧详情面板顶部展示凭证详细状态卡片：
-- 状态标签（Valid / Invalid / Not Configured）
-- 最后验证时间（相对时间，如"5 分钟前"）
-- 验证失败时显示错误信息（可展开查看完整错误）
-- "重新验证"按钮
-- "编辑凭证"按钮
-
-### 模型可用性实时状态
-
-后端 `get_available_models` 响应增加 `unavailable_reason` 字段：
-- `no_credentials` / `invalid_credentials` / `model_not_found` / `provider_error`
-- 前端根据 reason 展示不同的提示文案和修复引导
-
-前端 `AvailableModel` 类型同步更新：
-```typescript
-export interface AvailableModel {
-  provider_name: string
-  provider_display_name: string
-  name: string
-  display_name: string
-  description: string
-  is_available: boolean
-  is_default?: boolean
-  unavailable_reason?: 'no_credentials' | 'invalid_credentials' | 'model_not_found' | 'provider_error'
-}
-```
-
-### 全局概览（未选中 Provider 时）
-
-- Provider 健康摘要：X 个正常 / Y 个异常 / Z 个未配置
-- 默认模型信息卡片（名称、Provider、当前参数）
-- 最近一次凭证验证失败的告警（如果有）
-
-### 后端改动
-
-- 新增 `GET /v1/models/overview` — 返回聚合概览数据
-
-#### `GET /v1/models/overview` 响应定义
-
-```python
-class ModelsOverview(BaseModel):
-    """全局模型概览"""
-    total_providers: int                    # 总 Provider 数
-    healthy_providers: int                  # 凭证有效的 Provider 数
-    unhealthy_providers: int                # 凭证无效的 Provider 数
-    unconfigured_providers: int             # 未配置凭证的 Provider 数
-    total_models: int                       # 总模型实例数
-    available_models: int                   # 可用模型数
-    default_model: Optional[DefaultModelInfo]  # 默认模型信息
-    recent_credential_failure: Optional[CredentialFailureInfo]  # 最近一次凭证验证失败
-
-class DefaultModelInfo(BaseModel):
-    provider_name: str
-    provider_display_name: str
-    model_name: str
-    model_parameters: Dict[str, Any]
-
-class CredentialFailureInfo(BaseModel):
-    provider_name: str
-    provider_display_name: str
-    error: str
-    failed_at: Optional[datetime]
-```
-
-## 5. 使用量统计系统
-
-### 数据采集
-
-后端新增 `model_usage_log` 表（继承项目 `app.models.base.BaseModel`，自带 UUID 主键 + created_at + updated_at）：
-
-```python
-class ModelUsageLog(BaseModel):
-    """模型调用日志表"""
-    __tablename__ = "model_usage_log"
-
-    provider_name: Mapped[str] = mapped_column(String(100), nullable=False, comment="供应商名称")
-    model_name: Mapped[str] = mapped_column(String(255), nullable=False, comment="模型名称")
-    model_type: Mapped[str] = mapped_column(String(50), nullable=False, default="chat", comment="模型类型")
-    user_id: Mapped[Optional[str]] = mapped_column(String(255), ForeignKey("user.id", ondelete="SET NULL"), nullable=True, comment="调用用户")
-    input_tokens: Mapped[int] = mapped_column(nullable=False, default=0, comment="输入 token 数")
-    output_tokens: Mapped[int] = mapped_column(nullable=False, default=0, comment="输出 token 数")
-    total_time_ms: Mapped[float] = mapped_column(nullable=False, default=0.0, comment="总响应时间（毫秒）")
-    ttft_ms: Mapped[Optional[float]] = mapped_column(nullable=True, comment="首 token 延迟（毫秒）")
-    status: Mapped[str] = mapped_column(String(20), nullable=False, default="success", comment="success / error")
-    error_message: Mapped[Optional[str]] = mapped_column(String(2000), nullable=True, comment="错误信息")
-    source: Mapped[str] = mapped_column(String(50), nullable=False, default="chat", comment="调用来源：playground / chat / agent")
-
-    __table_args__ = (
-        Index("model_usage_log_created_at_idx", "created_at"),
-        Index("model_usage_log_provider_model_idx", "provider_name", "model_name"),
-        Index("model_usage_log_composite_idx", "created_at", "provider_name", "model_name"),
-    )
-```
-
-采集点：在 `ModelService` 的模型调用方法（`get_model_instance`、`get_runtime_model_by_name`、`test_output`）返回前，通过 `ModelUsageService.log_usage()` 异步记录。不使用装饰器（避免侵入 `model_resolver.py`），而是在 service 层显式调用。agent 路径的采集通过在 `model_resolver.py` 调用 `ModelService` 时由 `ModelService` 内部记录，不需要修改 `model_resolver.py` 本身。
-
-### 聚合 API
-
-`GET /v1/models/usage/stats`，支持查询参数：
-- `provider_name`（可选）
-- `model_name`（可选）
-- `period`：`24h` / `7d` / `30d`
-- `granularity`：`hour` / `day`
-
-返回 summary（总调用、总 token、平均响应时间、错误率）+ timeline（时序数据）+ by_model（按模型分组排行）。
-
-### 前端统计 Tab
-
-- 顶部：时间范围选择器（24h / 7d / 30d）
-- 摘要卡片行：总调用次数、总 token 消耗、平均响应时间、错误率
-- 趋势折线图（recharts）
-- 模型维度表格
-
-### 数据清理
-
-默认保留 90 天明细日志。清理方式：在 `ModelUsageService` 中提供 `cleanup_old_logs(days=90)` 方法，通过 `DELETE FROM model_usage_log WHERE created_at < now() - interval '90 days'` 实现。由后端启动时注册的 FastAPI `on_startup` 事件触发一次清理，之后每 24 小时执行一次（使用 `asyncio.create_task` + `asyncio.sleep` 的简单循环，不引入额外调度框架）。
-
-## 6. 前端组件架构
-
-### 目录结构
-
-```
-frontend/app/settings/models/
-├── page.tsx                          # Master-Detail 分栏入口
-├── components/
-│   ├── provider-sidebar/
-│   │   ├── provider-sidebar.tsx
-│   │   ├── provider-item.tsx
-│   │   └── provider-search.tsx
-│   ├── detail-panel/
-│   │   ├── detail-panel.tsx
-│   │   ├── overview-dashboard.tsx
-│   │   ├── provider-header.tsx
-│   │   ├── model-list-tab/
-│   │   │   ├── model-list-tab.tsx
-│   │   │   ├── model-row.tsx
-│   │   │   └── param-drawer.tsx
-│   │   ├── playground-tab/
-│   │   │   ├── playground-tab.tsx
-│   │   │   ├── prompt-input.tsx
-│   │   │   ├── output-display.tsx
-│   │   │   └── test-history.tsx
-│   │   └── stats-tab/
-│   │       ├── stats-tab.tsx
-│   │       ├── summary-cards.tsx
-│   │       └── usage-chart.tsx
-│   ├── credential-dialog.tsx         # 全新重写
-│   └── add-custom-model-dialog.tsx   # 全新重写
-```
-
-### 状态管理
-
-- 选中的 Provider：`page.tsx` 中的 `useState<string | null>`，通过 props 传递
-- 选中的 Tab：`detail-panel.tsx` 中的 `useState`
-- Playground 状态：`playground-tab.tsx` 本地 state
-- 服务端数据：React Query（`hooks/queries/models.ts` 扩展）
-
-### 新增 hooks
-
-```typescript
-useModelsOverview()                       // GET /v1/models/overview
-useModelUsageStats(params)                // GET /v1/models/usage/stats
-useUpdateModelInstance()                  // PATCH /v1/models/instances/{id}
-useUpdateProviderDefaults()              // PATCH /v1/model-providers/{name}/defaults
-useTestModelStream()                      // POST /v1/models/test-output (SSE)
-```
-
-注意：移除了 `useProviderConfigSchema`，因为 config schema 已包含在现有 `useModelProvider(providerName)` 的响应中（`config_schemas` 字段），无需单独 hook。
-
-### 旧组件处理
-
-`frontend/app/settings/models/components/` 下所有现有组件全部删除重写：
-- `provider-added-card.tsx` — 卡片展开模式与新设计不兼容，删除
-- `provider-card.tsx` — 网格卡片与左侧列表不兼容，删除
-- `credential-dialog.tsx` — 容器和触发方式完全不同，重写
-- `add-custom-model-dialog.tsx` — 同上，重写
-- `model-list.tsx` / `model-list-item.tsx` — 新设计中模型列表是独立 Tab 且功能更丰富，重写
-- `credential-panel.tsx` — 凭证状态移至 Provider header，删除
-- `provider-icon.tsx` — 融入新的 `provider-item.tsx`
-
-`frontend/app/workspace/[workspaceId]/[agentId]/services/modelService.ts` — 保留不动。此文件被 `agentService.ts` 引用，属于 workspace 模块而非 settings/models 模块，不在本次重构范围内。（注意：`frontend/services/modelService.ts` 不存在，之前的描述有误。）
-
-## 7. 后端变更清单
-
-### 保留不动（代码质量 OK，与新设计兼容）
-
-- `app/core/model/` 整个目录（factory、providers、base、utils）— Factory 模式干净，provider 注册/获取/创建模型实例的职责清晰
-- `app/models/model_instance.py` — 字段结构匹配新设计需求
-- `app/models/model_credential.py` — is_valid、last_validated_at、validation_error 正好是凭证健康状态需要的字段
-- `app/repositories/model_credential.py` — get_best_valid_credential 优先级逻辑合理，list_all 带 eager load
-- `app/services/model_credential_service.py` — 凭证创建/验证/解密/删除/自定义模型一步添加逻辑完整
-- `app/api/v1/model_credentials.py` — 接口设计合理，CRUD + validate 完整
-- `app/core/graph/deep_agents/model_resolver.py` — 运行时解析，不在本次重构范围
-
-### 小改（加字段，不重写）
-
-- `app/models/model_provider.py` — 加 `default_parameters: JSON` 字段：`Mapped[dict] = mapped_column(JSON, nullable=False, default=dict, comment="Provider 级默认参数")`。迁移脚本中对现有行 backfill 为 ``。
-
-注意：`default_parameters` 和 `model_usage_log` 表应拆为两个独立的 Alembic 迁移脚本，避免耦合。
-
-### 重构（结构性改动，大部分代码重写）
-
-**`app/repositories/model_instance.py`** — 重写
-- 问题：list_all() 没有 eager load provider 关系导致 N+1；缺少按 provider 过滤的查询；缺少按 ID 更新的便捷方法；get_best_instance 中 user_id/workspace_id 优先级逻辑是旧多租户遗留
-- 改为：加 eager load、按 provider 过滤、按 ID 更新、简化优先级逻辑
-
-**`app/repositories/model_provider.py`** — 重写
-- 问题：太薄，只有 get_by_name 和 list_enabled
-- 改为：加按 provider_type 过滤、default_parameters 更新、统计 Provider 数量
-
-**`app/services/model_service.py`** — 重写
-- 问题：test_output 同步返回（新设计要 SSE 流式 + 性能指标）；get_available_models 缺少 unavailable_reason；缺少 update_model_instance 和 get_overview；create_model_instance_config 不合并 Provider 默认参数；多个方法重复"获取 provider → instance → credentials → 创建模型"模式
-- 改为：流式 test_output 生成器、update_model_instance、get_overview、unavailable_reason、参数合并逻辑、提取公共模型解析方法
-
-**`app/services/model_provider_service.py`** — 重写
-- 问题：_sync_credentials 废弃方法还留着；sync_all/_sync_models/_ensure_model_instances_for_provider 占大量代码但与新设计无关；缺少 get_config_schema 和 update_provider_defaults；get_all_providers/get_provider 返回结构缺少 default_parameters；大量注释和废弃逻辑
-- 改为：清理废弃代码、加 get_config_schema、update_provider_defaults、返回结构增加 default_parameters
-
-**`app/api/v1/models.py`** — 重写
-- 问题：test-output 同步返回；缺少 PATCH instances、overview 端点；响应结构缺字段
-- 改为：SSE test-output（StreamingResponse）、PATCH instances/{id}、GET overview、响应增加 unavailable_reason
-
-**`app/api/v1/model_providers.py`** — 重写
-- 问题：get_current_user 被注释掉（安全问题）；缺少 update defaults 端点
-- 改为：恢复所有端点的认证（包括 sync 端点）、加 PATCH defaults
-
-### 新增
-
-- `app/models/model_usage_log.py` — 使用量日志 ORM
-- `app/repositories/model_usage_log.py` — 使用量日志 Repository（含聚合查询）
-- `app/services/model_usage_service.py` — 采集装饰器 + 聚合 Service
-- `app/api/v1/model_usage.py` — 使用量统计 API
-- Alembic 迁移脚本 1 — model_provider.default_parameters 字段（backfill 现有行为 `{}`）
-- Alembic 迁移脚本 2 — model_usage_log 表创建（含索引）
-
-## 8. 错误处理与边界情况
-
-### Playground
-
-- SSE 连接失败：错误提示卡片 + 重试按钮
-- 流式输出中断：保留已接收内容，底部追加错误提示
-- 模型调用超时：60s 超时，中断连接，显示超时提示
-- 凭证无效时：模型选择器中不可用模型置灰不可选，tooltip 显示原因
-
-### 参数配置
-
-- Provider 默认参数为空：模型参数表单中"使用 Provider 默认"开关仍然显示，但开关打开时字段值显示为 schema 中定义的 `default` 值（如 temperature 的 schema default 为 1.0），placeholder 标注"schema 默认值"。如果 schema 也没有 default，则显示为空并标注"未设置"
-- 参数 schema 缺失（Provider 未实现 `get_config_schema` 返回 None）：参数编辑入口隐藏，模型行不显示参数摘要
-- 参数值越界：前端即时校验 + 后端二次校验
-
-### 使用量统计
-
-- 无数据：空状态插图 + 提示文案
-- 数据量大：联合索引（created_at + provider_name + model_name），图表限制 720 数据点
-- 采集失败：try/catch 包裹，只记 warning，不影响主流程
-
-### 左侧面板
-
-- Provider 数量为 0：空状态 + 添加引导
-- 搜索无结果：提示文案
-- 选中的 Provider 被删除：自动取消选中，回到全局概览
-
-### 凭证状态
-
-- 验证中：蓝色脉冲动画
-- 验证完成：自动刷新状态灯
-- 不做自动过期检测，依赖手动验证或 Playground 测试发现
-
-## 9. 测试策略
-
-### 前端（Vitest + Testing Library）
-
-- `provider-sidebar` — 列表渲染、搜索过滤、选中切换、状态灯
-- `detail-panel` — Tab 切换、未选中概览
-- `model-list-tab` — 模型行渲染、默认模型、参数抽屉
-- `param-drawer` — schema 动态表单、默认值继承、覆盖开关
-- `playground-tab` — 模型选择、发送、流式输出、性能指标、错误状态
-- `stats-tab` — 空状态、摘要卡片、时间范围切换
-- `credential-dialog` — schema 表单、提交验证、错误提示
-- SSE 测试：mock fetch + ReadableStream
-
-### 后端（Pytest + httpx AsyncClient）
-
-- `test_models_api.py` — SSE 流式、PATCH instances、overview、unavailable_reason
-- `test_model_usage_api.py` — 统计查询、过滤、空数据
-- `test_model_providers_api.py` — update defaults、404
-- `test_model_usage_service.py` — 日志采集、聚合计算
-- `test_model_service.py` — update_model_instance、流式 test_output、参数合并
-
-### 不测的
-
-- 现有不变的代码不新增测试
-- 图表渲染细节不测，只测数据传入
diff --git a/docs/superpowers/specs/2026-03-31-model-management-refactor-design.md b/docs/superpowers/specs/2026-03-31-model-management-refactor-design.md
deleted file mode 100644
index 797f5f4c0..000000000
--- a/docs/superpowers/specs/2026-03-31-model-management-refactor-design.md
+++ /dev/null
@@ -1,419 +0,0 @@
-# 模型管理功能重构设计
-
-## 背景
-
-当前模型管理系统存在职责混乱、分支逻辑过多、代码冗余等问题。本次重构目标是在不改变数据库架构的前提下，划清 service 职责边界，清理垃圾逻辑，统一 API 语义，前后端对齐。
-
-## 核心规则
-
-1. **内置 provider**：只能添加/清除认证信息，一个 provider 一个认证
-2. **自定义 provider**：一步创建 provider + model + 认证，支持整体删除（级联）
-3. **全局系统级**：workspace_id 和 user_id 是预留字段，当前忽略
-4. **custom 模板**：is_template=true 的 provider 不在前端列表中显示
-
-## 1. 后端 Service 层职责划分
-
-### 1.1 ModelProviderService — provider 生命周期的唯一入口
-
-**保留方法：**
-- `sync_providers_from_factory()` — 同步内置 provider
-- `get_all_providers()` — 查询所有 provider（**新增**过滤掉 is_template=True，当前代码未过滤）
-- `get_provider(provider_name)` — 查询单个 provider（不过滤模板，允许按名称查询 custom 等模板 provider）
-- `update_provider_defaults(provider_name, default_parameters)` — 更新默认参数
-- `delete_provider(provider_name)` — 删除自定义 provider（级联删除 credential + instance）
-- `sync_all()` — 统一同步接口
-- `_ensure_model_instances_for_provider(provider)` — 确保模型实例存在
-- `_sync_models()` — 同步模型
-
-**新增方法：**
-- `add_custom_provider(credentials, model_name, display_name, model_parameters, validate)` — 一步创建自定义 provider + credential + model_instance。从 credential_service._add_one_custom_model 移入。
-
-**从 credential_service 移入的内部方法：**
-- `_create_derived_provider(template, name, display_name, template_name)` — 创建派生 provider DB 记录
-
-**简化：**
-- `get_all_providers()` 合并 factory_provider 存在/不存在两个分支的 dict 构建逻辑
-- `get_provider()` 简化为两段式：DB 存在 / DB 不存在
-
-### 1.2 ModelCredentialService — 只管认证 CRUD
-
-**保留方法：**
-- `upsert_credential(provider_name, credentials, validate)` — 为已有 provider 创建/更新认证（原 create_or_update_credential 简化版，删掉 custom 分支和派生逻辑）
-- `validate_credential(credential_id)` — 重新验证
-- `get_credential(credential_id, include_credentials)` — 获取详情
-- `list_credentials()` — 列表
-- `delete_credential(credential_id)` — 删除内置 provider 的认证记录。自定义 provider 的 credential 拒绝删除，返回 400
-- `get_decrypted_credentials(provider_name, user_id)` — 按 provider_name 获取解密凭证
-
-**保留的内部方法：**
-- `_upsert_credential(provider_id, encrypted, is_valid, validation_error, user_id)` — upsert 逻辑
-- `_validate_for_provider(provider, credentials, provider_id)` — 验证凭证
-
-**删除的方法：**
-- `_add_one_custom_model` → 移到 provider_service
-- `_create_derived_provider` → 移到 provider_service
-- `_ensure_model_instances` → 删除，provider_service 自己处理
-- `_update_default_model_cache` → 移到 model_service
-- `_update_default_model_cache_if_needed` → 移到 model_service
-- `get_current_credentials` → 删除（是 get_decrypted_credentials 的透传）
-- `_get_first_model_name_for_provider` → 移到 provider_service（自定义 provider 验证需要）
-
-### 1.3 ModelService — 模型实例和运行时
-
-**保留方法（全部保留，部分简化）：**
-- `get_available_models(model_type, user_id)` — 获取可用模型列表
-- `get_overview()` — 全局概览
-- `update_model_instance(instance_id, model_parameters, is_default)` — 更新实例
-- `create_model_instance_config(...)` — 创建实例配置
-- `update_model_instance_default(...)` — 更新默认状态
-- `get_model_instance(user_id, provider_name, model_name, use_default)` — 获取 LangChain 模型对象
-- `get_runtime_model_by_name(model_name, user_id)` — 按名称获取运行时模型
-- `list_model_instances()` — 列表
-- `test_output(...)` — 测试输出
-- `test_output_stream(...)` — 流式测试输出
-
-**新增内部方法：**
-- `_resolve_and_create_model(model_name, user_id)` — 统一 resolve provider → get credential → create model 逻辑，消除 test_output / test_output_stream / get_runtime_model_by_name / get_model_instance 四处重复
-
-**从 credential_service 移入：**
-- `_update_default_model_cache(provider_name, model_name, model_type, model_parameters)` — 更新默认模型缓存
-- `_update_default_model_cache_if_needed(provider_name)` — 条件刷新缓存
-
-**简化：**
-- `_build_provider_credentials_context` 中 global vs user-scoped 优先级判断简化（当前全局系统设计下不需要）
-- 所有调用 `credential_service._update_default_model_cache` 的地方改为调自己的方法
-- 所有调用 `credential_service.get_current_credentials` 的地方改为调 `credential_service.get_decrypted_credentials`
-
-## 2. 后端 API 层重构
-
-### 2.1 Provider 端点 (`/v1/model-providers`)
-
-| 方法 | 路径 | 说明 | 变化 |
-|------|------|------|------|
-| GET | `/` | 列表（新增过滤 is_template=True） | 变更 |
-| GET | `/{provider_name}` | 详情 | 不变 |
-| POST | `/custom` | **新增**：添加自定义 provider | 新增 |
-| PATCH | `/{provider_name}/defaults` | 更新默认参数 | 不变 |
-| POST | `/sync` | 同步 | 不变 |
-| DELETE | `/{provider_name}` | 删除自定义 provider（级联） | 不变 |
-
-**新增 Schema：**
-```python
-class CustomProviderCreate(BaseModel):
-    model_name: str = Field(description="模型名称")
-    credentials: Dict[str, Any] = Field(description="凭据字典（明文）")
-    display_name: Optional[str] = Field(default=None, description="自定义显示名称")
-    model_parameters: Optional[Dict[str, Any]] = Field(default=None, description="模型参数")
-    validate: bool = Field(default=True, description="是否验证凭据")
-```
-
-### 2.2 Credential 端点 (`/v1/model-credentials`)
-
-| 方法 | 路径 | 说明 | 变化 |
-|------|------|------|------|
-| POST | `/` | 创建/更新内置 provider 认证 | 简化 schema |
-| GET | `/` | 列表 | 不变 |
-| GET | `/{credential_id}` | 详情 | 不变 |
-| POST | `/{credential_id}/validate` | 重新验证 | 不变 |
-| DELETE | `/{credential_id}` | 删除内置 provider 认证 | 增加校验 |
-
-**简化 Schema：**
-```python
-class CredentialCreate(BaseModel):
-    provider_name: str = Field(description="供应商名称")
-    credentials: Dict[str, Any] = Field(description="凭据字典（明文）")
-    validate: bool = Field(default=True, alias="should_validate", description="是否验证凭据")
-```
-
-删除字段：`provider_display_name`、`model_name`、`model_parameters`
-
-**DELETE 校验：** 如果 credential 关联的 provider 是自定义 provider（provider_type='custom' 且 is_template=False），返回 400 提示走 `DELETE /model-providers/{name}`。
-
-### 2.3 Model 端点 (`/v1/models`)
-
-不变。
-
-## 3. 前端重构
-
-### 3.1 types/models.ts
-
-**新增：**
-```typescript
-export interface CreateCustomProviderRequest {
-  model_name: string
-  credentials: Record<string, any>
-  display_name?: string
-  model_parameters?: Record<string, unknown>
-  validate?: boolean
-}
-
-export interface CreateCustomProviderResponse {
-  provider_name: string
-  display_name: string
-  credential_id: string
-  is_valid: boolean
-  validation_error?: string
-}
-```
-
-**简化 CreateCredentialRequest：**
-```typescript
-export interface CreateCredentialRequest {
-  provider_name: string
-  credentials: Record<string, any>
-  validate?: boolean
-}
-```
-
-删除字段：`providerDisplayName`、`model_name`、`model_parameters`
-
-### 3.2 hooks/queries/models.ts
-
-**简化 useCreateCredential：**
-- body 只发 `{ provider_name, credentials, validate }`
-- onSuccess 不再需要 `if (request.model_name)` 分支
-
-**新增 useCreateCustomProvider：**
-```typescript
-export function useCreateCustomProvider() {
-  const queryClient = useQueryClient()
-  return useMutation({
-    mutationFn: async (request: CreateCustomProviderRequest) => {
-      return await apiPost<CreateCustomProviderResponse>(`${MODEL_PROVIDERS_PATH}/custom`, request)
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: modelKeys.providers() })
-      queryClient.invalidateQueries({ queryKey: modelKeys.credentials() })
-      queryClient.invalidateQueries({ queryKey: modelKeys.instances() })
-      queryClient.invalidateQueries({ queryKey: [...modelKeys.all, 'available'] })
-    },
-  })
-}
-```
-
-**useModelProvidersByConfig：**
-- 删除 `templateProviders` 分类，后端已过滤 is_template=True
-
-### 3.3 组件变更
-
-**add-custom-model-dialog.tsx：**
-- 改用 `useCreateCustomProvider` 替代 `useCreateCredential`
-- props 中的 `provider: ModelProvider` 改为接收 credential_schema（因为 custom 模板不再出现在 providers 列表里）
-
-**credential-dialog.tsx：**
-- 增加"清除认证"按钮，调用 `useDeleteCredential`，只在已有 credential 且 provider 为内置 provider（`provider_type !== 'custom'`）时显示
-- 自定义 provider 不显示此按钮（删除统一走 provider 删除入口）
-- 清除后关闭 dialog
-
-**provider-sidebar.tsx：**
-- 不再有 `templateProviders` 分类
-- 过滤掉 `is_template=true` 的 provider（后端已处理，前端做防御性过滤）
-
-**detail-panel.tsx / provider-header.tsx：**
-- 自定义 provider 的删除统一调 `useDeleteModelProvider`
-
-**models-page.tsx：**
-- `customProvider` 查找改为 `useModelProvider('custom')` 单独查询（因为 custom 模板不在列表里了）
-- 将 credential_schema 传给 AddCustomModelDialog
-
-## 4. 垃圾逻辑清理清单
-
-### 后端删除项
-
-| # | 文件 | 位置 | 说明 |
-|---|------|------|------|
-| 1 | credential_service.py | create_or_update_credential ~L136-143 | 删除 `if template and provider_display_name` 派生分支 |
-| 2 | credential_service.py | _add_one_custom_model ~L176-237 | 整个方法移到 provider_service |
-| 3 | credential_service.py | _create_derived_provider ~L43-57 | 移到 provider_service |
-| 4 | credential_service.py | _ensure_model_instances ~L383-387 | 删除 |
-| 5 | credential_service.py | _update_default_model_cache* ~L341-381 | 移到 model_service |
-| 6 | credential_service.py | get_current_credentials ~L327-335 | 删除（透传） |
-| 7 | credential_service.py | delete_credential 中自定义 provider 级联 ~L302-308 | 改为返回 400 |
-| 8 | credential_service.py | _get_first_model_name_for_provider ~L38-41 | 移到 provider_service |
-| 9 | model_service.py | 四处重复的 resolve 模式 | 提取 _resolve_and_create_model |
-| 10 | model_service.py | 调用 credential_service._update_default_model_cache ~L254,303,347 | 改为调自己的方法 |
-| 11 | provider_service.py | get_all_providers 两个分支 ~L120-157 | 合并 |
-| 12 | provider_service.py | get_provider 三段式逻辑 ~L169-242 | 简化为两段 |
-| 13 | model_credentials.py (API) | CredentialCreate schema | 删除多余字段 |
-| 14 | main.py | lifespan ~L193 | 替换 get_current_credentials 为 get_decrypted_credentials |
-| 15 | credential_resolver.py | get_credentials ~L68,~L95 | 替换 get_current_credentials 为 get_decrypted_credentials |
-| 16 | conversations.py (API) | ~L104,~L128 | 替换 get_current_credentials 为 get_decrypted_credentials |
-
-### 前端删除项
-
-| # | 文件 | 说明 |
-|---|------|------|
-| 17 | types/models.ts | CreateCredentialRequest 删除 model_name, model_parameters, providerDisplayName |
-| 18 | hooks/queries/models.ts | useCreateCredential 删除 model_name/model_parameters 分支 |
-| 19 | hooks/queries/models.ts | useModelProvidersByConfig 删除 templateProviders |
-| 20 | models-page.tsx | customProvider 查找方式改为单独查询 |
-
-### 简化项
-
-| # | 文件 | 说明 |
-|---|------|------|
-| 21 | model_service.py | _build_provider_credentials_context 简化 global vs user-scoped 优先级 |
-| 22 | provider_service.py | get_provider 简化为两段式 |
-
-## 5. 受影响的周边文件
-
-### 5.1 main.py — 启动默认模型缓存初始化
-
-当前 `main.py` 的 `lifespan` 中（~L172-216）调用 `credential_service.get_current_credentials(...)` 初始化默认模型缓存。由于 `get_current_credentials` 将被删除，需要改为调用 `credential_service.get_decrypted_credentials(provider_name)`。
-
-注意：`get_decrypted_credentials` 只在 credential 有效（`is_valid=True`）时返回解密凭证，否则返回 None。这与 `get_current_credentials` 的行为一致（后者就是透传前者），所以语义不变。
-
-具体变更：
-```python
-# 之前
-credentials = await credential_service.get_current_credentials(
-    provider_name=default_provider_name,
-    model_type="chat",
-    model_name=default_instance.model_name,
-)
-
-# 之后
-credentials = await credential_service.get_decrypted_credentials(default_provider_name)
-```
-
-### 5.2 credential_resolver.py — LLM 凭证解析工具
-
-`backend/app/core/model/utils/credential_resolver.py` 的 `LLMCredentialResolver.get_credentials()` 在两处调用 `credential_service.get_current_credentials(...)`。需要改为调用 `credential_service.get_decrypted_credentials(provider_name)`。
-
-第一处（~L68，默认模型路径）：
-```python
-# 之前
-credentials = await credential_service.get_current_credentials(
-    provider_name=provider_name or "",
-    model_type=model_type,
-    model_name=model_name or "",
-    user_id=user_id,
-)
-
-# 之后
-credentials = await credential_service.get_decrypted_credentials(provider_name or "")
-```
-
-第二处（~L95，回退路径）：注意此处 `provider_name` 可能为 None，实际使用的是 `provider_name_from_cred`：
-```python
-# 之前
-credentials = await credential_service.get_current_credentials(
-    provider_name=provider_name or provider_name_from_cred,
-    model_type=model_type,
-    model_name=model_name or "",
-    user_id=user_id,
-)
-
-# 之后
-credentials = await credential_service.get_decrypted_credentials(provider_name_from_cred)
-```
-
-### 5.3 conversations.py — 对话 API
-
-`backend/app/api/v1/conversations.py` 在两处（~L104, ~L128）调用 `credential_service.get_current_credentials(...)`。与 credential_resolver.py 类似，需要改为调用 `credential_service.get_decrypted_credentials(provider_name)`。
-
-第一处（~L104，默认模型路径）：
-```python
-credentials = await credential_service.get_decrypted_credentials(str(provider_name))
-```
-
-第二处（~L128，回退路径）：
-```python
-credentials = await credential_service.get_decrypted_credentials(provider_name_from_cred)
-```
-
-## 6. 边界情况处理
-
-### 6.1 删除自定义 provider 时包含默认模型
-
-当前 `provider_service.delete_provider()` 已处理此情况（~L287-307）：检测默认模型是否属于被删除的 provider，如果是则自动重新分配默认模型到第一个可用的全局模型实例。**此行为必须保留。**
-
-此外，删除后需要更新默认模型缓存：
-- 如果重新分配了新默认模型 → 调用 `model_service._update_default_model_cache(...)` 刷新缓存
-- 如果没有剩余模型可分配 → 调用 `clear_default_model_config()` 清除缓存
-
-### 6.2 清除内置 provider 认证时该 provider 包含默认模型
-
-当前 `credential_service.delete_credential()` 没有处理此情况。重构后需要在 `delete_credential` 中增加逻辑：
-
-1. 删除 credential 记录
-2. 检查当前默认模型是否属于该 provider
-3. 如果是 → 调用 `clear_default_model_config()` 清除缓存（因为该 provider 已无有效凭证，默认模型不可用）
-
-注意：不自动重新分配默认模型。用户清除认证是主动行为，应该让用户自己选择新的默认模型。
-
-### 6.3 GET /model-providers/{provider_name} 对模板 provider 的行为
-
-列表接口 `GET /model-providers` 过滤掉 `is_template=True` 的 provider，但详情接口 `GET /model-providers/{provider_name}` **不过滤**，仍然允许按名称查询模板 provider（如 `custom`）。
-
-这是前端 `models-page.tsx` 通过 `useModelProvider('custom')` 获取 custom 模板 credential_schema 的必要条件。
-
-### 6.4 POST /model-providers/custom 的返回值
-
-`POST /model-providers/custom` 创建自定义 provider 后，返回一个复合对象：
-
-```python
-{
-    "provider_name": str,       # 新创建的派生 provider 名称
-    "display_name": str,        # 显示名称
-    "credential_id": str,       # 关联的 credential ID
-    "is_valid": bool,           # 凭证验证结果
-    "validation_error": str?,   # 验证错误信息
-}
-```
-
-前端 `useCreateCustomProvider` 的返回类型相应调整为 `CreateCustomProviderResponse`（而非 `ModelCredential`）。
-
-### 6.5 credential-dialog 对自定义 provider 的处理
-
-`credential-dialog.tsx` 的"清除认证"按钮只在内置 provider（`provider_type !== 'custom'`）时显示。自定义 provider 不显示此按钮，因为自定义 provider 的删除统一走 provider 删除入口。
-
-### 6.6 API 兼容性
-
-`POST /model-credentials` 不再接受 `provider_name=custom` + `model_name` 的组合。这是一个 breaking change。由于当前系统是内部使用，不需要向后兼容过渡期，直接切换到新 API。
-
-**实施顺序要求**：后端新增 `POST /model-providers/custom` 和前端切换到 `useCreateCustomProvider` 必须在同一批次完成，避免前端调用已删除的旧 API 路径导致临时故障。实施顺序（见 Section 9）已考虑此约束。
-
-## 7. 不变的部分
-
-- 数据库架构（model_provider / model_credential / model_instance 三表关系）
-- 加密/解密逻辑（encryption.py）
-- Provider 运行时实现（core/model/providers/*.py）
-- Factory 和 provider 发现机制
-- Model usage 相关（model_usage_service / model_usage API）
-- Playground 和 stats 前端组件
-- Schema-driven 表单机制（schema-utils.ts）
-- Model 端点（`/v1/models`）— API 不变，但内部实现中 `ModelService` 调用 credential_service 的方法需要替换（见 Section 1.3）
-
-## 8. 完整受影响文件清单
-
-### 后端
-| 文件 | 变更类型 |
-|------|----------|
-| `app/services/model_provider_service.py` | 重构：新增 add_custom_provider，简化 get_all_providers / get_provider |
-| `app/services/model_credential_service.py` | 重构：大幅简化，删除越界方法 |
-| `app/services/model_service.py` | 重构：提取 _resolve_and_create_model，移入缓存方法 |
-| `app/api/v1/model_providers.py` | 新增 POST /custom 端点 |
-| `app/api/v1/model_credentials.py` | 简化 schema，增加 DELETE 校验 |
-| `app/main.py` | 小改：替换 get_current_credentials 调用 |
-| `app/core/model/utils/credential_resolver.py` | 小改：替换 get_current_credentials 调用 |
-| `app/api/v1/conversations.py` | 小改：替换 get_current_credentials 调用 |
-
-### 前端
-| 文件 | 变更类型 |
-|------|----------|
-| `types/models.ts` | 新增 CreateCustomProviderRequest，简化 CreateCredentialRequest |
-| `hooks/queries/models.ts` | 新增 useCreateCustomProvider，简化 useCreateCredential，删除 templateProviders |
-| `components/settings/models/add-custom-model-dialog.tsx` | 改用 useCreateCustomProvider |
-| `components/settings/models/credential-dialog.tsx` | 增加清除认证按钮 |
-| `components/settings/models/provider-sidebar/provider-sidebar.tsx` | 防御性过滤 is_template |
-| `components/settings/models-page.tsx` | 改用 useModelProvider('custom') |
-
-## 9. 实施顺序
-
-1. 后端 service 层重构（provider_service → credential_service → model_service）
-2. 后端周边文件更新（main.py, credential_resolver.py）
-3. 后端 API 层重构（model_providers.py → model_credentials.py）
-4. 前端 types + hooks 重构
-5. 前端组件重构
-6. 端到端验证
diff --git a/docs/superpowers/specs/2026-04-03-sandbox-overhaul-design.md b/docs/superpowers/specs/2026-04-03-sandbox-overhaul-design.md
deleted file mode 100644
index 98b5f27e0..000000000
--- a/docs/superpowers/specs/2026-04-03-sandbox-overhaul-design.md
+++ /dev/null
@@ -1,258 +0,0 @@
-# 沙箱体系整体改造设计
-
-## 问题背景
-
-沙箱体系存在四个维度的问题：
-
-1. **引用计数泄漏**：`_get_user_sandbox` 通过 `ensure_sandbox_running` 获取 adapter（`active_count+1`），但 `_cleanup_backend` 只调 `adapter.cleanup()`，不调 `pool.release()`。`active_count` 永远不归零，空闲回收永远不触发，Docker 容器堆积。
-
-2. **上传路径绕过 adapter 抽象**：当前方案 B 直接写宿主机挂载目录，绕过了 `PydanticSandboxAdapter`。应该通过 adapter API 写入，保持抽象层完整。
-
-3. **多 worker 并发不安全**：`SandboxPool` 是进程内单例，`asyncio.Lock` 只在单进程有效。多 worker 部署时，worker A 的 pool 不知道 worker B 的容器状态，可能重复创建或连接失败。
-
-4. **execute 安全边界缺失**：Agent 可在容器内执行任意 shell 命令，无 pids-limit、无网络隔离、无危险命令过滤。
-
-## 改造范围
-
-### Part 1：SandboxHandle — 引用计数 RAII 封装
-
-**新建 `backend/app/services/sandbox_handle.py`：**
-
-```python
-class SandboxHandle:
-    """RAII wrapper — acquire on create, release on exit/release().
-
-    不使用 __del__ 作为安全网：Python 的 __del__ 在 async 上下文中不可靠，
-    且无法调用 async release()。改用定期审计检测泄漏。
-    """
-
-    def __init__(self, adapter, sandbox_id: str, pool):
-        self.adapter = adapter
-        self._sandbox_id = sandbox_id
-        self._pool = pool
-        self._released = False
-
-    @property
-    def released(self) -> bool:
-        return self._released
-
-    async def release(self):
-        if not self._released:
-            self._released = True
-            await self._pool.release(self._sandbox_id)
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, *exc):
-        await self.release()
-```
-
-**泄漏检测：** 不依赖 `__del__`（Python async 上下文中不可靠），改为在 `SandboxPool.cleanup_idle()` 中增加审计日志：如果某个 entry 的 `active_count > 0` 超过 30 分钟，记录 warning。
-
-**改造点：**
-
-| 文件 | 改动 |
-|------|------|
-| `sandbox_manager.py` | `ensure_sandbox_running()` 返回 `SandboxHandle` 而非裸 adapter |
-| `sandbox_manager.py` | 新增 `warm_up_sandbox(user_id)` 方法，只确保容器运行，不增减 `active_count` |
-| `builder.py` | `_get_user_sandbox()` 返回 handle，保存在 graph 生命周期内 |
-| `builder.py` | `_cleanup_backend()` 改为 `handle.release()`（不再直接 `adapter.cleanup()`） |
-| `chat_turn_executor.py` | finally 块调用 `handle.release()` |
-| `auth.py` | `_warm_up_sandbox` 改用 `warm_up_sandbox()` 而非 `ensure_sandbox_running()` |
-
-**`warm_up_sandbox` vs `ensure_sandbox_running`：**
-- `warm_up_sandbox(user_id)` — 确保容器运行，不增 `active_count`，用于登录预热
-- `ensure_sandbox_running(user_id)` — 确保容器运行 + 返回 `SandboxHandle`（`active_count+1`），用于需要操作沙箱的场景
-
-**关键语义：** `release()` ≠ `cleanup()`。release 只减引用计数，容器继续运行供后续请求复用。只有 pool 的 idle cleanup 才真正销毁容器。
-
-### Part 2：PydanticSandboxAdapter 能力补全
-
-上游 `DockerSandbox.write()` 签名是 `content: str | bytes`，原生支持二进制（通过 Docker `put_archive` API）。但 `PydanticSandboxAdapter.write()` 把参数类型限制成了 `content: str`。
-
-**改造 `backend/app/core/agent/backends/pydantic_adapter.py`：**
-
-| 方法 | 改动 |
-|------|------|
-| `write(path, content)` | 参数类型 `str` → `str \| bytes`，透传给上游 |
-| `write_overwrite(path, content)` | 参数类型 `str` → `str \| bytes`，透传给上游 |
-| 新增 `delete(path)` | 封装 `execute(f"rm {shlex.quote(path)}")`，返回 bool |
-| 新增 `mkdir(path)` | 封装 `execute(f"mkdir -p {shlex.quote(path)}")`，返回 bool |
-
-**同步更新 `backend/app/core/agent/backends/file_tracking_proxy.py`：**
-
-`FileTrackingProxy` 的 `write` 和 `write_overwrite` 方法中 `content.encode("utf-8")` 会在 `bytes` 输入时崩溃。改为：
-
-```python
-size = len(content) if isinstance(content, bytes) else len(content.encode("utf-8"))
-```
-
-同时为 `delete` 和 `mkdir` 新方法添加透传。
-
-**关于 adapter 调用是同步阻塞的：** `PydanticSandboxAdapter` 的所有方法（write、read、execute 等）都是同步的，会阻塞事件循环。对于大文件上传（最大 50MB），应在 Files API 中用 `asyncio.to_thread()` 包装：
-
-```python
-result = await asyncio.to_thread(handle.adapter.write_overwrite, container_path, content)
-```
-
-### Part 3：上传改 adapter API（回退方案 B，改为方案 A）
-
-**依赖 Part 1 的 SandboxHandle 和 Part 2 的 adapter 能力补全。**
-
-**前置操作：** 回退之前的 commit（方案 B 的宿主机直写改动），`files.py` 重新基于 adapter API 实现。保留 `constants.py` 中的共享常量和 `sandbox_paths.py` 中的 `get_user_sandbox_host_dir`（`sandbox_manager.py` 仍需要宿主机路径来设置 Docker volume）。
-
-**改造 `backend/app/api/v1/files.py`：**
-
-```python
-import asyncio
-from app.services.sandbox_manager import SandboxManagerService
-from app.core.database import AsyncSessionLocal
-
-async def _get_sandbox_handle(user_id: str) -> SandboxHandle:
-    """获取用户沙箱 handle，用于文件操作。"""
-    async with AsyncSessionLocal() as db:
-        service = SandboxManagerService(db)
-        return await service.ensure_sandbox_running(user_id)
-
-@router.post("/upload")
-async def upload_file(request, current_user, file):
-    async with await _get_sandbox_handle(str(current_user.id)) as handle:
-        content = await file.read()
-        safe_filename, err = validate_file_upload(filename, content, content_type, handle.adapter)
-        if err:
-            raise err
-        container_path = f"/workspace/uploads/{safe_filename}"
-        await asyncio.to_thread(handle.adapter.mkdir, "/workspace/uploads")
-        result = await asyncio.to_thread(handle.adapter.write_overwrite, container_path, content)
-        if result.error:
-            raise HTTPException(500, detail=result.error)
-        return UploadResponse(path=container_path, ...)
-```
-
-| 接口 | adapter 方法 | 包装 |
-|------|-------------|------|
-| `POST /upload` | `mkdir()` + `write_overwrite(path, bytes)` | `asyncio.to_thread` |
-| `GET /list` | `ls_info("/workspace/uploads/")` | `asyncio.to_thread` |
-| `GET /read/{filename}` | `raw_read(path)` | `asyncio.to_thread` |
-| `DELETE /{filename}` | `delete(path)` | `asyncio.to_thread` |
-| `DELETE /` (clear) | `execute("rm -rf /workspace/uploads/*")` + `mkdir(...)` | `asyncio.to_thread` |
-
-**存储配额检查：** 当前 `_get_upload_dir_size()` 用 `os.scandir` 扫描宿主机目录。改为通过 adapter：
-
-```python
-def _get_upload_dir_size(adapter) -> int:
-    result = adapter.execute("du -sb /workspace/uploads 2>/dev/null || echo 0")
-    # 解析 du 输出，返回字节数
-```
-
-**路径统一：** 上传返回 `/workspace/uploads/{filename}`，Agent 用同路径 `read_file`。全链路零转换。
-
-**沙箱未就绪时：** `ensure_sandbox_running()` 按需创建沙箱（幂等），上传时自动触发。
-
-### Part 4：多 worker 并发安全加强
-
-不改 pool 架构，加强 reconnect 路径健壮性。
-
-**改造 `backend/app/services/sandbox_manager.py`：**
-
-1. **reconnect 路径加强：**
-   - pool miss 时先查 DB `container_id`
-   - reconnect 失败时 `docker inspect` 确认容器状态
-   - 容器存在但停止 → restart
-   - 容器不存在 → 清理 DB 记录（置 `container_id=None`, `status=pending`），重新创建
-   - 加重试（最多 2 次）
-
-2. **Pool cleanup 前检查 DB：**
-   - `cleanup_idle` 在清理前查 DB 记录 `status`
-   - 如果 DB 显示 `running` 但本 worker 的 pool 里 `active_count == 0`，跳过清理（可能其他 worker 在用）
-   - 只清理 DB 状态也是 `idle` 或 `stopped` 的容器
-
-3. **Stale entry 检测：**
-   - Pool entry 加 `created_at: float` 字段
-   - 超过 2 小时未使用且 `active_count == 0` 时，主动 `docker inspect` 验证容器存活
-   - 容器已死 → 从 pool 移除，清理 DB 记录
-
-4. **container_id 过期检测：**
-   - DB 中 `container_id` 可能指向已被 Docker 自动清理的容器
-   - reconnect 时如果 `docker inspect` 返回 404，清理 DB 记录并重新创建
-
-**改造 `backend/app/services/sandbox_pool.py`：**
-
-- `PoolEntry` 新增 `created_at: float` 字段
-- `cleanup_idle` 增加可选的 DB 状态检查回调参数
-
-### Part 5：execute 安全边界
-
-**改造 `backend/app/services/sandbox_manager.py`（容器创建时）：**
-
-1. **`pids_limit=256`** — 传入 Docker 容器创建参数，防止 fork bomb
-2. **网络隔离** — `network_mode="none"`（默认）。如果 Agent 需要网络访问（如 tavily_search），通过配置开启受限网络
-
-**改造 `backend/app/core/agent/backends/pydantic_adapter.py`（execute 方法）：**
-
-3. **命令黑名单（纵深防御，非唯一防线）：**
-
-```python
-DANGEROUS_PATTERNS = [
-    r"rm\s+-rf\s+/\s*$",       # rm -rf /
-    r"mkfs\.",                   # format disk
-    r"dd\s+.*of=/dev/",         # write to device
-    r":\(\)\s*\{",              # fork bomb
-]
-```
-
-注意：命令黑名单可被绕过（base64 编码、变量替换等），仅作为纵深防御层。真正的安全边界是 Docker 隔离 + pids-limit + 网络隔离。
-
-4. **磁盘配额** — Docker `--storage-opt size=2G`（需要 overlay2 + xfs，可选，视部署环境决定）
-
-## 实施顺序
-
-```
-Part 1 (SandboxHandle)           ← 基础设施，最先修
-  ↓
-Part 2 (adapter 能力补全)         ← Part 3 的前置依赖
-  ↓
-Part 3 (上传改 adapter API)       ← 依赖 Part 1 + Part 2
-  ↓
-Part 4 (多 worker 安全)           ← 独立，但建议在 Part 1 之后
-  ↓
-Part 5 (execute 安全)             ← 独立
-```
-
-## 需要回退的改动
-
-之前的 commit `0623c20a`（方案 B 宿主机直写）需要部分回退：
-- `files.py` — 完全重写为 adapter API 方式
-- `sandbox_paths.py` — 保留（`sandbox_manager.py` 仍需要宿主机路径设置 Docker volume）
-- `constants.py` — 保留共享常量
-- `chat.py` `_enrich_message` — 保留（路径提示 + read_file 引导不变）
-- `sandbox_manager.py` — 保留共享常量引用
-- `node_tools.py` — 保留共享常量引用 + sanitize 修复
-
-## 验证方式
-
-**Part 1：**
-- 单元测试：SandboxHandle 的 acquire/release/context-manager 语义
-- 集成测试：Agent turn 完成后 active_count 归零
-- 审计日志：active_count > 0 超过 30 分钟时记录 warning
-
-**Part 2：**
-- 单元测试：write_overwrite 接受 bytes，delete/mkdir 正常工作
-- 单元测试：FileTrackingProxy 正确处理 bytes 输入
-- 集成测试：50MB 二进制文件通过 write_overwrite 写入成功
-
-**Part 3：**
-- 端到端：上传文件 → Agent read_file 成功读取
-- API 测试：list/read/delete 通过 adapter 正常工作
-- 配额测试：存储配额检查通过 adapter execute 正常工作
-
-**Part 4：**
-- 模拟测试：worker A 创建容器，worker B 能 reconnect
-- 模拟测试：pool cleanup 不清理其他 worker 正在使用的容器
-- 模拟测试：container_id 指向已删除容器时能正确重建
-
-**Part 5：**
-- 安全测试：fork bomb 命令被 pids-limit 阻止
-- 安全测试：危险命令被黑名单拦截（纵深防御验证）
-- 安全测试：容器无法访问外部网络（network_mode=none 时）
diff --git a/docs/superpowers/specs/2026-04-05-trace-id-full-chain-design.md b/docs/superpowers/specs/2026-04-05-trace-id-full-chain-design.md
deleted file mode 100644
index 0d114e0b6..000000000
--- a/docs/superpowers/specs/2026-04-05-trace-id-full-chain-design.md
+++ /dev/null
@@ -1,303 +0,0 @@
-# Trace ID Full-Chain Propagation Design
-
-## Problem
-
-The backend has three independent trace ID systems that never connect:
-
-1. **HTTP `trace_id`** — generated in `LoggingMiddleware`, stored on `request.state`, echoed as `X-Trace-Id` header. Only exists for HTTP requests, not WebSocket.
-2. **StreamState `trace_id`** — generated per streaming turn in `stream_event_handler.py`. Flows into SSE events and `ExecutionTrace` persistence. Never linked to the client's `request_id` or the HTTP trace.
-3. **Langfuse trace** — auto-generated by `LangfuseCallbackHandler`. Cannot be correlated with internal traces.
-
-Additionally, `AgentRun.trace_id` is declared but never written, and resume turns don't mirror events to `AgentRunEvent`.
-
-This creates 7 identified gaps where trace context is lost:
-
-1. HTTP `trace_id` never reaches WebSocket path
-2. Client `request_id` never linked to `StreamState.trace_id`
-3. `StreamState.trace_id` absent from LangGraph `RunnableConfig`
-4. `AgentRun.trace_id` column always NULL
-5. Langfuse traces not correlated with internal traces
-6. A2A calls generate independent `request_id`
-7. Resume turns don't mirror events to `AgentRunEvent`
-
-## Solution: contextvars-based Propagation
-
-A single `ContextVar[str]` carries the trace_id through the entire async call chain. Set once at the request entry point, readable everywhere via `get_trace_id()`.
-
-```
-Client request_id ─────────────────────────────────────┐
-    │                                                    │
-    ▼                                                    │
-set_trace_id(request_id)  [WS handler / HTTP middleware] │
-    │                                                    │
-    ├── loguru auto-injects trace_id in every log line   │
-    ├── StreamState.trace_id = get_trace_id()            │
-    ├── LangGraph config["configurable"]["trace_id"]     │
-    ├── Langfuse CallbackHandler(trace_id=...)           │
-    ├── A2A client sends X-Request-ID header             │
-    │                                                    │
-    ▼                                                    │
-SSE events carry trace_id ──────────────────────────────┤
-AgentRun.trace_id = get_trace_id()                      │
-ExecutionTrace.id = trace_id                            │
-AgentRunEvent.trace_id = trace_id (from SSE mirror)     │
-                                                         │
-Client correlates: request_id == trace_id in all outputs ┘
-```
-
-## Component Design
-
-### 1. Trace Context Module
-
-**New file: `backend/app/core/trace_context.py`**
-
-```python
-"""Trace context propagation via contextvars."""
-
-import uuid
-from contextvars import ContextVar
-
-_trace_id_var: ContextVar[str] = ContextVar("trace_id", default="")
-
-
-def set_trace_id(trace_id: str | None = None) -> str:
-    """Set trace_id for the current async context.
-
-    Always normalizes to a valid UUID string. If the input is not a
-    valid UUID (e.g., a free-form client request_id), a new UUID is
-    generated instead. Returns the trace_id.
-    """
-    tid = _normalize_to_uuid(trace_id) if trace_id else str(uuid.uuid4())
-    _trace_id_var.set(tid)
-    return tid
-
-
-def get_trace_id() -> str:
-    """Get the current trace_id (empty string if not set)."""
-    return _trace_id_var.get()
-
-
-def _normalize_to_uuid(value: str) -> str:
-    """Return value if it's a valid UUID string, otherwise generate a new UUID."""
-    try:
-        return str(uuid.UUID(value))
-    except (ValueError, AttributeError):
-        return str(uuid.uuid4())
-```
-
-Design choices:
-- Default is empty string, not None — avoids null checks downstream.
-- `set_trace_id()` always normalizes to a valid UUID string. Client `request_id` may be free-form, but `AgentRun.trace_id` and `ExecutionTrace.id` are UUID columns. If the client sends a non-UUID, a new UUID is generated.
-- `set_trace_id()` returns the ID for convenience at call sites.
-- asyncio `create_task()` automatically copies contextvars to child tasks.
-
-### 2. Entry Points
-
-#### 2a. HTTP Middleware — `app/common/logging.py`
-
-```python
-from app.core.trace_context import set_trace_id
-
-async def dispatch(self, request, call_next):
-    trace_id = request.headers.get("X-Request-ID") or str(uuid.uuid4())
-    set_trace_id(trace_id)                    # ← inject into contextvars
-    request.state.trace_id = trace_id         # keep for backward compat
-    log = logger.bind(trace_id=trace_id, ...)
-    ...
-```
-
-#### 2b. WebSocket — `websocket/chat_ws_handler.py`
-
-When a WS frame is received and parsed into a `ChatStartFrame`:
-
-```python
-from app.core.trace_context import set_trace_id
-
-# In the frame dispatch method, BEFORE create_task() — context is captured at task creation
-set_trace_id(frame.request_id or None)
-```
-
-**Important:** `set_trace_id()` must be called in the WS handler's receive loop, **before** `ChatTaskSupervisor.create_task()` is called. `asyncio.create_task()` copies the current context at creation time, so the trace_id must be set before the task is spawned.
-
-#### 2c. WebSocket — `websocket/chat_turn_executor.py`
-
-`execute_standard_turn()` receives `request_id` as a parameter. Add at the top as a safety net (for any code path that calls the executor directly):
-
-```python
-from app.core.trace_context import set_trace_id
-
-async def execute_standard_turn(self, request_id, ...):
-    set_trace_id(request_id)  # ← safety net; primary injection is in 2b
-    ...
-```
-
-**Why both 2b and 2c?** Section 2b is the primary injection point (before `create_task()`). Section 2c is a defensive safety net — if `execute_standard_turn()` is ever called from a different code path without going through the WS handler, the trace_id still gets set.
-
-### 3. loguru Auto-Injection
-
-In `setup_logging()`, replace the existing `logger.configure(extra=...)` call (line 89 of `logging.py`) with a version that includes a patcher. This ensures every log line carries the current trace_id without explicit `logger.bind()`:
-
-```python
-from app.core.trace_context import get_trace_id
-
-def setup_logging():
-    logger.configure(
-        patcher=lambda record: record["extra"].update(
-            trace_id=get_trace_id() or record["extra"].get("trace_id", "-")
-        ),
-        extra={"trace_id": "-", "method": "-", "path": "-", "client": "-"},
-    )
-    ...
-```
-
-The patcher runs per-log-call and reads from contextvars. If no context is set (e.g., during startup before any request), falls back to the existing extra value or "-".
-
-### 4. StreamState
-
-**File: `app/utils/stream_event_handler.py`**
-
-```python
-from app.core.trace_context import get_trace_id
-
-class StreamState:
-    def __init__(self, thread_id: str):
-        self.trace_id = get_trace_id()  # ← read from context, don't generate
-        ...
-```
-
-No changes to `_build_sse_envelope()` — it already reads `state.trace_id`.
-
-### 5. LangGraph Config
-
-**File: `app/api/v1/chat.py` — `get_user_config()`**
-
-```python
-from app.core.trace_context import get_trace_id
-
-config: RunnableConfig = {
-    "configurable": {
-        "thread_id": thread_id,
-        "user_id": str(user_id),
-        "trace_id": get_trace_id(),   # ← new
-    },
-    "recursion_limit": 300,
-    "callbacks": get_langfuse_callbacks(enabled=settings.langfuse_enabled),
-}
-```
-
-Graph nodes and tools can read `config["configurable"]["trace_id"]` if needed (e.g., for A2A calls), but most code should use `get_trace_id()` directly.
-
-### 6. Langfuse Integration
-
-**File: `app/core/agent/langfuse_callback.py`**
-
-```python
-from app.core.trace_context import get_trace_id
-
-def get_langfuse_callbacks(enabled: bool):
-    if not enabled:
-        return []
-    trace_id = get_trace_id()
-    handler = CallbackHandler(
-        trace_id=trace_id if trace_id else None,
-        trace_name="graph_execution",
-    )
-    return [handler]
-```
-
-`CallbackHandler` supports `trace_id` parameter. When set, the Langfuse trace uses this ID, making internal `ExecutionTrace.id` and Langfuse trace directly joinable.
-
-### 7. A2A Client
-
-**File: `app/core/a2a/client.py`**
-
-Add trace context to outbound HTTP headers for cross-service correlation. The JSON-RPC `id` field remains a per-request UUID (it serves request/response correlation, not distributed tracing):
-
-```python
-from app.core.trace_context import get_trace_id
-
-# Keep existing: request_id = str(uuid.uuid4()) for JSON-RPC id
-# Add to outbound HTTP headers:
-headers["X-Request-ID"] = get_trace_id() or request_id
-```
-
-### 8. Persistence
-
-#### AgentRun.trace_id
-
-**File: `app/services/run_service.py` — `create_run()`**
-
-```python
-from app.core.trace_context import get_trace_id
-
-tid = get_trace_id()
-run = AgentRun(
-    ...
-    trace_id=uuid.UUID(tid) if tid else None,
-)
-```
-
-Since `set_trace_id()` always normalizes to a valid UUID string, `uuid.UUID(tid)` will never raise ValueError.
-
-#### ExecutionTrace
-
-No change needed — `_persist_trace_data()` already reads `StreamState.trace_id`, which now comes from contextvars.
-
-#### AgentRunEvent
-
-No change needed — `_mirror_run_stream_event()` reads from the SSE payload, which already carries the correct trace_id.
-
-#### Resume Turn Fix
-
-**File: `app/websocket/chat_turn_executor.py`**
-
-The resume turn path must:
-1. Call `set_trace_id()` at the start (same as standard turn)
-2. Pass `agent_run_id` and `assistant_message_id` to `_send_event_from_sse()` so events are mirrored to `AgentRunEvent`
-
-For `agent_run_id` sourcing: the resume turn should look up the existing `AgentRun` for the conversation's current thread_id (the run that was interrupted), or create a new child run linked to the original. Implementation will determine which approach based on the `ChatTaskEntry` structure at that point.
-
-## Assumptions and Constraints
-
-- **Starlette version >= 0.36.2** required for `BaseHTTPMiddleware` to correctly propagate `ContextVar` through `call_next()`. Earlier versions had a known bug.
-- **No `run_in_executor()` or `ProcessPoolExecutor`** in the codebase (verified). If added in the future, trace context must be manually copied.
-- **`asyncio.create_task()` copies context automatically** (Python 3.7+). LangGraph's async execution uses this mechanism, so trace_id propagates through graph nodes and tool calls.
-- **`langfuse >= 2.0`** required for `CallbackHandler(trace_id=...)` parameter support.
-- **Trace ID format is UUID v4.** Not compatible with OpenTelemetry's 32-hex-char trace ID format. Future OTel integration would need a mapping layer.
-
-## Files Changed
-
-| File | Change |
-|------|--------|
-| `app/core/trace_context.py` | **New** — ContextVar module |
-| `app/common/logging.py` | Add `set_trace_id()` in middleware dispatch; add patcher in `setup_logging()` |
-| `app/websocket/chat_ws_handler.py` | Add `set_trace_id()` on frame receive |
-| `app/websocket/chat_turn_executor.py` | Add `set_trace_id()` in standard + resume turn entry |
-| `app/utils/stream_event_handler.py` | `StreamState.__init__` reads from context |
-| `app/api/v1/chat.py` | Add `trace_id` to `RunnableConfig` |
-| `app/core/agent/langfuse_callback.py` | Pass `trace_id` to `CallbackHandler` |
-| `app/core/a2a/client.py` | Use `get_trace_id()` for request_id |
-| `app/services/run_service.py` | Write `trace_id` in `create_run()` |
-| `app/websocket/chat_turn_executor.py` | Fix resume turn to mirror events |
-
-Estimated: ~10 files, ~50 lines changed.
-
-## Verification
-
-1. **Unit test**: Set `set_trace_id("test-123")`, verify `get_trace_id()` returns it, verify it propagates through `asyncio.create_task()`. Also test that non-UUID input gets normalized to a valid UUID.
-2. **Patcher test**: Call `set_trace_id("...")`, then `logger.info("hello")` — verify the log output contains `trace_id=...` even without explicit `logger.bind()`. This is the core loguru integration.
-3. **Integration test**: Send a WS message with `request_id: "abc..."` (valid UUID), verify:
-   - All SSE events have `trace_id` matching the normalized UUID
-   - `AgentRun.trace_id` in DB matches
-   - `ExecutionTrace.id` in DB matches
-   - Langfuse trace (if enabled) uses the same ID
-4. **Log grep**: `grep trace_id=<uuid> logs/app.log` should show all log lines for that request.
-5. **Resume turn**: Verify resume turns also produce events with correct trace_id and mirror to `AgentRunEvent`.
-6. **BaseHTTPMiddleware**: Verify `set_trace_id()` in middleware dispatch is readable inside a downstream route handler via `get_trace_id()`.
-
-## Non-Goals
-
-- OpenTelemetry integration (future iteration)
-- Frontend trace visualization UI
-- Trace-based sampling or rate limiting
-- Merging AgentRun and ExecutionTrace tables (separate concern)
diff --git a/docs/superpowers/specs/2026-04-06-chat-run-center-integration-design.md b/docs/superpowers/specs/2026-04-06-chat-run-center-integration-design.md
deleted file mode 100644
index a31628397..000000000
--- a/docs/superpowers/specs/2026-04-06-chat-run-center-integration-design.md
+++ /dev/null
@@ -1,311 +0,0 @@
-# Chat Run Center Integration Design
-
-**Date:** 2026-04-06
-**Status:** Approved
-**Phase:** Phase 2 of the Long-Task Progress Persistence roadmap (see `2026-03-25-long-task-progress-persistence-design.md`)
-
-## Problem
-
-Chat sessions in `/chat` are not tracked in Run Center. When the WebSocket disconnects, the agent task is cancelled. Users have no way to:
-
-- Monitor active Chat runs alongside Skill Creator runs
-- Recover from accidental disconnects
-- Review historical Chat turn execution details (events, tool calls, node logs)
-
-## Goals
-
-1. All Chat conversations appear in Run Center as trackable runs
-2. WS disconnect does not cancel the agent — it continues running
-3. Users can reconnect and resume observing progress
-4. Chat runs viewable in Run Center detail page (events, messages, tool calls)
-
-## Non-Goals
-
-- Copilot integration (Phase 3)
-- Workspace execution integration (Phase 4)
-- Changing the Chat UI layout or message display
-
-## Design Decisions
-
-| Decision | Choice | Rationale |
-|---|---|---|
-| Run granularity | 1 turn = 1 run | Clean lifecycle (start → end). Thread-level run would require reworking the status machine for multi-turn pause/resume. Same-thread runs linked via `thread_id`. |
-| Integration pattern | Extend `extension` mechanism | Reuse the proven skill_creator path. Frontend explicitly creates run before WS frame. Consistent, predictable, debuggable. |
-| Run Center display | Flat list + thread filter | Consistent with skill_creator display. Thread grouping via `thread_id` tag/filter. |
-| "Open" navigation | Run Center detail page | Show events, messages, and tool calls within Run Center, not redirect to `/chat`. |
-| Disconnect behavior | Persist on disconnect | Same as skill_creator. Heartbeat continues. User reconnects via `/ws/runs` subscription. |
-
----
-
-## Section 1: Backend Data Model & Agent Registration
-
-### 1.1 Register `chat` Agent
-
-New file: `backend/app/services/run_reducers/chat.py`
-
-```python
-AgentRegistry.register(AgentDefinition(
-    name="chat",
-    display_name="Chat",
-    default_run_type="chat_turn",
-    reducer=chat_run_reducer,
-    initial_projection=chat_initial_projection,
-))
-```
-
-Register in `backend/app/services/run_reducers/__init__.py` alongside `skill_creator`.
-
-### 1.2 Chat Projection Schema
-
-```json
-{
-  "version": 1,
-  "run_type": "chat_turn",
-  "status": "running",
-  "thread_id": "uuid-string",
-  "graph_id": "uuid-string",
-  "user_message": {
-    "content": "user's message text",
-    "files": []
-  },
-  "assistant_message": {
-    "id": "msg-uuid",
-    "content": "",
-    "tool_calls": []
-  },
-  "file_tree": {},
-  "preview_data": null,
-  "node_execution_log": [],
-  "interrupt": null,
-  "meta": {
-    "model": "model-name",
-    "started_at": "ISO-8601"
-  }
-}
-```
-
-Key differences from skill_creator projection:
-- Has `user_message` with the triggering message
-- `tool_calls` stored inline on `assistant_message`
-- `node_execution_log` for graph node tracking
-
-### 1.3 Chat Run Reducer
-
-Handles the same canonical event types as skill_creator, mapped to the chat projection:
-
-| Event Type | Projection Update |
-|---|---|
-| `user_message_added` | Set `user_message` |
-| `assistant_message_started` | Initialize `assistant_message` with id |
-| `content_delta` | Append to `assistant_message.content` |
-| `tool_start` | Append to `assistant_message.tool_calls` (status: running) |
-| `tool_end` | Update matching tool_call (status: completed, result); capture `preview_data` from designated preview tools |
-| `file_event` | Update `file_tree` — add/update on create/modify, remove on delete |
-| `node_start` / `node_end` | Update `node_execution_log` |
-| `interrupt` | Set `interrupt` |
-| `error` | Set status to `failed`, record error |
-| `done` | Set status to `completed` |
-
-### 1.4 Database Changes
-
-**No new migration required.** `agent_runs.agent_name` is `VARCHAR(100)` and `run_type` is `VARCHAR(100)`. Values `"chat"` / `"chat_turn"` are used directly.
-
----
-
-## Section 2: Chat Protocol & WebSocket Changes
-
-### 2.1 Extend `chat_protocol.py`
-
-Add `"chat"` to supported extension kinds:
-
-```python
-SUPPORTED_EXTENSION_KINDS = {"skill_creator", "chat"}
-
-@dataclass
-class ParsedChatExtension:
-    kind: Literal["chat"]
-    run_id: str | None
-```
-
-`ParsedChatStartFrame.extension` type becomes `ParsedSkillCreatorExtension | ParsedChatExtension | None`.
-
-### 2.2 New `ChatRunTurnCommand`
-
-In `chat_commands.py`:
-
-```python
-@dataclass
-class ChatRunTurnCommand(StandardChatTurnCommand):
-    run_id: str | None = None
-```
-
-`ChatTurnCommand = StandardChatTurnCommand | SkillCreatorTurnCommand | ChatRunTurnCommand`
-
-`build_command_from_parsed_frame()` routes to `ChatRunTurnCommand` when `extension.kind == "chat"`.
-
-### 2.3 `ChatTurnExecutor` Changes
-
-In `prepare_standard_turn`, detect `ChatRunTurnCommand`:
-
-- Parse `run_id` into UUID
-- Set `persist_on_disconnect = True` (when run_id is present)
-- Start heartbeat task via `_run_persisted_run_heartbeat`
-- Mirror events to `agent_run_events` via `_mirror_run_stream_event`
-
-This logic is largely shared with `SkillCreatorTurnCommand` — extract a common helper for "persisted run" setup. Note: the existing `_finalize_task` has a hardcoded "Skill Creator run failed" error message that must be generalized when extracting the common helper.
-
-### 2.4 Resume Turn Handling
-
-When a chat turn ends with a graph interrupt and the user resumes via `chat.resume`, the resume turn must also be persisted under the **same `run_id`**. Changes needed in `execute_resume_turn`:
-
-- Accept `run_id` from the original task's metadata (stored in `ChatTaskSupervisor` task entry)
-- Set `persist_on_disconnect = True`
-- Start heartbeat and mirror events, same as the initial turn
-- The run status transitions: `INTERRUPT_WAIT → RUNNING → COMPLETED/FAILED`
-
-This ensures the full interrupt-resume cycle is captured in a single run's event stream.
-
-### 2.5 `chat.stop` Frame Interaction
-
-When a user sends `chat.stop` for a persisted chat run, the existing `ChatTaskSupervisor.stop_by_request_id()` sets `state.stopped = True`, causing the turn to end with a `done` event. The finalization path in `_finalize_task` already transitions the run to `CANCELLED` when stopped. No additional changes needed.
-
-### 2.6 API Endpoint
-
-Use the existing generic `POST /v1/runs` endpoint with `agent_name: "chat"`. No new alias endpoint needed (unlike skill-creator's convenience endpoint).
-
-### 2.7 WS Frame Example
-
-```json
-{
-  "type": "chat.start",
-  "request_id": "uuid",
-  "thread_id": "thread-uuid",
-  "graph_id": "graph-uuid",
-  "input": { "message": "Hello" },
-  "extension": { "kind": "chat", "run_id": "run-uuid" }
-}
-```
-
----
-
-## Section 3: Frontend Changes
-
-### 3.1 Chat Send Message Flow
-
-Current flow:
-```
-User clicks send → chat.start WS frame → stream events
-```
-
-New flow:
-```
-User clicks send
-  → POST /v1/runs { agent_name: "chat", thread_id, graph_id, message }
-  → Receive { run_id, thread_id, status }
-  → Send chat.start WS frame with extension: { kind: "chat", run_id }
-  → Subscribe /ws/runs (run_id) for Run Center updates
-```
-
-**Files to modify:**
-
-| File | Change |
-|---|---|
-| `frontend/lib/ws/chat/types.ts` | Add `ChatExtension` type |
-| `frontend/lib/ws/chat/chatWsClient.ts` | Support `ChatExtension` in `chat.start` frame |
-| `frontend/app/chat/hooks/useChatWebSocket.ts` | Create run before sending WS frame in `sendMessage` |
-| `frontend/app/chat/ChatProvider.tsx` | Add `run_id` to context state |
-
-### 3.2 Run Center List Page
-
-- Agent filter chips: "Chat" appears automatically (backend `GET /v1/runs/agents` returns registered agents)
-- Chat run title: first 80 characters of user message
-- Thread tag: display `thread_id` (truncated), clickable to filter same-thread runs
-
-### 3.3 Run Center Detail Page — Chat Overview
-
-New Chat-specific Overview tab content:
-
-- **Message area**: User message + assistant reply (from projection `user_message` / `assistant_message`)
-- **Tool calls**: Expandable list of tool invocations with inputs/outputs
-- **File tree**: Files created/modified/deleted during the run (from `file_tree`)
-- **Preview**: Rendered preview output when available (from `preview_data`)
-- **Node execution log**: Timeline of graph node executions
-
-Events tab and Snapshot tab remain unchanged (generic capabilities).
-
-### 3.4 `buildRunHref` Update
-
-```typescript
-// frontend/lib/utils/runHelpers.ts
-case "chat":
-  return `/runs/${run.id}`;  // View within Run Center
-```
-
----
-
-## Section 4: Disconnect Recovery & Edge Cases
-
-### 4.1 WS Disconnect Persistence
-
-Identical to skill_creator:
-- `ChatRunTurnCommand` tasks have `persist_on_disconnect = True`
-- `ChatWsHandler._cancel_all_tasks()` skips persisted tasks
-- Heartbeat writes `last_heartbeat_at` at `settings.run_heartbeat_interval_seconds`
-- User reconnects via `/ws/runs` subscription to resume live stream
-
-### 4.2 Chat Page Reconnect Recovery
-
-When user refreshes `/chat`:
-
-1. Query `GET /v1/runs/active?agent_name=chat&thread_id=xxx`
-2. If active run exists → subscribe `/ws/runs`, restore UI from snapshot + event replay
-3. If run completed → load from `conversations` + `messages` tables (existing flow)
-
-**Required API change:** The current `GET /v1/runs/active` endpoint requires `graph_id` as a mandatory query parameter. Chat conversations may not always have a `graph_id` (users can chat with the default agent). Make `graph_id` optional on this endpoint — when omitted, query only by `agent_name` + `thread_id`.
-
-### 4.3 Stale Run Recovery
-
-Reuse existing `recover_stale_incomplete_runs()` — runs with heartbeat timeout are marked `FAILED`.
-
-### 4.4 Concurrency Control
-
-`ChatTaskSupervisor.is_thread_active()` already prevents concurrent turns on the same thread. Frontend disables send button while a turn is active.
-
-### 4.5 Run Title Generation
-
-Chat run `title` = first 80 characters of user message content. Truncated with `...` if longer.
-
----
-
-## File Change Summary
-
-### Backend (new files)
-
-| File | Purpose |
-|---|---|
-| `backend/app/services/run_reducers/chat.py` | Chat agent registration + reducer + initial projection |
-
-### Backend (modified files)
-
-| File | Change |
-|---|---|
-| `backend/app/services/run_reducers/__init__.py` | Import and register chat reducer |
-| `backend/app/websocket/chat_protocol.py` | Accept `extension.kind = "chat"`, add `ParsedChatExtension` |
-| `backend/app/websocket/chat_commands.py` | Add `ChatRunTurnCommand`, update union type and routing |
-| `backend/app/websocket/chat_turn_executor.py` | Extract shared persisted-run setup, handle `ChatRunTurnCommand`, wire resume turns |
-| `backend/app/api/v1/runs.py` | Make `graph_id` optional on `GET /v1/runs/active` endpoint |
-| `backend/app/services/run_service.py` | Make `graph_id` optional in `find_latest_active_run` |
-| `backend/app/repositories/agent_run.py` | Make `graph_id` optional in repository query |
-
-### Frontend (modified files)
-
-| File | Change |
-|---|---|
-| `frontend/lib/ws/chat/types.ts` | Add `ChatExtension` type |
-| `frontend/lib/ws/chat/chatWsClient.ts` | Support `ChatExtension` in `chat.start` frame |
-| `frontend/app/chat/hooks/useChatWebSocket.ts` | Create run before WS frame, track `run_id` |
-| `frontend/app/chat/ChatProvider.tsx` | Add `run_id` to context |
-| `frontend/lib/utils/runHelpers.ts` | Add `"chat"` case to `buildRunHref` |
-| `frontend/app/runs/[runId]/page.tsx` | Add Chat-specific Overview tab content |
-
-### No new migrations required
diff --git a/docs/superpowers/specs/2026-04-06-copilot-run-center-integration-design.md b/docs/superpowers/specs/2026-04-06-copilot-run-center-integration-design.md
deleted file mode 100644
index c3c93ed02..000000000
--- a/docs/superpowers/specs/2026-04-06-copilot-run-center-integration-design.md
+++ /dev/null
@@ -1,494 +0,0 @@
-# Phase 3: Copilot Run Center Integration
-
-## Goal
-
-Unify Copilot's session-based persistence (Redis Pub/Sub + ephemeral keys) into the shared Agent Run Center model. Copilot execution moves from a standalone BackgroundTask + `/ws/copilot` endpoint into the Chat WS turn executor, using `agent_run_events` for persistence and `/ws/runs` for observation. The existing `copilot_chats` table and Redis Pub/Sub mechanism are removed entirely.
-
-## Architecture Overview
-
-After this change, Copilot follows the same pattern as Chat and Skill Creator:
-
-```
-Frontend                         Backend
-────────                         ───────
-runService.createRun()  ──POST──►  agent_runs row created
-      │
-getChatWsClient().sendChat({     ChatWsHandler receives chat.start
-  extension: {                   ├─ _parse_extension → ParsedCopilotExtension
-    kind: "copilot",             ├─ build_command → CopilotTurnCommand
-    run_id, graph_context,       ├─ prepare_standard_turn → PreparedStandardTurn
-    conversation_history, mode   └─ execute_copilot_turn:
-  }                                   ├─ CopilotService._get_copilot_stream()
-})                                    ├─ for event in stream:
-      │                               │   _emit_event() → WS + agent_run_events
-      │                               ├─ _persist_graph_from_actions()
-      ▼                               └─ emit "done"
-onEvent callback ◄──── /ws/chat ─────┘
-      │
-      ▼
-/ws/runs subscription ◄── snapshot + event replay (reconnect)
-```
-
-Three systems removed:
-- `/ws/copilot/{session_id}` WebSocket endpoint
-- Redis Pub/Sub (`copilot:session:*` keys)
-- `copilot_chats` table (no dual-write, no backward compat)
-
-## Detailed Design
-
-### 1. Extension Protocol
-
-#### WS Frame
-
-```json
-{
-  "type": "chat.start",
-  "request_id": "req-uuid",
-  "thread_id": null,
-  "graph_id": "graph-uuid",
-  "input": { "message": "Build a RAG pipeline", "model": "anthropic:claude-3-7-sonnet" },
-  "extension": {
-    "kind": "copilot",
-    "run_id": "run-uuid",
-    "graph_context": { "nodes": [], "edges": [] },
-    "conversation_history": [{"role": "user", "content": "..."}, ...],
-    "mode": "deepagents"
-  }
-}
-```
-
-`graph_context` and `conversation_history` live in the extension (not input/metadata) because they are Copilot-specific payloads that do not belong in the generic chat input.
-
-#### chat_protocol.py
-
-New dataclass:
-
-```python
-@dataclass(frozen=True)
-class ParsedCopilotExtension:
-    kind: Literal["copilot"]
-    run_id: str | None
-    graph_context: dict[str, Any]
-    conversation_history: list[dict[str, Any]]
-    mode: str  # "standard" | "deepagents"
-```
-
-`_parse_extension` adds a `kind == "copilot"` branch that extracts `graph_context` (required dict), `conversation_history` (optional list, default `[]`), and `mode` (optional string, default `"deepagents"`).
-
-`ParsedChatStartFrame.extension` type widens to include `ParsedCopilotExtension`.
-
-#### chat_commands.py
-
-New command:
-
-```python
-@dataclass(frozen=True)
-class CopilotTurnCommand(StandardChatTurnCommand):
-    run_id: str | None = None
-    graph_context: dict[str, Any] = field(default_factory=dict)
-    conversation_history: list[dict[str, Any]] = field(default_factory=list)
-    mode: str = "deepagents"
-```
-
-`ChatTurnCommand` union type adds `CopilotTurnCommand`.
-
-`build_command_from_parsed_frame` adds `isinstance(extension, ParsedCopilotExtension)` branch before the existing chat/skill_creator branches.
-
-### 2. Copilot Reducer & Projection
-
-#### Event Vocabulary
-
-| Copilot stream event | run event_type | payload |
-|---|---|---|
-| `status` | `status` | `{stage, message}` |
-| `content` | `content_delta` | `{delta}` |
-| `thought_step` | `thought_step` | `{step: {index, content}}` |
-| `tool_call` | `tool_call` | `{tool, input}` |
-| `tool_result` | `tool_result` | `{action: {type, payload, reasoning}}` |
-| `result` | `result` | `{message, actions[], batch?}` |
-| `error` | `error` | `{message, code}` |
-| `done` | `done` | `{}` |
-
-Note: `content` is stored as `content_delta` in run events (aligning with chat reducer naming), but emitted over WS as the original `content` type so the frontend callback can discriminate.
-
-#### Initial Projection
-
-Signature matches `AgentDefinition.make_initial_projection: Callable[[dict, str], dict]`:
-
-```python
-def make_initial_projection(payload: dict[str, Any], status: str) -> dict[str, Any]:
-    return {
-        "run_type": "copilot_turn",
-        "status": status,
-        "stage": None,
-        "content": "",
-        "thought_steps": [],
-        "tool_calls": [],
-        "tool_results": [],
-        "result_message": None,
-        "result_actions": [],
-        "error": None,
-        "graph_id": payload.get("graph_id"),
-        "mode": payload.get("mode"),
-    }
-```
-
-#### Reducer Logic
-
-```python
-def apply_copilot_event(projection, *, event_type, payload, status) -> dict:
-    p = copy.deepcopy(projection)
-
-    if event_type == "run_initialized":
-        p["graph_id"] = payload.get("graph_id")
-        p["mode"] = payload.get("mode")
-        return p
-
-    if event_type == "status":
-        p["stage"] = payload.get("stage")
-        return p
-
-    if event_type == "content_delta":
-        p["content"] += payload.get("delta", "")
-        return p
-
-    if event_type == "thought_step":
-        step = payload.get("step")
-        if step:
-            p["thought_steps"].append(step)
-        return p
-
-    if event_type == "tool_call":
-        p["tool_calls"].append({
-            "tool": payload.get("tool", ""),
-            "input": payload.get("input", {}),
-        })
-        return p
-
-    if event_type == "tool_result":
-        action = payload.get("action")
-        if action:
-            p["tool_results"].append(action)
-        return p
-
-    if event_type == "result":
-        p["result_message"] = payload.get("message", "")
-        p["result_actions"] = payload.get("actions", [])
-        return p
-
-    if event_type == "error":
-        p["status"] = "failed"
-        p["error"] = payload.get("message")
-        return p
-
-    if event_type == "done":
-        if p["status"] != "failed":
-            p["status"] = "completed"
-        return p
-
-    return p
-```
-
-#### AgentRegistry
-
-```python
-agent_registry.register(
-    AgentDefinition(
-        agent_name="copilot",
-        display_name="Copilot",
-        run_type="copilot_turn",
-        reducer=apply_copilot_event,
-        make_initial_projection=copilot_make_initial_projection,
-    )
-)
-```
-
-### 3. Backend Execution Flow
-
-#### execute_copilot_turn
-
-New method on `ChatTurnExecutor`:
-
-```
-execute_copilot_turn(request_id, payload, graph_context, conversation_history, mode):
-    1. set_trace_id(request_id)
-    2. Read agent_run_id, tolerate_disconnect from task_supervisor
-    3. Generate assistant_message_id
-    4. Mark run RUNNING + start heartbeat
-    5. Emit "accepted" event
-    6. Open DB session, get user credentials (get_user_config)
-    7. Create CopilotService instance
-    8. Call service._get_copilot_stream(prompt, graph_context, history, mode, graph_id)
-    9. Consume stream:
-       for event in stream:
-           # Normalize to standard WS event format
-           ws_event = {
-               "type": event["type"],
-               "thread_id": thread_id,
-               "node_name": "copilot",
-               "timestamp": int(time.time() * 1000),
-               "data": event,
-           }
-           await handler._emit_event(ws_event, request_id, ...)
-           # Collect thought_steps, tool_calls, final_message, final_actions
-   10. _persist_graph_from_actions(graph_id, final_actions)
-   11. Emit "done"
-
-   except CancelledError → emit "done", raise
-   except Exception → emit "error" + "done"
-   finally → _finalize_task(...)
-```
-
-Events are emitted directly via `handler._emit_event()` (approach A) rather than going through SSE format_sse / parse round-trip. Each copilot event dict is placed under the `data` key of the standard WS event envelope.
-
-#### Turn Executor Integration
-
-`ChatTurnExecutor.prepare_standard_turn` adds:
-
-```python
-elif isinstance(command, CopilotTurnCommand):
-    run_id = self._parse_uuid(command.run_id)
-    persist_on_disconnect = run_id is not None
-```
-
-`ChatTurnExecutor.run_standard_turn` or `ChatWsHandler._handle_standard_turn` routes to `execute_copilot_turn` when the command is `CopilotTurnCommand`.
-
-#### Relationship to Existing Code
-
-- `CopilotService._get_copilot_stream` — **unchanged**, the core engine entry point
-- `CopilotService._persist_graph_from_actions` — **unchanged**, called after stream completes
-- `CopilotService.generate_actions_async` — **deleted** (Redis Pub/Sub path)
-- `CopilotService._consume_stream_and_publish_to_redis` — **deleted**
-- `CopilotService._persist_conversation` / `save_messages` / `save_conversation_from_stream` — **deleted** (no copilot_chats writes)
-- `POST /copilot/actions` (sync path) — **unchanged**, standalone non-streaming endpoint
-- `POST /copilot/actions/create` — **deleted** (replaced by WS chat.start)
-- `GET /copilot/sessions/{session_id}` — **deleted** (replaced by run snapshot)
-
-### 4. Frontend Changes
-
-#### Scope
-
-Transport + persistence only. All Copilot UI components remain unchanged: `CopilotChat`, `CopilotStreaming`, `CopilotInput`, `CopilotPanel`, `CopilotErrorBoundary`.
-
-#### New Types
-
-```typescript
-// lib/ws/chat/types.ts
-interface CopilotExtension {
-  kind: 'copilot'
-  runId?: string | null
-  graphContext: Record<string, unknown>
-  conversationHistory: Array<Record<string, unknown>>
-  mode: string
-}
-```
-
-`ChatSendParams.extension` type widens to include `CopilotExtension`.
-
-#### serializeExtension
-
-```typescript
-if (extension.kind === 'copilot') {
-  return {
-    kind: extension.kind,
-    run_id: extension.runId ?? null,
-    graph_context: extension.graphContext,
-    conversation_history: extension.conversationHistory,
-    mode: extension.mode,
-  }
-}
-```
-
-#### Send Flow (New)
-
-```
-CopilotInput → handleSend → useCopilotActions.handleSendWithInput:
-  1. runService.createRun({ agent_name: "copilot", graph_id, message })
-     → returns run_id
-  2. getChatWsClient().sendChat({
-       input: { message, model },
-       graphId,
-       extension: {
-         kind: "copilot",
-         runId: run_id,
-         graphContext: getGraphContext(),
-         conversationHistory: convertConversationHistory(messages),
-         mode: selectedMode,
-       },
-       onEvent: handleCopilotEvent,
-       onAccepted: (evt) => { /* save thread_id if needed */ },
-     })
-  3. Save run_id to localStorage as copilot_run_{graphId}
-```
-
-#### Event Reception
-
-`handleCopilotEvent` receives standard `ChatStreamEvent` from the `onEvent` callback. The copilot payload is nested under `evt.data`:
-
-```typescript
-function handleCopilotEvent(evt: ChatStreamEvent) {
-  const data = evt.data as Record<string, unknown>
-  const type = data?.type as string
-
-  switch (type) {
-    case 'status':       onStatus(data.stage, data.message); break
-    case 'content':      onContent(data.content); break
-    case 'thought_step': onThoughtStep(data.step); break
-    case 'tool_call':    onToolCall(data.tool, data.input); break
-    case 'tool_result':  onToolResult(data.action); break
-    case 'result':       onResult({ message: data.message, actions: data.actions }); break
-    case 'error':        onError(data.message, data.code); break
-  }
-}
-```
-
-Existing `onStatus / onContent / onResult / onError / onDone` callbacks and all UI components remain unchanged.
-
-#### Session Recovery (New)
-
-Old: `localStorage(session_id)` → `copilotService.getSession()` → only recovers final `result`.
-
-New:
-1. Page load → `localStorage` reads `copilot_run_{graphId}` → gets `run_id`
-2. `runService.getRunSnapshot(run_id)` → full projection (content, thought_steps, tool_calls, result_actions)
-3. If run is active → subscribe `/ws/runs` for `run_id`, replay from `after_seq`
-4. If run is completed/failed → restore final state from projection
-
-Full-fidelity recovery: streaming content, thought_steps, tool_calls all preserved across page refresh.
-
-#### Stop Flow
-
-`handleStop` calls `getChatWsClient().stopByRequestId(requestId)` (sends `chat.stop` frame). Same mechanism as Chat/Skill Creator.
-
-#### Files Changed
-
-| File | Change |
-|---|---|
-| `lib/ws/chat/types.ts` | Add `CopilotExtension` interface, widen `ChatSendParams.extension` |
-| `lib/ws/chat/chatWsClient.ts` | Add `copilot` branch in `serializeExtension` |
-| `hooks/copilot/useCopilotSession.ts` | `session_id` → `run_id`, key → `copilot_run_{graphId}` |
-| `app/workspace/.../hooks/useCopilotActions.ts` | Replace `copilotService.createCopilotTask` → `runService.createRun` + `sendChat` |
-| `app/workspace/.../hooks/useCopilotWebSocketHandler.ts` | Receive events from chat WS `onEvent` callback |
-| `app/workspace/.../hooks/useCopilotEffects.ts` | Recovery via `runService` + `/ws/runs` subscription |
-| `services/copilotService.ts` | Remove `createCopilotTask`, `getSession` |
-
-#### Files Deleted
-
-| File | Reason |
-|---|---|
-| `hooks/use-copilot-websocket.ts` | Replaced by shared chat WS client |
-
-### 5. History API Rewrite
-
-#### GET /{graph_id}/copilot/history
-
-Rewritten to query `agent_runs`:
-
-```python
-async def get_copilot_history(graph_id, user_id, db):
-    runs = await agent_run_repo.list_recent_runs_for_user(
-        user_id=user_id,
-        agent_name="copilot",
-        limit=100,
-    )
-    # Filter to matching graph_id
-    runs = [r for r in runs if str(r.graph_id) == str(graph_id)]
-    # Build messages from run snapshots
-    messages = []
-    for run in reversed(runs):  # oldest first
-        snapshot = await agent_run_repo.get_snapshot(run.id)
-        if not snapshot or not snapshot.projection:
-            continue
-        p = snapshot.projection
-        # User message
-        messages.append({
-            "role": "user",
-            "content": run.title or "",
-            "created_at": run.created_at.isoformat(),
-        })
-        # Assistant message
-        messages.append({
-            "role": "assistant",
-            "content": p.get("result_message") or p.get("content", ""),
-            "created_at": run.updated_at.isoformat(),
-            "actions": p.get("result_actions", []),
-            "thought_steps": p.get("thought_steps", []),
-            "tool_calls": p.get("tool_calls", []),
-        })
-    return {"graph_id": str(graph_id), "messages": messages}
-```
-
-Response format matches existing `CopilotHistoryResponse` so frontend `useCopilotHistory` works unchanged.
-
-#### DELETE /{graph_id}/copilot/history
-
-Hard-delete: removes all copilot `agent_run` rows (and their events/snapshots via CASCADE) for the given `(graph_id, user_id)`. No schema migration needed — uses existing `AgentRunRepository` delete capabilities. This matches the current behavior of `CopilotChatRepository.delete_by_graph_and_user` (which deletes the entire row).
-
-### 6. Run Center Visibility
-
-#### runHelpers.ts
-
-```typescript
-case 'copilot_turn':
-  return `/runs/${encodeURIComponent(run.run_id)}`
-```
-
-#### CopilotTurnOverview Component
-
-New component in `/runs/[runId]/page.tsx` for `run_type === 'copilot_turn'`:
-
-- Stage indicator
-- Streaming content
-- Thought steps (collapsible)
-- Tool calls (collapsible)
-- Result message + actions list
-- Error display
-
-### 7. Deleted Code
-
-#### Backend
-
-| Target | Action |
-|---|---|
-| `app/websocket/copilot_handler.py` | Delete entire file |
-| `app/main.py` `/ws/copilot` route | Delete route registration |
-| `app/repositories/copilot_chat_repository.py` | Delete entire file |
-| `app/models/chat.py` `CopilotChat` class | Delete model |
-| `app/core/redis.py` copilot methods | Delete ~12 methods and key constants |
-| `app/api/v1/graphs.py` `POST /copilot/actions/create` | Delete endpoint |
-| `app/api/v1/graphs.py` `POST /{graph_id}/copilot/messages` | Delete endpoint (writes to deleted copilot_chats) |
-| `app/api/v1/graphs.py` `GET /copilot/sessions/{session_id}` | Delete endpoint |
-| `app/services/copilot_service.py` Redis/persist methods | Delete `generate_actions_async`, `_consume_stream_and_publish_to_redis`, `_persist_conversation`, `save_messages`, `save_conversation_from_stream` |
-
-Note: Dropping the `copilot_chats` table requires an Alembic migration (`op.drop_table('copilot_chats')`). The existing index migration (`20260108_000001`) will be superseded.
-
-#### Frontend
-
-| Target | Action |
-|---|---|
-| `hooks/use-copilot-websocket.ts` | Delete entire file |
-| `services/copilotService.ts` `createCopilotTask`, `getSession` | Delete methods |
-
-### 8. Testing
-
-#### Backend Unit Tests
-
-| Test file | Coverage |
-|---|---|
-| `test_copilot_run_reducer.py` | All event types: status, content_delta, thought_step, tool_call, tool_result, result, error, done, run_initialized (~10 cases) |
-| `test_chat_protocol_copilot_extension.py` | Parse `kind="copilot"` with graph_context, mode, conversation_history; reject missing graph_context |
-| `test_chat_commands_copilot.py` | `CopilotTurnCommand` construction + regression for chat/skill_creator paths |
-| `test_copilot_history_from_runs.py` | History endpoint correctly assembles response from agent_run snapshots |
-
-#### Frontend
-
-- TypeScript compilation passes
-- `serializeExtension` correctly serializes `copilot` kind
-
-#### Manual Verification
-
-1. Send copilot message → full event stream (status → content → thought_step → tool_call → result → done)
-2. Page refresh during execution → full state recovery from run snapshot + event replay
-3. Run Center `/runs` → copilot runs visible with correct overview
-4. `GET copilot/history` → returns history from run snapshots
-5. Stop mid-execution → clean interruption
diff --git a/docs/superpowers/specs/2026-04-06-ws-layer-cleanup-unification-design.md b/docs/superpowers/specs/2026-04-06-ws-layer-cleanup-unification-design.md
deleted file mode 100644
index f902b12d0..000000000
--- a/docs/superpowers/specs/2026-04-06-ws-layer-cleanup-unification-design.md
+++ /dev/null
@@ -1,207 +0,0 @@
-# WebSocket Layer Cleanup & Unification Design
-
-**Date:** 2026-04-06
-**Branch:** dev-0404
-**Scope:** Frontend WS clients, backend dead code, protocol naming, auth unification
-
-## Problem
-
-After migrating streaming chat to WebSocket, the codebase has accumulated:
-
-1. **~200 lines of duplicated code** across `chatWsClient.ts` and `runWsClient.ts` (connect, reconnect, heartbeat, state management, sendFrame, singleton factory).
-2. **Inconsistent auth** — notifications WS uses cookie-only auth while chat/runs use short-lived ws-token.
-3. **Dead backend endpoints** — `POST /copilot/actions` has no frontend caller.
-4. **Legacy protocol tombstones** — `"chat"` frame type accepted only to error, `"resume"`/`"stop"` aliases for `"chat.resume"`/`"chat.stop"`.
-5. **Stale naming** — types and functions still reference "SSE" when data flows over WebSocket.
-6. **Dead dependency** — `axios` in `package.json` but never imported.
-7. **Duplicated constants** — `MAX_RECONNECT_DELAY_MS` defined in two files; `NO_RECONNECT_CLOSE_CODES` vs `UNRECOVERABLE_CLOSE_CODES` overlap.
-
-## Out of Scope
-
-- Internal SSE-to-WS bridge (LangGraph produces SSE strings internally → parsed → forwarded as WS JSON). This is an internal serialization detail with high refactoring risk. Deferred.
-- HTTP SSE endpoints (`POST /models/test-output-stream`, `POST /openclaw/chat`). These are independent short-lived streams. Deferred.
-- HTTP REST API. CRUD endpoints remain on HTTP by design.
-
-## Design
-
-### Part 1: BaseWsClient Abstract Class
-
-**New file:** `frontend/lib/ws/base/BaseWsClient.ts`
-
-Extract all shared connection lifecycle logic into a generic abstract base class:
-
-```typescript
-interface WsClientConfig {
-  maxReconnectAttempts: number | null  // chat=20, runs=null (unlimited), notifications=10
-                                       // null means no cap — reconnects indefinitely
-  maxReconnectDelayMs: number          // 15000
-  reconnectStrategy: 'exponential' | 'fixed'  // chat/runs=exponential, notifications=fixed
-  fixedReconnectIntervalMs?: number    // only used when strategy='fixed' (notifications=3000)
-  pingIntervalMs: number               // 30000 (from HEARTBEAT.PING_INTERVAL_MS)
-  pongTimeoutMs: number                // 60000 (from HEARTBEAT.PONG_TIMEOUT_MS)
-  name: string                         // "[ChatWS]", "[RunsWS]", "[NotifWS]"
-}
-
-abstract class BaseWsClient<TState extends BaseConnectionState> {
-  // === Shared fields (currently duplicated) ===
-  protected ws: WebSocket | null
-  private connectPromise: Promise<void> | null
-  private reconnectTimer: ReturnType<typeof setTimeout> | null
-  private heartbeatTimer: ReturnType<typeof setInterval> | null
-  private reconnectAttempts: number
-  private lastPongTime: number
-  protected isDisposed: boolean
-  private state: TState
-  private stateListeners: Set<(state: TState) => void>
-
-  // === Shared methods (move verbatim) ===
-  async connect(): Promise<void>        // calls getWsUrl()
-  disconnect(): void                     // calls onDispose()
-  protected sendFrame(data: object): void // calls createConnectionError()
-  private startHeartbeat(): void
-  private stopHeartbeat(): void
-  private scheduleReconnect(): void      // uses config.reconnectStrategy; calls onReconnected(), onReconnectExhausted()
-  protected setConnectionState(isConnected: boolean, extra?: Partial<TState>): void
-      // Note: existing callers use setConnectionState(true/false). The base class
-      // constructs { ...state, isConnected, ...extra } internally. Subclasses pass
-      // extra fields (e.g. authExpired) via the second argument.
-  getConnectionState(): TState
-  subscribeConnectionState(listener: (state: TState) => void): () => void
-
-  // === Abstract hooks for subclasses ===
-  protected abstract getWsUrl(): Promise<string>
-  protected abstract handleMessage(data: unknown): void
-  protected abstract createInitialState(): TState
-
-  // === Optional hooks (default no-op) ===
-  protected onReconnected(): void {}
-  protected onReconnectExhausted(): void {}
-  protected onDispose(): void {}
-  protected createConnectionError(message: string): Error {
-    return new Error(message)
-  }
-}
-```
-
-**Base connection state:**
-
-```typescript
-interface BaseConnectionState {
-  isConnected: boolean
-  authExpired?: boolean
-}
-```
-
-**Subclass responsibilities:**
-
-| Client | `getWsUrl()` | `handleMessage()` | Hooks used |
-|---|---|---|---|
-| `ChatWsClient` | `getWsChatUrl()` | Route by frame type to pending map | `onDispose` → rejectAllPending, `onReconnectExhausted` → rejectAllPending, `createConnectionError` → ChatWsError |
-| `RunWsClient` | `getWsRunsUrl()` | Route to subscription callbacks | `onReconnected` → re-subscribe all active subs. Config: `maxReconnectAttempts=null` (unlimited) |
-| `NotificationWsClient` | `getWsNotificationUrl()` (new) | Emit via callback | Config: `maxReconnectAttempts=10`, `reconnectStrategy='fixed'`, `fixedReconnectIntervalMs=3000` |
-
-**Notification hook refactor:**
-
-`use-notification-websocket.ts` changes from inlining all WS logic to holding a `NotificationWsClient` instance via `useRef`. The hook manages only:
-- Creating/disposing the client on mount/unmount
-- Bridging `handleMessage` callback to React state updates
-- Visibility change listener (reconnect on tab focus)
-
-The class-based `NotificationWsClient extends BaseWsClient` replaces the current ~100 lines of inline connection/heartbeat/reconnect code.
-
-**Behavioral changes for NotificationWsClient:**
-- **Pong timeout detection added:** The base class checks `lastPongTime` on each heartbeat tick. The current notification hook sends pings but never checks for pongs. Prerequisite: verify that the backend `/ws/notifications` endpoint (via `NotificationManager`) responds to `"ping"` frames with `"pong"`. If the backend does not send pongs, add pong support to `NotificationManager` before migrating.
-- **Reconnect strategy preserved:** NotificationWsClient uses `reconnectStrategy: 'fixed'` with `fixedReconnectIntervalMs: 3000` to match existing behavior (not exponential backoff).
-
-**Public API unification — `dispose()` vs `disconnect()`:**
-
-The base class exposes a single public teardown method: **`disconnect()`**. The current `ChatWsClient` exposes `dispose()` while `RunWsClient` exposes `disconnect()`. After migration:
-- `SharedChatWsClient` renames `dispose()` → `disconnect()` (inherited from base)
-- The `ChatWsClient` interface in `frontend/lib/ws/chat/types.ts` must update `dispose()` → `disconnect()`
-- All call sites importing `ChatWsClient` must be updated (search for `.dispose(`)
-
-The `ChatWsClient` interface type in `chat/types.ts` continues to exist as the consumer-facing contract. `SharedChatWsClient extends BaseWsClient implements ChatWsClient` — the interface is updated to match the base class public API.
-
-### Part 2: Unified Authentication
-
-**Current state:**
-- Chat/Runs: `GET /api/v1/auth/ws-token` → 60-second JWT → `?token=` query param
-- Notifications: Cookie-only (relies on `authenticate_websocket()` trying cookie first)
-
-**Change:**
-- Create `getWsNotificationUrl()` in `wsUrl.ts` using the same `getWsTokenUrl()` pattern
-- `NotificationWsClient.getWsUrl()` calls this new function
-- Backend `authenticate_websocket()` unchanged — it already supports both paths
-- Result: all three WS connections use identical auth flow
-
-**Why:** Security (short-lived token > long-lived cookie for WS), consistency, and cross-origin readiness.
-
-### Part 3: Dead Code Removal
-
-| Item | Location | Action |
-|---|---|---|
-| `POST /copilot/actions` endpoint | `backend/app/api/v1/graphs.py:649` | Delete the route handler only. `CopilotResponse` model is still used by `CopilotService` in the service layer — do NOT delete it. |
-| `axios` dependency | `frontend/package.json:64` | Run `npm uninstall axios` or `bun remove axios`. |
-| `"chat"` in `ALLOWED_CLIENT_FRAME_TYPES` | `backend/app/websocket/chat_protocol.py:12` | Remove `"chat"` from the set. Remove the explicit rejection block at lines 92-96. Unknown `"chat"` frames will now get the standard "unknown frame type" error. |
-| `"resume"` / `"stop"` aliases | `chat_protocol.py:16-17`, `chat_ws_handler.py:126-130` | Remove from `ALLOWED_CLIENT_FRAME_TYPES`. Update handler dispatch to only accept `"chat.resume"` / `"chat.stop"`. Verify no frontend code sends the old aliases (confirmed: frontend only uses `chat.stop`/`chat.resume`). |
-| `RESERVED_METADATA_KEYS` check | `chat_protocol.py` | Simplify or remove if the `"chat"` path is gone — the reserved keys were only checked to give a better error when migrating from the old format. |
-
-### Part 4: Naming Corrections
-
-Rename SSE-era identifiers to reflect the actual WebSocket transport:
-
-| Old Name | New Name | File(s) |
-|---|---|---|
-| `StreamEventEnvelope` | `ChatWsFrame` | `frontend/services/chatBackend.ts` |
-| `_parse_sse_event()` | `_parse_stream_event()` | `backend/app/websocket/chat_ws_handler.py` (definition), `backend/app/websocket/chat_turn_executor.py` (call sites via `handler._parse_sse_event`) |
-| `_send_event_from_sse()` | `_send_stream_event()` | `backend/app/websocket/chat_ws_handler.py` (definition), `backend/app/websocket/chat_turn_executor.py` (call sites at lines ~258, 289, 614, 628 via `handler._send_event_from_sse`) |
-| Comments referencing "SSE" in WS context | Update to "stream event" or "WS frame" | Various |
-
-**Note:** The internal SSE bridge (LangGraph → SSE string → parse → WS JSON) is out of scope. These renames only affect the WS-facing surface, not the internal bridge code.
-
-### Part 5: Constants Consolidation
-
-**Target file:** `frontend/lib/ws/constants.ts` (already exists)
-
-Add to existing constants:
-
-```typescript
-export const RECONNECT = {
-  MAX_DELAY_MS: 15_000,           // was duplicated in chatWsClient.ts:31 and runWsClient.ts:13
-  DEFAULT_MAX_ATTEMPTS: 20,        // was private static in chatWsClient only
-  NOTIFICATION_MAX_ATTEMPTS: 10,   // was in use-notification-websocket.ts
-} as const
-```
-
-Remove redundant constants:
-- Delete `NO_RECONNECT_CLOSE_CODES` — keep only `UNRECOVERABLE_CLOSE_CODES` (which includes `WS_CLOSE_CODE.NORMAL`). The base class handles normal close internally.
-- Move the `MAX_RECONNECT_DELAY_MS` module-scope definitions from both client files into the shared constants.
-
-## Execution Order
-
-Each part is an independent, testable change. Recommended order:
-
-1. **Part 5a: Constants consolidation** — Add `RECONNECT` constants to `constants.ts`. Do NOT delete `NO_RECONNECT_CLOSE_CODES` yet (notification hook still imports it).
-2. **Part 1: BaseWsClient** — the core change, biggest value. Migrate chat → runs → notifications in sequence. After notification hook migrates to `NotificationWsClient`, it no longer imports `NO_RECONNECT_CLOSE_CODES`.
-3. **Part 5b: Constants cleanup** — Now safe to delete `NO_RECONNECT_CLOSE_CODES` and remove duplicated module-scope constants from the old client files.
-4. **Part 2: Auth unification** — small change on top of Part 1
-5. **Part 3: Dead code removal** — independent of Parts 1-2, can be done in parallel with any step
-6. **Part 4: Naming** — cosmetic, lowest priority, independent
-
-Parts 3 and 4 have no dependency on Parts 1-2 and could be done first or in parallel.
-
-## Risk Assessment
-
-| Part | Risk | Mitigation |
-|---|---|---|
-| BaseWsClient | Medium — touches all real-time connections | Implement and test one client at a time; run existing WS integration tests after each migration |
-| Auth unification | Low — backend already supports token path | Test notification WS with token before removing cookie fallback |
-| Dead code removal | Low — confirmed no callers | Grep verification before each deletion |
-| Naming | Low — find-and-replace with type checking | TypeScript compiler catches missed renames |
-| Constants | Very low — value extraction only | Trivial |
-
-## Testing Strategy
-
-- **Unit:** BaseWsClient with mock WebSocket (test connect, reconnect backoff, heartbeat timeout, auth expiry)
-- **Integration:** Each migrated client sends/receives frames correctly, reconnects after server restart, handles auth expiry
-- **Manual QA:** Chat streaming, run event replay, notification delivery, tab-switch reconnect
diff --git a/docs/superpowers/specs/2026-04-07-dark-mode-and-preferences-design.md b/docs/superpowers/specs/2026-04-07-dark-mode-and-preferences-design.md
deleted file mode 100644
index 4555c25c0..000000000
--- a/docs/superpowers/specs/2026-04-07-dark-mode-and-preferences-design.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# Dark Mode & Preferences in Profile Page
-
-> All file paths below are relative to `frontend/`.
-
-## Summary
-
-Enable dark mode switching and consolidate user preferences (language + theme) into the Settings → Profile page. Remove the language switcher from the sidebar dropdown menu.
-
-## Current State
-
-- **Dark mode infrastructure exists** but is force-locked:
-  - `globals.css` has complete `:root/.light` and `.dark` CSS token sets
-  - `tailwind.config.ts` uses `darkMode: ['class']`
-  - `next-themes` ThemeProvider configured with `forcedTheme="light"` and `enableSystem={false}`
-  - Zustand store has `theme: 'light' | 'dark' | 'system'` field (default: `'dark'`)
-  - `syncThemeToNextThemes()` utility exists in `lib/core/utils/theme.ts` — manually writes to localStorage and toggles HTML classes, bypassing next-themes internal state
-  - `fetchGeneralSettings()` hardcodes `theme: 'dark' as const`, ignoring API response
-- **Language switcher** lives in sidebar user dropdown (`components/app-sidebar/user-info.tsx`) as a sub-menu
-- **Profile page** (`components/settings/profile-page.tsx`) contains only avatar/name editing, logout, and reset password
-
-## Changes
-
-### 1. Unlock dark mode in ThemeProvider
-
-**File:** `providers/theme-provider.tsx`
-
-- Remove `forcedTheme="light"`
-- Set `enableSystem={true}`
-- Change `defaultTheme` to `"system"`
-
-### 2. Remove hardcoded theme in general-settings query
-
-**File:** `hooks/queries/general-settings.ts`
-
-- In `fetchGeneralSettings()`, change `theme: 'dark' as const` to `theme: data.theme ?? 'system'` so the API value is respected with a `'system'` fallback
-
-### 3. Update Zustand store default
-
-**File:** `stores/settings/general/store.ts`
-
-- Change default `theme` from `'dark'` to `'system'` to match the ThemeProvider default and avoid a flash of dark mode before query data arrives
-
-### 4. Simplify theme sync utility
-
-**File:** `lib/core/utils/theme.ts`
-
-- Remove manual HTML class manipulation from `syncThemeToNextThemes()`. With next-themes unlocked, writing to localStorage + dispatching a StorageEvent is sufficient — next-themes handles the class toggle automatically. (Using `setTheme()` from the `useTheme()` hook is not possible here since this utility is called from non-React contexts like `syncSettingsToZustand()`.)
-
-**File:** `hooks/queries/general-settings.ts`
-
-- Add clarifying comment on the `syncThemeToNextThemes()` call in `syncSettingsToZustand()`
-
-### 5. Add Preferences section to Profile page
-
-**File:** `components/settings/profile-page.tsx`
-
-Add a new "Preferences" section below the Action Buttons area:
-
-```
-──────────────────────────
-Preferences
-  Language:  [Select: English / 中文]
-  Theme:     [Light | Dark | System]  (segmented toggle group)
-──────────────────────────
-```
-
-**Language selector:**
-- Use the existing shadcn `Select` component with two options (English, 中文)
-- Label uses existing `t('common.language')` key
-- On change, call `i18n.changeLanguage(langCode)`
-- Display current language as selected value
-
-**Theme selector:**
-- Install `@radix-ui/react-toggle-group` and generate shadcn `components/ui/toggle-group.tsx`
-- Three options: Light (Sun icon), Dark (Moon icon), System (Monitor icon)
-- On change, call `setTheme()` from `next-themes` `useTheme()` hook
-- Instant effect, no save button needed
-
-**Dark mode color fixes in profile page:**
-- Replace hardcoded `bg-violet-50 text-violet-600` in the reset password dialog icon with dark-aware variants (e.g., `bg-violet-50 dark:bg-violet-900/30 text-violet-600 dark:text-violet-400`)
-
-### 6. Remove language switcher from sidebar dropdown
-
-**File:** `components/app-sidebar/user-info.tsx`
-
-- Remove the `DropdownMenuSub` block for language switching
-- Remove the `Languages`, `Check` icon imports and `languages` array
-- Remove `handleLanguageChange` function
-- Remove unused imports: `DropdownMenuSub`, `DropdownMenuSubContent`, `DropdownMenuSubTrigger`
-- Keep Settings, Logout menu items
-
-### 7. Add i18n translation keys
-
-**Files:** `lib/i18n/locales/en.ts`, `lib/i18n/locales/zh.ts`
-
-New keys under `settings`:
-- `settings.preferences` — "Preferences" / "偏好设置"
-- `settings.theme` — "Theme" / "主题"
-- `settings.themeLight` — "Light" / "浅色"
-- `settings.themeDark` — "Dark" / "深色"
-- `settings.themeSystem` — "System" / "跟随系统"
-
-Language label reuses existing `common.language` key.
-
-## Files Changed (Summary)
-
-| File | Change |
-|------|--------|
-| `providers/theme-provider.tsx` | Remove `forcedTheme`, enable system |
-| `hooks/queries/general-settings.ts` | Remove hardcoded theme, update sync |
-| `stores/settings/general/store.ts` | Change default theme to `'system'` |
-| `lib/core/utils/theme.ts` | Refactor to use next-themes `setTheme()` |
-| `components/settings/profile-page.tsx` | Add Preferences section, fix hardcoded colors |
-| `components/ui/toggle-group.tsx` | New shadcn component (generated) |
-| `components/app-sidebar/user-info.tsx` | Remove language sub-menu |
-| `lib/i18n/locales/en.ts` | Add translation keys |
-| `lib/i18n/locales/zh.ts` | Add translation keys |
-
-## Dependencies to Install
-
-- `@radix-ui/react-toggle-group` (for the theme segmented control)
-
-## Out of Scope
-
-- Persisting theme preference to backend API (current localStorage via next-themes is sufficient)
-- Animated theme transitions (kept disabled via `disableTransitionOnChange`)
-- Comprehensive dark mode audit of all components (most use CSS variables; the profile page hardcoded colors are fixed in this spec)
diff --git a/docs/superpowers/specs/2026-04-30-agent-kind-refactor-design.md b/docs/superpowers/specs/2026-04-30-agent-kind-refactor-design.md
new file mode 100644
index 000000000..32526979c
--- /dev/null
+++ b/docs/superpowers/specs/2026-04-30-agent-kind-refactor-design.md
@@ -0,0 +1,158 @@
+# Agent Kind Refactor: EngineKind + RuntimeKind
+
+## Problem
+
+The current agent "kind" system uses three confusing, overlapping concepts:
+
+- `DefinitionKindLiteral = Literal["graph", "code", "sandbox_cli"]` — what engine built the agent
+- `RuntimeKindLiteral = Literal["graph", "code", "sandbox"]` — where the agent runs
+- `executor_kind` (on Execution) — the actual CLI tool (`claude_code`, `codex`, `openclaw`)
+
+Problems:
+1. `"sandbox_cli"` mixes runtime (sandbox) and definition (cli) concepts
+2. `definition_kind → runtime_kind` mapping is identity for graph/code, confusing why two concepts exist
+3. `executor_kind` is a hidden third layer that carries the real engine identity for CLI agents
+4. `CLIEngine` + `RuntimeProviderRegistry` adds unnecessary dispatch indirection
+
+## Design: Two Orthogonal Axes
+
+### Axis 1: EngineKind — what kernel builds the agent
+
+```python
+EngineKind = Literal[
+    "langgraph_visual",   # LangGraph visual builder
+    "langgraph_code",     # LangGraph code
+    "claude_code",        # Claude Code CLI
+    "codex",              # Codex CLI
+    "openclaw",           # OpenClaw CLI
+]
+ENGINE_KINDS: set[str] = {"langgraph_visual", "langgraph_code", "claude_code", "codex", "openclaw"}
+
+InternalEngineKind = Literal["build_copilot"]
+INTERNAL_ENGINE_KINDS: set[str] = {"build_copilot"}
+
+AllEngineKind = Union[EngineKind, InternalEngineKind]
+ALL_ENGINE_KINDS: set[str] = ENGINE_KINDS | INTERNAL_ENGINE_KINDS
+```
+
+### Axis 2: RuntimeKind — where the agent runs
+
+```python
+RuntimeKind = Literal["sandbox", "server"]
+RUNTIME_KINDS: set[str] = {"sandbox", "server"}
+```
+
+### Mapping
+
+```python
+ENGINE_RUNTIME_MAP: dict[str, str] = {
+    "langgraph_visual": "server",
+    "langgraph_code":   "server",
+    "claude_code":      "sandbox",
+    "codex":            "sandbox",
+    "openclaw":         "sandbox",
+}
+
+CLI_ENGINE_KINDS: set[str] = {"claude_code", "codex", "openclaw"}
+```
+
+## Concept Elimination
+
+| Old | New |
+|---|---|
+| `DefinitionKindLiteral` | `EngineKind` |
+| `RuntimeKindLiteral` | `RuntimeKind` |
+| `DEFINITION_KINDS` | `ENGINE_KINDS` |
+| `CLI_DEFINITION_KINDS` | `CLI_ENGINE_KINDS` |
+| `DEFINITION_RUNTIME_KIND` | `ENGINE_RUNTIME_MAP` |
+| `"graph"` (definition) | `"langgraph_visual"` |
+| `"code"` (definition) | `"langgraph_code"` |
+| `"sandbox_cli"` | eliminated |
+| `"graph"` / `"code"` (runtime) | `"server"` |
+| `executor_kind` (column) | `engine_kind` |
+
+## Engine Registry
+
+Each engine kind maps to its own `ExecutionEngine` implementation. No intermediate dispatch layer.
+
+```python
+engine_registry.register("langgraph_visual", LangGraphVisualEngine())
+engine_registry.register("langgraph_code",   LangGraphCodeEngine())
+engine_registry.register("claude_code",      ClaudeCodeEngine())
+engine_registry.register("codex",            CodexEngine())
+engine_registry.register("openclaw",         OpenClawEngine())
+engine_registry.register("build_copilot",    CopilotEngine())
+```
+
+### Eliminated layers
+
+- `CLIEngine` — deleted. Each CLI tool is a first-class engine.
+- `RuntimeProviderRegistry` + `ClaudeCodeProvider` / `CodexProvider` / `OpenClawProvider` — promoted to engines.
+- `core/agent/cli_backends/registry.py` — deleted.
+
+### Engine renames
+
+| Old | New |
+|---|---|
+| `GraphEngine` | `LangGraphVisualEngine` |
+| `CodeEngine` | `LangGraphCodeEngine` |
+| `CLIEngine` | eliminated |
+| `ClaudeCodeProvider` | `ClaudeCodeEngine` (implements `ExecutionEngine`) |
+| `CodexProvider` | `CodexEngine` (implements `ExecutionEngine`) |
+| `OpenClawProvider` | `OpenClawEngine` (implements `ExecutionEngine`) |
+
+## Database Migration
+
+```sql
+-- 1. AgentVersion: rename column + remap values
+ALTER TABLE agent_versions RENAME COLUMN definition_kind TO engine_kind;
+UPDATE agent_versions SET engine_kind = 'langgraph_visual' WHERE engine_kind = 'graph';
+UPDATE agent_versions SET engine_kind = 'langgraph_code'   WHERE engine_kind = 'code';
+UPDATE agent_versions av SET engine_kind = (
+    SELECT COALESCE(
+        (SELECT rv.runtime_binding->>'runtime_type'
+         FROM agent_releases rv
+         WHERE rv.agent_version_id = av.id
+         LIMIT 1),
+        'claude_code'
+    )
+) WHERE av.engine_kind = 'sandbox_cli';
+
+-- 2. AgentRelease: remap runtime_kind values
+UPDATE agent_releases SET runtime_kind = 'server' WHERE runtime_kind IN ('graph', 'code');
+
+-- 3. Execution: rename column (values already correct)
+ALTER TABLE executions RENAME COLUMN executor_kind TO engine_kind;
+```
+
+## Frontend Types
+
+```typescript
+export const ENGINE_KINDS = [
+  'langgraph_visual', 'langgraph_code',
+  'claude_code', 'codex', 'openclaw'
+] as const
+export type EngineKind = (typeof ENGINE_KINDS)[number]
+
+export const RUNTIME_KINDS = ['sandbox', 'server'] as const
+export type RuntimeKind = (typeof RUNTIME_KINDS)[number]
+```
+
+## Affected Files
+
+| Module | Change |
+|---|---|
+| `core/contracts/agent.py` | Rewrite types, constants, utility functions |
+| `models/agent.py` | `definition_kind` → `engine_kind`, remove `normalize_*` |
+| `models/agent_run.py` | `executor_kind` → `engine_kind` |
+| `schemas/agent.py` | `DefinitionKindLiteral` → `EngineKind` |
+| `schemas/agent_version.py` | same |
+| `schemas/agent_release.py` | `RuntimeKindLiteral` → `RuntimeKind` |
+| `services/agent_publish_service.py` | Use `ENGINE_RUNTIME_MAP` |
+| `services/execution_orchestrator.py` | Route by `engine_kind` directly |
+| `core/engine/__init__.py` | Register by `engine_kind` |
+| `core/engine/protocol.py` | Align with new enums |
+| `core/agent/cli_backends/` | Delete `registry.py`, promote providers to engines |
+| `frontend/types/agent.ts` | New types |
+| `frontend/` components | Update all references |
+| Alembic | New migration script |
diff --git a/docs/tutorials/05-copilot-usage.md b/docs/tutorials/05-copilot-usage.md
index d4eff0776..a77406885 100644
--- a/docs/tutorials/05-copilot-usage.md
+++ b/docs/tutorials/05-copilot-usage.md
@@ -15,17 +15,17 @@
 
 ## 1. 核心架构与实现原理（”Under the Hood”）
 
-Copilot 已全面迁移至 **Run Center 模型**，与 Chat 和 Skill Creator 共享同一 WebSocket 通信层。
+Copilot 已全面迁移至 **Agent/Execution 模型**，与 Chat 和 Skill Creator 共享同一 WebSocket 通信层，并通过统一的执行事件通道观测。
 
-### 1.1 通信架构（Shared Chat WS + Run Center）
+### 1.1 通信架构（Execution Events + /ws/executions）
 
-所有 Copilot 交互都通过 **`/ws/chat` 共享 WebSocket** 进行：
+Copilot 遵循统一的 **Engine → EventBus → WebSocket** 执行管道：
 
-1. **创建 Run**：前端调用 `runService.createRun({ agent_name: “copilot”, graph_id, message })` 在 Run Center 注册本次任务。
-2. **发送消息**：通过 `getChatWsClient().sendChat()` 发送 `chat.start` 帧，携带 `extension: { kind: “copilot”, runId, graphContext, conversationHistory, mode }`。
-3. **后端执行**：`ChatWsHandler` 解析协议后路由到 `execute_copilot_turn()`，消费 `CopilotService._get_copilot_stream()` 产生的事件流。
-4. **事件持久化**：每个事件通过 `_emit_event()` 同时推送到 WS 客户端，并通过 `_mirror_run_stream_event()` 持久化到 `agent_run_events` 表。
-5. **状态投影**：`run_reducers/copilot.py` 维护实时投影（stage、content、thought_steps、tool_calls 等），存储于 `agent_run_snapshots`。
+1. **创建执行**：前端提交当前 `AgentVersion.definition_payload`、画布上下文和 prompt，后端通过 `DispatchService` → `ExecutionOrchestrator` 创建 `AgentRun` 与 `Execution`。
+2. **引擎执行**：`CopilotEngine` 消费 `CopilotService` 产生的事件流，通过 `ExecutionContext.emit()` 写入 `execution_events`。
+3. **两阶段事件总线**：`ExecutionEventBus` 第 1 阶段持久化 + 状态变迁（共享事务），第 2 阶段 WebSocket 推送 + Task 同步（并行扇出）。
+4. **实时订阅**：前端通过 `/ws/executions` 订阅执行事件，接收 Copilot 状态（stage、content、thought_steps、tool_calls）。
+5. **状态投影**：执行快照由 `execution_events` 重放和投影生成。
 
 ### 1.2 标准模式 vs DeepAgents 模式
 
@@ -44,9 +44,9 @@ Copilot 已全面迁移至 **Run Center 模型**，与 Chat 和 Skill Creator 
 
 ### 1.3 页面刷新恢复
 
-得益于 Run Center 持久化，Copilot 支持页面刷新后无缝恢复：
-- 前端检测到未完成的 `currentRunId` 后，先获取 `runService.getRunSnapshot()` 恢复最新状态。
-- 若 run 仍在执行中，通过 `/ws/runs` 订阅后续实时事件。
+得益于 `execution_events` 持久化，Copilot 支持页面刷新后无缝恢复：
+- 前端检测到未完成的 `executionId` 后，先获取执行快照恢复最新状态。
+- 若 execution 仍在执行中，通过 `/ws/executions` 订阅后续实时事件。
 
 ---
 
diff --git a/docs/tutorials/README.md b/docs/tutorials/README.md
index 798bc0702..f320c10bf 100644
--- a/docs/tutorials/README.md
+++ b/docs/tutorials/README.md
@@ -61,7 +61,6 @@
 ## 相关文档
 
 - [系统架构](../ARCHITECTURE.md)
-- [MCP 工具分析](../mcp-tools-analysis.md)
 
 ---
 
diff --git a/docs/user-journey-quickstart.drawio b/docs/user-journey-quickstart.drawio
index 4074a4125..24fc8c613 100644
--- a/docs/user-journey-quickstart.drawio
+++ b/docs/user-journey-quickstart.drawio
@@ -98,7 +98,7 @@
 <mxCell id="s6h" value="&lt;b&gt;STEP 6&lt;/b&gt;  自测 (Langfuse 风格 Trace)" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#2e7d32;fontColor=#ffffff;fontSize=12;arcSize=15;" vertex="1" parent="1">
   <mxGeometry x="30" y="530" width="350" height="30" as="geometry"/>
 </mxCell>
-<mxCell id="s6c" value="&lt;b&gt;点击 Run 按钮&lt;/b&gt;&lt;br/&gt;RunInputModal → 输入测试消息&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Execution Panel 展开&lt;/b&gt;&lt;br/&gt;Langfuse 风格实时追踪&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tree View — 执行树&lt;/b&gt;&lt;br/&gt;输入 → LLM → 工具调用 → 输出&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Timeline View — 瀑布时间轴&lt;/b&gt;&lt;br/&gt;耗时 / Token / 并发可视化&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Detail Panel&lt;/b&gt;&lt;br/&gt;Preview / Output / Metadata&lt;br/&gt;&lt;br/&gt;&lt;b&gt;实时流式 (WS /ws/chat)&lt;/b&gt;&lt;br/&gt;边执行边查看" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;overflow=hidden;fontSize=11;spacing=6;" vertex="1" parent="1">
+<mxCell id="s6c" value="&lt;b&gt;点击 Run 按钮&lt;/b&gt;&lt;br/&gt;RunInputModal → 输入测试消息&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Execution Panel 展开&lt;/b&gt;&lt;br/&gt;Langfuse 风格实时追踪&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tree View — 执行树&lt;/b&gt;&lt;br/&gt;输入 → LLM → 工具调用 → 输出&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Timeline View — 瀑布时间轴&lt;/b&gt;&lt;br/&gt;耗时 / Token / 并发可视化&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Detail Panel&lt;/b&gt;&lt;br/&gt;Preview / Output / Metadata&lt;br/&gt;&lt;br/&gt;&lt;b&gt;实时流式 (WS /ws/executions)&lt;/b&gt;&lt;br/&gt;边执行边查看" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;overflow=hidden;fontSize=11;spacing=6;" vertex="1" parent="1">
   <mxGeometry x="30" y="568" width="350" height="312" as="geometry"/>
 </mxCell>
 
@@ -131,7 +131,7 @@
 <mxCell id="s9h" value="&lt;b&gt;STEP 9&lt;/b&gt;  Run Center 详情  /runs" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#283593;fontColor=#ffffff;fontSize=12;arcSize=15;" vertex="1" parent="1">
   <mxGeometry x="1040" y="530" width="510" height="30" as="geometry"/>
 </mxCell>
-<mxCell id="s9c" value="&lt;b&gt;进入 /runs — Run Center&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;&lt;b&gt;筛选过滤&lt;/b&gt;&lt;br/&gt;Agent 名称 / Status (Running/Completed/Failed)&lt;br/&gt;&lt;br/&gt;&lt;b&gt;运行列表 (实时更新)&lt;/b&gt;&lt;br/&gt;RunRow 卡片: 标题 / 状态 / Agent名 / 心跳&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Details → /runs/[runId]&lt;/b&gt;&lt;br/&gt;Overview: 消息 → 回复 → 工具调用&lt;br/&gt;Events: 全部事件流 (JSON)&lt;br/&gt;Snapshot: 运行时状态&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tool Calls 展开&lt;/b&gt;&lt;br/&gt;工具名 / 参数 / 结果&lt;br/&gt;&lt;br/&gt;&lt;b&gt;实时 WS /ws/runs&lt;/b&gt;&lt;br/&gt;WebSocket 推送状态变更" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;overflow=hidden;fontSize=11;spacing=6;" vertex="1" parent="1">
+<mxCell id="s9c" value="&lt;b&gt;进入 /runs — Run Center&lt;/b&gt;&lt;br/&gt;&lt;br/&gt;&lt;b&gt;筛选过滤&lt;/b&gt;&lt;br/&gt;Agent 名称 / Status (Running/Completed/Failed)&lt;br/&gt;&lt;br/&gt;&lt;b&gt;运行列表 (实时更新)&lt;/b&gt;&lt;br/&gt;RunRow 卡片: 标题 / 状态 / Agent名 / 心跳&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Details → /runs/[runId]&lt;/b&gt;&lt;br/&gt;Overview: 消息 → 回复 → 工具调用&lt;br/&gt;Events: 全部事件流 (JSON)&lt;br/&gt;Snapshot: 运行时状态&lt;br/&gt;&lt;br/&gt;&lt;b&gt;Tool Calls 展开&lt;/b&gt;&lt;br/&gt;工具名 / 参数 / 结果&lt;br/&gt;&lt;br/&gt;&lt;b&gt;实时 WS /ws/executions&lt;/b&gt;&lt;br/&gt;WebSocket 推送状态变更" style="text;html=1;align=left;verticalAlign=top;whiteSpace=wrap;overflow=hidden;fontSize=11;spacing=6;" vertex="1" parent="1">
   <mxGeometry x="1040" y="568" width="510" height="312" as="geometry"/>
 </mxCell>
 
diff --git a/frontend/README.md b/frontend/README.md
index 0490e03e4..ac98ff35b 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -28,6 +28,36 @@ bun run dev
 
 访问：http://localhost:3000
 
+## 架构概述
+
+### 路由结构（App Router）
+
+```
+app/
+├── (auth)/                       # 认证页面（登录、注册、验证、重置密码）
+├── dashboard/                    # 仪表盘
+├── agents/[agentId]/             # Agent 详情：编辑、版本、发布、任务、会话
+├── executions/[executionId]/     # 执行详情 + 实时追踪
+├── tasks/                        # 任务管理
+├── skills/                       # 技能市场 + 创建器
+├── tools/                        # 工具管理
+├── memory/                       # 记忆管理
+├── openclaw/                     # OpenClaw 看板
+└── settings/                     # 模型、成员、沙箱、Token
+```
+
+### 核心模块
+
+| 模块             | 路径                   | 职责                                                                       |
+| ---------------- | ---------------------- | -------------------------------------------------------------------------- |
+| **API 客户端**   | `lib/api-client.ts`    | 统一 REST 请求（URL 构建、CSRF、401 自动刷新、ErrorDescriptor 提取）       |
+| **WebSocket 层** | `lib/ws/`              | BaseWsClient 抽象类 + ExecutionWsClient / NotificationWsClient             |
+| **状态管理**     | `stores/`              | Zustand 客户端 Store（执行追踪、侧边栏、编辑器等）                         |
+| **服务端状态**   | hooks + TanStack Query | 缓存 + 失效（agents、skills、models 等）                                   |
+| **错误消费**     | `ApiError` class       | 镜像后端 ErrorDescriptor：`source`、`retryable`、`userAction` 驱动 UI 行为 |
+
+> 完整架构文档：[`docs/ARCHITECTURE.md`](../docs/ARCHITECTURE.md) | [中文版](../docs/ARCHITECTURE_CN.md)
+
 ## 常用脚本
 
 ```bash
diff --git a/frontend/app/(auth)/layout.tsx b/frontend/app/(auth)/layout.tsx
index 880d34676..f6ca1cb65 100644
--- a/frontend/app/(auth)/layout.tsx
+++ b/frontend/app/(auth)/layout.tsx
@@ -41,8 +41,8 @@ export default function AuthLayout({ children }: { children: React.ReactNode })
               {/* Brand identity */}
               <div className="flex items-center gap-3">
                 <div className="relative flex h-12 w-12 flex-shrink-0 items-center justify-center">
-                  <div className="absolute inset-0 rounded-xl brand-gradient opacity-100" />
-                  <div className="absolute inset-0 rounded-xl brand-gradient opacity-20 blur-md" />
+                  <div className="brand-gradient absolute inset-0 rounded-xl opacity-100" />
+                  <div className="brand-gradient absolute inset-0 rounded-xl opacity-20 blur-md" />
                   <svg
                     className="relative z-10 h-6 w-6 text-white"
                     viewBox="0 0 24 24"
@@ -79,9 +79,7 @@ export default function AuthLayout({ children }: { children: React.ReactNode })
                   </svg>
                 </div>
                 <div>
-                  <span
-                    className={`${soehne.className} brand-gradient-text text-2xl font-bold`}
-                  >
+                  <span className={`${soehne.className} brand-gradient-text text-2xl font-bold`}>
                     JoySafeter
                   </span>
                   <p className="text-xs font-medium text-[var(--text-tertiary)]">
diff --git a/frontend/app/(auth)/reset-password/page.tsx b/frontend/app/(auth)/reset-password/page.tsx
index 3aeb1d32b..8c37f6feb 100644
--- a/frontend/app/(auth)/reset-password/page.tsx
+++ b/frontend/app/(auth)/reset-password/page.tsx
@@ -76,7 +76,9 @@ function ResetPasswordContent() {
   return (
     <>
       <div className="space-y-1 text-center">
-        <h1 className={`${soehne.className} text-3xl font-medium tracking-tight text-[var(--text-primary)]`}>
+        <h1
+          className={`${soehne.className} text-3xl font-medium tracking-tight text-[var(--text-primary)]`}
+        >
           Reset your password
         </h1>
         <p className={`${inter.className} text-lg font-[380] text-muted-foreground`}>
diff --git a/frontend/app/(auth)/reset-password/reset-password-form.tsx b/frontend/app/(auth)/reset-password/reset-password-form.tsx
index f46949c09..af240ee0f 100644
--- a/frontend/app/(auth)/reset-password/reset-password-form.tsx
+++ b/frontend/app/(auth)/reset-password/reset-password-form.tsx
@@ -3,7 +3,6 @@
 import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import { useEffect, useState } from 'react'
 
-
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
@@ -84,7 +83,7 @@ export function RequestResetForm({
         disabled={isSubmitting}
         onMouseEnter={() => setIsButtonHovered(true)}
         onMouseLeave={() => setIsButtonHovered(false)}
-        className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] py-1.5 px-3 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
+        className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] px-3 py-1.5 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
       >
         <span className="flex items-center gap-1" suppressHydrationWarning>
           {isSubmitting
@@ -281,7 +280,7 @@ export function SetNewPasswordForm({
         type="submit"
         onMouseEnter={() => setIsButtonHovered(true)}
         onMouseLeave={() => setIsButtonHovered(false)}
-        className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] py-1.5 px-3 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
+        className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] px-3 py-1.5 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
       >
         <span className="flex items-center gap-1" suppressHydrationWarning>
           {isSubmitting
diff --git a/frontend/app/(auth)/signin/login-form.tsx b/frontend/app/(auth)/signin/login-form.tsx
index f611825a2..88170e95a 100644
--- a/frontend/app/(auth)/signin/login-form.tsx
+++ b/frontend/app/(auth)/signin/login-form.tsx
@@ -19,6 +19,7 @@ import {
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { client, useSession, type AuthError } from '@/lib/auth/auth-client'
+import { ApiError } from '@/lib/api-client'
 import { getEnv, isFalsy } from '@/lib/core/config/env'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { useTranslation } from '@/lib/i18n'
@@ -45,6 +46,52 @@ const getEmailErrorKey = (reason?: string): string => {
   return 'auth.emailInvalid'
 }
 
+const getAuthErrorMessageKey = (errorCode: string): string | null => {
+  switch (errorCode) {
+    case 'INVALID_CREDENTIALS':
+    case 'MISSING_CREDENTIALS':
+    case 'FAILED_TO_CREATE_SESSION':
+      return 'auth.invalidCredentials'
+    case 'USER_NOT_FOUND':
+      return 'auth.userNotFound'
+    case 'EMAIL_PASSWORD_DISABLED':
+      return 'auth.emailSignInDisabled'
+    case 'RATE_LIMITED':
+      return 'auth.tooManyAttempts'
+    case 'NETWORK_ERROR':
+    case 'REQUEST_TIMEOUT':
+      return 'auth.networkError'
+    default:
+      return null
+  }
+}
+
+const getOAuthCallbackErrorKey = (errorCode?: string | null): string => {
+  switch (errorCode) {
+    case 'OAUTH_ACCESS_DENIED':
+      return 'auth.oauthDenied'
+    case 'OAUTH_STATE_INVALID':
+    case 'OAUTH_STATE_MISSING':
+    case 'OAUTH_PROVIDER_MISMATCH':
+      return 'auth.oauthInvalidState'
+    case 'OAUTH_DISCOVERY_FAILED':
+    case 'OAUTH_TOKEN_ENDPOINT_DISCOVERY_FAILED':
+    case 'OAUTH_USERINFO_ENDPOINT_DISCOVERY_FAILED':
+      return 'auth.oauthDiscoveryFailed'
+    case 'OAUTH_AUTHORIZE_URL_MISSING':
+      return 'auth.oauthAuthorizeUrlMissing'
+    case 'OAUTH_TOKEN_URL_MISSING':
+      return 'auth.oauthTokenUrlMissing'
+    case 'OAUTH_USERINFO_URL_MISSING':
+      return 'auth.oauthUserinfoUrlMissing'
+    case 'OAUTH_TOKEN_EXCHANGE_FAILED':
+    case 'OAUTH_USERINFO_FETCH_FAILED':
+      return 'auth.oauthFailed'
+    default:
+      return 'auth.oauthError'
+  }
+}
+
 const validateCallbackUrl = (url: string): boolean => {
   try {
     if (url.startsWith('/')) {
@@ -73,7 +120,7 @@ export default function LoginPage() {
   const [showPassword, setShowPassword] = useState(false)
   const [isButtonHovered, setIsButtonHovered] = useState(false)
 
-  const [callbackUrl, setCallbackUrl] = useState('/chat')
+  const [callbackUrl, setCallbackUrl] = useState('/dashboard')
   const [isInviteFlow, setIsInviteFlow] = useState(false)
 
   const [forgotPasswordOpen, setForgotPasswordOpen] = useState(false)
@@ -110,28 +157,25 @@ export default function LoginPage() {
       setIsInviteFlow(inviteFlow)
 
       // handle OAuth errors
-      const error = searchParams.get('error')
-      const errorDescription = searchParams.get('error_description')
-      if (error) {
-        let errorMessage = t('auth.oauthError')
-        if (error === 'oauth_denied') {
-          errorMessage = t('auth.oauthDenied')
-        } else if (error === 'invalid_state') {
-          errorMessage = t('auth.oauthInvalidState')
-        } else if (error === 'oauth_failed') {
-          errorMessage = errorDescription || t('auth.oauthFailed')
-        } else if (errorDescription) {
-          errorMessage = errorDescription
-        }
+      const errorCode = searchParams.get('error_code')
+      const errorMessageParam = searchParams.get('error_message')
+      if (errorCode) {
+        const errorKey = getOAuthCallbackErrorKey(errorCode)
+        const errorMessage =
+          errorMessageParam &&
+          (errorKey === 'auth.oauthFailed' ||
+            errorKey === 'auth.oauthError' ||
+            errorKey === 'auth.oauthDiscoveryFailed')
+            ? errorMessageParam
+            : t(errorKey)
         setOauthError(errorMessage)
         // clear error params from URL
         const url = new URL(window.location.href)
-        url.searchParams.delete('error')
-        url.searchParams.delete('error_description')
+        url.searchParams.delete('error_code')
+        url.searchParams.delete('error_message')
         window.history.replaceState({}, '', url.toString())
       }
     }
-
   }, [searchParams, t])
 
   const handleForgotPassword = useCallback(async () => {
@@ -165,14 +209,16 @@ export default function LoginPage() {
       logger.error('Error requesting password reset:', { error })
 
       let errorMessage = 'Failed to request password reset'
-      if (error instanceof Error) {
-        if (error.message.includes('invalid email')) {
+      if (error instanceof ApiError) {
+        if (error.code === 'INVALID_EMAIL') {
           errorMessage = 'Please enter a valid email address'
-        } else if (error.message.includes('Email is required')) {
+        } else if (error.code === 'EMAIL_REQUIRED') {
           errorMessage = 'Please enter your email address'
         } else {
           errorMessage = error.message
         }
+      } else if (error instanceof Error) {
+        errorMessage = error.message
       }
 
       toastError(errorMessage)
@@ -211,7 +257,7 @@ export default function LoginPage() {
     }
 
     try {
-      const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/chat'
+      const safeCallbackUrl = validateCallbackUrl(callbackUrl) ? callbackUrl : '/dashboard'
 
       logger.info('Attempting login with email:', email)
       const result = await client.signIn.email(
@@ -227,39 +273,15 @@ export default function LoginPage() {
             const errorCode = typeof ctx.error.code === 'string' ? ctx.error.code : ''
             const errorMessage = typeof ctx.error.message === 'string' ? ctx.error.message : ''
 
-            if (errorCode.includes('EMAIL_NOT_VERIFIED')) {
+            if (errorCode === 'EMAIL_NOT_VERIFIED') {
               return
             }
 
             let displayMessage = t('auth.invalidCredentials')
 
-            if (
-              errorCode.includes('BAD_REQUEST') ||
-              errorMessage.includes('Email and password sign in is not enabled')
-            ) {
-              displayMessage = t('auth.emailSignInDisabled')
-            } else if (
-              errorCode.includes('INVALID_CREDENTIALS') ||
-              errorMessage.includes('invalid password') ||
-              errorMessage.includes('Incorrect email or password')
-            ) {
-              displayMessage = t('auth.invalidCredentials')
-            } else if (errorCode.includes('USER_NOT_FOUND') || errorMessage.includes('not found')) {
-              displayMessage = t('auth.userNotFound')
-            } else if (errorCode.includes('MISSING_CREDENTIALS')) {
-              displayMessage = t('auth.invalidCredentials')
-            } else if (errorCode.includes('EMAIL_PASSWORD_DISABLED')) {
-              displayMessage = t('auth.emailSignInDisabled')
-            } else if (errorCode.includes('FAILED_TO_CREATE_SESSION')) {
-              displayMessage = t('auth.invalidCredentials')
-            } else if (errorCode.includes('too many attempts')) {
-              displayMessage = t('auth.tooManyAttempts')
-            } else if (errorCode.includes('account locked')) {
-              displayMessage = t('auth.accountLocked')
-            } else if (errorCode.includes('network') || errorMessage.includes('network')) {
-              displayMessage = t('auth.networkError')
-            } else if (errorMessage.includes('rate limit')) {
-              displayMessage = t('auth.rateLimitError')
+            const messageKey = getAuthErrorMessageKey(errorCode)
+            if (messageKey) {
+              displayMessage = t(messageKey)
             } else if (errorMessage) {
               displayMessage = errorMessage
             }
@@ -286,22 +308,9 @@ export default function LoginPage() {
 
           let displayMessage = t('auth.invalidCredentials')
 
-          if (
-            errorCode.includes('INVALID_CREDENTIALS') ||
-            errorMsg.includes('invalid password') ||
-            errorMsg.includes('Incorrect email or password')
-          ) {
-            displayMessage = t('auth.invalidCredentials')
-          } else if (errorCode.includes('USER_NOT_FOUND') || errorMsg.includes('not found')) {
-            displayMessage = t('auth.userNotFound')
-          } else if (errorCode.includes('too many attempts')) {
-            displayMessage = t('auth.tooManyAttempts')
-          } else if (errorCode.includes('account locked')) {
-            displayMessage = t('auth.accountLocked')
-          } else if (errorCode.includes('network') || errorMsg.includes('network')) {
-            displayMessage = t('auth.networkError')
-          } else if (errorMsg.includes('rate limit')) {
-            displayMessage = t('auth.rateLimitError')
+          const messageKey = getAuthErrorMessageKey(errorCode)
+          if (messageKey) {
+            displayMessage = t(messageKey)
           } else if (errorMsg) {
             displayMessage = errorMsg
           }
@@ -355,7 +364,7 @@ export default function LoginPage() {
       }, 50)
     } catch (err: unknown) {
       const error = err as { message?: string; code?: string }
-      if (error.message?.includes('not verified') || error.code?.includes('EMAIL_NOT_VERIFIED')) {
+      if (error.code === 'EMAIL_NOT_VERIFIED') {
         if (typeof window !== 'undefined') {
           sessionStorage.setItem('verificationEmail', email)
         }
@@ -390,7 +399,9 @@ export default function LoginPage() {
 
       {/* OAuth error message */}
       {oauthError && (
-        <div className="mt-4 rounded-md bg-[var(--status-error-bg)] p-3 text-sm text-[var(--status-error)]">{oauthError}</div>
+        <div className="mt-4 rounded-md bg-[var(--status-error-bg)] p-3 text-sm text-[var(--status-error)]">
+          {oauthError}
+        </div>
       )}
 
       {!isFalsy(getEnv('NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED')) && (
@@ -414,7 +425,7 @@ export default function LoginPage() {
                 {...form.register('email')}
                 className={cn(
                   'rounded-auth shadow-sm transition-colors focus:border-[var(--brand-400)] focus:ring-2 focus:ring-[var(--brand-100)]',
-                    'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)] focus-visible:ring-[var(--status-error)]',
+                  'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)] focus-visible:ring-[var(--status-error)]',
                 )}
               />
             </div>
@@ -463,7 +474,7 @@ export default function LoginPage() {
             type="submit"
             onMouseEnter={() => setIsButtonHovered(true)}
             onMouseLeave={() => setIsButtonHovered(false)}
-            className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-600)] bg-gradient-to-b from-[var(--brand-500)] to-[var(--brand-600)] py-1.5 px-3 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
+            className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-600)] bg-gradient-to-b from-[var(--brand-500)] to-[var(--brand-600)] px-3 py-1.5 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
             disabled={isLoading}
             suppressHydrationWarning
           >
@@ -541,7 +552,7 @@ export default function LoginPage() {
                 type="email"
                 className={cn(
                   'rounded-auth shadow-sm transition-colors focus:border-[var(--brand-400)] focus:ring-2 focus:ring-[var(--brand-100)]',
-                    'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)] focus-visible:ring-[var(--status-error)]',
+                  'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)] focus-visible:ring-[var(--status-error)]',
                 )}
               />
             </div>
@@ -550,7 +561,7 @@ export default function LoginPage() {
               onClick={handleForgotPassword}
               onMouseEnter={() => setIsResetButtonHovered(true)}
               onMouseLeave={() => setIsResetButtonHovered(false)}
-              className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-600)] bg-gradient-to-b from-[var(--brand-500)] to-[var(--brand-600)] py-1.5 px-3 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
+              className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-600)] bg-gradient-to-b from-[var(--brand-500)] to-[var(--brand-600)] px-3 py-1.5 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
               disabled={isSubmittingReset}
             >
               <span className="flex items-center gap-1" suppressHydrationWarning>
diff --git a/frontend/app/(auth)/signup/signup-form.tsx b/frontend/app/(auth)/signup/signup-form.tsx
index 4cb9f5946..e223362e7 100644
--- a/frontend/app/(auth)/signup/signup-form.tsx
+++ b/frontend/app/(auth)/signup/signup-form.tsx
@@ -5,7 +5,6 @@ import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { Suspense, useEffect, useMemo, useState } from 'react'
 
-
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
@@ -271,25 +270,17 @@ function SignupFormContent() {
             const errorCode = typeof ctx.error.code === 'string' ? ctx.error.code : ''
             const errorMessage = typeof ctx.error.message === 'string' ? ctx.error.message : ''
 
-            if (
-              errorCode.includes('USER_ALREADY_EXISTS') ||
-              errorMessage.includes('already registered')
-            ) {
+            if (errorCode === 'USER_ALREADY_EXISTS') {
               toastError(t('auth.userAlreadyExists'))
-            } else if (
-              errorCode.includes('BAD_REQUEST') ||
-              errorMessage.includes('Email and password sign up is not enabled')
-            ) {
-              toastError(t('auth.emailSignInDisabled'))
-            } else if (errorCode.includes('INVALID_EMAIL')) {
+            } else if (errorCode === 'INVALID_EMAIL') {
               toastError(t('auth.emailInvalid'))
-            } else if (errorCode.includes('PASSWORD_TOO_SHORT')) {
+            } else if (errorCode === 'PASSWORD_TOO_SHORT') {
               toastError(t('auth.passwordMinLength'))
-            } else if (errorCode.includes('PASSWORD_TOO_LONG')) {
+            } else if (errorCode === 'PASSWORD_TOO_LONG') {
               toastError(t('auth.passwordMaxLength'))
-            } else if (errorCode.includes('network')) {
+            } else if (errorCode === 'network') {
               toastError(t('auth.networkError'))
-            } else if (errorCode.includes('rate limit')) {
+            } else if (errorCode === 'RATE_LIMITED') {
               toastError(t('auth.rateLimitError'))
             } else {
               toastError(errorMessage || t('auth.invalidCredentials'))
@@ -432,7 +423,7 @@ function SignupFormContent() {
             type="submit"
             onMouseEnter={() => setIsButtonHovered(true)}
             onMouseLeave={() => setIsButtonHovered(false)}
-            className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] py-1.5 px-3 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
+            className="group inline-flex w-full items-center justify-center gap-2 rounded-auth border border-[var(--brand-500)] bg-gradient-to-b from-[var(--brand-400)] to-[var(--brand-500)] px-3 py-1.5 pr-2.5 text-base text-white shadow-[inset_0_2px_4px_0_var(--brand-200)] transition-all"
             disabled={isLoading}
             suppressHydrationWarning
           >
diff --git a/frontend/app/(auth)/verify/use-verification.ts b/frontend/app/(auth)/verify/use-verification.ts
index 633726cf1..f5ebd1b60 100644
--- a/frontend/app/(auth)/verify/use-verification.ts
+++ b/frontend/app/(auth)/verify/use-verification.ts
@@ -4,6 +4,7 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { useCallback, useEffect, useState } from 'react'
 
 import { client, useSession } from '@/lib/auth/auth-client'
+import { ApiError } from '@/lib/api-client'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('useVerification')
@@ -75,7 +76,7 @@ export function useVerification({
       }
 
       // Whitelist check: only allow specific paths
-      const allowedPaths = ['/chat', '/workspace', '/dashboard']
+      const allowedPaths = ['/dashboard', '/workspace', '/agents']
       const isAllowed = allowedPaths.some((path) => url.startsWith(path))
 
       if (!isAllowed) {
@@ -163,12 +164,16 @@ export function useVerification({
           if (isInviteFlow && redirectUrl) {
             window.location.href = redirectUrl
           } else {
-            window.location.href = '/chat'
+            window.location.href = '/dashboard'
           }
         }, 1000)
       } else {
         logger.info('Setting invalid OTP state - API error response')
-        const message = 'Invalid verification code. Please check and try again.'
+        const code = response?.error?.code ?? ''
+        const message =
+          code === 'VERIFICATION_TOKEN_EXPIRED'
+            ? 'The verification code has expired. Please request a new one.'
+            : 'Invalid verification code. Please check and try again.'
         setIsInvalidOtp(true)
         setErrorMessage(message)
         logger.info('Error state after API error:', {
@@ -180,14 +185,12 @@ export function useVerification({
     } catch (error: unknown) {
       let message = 'Verification failed. Please check your code and try again.'
 
-      const errorMessage = error instanceof Error ? error.message : ''
-      if (errorMessage.includes('expired')) {
+      const errorCode = error instanceof ApiError ? error.code : ''
+      if (errorCode === 'VERIFICATION_TOKEN_EXPIRED') {
         message = 'The verification code has expired. Please request a new one.'
-      } else if (errorMessage.includes('invalid')) {
+      } else if (errorCode === 'VERIFICATION_TOKEN_INVALID') {
         logger.info('Setting invalid OTP state - caught error')
         message = 'Invalid verification code. Please check and try again.'
-      } else if (errorMessage.includes('attempts')) {
-        message = 'Too many failed attempts. Please request a new code.'
       }
 
       setIsInvalidOtp(true)
@@ -257,7 +260,7 @@ export function useVerification({
           if (isInviteFlow && redirectUrl) {
             window.location.href = redirectUrl
           } else {
-            router.push('/chat')
+            router.push('/dashboard')
           }
         }
 
diff --git a/frontend/app/(auth)/verify/verify-content.tsx b/frontend/app/(auth)/verify/verify-content.tsx
index f3dd1b7a9..c9c1bf8b6 100644
--- a/frontend/app/(auth)/verify/verify-content.tsx
+++ b/frontend/app/(auth)/verify/verify-content.tsx
@@ -100,7 +100,9 @@ function VerificationForm({
   return (
     <>
       <div className="space-y-1 text-center">
-        <h1 className={`${soehne.className} text-3xl font-medium tracking-tight text-[var(--text-primary)]`}>
+        <h1
+          className={`${soehne.className} text-3xl font-medium tracking-tight text-[var(--text-primary)]`}
+        >
           {isVerified ? 'Email Verified!' : 'Verify Your Email'}
         </h1>
         <p className={`${inter.className} text-lg font-[380] text-muted-foreground`}>
@@ -139,7 +141,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                   <InputOTPSlot
@@ -148,7 +151,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                   <InputOTPSlot
@@ -157,7 +161,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                   <InputOTPSlot
@@ -166,7 +171,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                   <InputOTPSlot
@@ -175,7 +181,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                   <InputOTPSlot
@@ -184,7 +191,8 @@ function VerificationForm({
                       'h-12 w-12 !rounded-auth border bg-[var(--surface-2)] text-center text-lg font-medium shadow-sm transition-all duration-200',
                       'border-[var(--border-strong)] hover:border-[var(--border-strong)]',
                       'focus:border-[var(--border-strong)] focus:outline-none focus:ring-2 focus:ring-[var(--border-muted)]',
-                      isInvalidOtp && 'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
+                      isInvalidOtp &&
+                        'border-[var(--status-error)] focus:border-[var(--status-error)] focus:ring-[var(--status-error-bg)]',
                     )}
                   />
                 </InputOTPGroup>
diff --git a/frontend/app/agents/[agentId]/edit/page.tsx b/frontend/app/agents/[agentId]/edit/page.tsx
new file mode 100644
index 000000000..e4babe2f6
--- /dev/null
+++ b/frontend/app/agents/[agentId]/edit/page.tsx
@@ -0,0 +1,16 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import { useEffect } from 'react'
+
+export default function AgentEditRedirect() {
+  const params = useParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+
+  useEffect(() => {
+    router.replace(`/agents/${agentId}?tab=settings`)
+  }, [agentId, router])
+
+  return null
+}
diff --git a/frontend/app/agents/[agentId]/layout.tsx b/frontend/app/agents/[agentId]/layout.tsx
new file mode 100644
index 000000000..31a79b8f5
--- /dev/null
+++ b/frontend/app/agents/[agentId]/layout.tsx
@@ -0,0 +1,123 @@
+'use client'
+
+import { ArrowLeft, Bot, Loader2, MessageSquare, Settings } from 'lucide-react'
+import Link from 'next/link'
+import { useParams, useSearchParams, useRouter } from 'next/navigation'
+import {
+  BUILD_STAGES,
+  isBuildStageId,
+  type BuildStageId,
+} from '@/components/agents/agent-build/agent-build-types'
+import { BuildStepper } from '@/components/agents/agent-build/build-stepper'
+
+import { AgentStatusIndicator } from '@/components/agents/agent-status'
+import { Button } from '@/components/ui/button'
+import { useAgent } from '@/hooks/queries/agents'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
+export default function AgentDetailLayout({ children }: { children: React.ReactNode }) {
+  const { t } = useTranslation()
+  const params = useParams()
+  const searchParams = useSearchParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+  const { workspaceId } = useCurrentWorkspace()
+  const { data: agent, isLoading } = useAgent(agentId, workspaceId)
+  const currentTab = searchParams.get('tab')
+
+  const activeStageId = searchParams.get('stage') as BuildStageId | null
+
+  const navigateToStage = (stageId: BuildStageId) => {
+    const params = new URLSearchParams(searchParams.toString())
+    params.set('stage', stageId)
+    router.replace(`/agents/${agentId}?${params.toString()}`, { scroll: false })
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+        {t('common.loading')}
+      </div>
+    )
+  }
+
+  if (!agent) {
+    return (
+      <div className="flex h-full flex-col items-center justify-center gap-4">
+        <p className="text-sm text-[var(--text-muted)]">Agent not found</p>
+        <Button variant="outline" size="sm" asChild>
+          <Link href="/agents">Back to Agents</Link>
+        </Button>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--bg)]">
+      <div className="flex items-center justify-between border-b border-[var(--border)] bg-[var(--surface-elevated)] px-4 py-2">
+        {/* Left: Identity */}
+        <div className="flex min-w-0 items-center gap-3">
+          <Button
+            variant="ghost"
+            size="sm"
+            asChild
+            className="-ml-2 h-8 w-8 p-0 text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
+          >
+            <Link href="/agents">
+              <ArrowLeft className="h-4 w-4" />
+            </Link>
+          </Button>
+          <Bot className="h-4 w-4 shrink-0 text-[var(--skill-brand-600)]" />
+          <h1 className="truncate text-sm font-semibold text-[var(--text-primary)]">
+            {agent.name}
+          </h1>
+          <AgentStatusIndicator status={agent.status} className="shrink-0 origin-left scale-75" />
+        </div>
+
+        {/* Center: Build Stepper (only in builder mode) */}
+        {!currentTab && (
+          <div className="hidden lg:block">
+            <BuildStepper
+              stages={BUILD_STAGES}
+              activeStage={activeStageId && isBuildStageId(activeStageId) ? activeStageId : 'brief'}
+              onNavigate={navigateToStage}
+            />
+          </div>
+        )}
+
+        {/* Right: Chat + Settings */}
+        <div className="flex items-center gap-1">
+          <Button
+            variant={currentTab === 'chat' ? 'secondary' : 'ghost'}
+            size="sm"
+            asChild
+            className="h-7 px-2 text-xs"
+          >
+            <Link href={`/agents/${agentId}?tab=chat`}>
+              <MessageSquare className="mr-1.5 h-3 w-3" />
+              {t('agents.detail.tabs.chat', { defaultValue: 'Chat' })}
+            </Link>
+          </Button>
+          <Button
+            variant={currentTab === 'settings' ? 'secondary' : 'ghost'}
+            size="sm"
+            asChild
+            className="h-7 px-2 text-xs"
+          >
+            <Link href={`/agents/${agentId}?tab=settings`}>
+              <Settings className="mr-1.5 h-3 w-3" />
+              {t('agents.detail.tabs.settings', { defaultValue: 'Settings' })}
+            </Link>
+          </Button>
+        </div>
+      </div>
+
+      <div className={cn('flex-1', currentTab ? 'overflow-y-auto' : 'overflow-hidden')}>
+        {children}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/agents/[agentId]/page.tsx b/frontend/app/agents/[agentId]/page.tsx
new file mode 100644
index 000000000..433373de6
--- /dev/null
+++ b/frontend/app/agents/[agentId]/page.tsx
@@ -0,0 +1,73 @@
+'use client'
+
+import { Loader2 } from 'lucide-react'
+import { useParams, useSearchParams, useRouter } from 'next/navigation'
+
+import { AgentBuildShell } from '@/components/agents/agent-build/agent-build-shell'
+import { BuilderSurfaceContext } from '@/components/agents/agent-build/builder-surface-context'
+import { resolveBuilderSurface } from '@/components/agents/agent-build/builder-surface-registry'
+import { AgentSettingsTab } from '@/components/agents/agent-settings-tab'
+import { ChatPanel } from '@/components/chat/ChatPanel'
+import { useAgent } from '@/hooks/queries/agents'
+import { useVersion } from '@/hooks/queries/agentVersions'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
+export default function AgentDetailPage() {
+  const params = useParams()
+  const searchParams = useSearchParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+  const tab = searchParams.get('tab')
+  const threadId = searchParams.get('thread') || undefined
+  const { workspaceId } = useCurrentWorkspace()
+
+  const { data: agent, isLoading: isAgentLoading } = useAgent(agentId, workspaceId)
+  const draftVersionId = agent?.current_draft_version_id || ''
+  const { data: version, isLoading: isVersionLoading } = useVersion(
+    agentId,
+    draftVersionId,
+    workspaceId,
+    { enabled: Boolean(agent && draftVersionId && workspaceId) },
+  )
+
+  if (tab === 'chat') {
+    return (
+      <ChatPanel
+        agentId={agentId}
+        workspaceId={workspaceId}
+        threadId={threadId}
+        onThreadChange={(id) => {
+          router.push(`/agents/${agentId}?tab=chat&thread=${id}`)
+        }}
+      />
+    )
+  }
+
+  if (tab === 'settings') {
+    return <AgentSettingsTab agentId={agentId} />
+  }
+
+  if (isAgentLoading || (draftVersionId && isVersionLoading)) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <Loader2 className="h-6 w-6 animate-spin text-[var(--brand-500)]" />
+      </div>
+    )
+  }
+
+  if (!agent) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+        Agent not found
+      </div>
+    )
+  }
+
+  const surface = resolveBuilderSurface(version?.engine_kind)
+
+  return (
+    <BuilderSurfaceContext.Provider value={surface}>
+      <AgentBuildShell agent={agent} version={version ?? null} />
+    </BuilderSurfaceContext.Provider>
+  )
+}
diff --git a/frontend/app/agents/[agentId]/releases/page.tsx b/frontend/app/agents/[agentId]/releases/page.tsx
new file mode 100644
index 000000000..3bc4c226b
--- /dev/null
+++ b/frontend/app/agents/[agentId]/releases/page.tsx
@@ -0,0 +1,16 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import { useEffect } from 'react'
+
+export default function AgentReleasesRedirect() {
+  const params = useParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+
+  useEffect(() => {
+    router.replace(`/agents/${agentId}?tab=settings`)
+  }, [agentId, router])
+
+  return null
+}
diff --git a/frontend/app/agents/[agentId]/tasks/page.tsx b/frontend/app/agents/[agentId]/tasks/page.tsx
new file mode 100644
index 000000000..ae0960f64
--- /dev/null
+++ b/frontend/app/agents/[agentId]/tasks/page.tsx
@@ -0,0 +1,138 @@
+'use client'
+
+import { Kanban, List, Loader2, Plus, Target } from 'lucide-react'
+import { useSearchParams, useRouter, useParams } from 'next/navigation'
+import { useCallback, useState } from 'react'
+
+import { TaskBoard } from '@/components/tasks/task-board'
+import { TaskCreateDialog } from '@/components/tasks/task-create-dialog'
+import { TaskDetailPanel } from '@/components/tasks/task-detail-panel'
+import { TaskListView } from '@/components/tasks/task-list-view'
+import { Button } from '@/components/ui/button'
+import { useAgentNameMap } from '@/hooks/queries/agents'
+import { useTasks } from '@/hooks/queries/tasks'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+
+type ViewMode = 'board' | 'list'
+
+export default function AgentTasksPage() {
+  const params = useParams()
+  const agentId = params.agentId as string
+  const [viewMode, setViewMode] = useState<ViewMode>('board')
+  const searchParams = useSearchParams()
+  const router = useRouter()
+  const selectedTaskId = searchParams.get('task')
+
+  const setSelectedTaskId = useCallback(
+    (id: string | null) => {
+      const p = new URLSearchParams(searchParams.toString())
+      if (id) {
+        p.set('task', id)
+      } else {
+        p.delete('task')
+      }
+      router.replace(`/agents/${agentId}/tasks?${p.toString()}`, { scroll: false })
+    },
+    [searchParams, router, agentId],
+  )
+
+  const { workspaceId, isLoading: isWorkspacesLoading } = useCurrentWorkspace()
+  const { canEdit } = useUserPermissionsContext()
+
+  const { data: allTasks = [], isLoading: isTasksLoading } = useTasks(
+    workspaceId,
+    // Use server-side agent_id filter when workspaceId is ready
+    workspaceId ? { agent_id: agentId } : undefined,
+  )
+  const agentsMap = useAgentNameMap(workspaceId)
+
+  // Tasks are already filtered server-side by agent_id.
+  const tasks = allTasks.filter((t) => t.agent_id === agentId)
+
+  const isLoading = isWorkspacesLoading || isTasksLoading
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--bg)]">
+      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-2">
+            <Target className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <h2 className="text-lg font-semibold text-[var(--text-primary)]">Tasks</h2>
+          </div>
+
+          <div className="flex items-center gap-2">
+            <div className="flex items-center rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-0.5">
+              <button
+                type="button"
+                onClick={() => setViewMode('board')}
+                className={cn(
+                  'inline-flex items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors',
+                  viewMode === 'board'
+                    ? 'bg-[var(--surface-5)] text-[var(--text-primary)]'
+                    : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]',
+                )}
+                aria-label="Board view"
+              >
+                <Kanban className="h-3.5 w-3.5" />
+                Board
+              </button>
+              <button
+                type="button"
+                onClick={() => setViewMode('list')}
+                className={cn(
+                  'inline-flex items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors',
+                  viewMode === 'list'
+                    ? 'bg-[var(--surface-5)] text-[var(--text-primary)]'
+                    : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]',
+                )}
+                aria-label="List view"
+              >
+                <List className="h-3.5 w-3.5" />
+                List
+              </button>
+            </div>
+
+            {workspaceId && canEdit && (
+              <TaskCreateDialog
+                workspaceId={workspaceId}
+                trigger={
+                  <Button size="sm">
+                    <Plus className="h-4 w-4" />
+                    New Task
+                  </Button>
+                }
+              />
+            )}
+          </div>
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-hidden">
+        {isLoading ? (
+          <div className="flex h-full items-center justify-center">
+            <Loader2 className="h-6 w-6 animate-spin text-[var(--text-muted)]" />
+          </div>
+        ) : viewMode === 'board' ? (
+          <TaskBoard
+            tasks={tasks}
+            workspaceId={workspaceId}
+            agentsMap={agentsMap}
+            onSelectTask={setSelectedTaskId}
+          />
+        ) : (
+          <TaskListView tasks={tasks} agentsMap={agentsMap} onSelectTask={setSelectedTaskId} />
+        )}
+      </div>
+
+      {selectedTaskId && workspaceId && (
+        <TaskDetailPanel
+          taskId={selectedTaskId}
+          workspaceId={workspaceId}
+          onClose={() => setSelectedTaskId(null)}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/frontend/app/agents/[agentId]/threads/[threadId]/page.tsx b/frontend/app/agents/[agentId]/threads/[threadId]/page.tsx
new file mode 100644
index 000000000..f48cd29e6
--- /dev/null
+++ b/frontend/app/agents/[agentId]/threads/[threadId]/page.tsx
@@ -0,0 +1,17 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import { useEffect } from 'react'
+
+export default function ThreadDetailRedirect() {
+  const params = useParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+  const threadId = params.threadId as string
+
+  useEffect(() => {
+    router.replace(`/agents/${agentId}?tab=chat&thread=${threadId}`)
+  }, [agentId, threadId, router])
+
+  return null
+}
diff --git a/frontend/app/agents/[agentId]/threads/page.tsx b/frontend/app/agents/[agentId]/threads/page.tsx
new file mode 100644
index 000000000..cc237a199
--- /dev/null
+++ b/frontend/app/agents/[agentId]/threads/page.tsx
@@ -0,0 +1,16 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import { useEffect } from 'react'
+
+export default function AgentThreadsRedirect() {
+  const params = useParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+
+  useEffect(() => {
+    router.replace(`/agents/${agentId}?tab=chat`)
+  }, [agentId, router])
+
+  return null
+}
diff --git a/frontend/app/agents/[agentId]/versions/page.tsx b/frontend/app/agents/[agentId]/versions/page.tsx
new file mode 100644
index 000000000..49bf085e0
--- /dev/null
+++ b/frontend/app/agents/[agentId]/versions/page.tsx
@@ -0,0 +1,16 @@
+'use client'
+
+import { useParams, useRouter } from 'next/navigation'
+import { useEffect } from 'react'
+
+export default function AgentVersionsRedirect() {
+  const params = useParams()
+  const router = useRouter()
+  const agentId = params.agentId as string
+
+  useEffect(() => {
+    router.replace(`/agents/${agentId}?tab=settings`)
+  }, [agentId, router])
+
+  return null
+}
diff --git a/frontend/app/agents/layout.tsx b/frontend/app/agents/layout.tsx
new file mode 100644
index 000000000..d6d5c6d32
--- /dev/null
+++ b/frontend/app/agents/layout.tsx
@@ -0,0 +1,18 @@
+'use client'
+
+import { useEffect } from 'react'
+import { useSidebarStore } from '@/stores/sidebar/store'
+
+export default function AgentsLayout({ children }: { children: React.ReactNode }) {
+  const setIsCollapsed = useSidebarStore((state) => state.setIsCollapsed)
+
+  useEffect(() => {
+    setIsCollapsed(true)
+
+    return () => {
+      setIsCollapsed(false)
+    }
+  }, [setIsCollapsed])
+
+  return <>{children}</>
+}
diff --git a/frontend/app/agents/page.tsx b/frontend/app/agents/page.tsx
new file mode 100644
index 000000000..a888f7610
--- /dev/null
+++ b/frontend/app/agents/page.tsx
@@ -0,0 +1,211 @@
+'use client'
+
+import { Bot, Loader2, Plus } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+import { useState } from 'react'
+
+import { AgentCard } from '@/components/agents/agent-card'
+import { CreateAgentDialog } from '@/components/agents/agent-form-dialog'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { ConfirmDialog } from '@/components/ui/confirm-dialog'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { useAgents, useCreateAgent, useDeleteAgent } from '@/hooks/queries/agents'
+import {
+  AGENT_LIST_ENGINE_FILTERS,
+  AGENT_LIST_RUNTIME_FILTERS,
+  filterAgentsForList,
+  type AgentListEngineFilter,
+  type AgentListRuntimeFilter,
+} from '@/lib/agents/agent-list-filters'
+import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import type { Agent, CreateAgentRequest } from '@/types/agent'
+
+export default function AgentsPage() {
+  const { t } = useTranslation()
+  const router = useRouter()
+  const { workspaceId } = useCurrentWorkspace()
+  const { canEdit } = useUserPermissionsContext()
+
+  const { data: agents = [], isLoading } = useAgents(workspaceId)
+  const createMutation = useCreateAgent()
+  const deleteMutation = useDeleteAgent()
+
+  const [dialogOpen, setDialogOpen] = useState(false)
+  const [deletingAgent, setDeletingAgent] = useState<Agent | null>(null)
+  const [engineFilter, setEngineFilter] = useState<AgentListEngineFilter>('all')
+  const [runtimeFilter, setRuntimeFilter] = useState<AgentListRuntimeFilter>('all')
+
+  const filteredAgents = filterAgentsForList(agents, {
+    engineKind: engineFilter,
+    runtimeKind: runtimeFilter,
+  })
+
+  async function handleSubmit(data: CreateAgentRequest) {
+    try {
+      const newAgent = await createMutation.mutateAsync({
+        ...data,
+        workspace_id: workspaceId,
+      })
+      setDialogOpen(false)
+      router.push(`/agents/${newAgent.id}?stage=brief`)
+    } catch {
+      // error handled by React Query
+    }
+  }
+
+  function handleNavigate(agent: Agent) {
+    router.push(`/agents/${agent.id}`)
+  }
+
+  function confirmDelete() {
+    if (!deletingAgent) return
+    deleteMutation.mutate(
+      { agentId: deletingAgent.id, workspaceId },
+      { onSettled: () => setDeletingAgent(null) },
+    )
+  }
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+        {t('common.loading')}
+      </div>
+    )
+  }
+
+  return (
+    <div className="h-full overflow-y-auto bg-[var(--bg)] p-6">
+      <div className="mb-6 flex items-center justify-between">
+        <div>
+          <h1 className="text-2xl font-semibold text-[var(--text-primary)]">
+            {t('agents.title', { defaultValue: 'Agents' })}
+          </h1>
+          <p className="mt-1 text-sm text-[var(--text-muted)]">
+            {t('agents.subtitle', { defaultValue: 'Build and manage your AI agents' })}
+          </p>
+        </div>
+        {canEdit && (
+          <Button onClick={() => setDialogOpen(true)} className="gap-1.5">
+            <Plus className="h-4 w-4" />
+            {t('agents.newAgent', { defaultValue: 'New Agent' })}
+          </Button>
+        )}
+      </div>
+
+      {agents.length > 0 && (
+        <div className="mb-4 flex flex-wrap items-center gap-3">
+          <Select
+            value={engineFilter}
+            onValueChange={(value) => setEngineFilter(value as AgentListEngineFilter)}
+          >
+            <SelectTrigger className="h-9 w-[190px] bg-[var(--surface-1)]">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {AGENT_LIST_ENGINE_FILTERS.map((option) => (
+                <SelectItem key={option.value} value={option.value}>
+                  {t(option.labelKey, { defaultValue: option.defaultLabel })}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+
+          <Select
+            value={runtimeFilter}
+            onValueChange={(value) => setRuntimeFilter(value as AgentListRuntimeFilter)}
+          >
+            <SelectTrigger className="h-9 w-[190px] bg-[var(--surface-1)]">
+              <SelectValue />
+            </SelectTrigger>
+            <SelectContent>
+              {AGENT_LIST_RUNTIME_FILTERS.map((option) => (
+                <SelectItem key={option.value} value={option.value}>
+                  {t(option.labelKey, { defaultValue: option.defaultLabel })}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+        </div>
+      )}
+
+      {agents.length === 0 ? (
+        <Card className="flex flex-col items-center justify-center gap-4 border-dashed p-12 text-center">
+          <Bot className="h-10 w-10 text-[var(--text-muted)]" />
+          <div>
+            <h3 className="text-sm font-medium text-[var(--text-primary)]">
+              {t('agents.emptyTitle', { defaultValue: 'No agents yet' })}
+            </h3>
+            <p className="mt-1 text-sm text-[var(--text-muted)]">
+              {t('agents.emptySubtitle', {
+                defaultValue: 'Create your first agent to get started',
+              })}
+            </p>
+          </div>
+          {canEdit && (
+            <Button onClick={() => setDialogOpen(true)} variant="outline" className="gap-1.5">
+              <Plus className="h-4 w-4" />
+              {t('agents.newAgent', { defaultValue: 'New Agent' })}
+            </Button>
+          )}
+        </Card>
+      ) : filteredAgents.length === 0 ? (
+        <Card className="flex flex-col items-center justify-center gap-3 border-dashed p-10 text-center">
+          <Bot className="h-8 w-8 text-[var(--text-muted)]" />
+          <div>
+            <h3 className="text-sm font-medium text-[var(--text-primary)]">
+              {t('agents.filters.emptyTitle', { defaultValue: 'No matching agents' })}
+            </h3>
+            <p className="mt-1 text-sm text-[var(--text-muted)]">
+              {t('agents.filters.emptySubtitle', {
+                defaultValue: 'Adjust the build type or runtime filters.',
+              })}
+            </p>
+          </div>
+        </Card>
+      ) : (
+        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
+          {filteredAgents.map((agent) => (
+            <AgentCard
+              key={agent.id}
+              agent={agent}
+              onClick={handleNavigate}
+              onDelete={canEdit ? (a) => setDeletingAgent(a) : undefined}
+            />
+          ))}
+        </div>
+      )}
+
+      <CreateAgentDialog
+        open={dialogOpen}
+        onOpenChange={setDialogOpen}
+        onSubmit={handleSubmit}
+        isPending={createMutation.isPending}
+      />
+
+      <ConfirmDialog
+        open={Boolean(deletingAgent)}
+        onOpenChange={(open) => {
+          if (!open) setDeletingAgent(null)
+        }}
+        title={t('agents.deleteConfirmTitle', { defaultValue: 'Delete agent' })}
+        description={t('agents.deleteConfirmDescription', {
+          name: deletingAgent?.name,
+          defaultValue: `Are you sure you want to delete "${deletingAgent?.name}"?`,
+        })}
+        onConfirm={confirmDelete}
+        loading={deleteMutation.isPending}
+        variant="destructive"
+      />
+    </div>
+  )
+}
diff --git a/frontend/app/chat/ChatLayout.tsx b/frontend/app/chat/ChatLayout.tsx
deleted file mode 100644
index 59c87f914..000000000
--- a/frontend/app/chat/ChatLayout.tsx
+++ /dev/null
@@ -1,390 +0,0 @@
-'use client'
-
-import { FolderOpen, List, Plus } from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import React, { useEffect, useRef, useCallback } from 'react'
-import type { ImperativePanelHandle } from 'react-resizable-panels'
-
-import { Button } from '@/components/ui/button'
-import { ResizablePanelGroup, ResizablePanel, ResizableHandle } from '@/components/ui/resizable'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useDeployedGraphs, useWorkspaces } from '@/hooks/queries'
-import { useTranslation } from '@/lib/i18n'
-import { conversationService } from '@/services/conversationService'
-
-import { useChatState, useChatStream } from './ChatProvider'
-import ChatHome from './components/ChatHome'
-import ChatSidebar from './components/ChatSidebar'
-import { getModeConfig } from './config/modeConfig'
-import { ConversationPanel } from './conversation'
-import { usePreviewTrigger } from './hooks/usePreviewTrigger'
-import { PreviewPanel } from './preview'
-import { graphResolutionService } from './services/graphResolutionService'
-import { generateId, type Message, type ToolCall } from './types'
-
-interface ChatLayoutProps {
-  chatId?: string | null
-}
-
-export default function ChatLayout({ chatId: propChatId }: ChatLayoutProps) {
-  const { state, dispatch } = useChatState()
-  const stream = useChatStream()
-  const { t } = useTranslation()
-  const router = useRouter()
-
-  // Data fetching
-  const { data: deployedAgents = [] } = useDeployedGraphs()
-  const { data: workspacesData } = useWorkspaces()
-
-  usePreviewTrigger(state, dispatch)
-
-  const prevPropChatIdRef = useRef<string | null | undefined>(propChatId)
-  const isInitialMountRef = useRef(true)
-  const sidebarPanelRef = useRef<ImperativePanelHandle>(null)
-  const sidebarVisibleRef = useRef(state.ui.sidebarVisible)
-  // eslint-disable-next-line react-hooks/refs
-  sidebarVisibleRef.current = state.ui.sidebarVisible
-
-  const toggleSidebar = useCallback(() => {
-    if (sidebarVisibleRef.current) {
-      sidebarPanelRef.current?.collapse()
-    } else {
-      sidebarPanelRef.current?.expand()
-    }
-  }, [])
-
-  // Keyboard shortcut: Cmd+B toggle sidebar
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if ((e.metaKey || e.ctrlKey) && e.key === 'b') {
-        e.preventDefault()
-        toggleSidebar()
-      }
-    }
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [toggleSidebar])
-
-  // Sync propChatId changes
-  useEffect(() => {
-    if (isInitialMountRef.current) {
-      isInitialMountRef.current = false
-      if (propChatId) {
-        dispatch({ type: 'SET_THREAD', threadId: propChatId })
-      }
-      return
-    }
-
-    if (propChatId !== prevPropChatIdRef.current) {
-      prevPropChatIdRef.current = propChatId
-      if (propChatId) {
-        dispatch({ type: 'SET_THREAD', threadId: propChatId })
-      } else {
-        dispatch({ type: 'RESET' })
-      }
-    }
-  }, [propChatId, dispatch])
-
-  // APK auto-prompt
-  useEffect(() => {
-    if (
-      state.mode.currentMode === 'apk-vulnerability' &&
-      state.messages.length === 0 &&
-      !state.mode.hasShownApkPrompt &&
-      !stream.isProcessing
-    ) {
-      dispatch({ type: 'SET_APK_PROMPT_SHOWN' })
-      const promptMessage: Message = {
-        id: generateId(),
-        role: 'assistant',
-        content: t('chat.apkUploadPrompt', { defaultValue: 'Please upload an APK file to start vulnerability analysis.' }),
-        timestamp: Date.now(),
-      }
-      dispatch({ type: 'APPEND_MESSAGE', message: promptMessage })
-    }
-  }, [state.mode.currentMode, state.messages.length, state.mode.hasShownApkPrompt, stream.isProcessing, t, dispatch])
-
-  // Handle conversation selection from sidebar
-  const handleSelectConversation = useCallback(
-    async (threadId: string) => {
-      dispatch({ type: 'SET_THREAD', threadId })
-      dispatch({ type: 'SET_MESSAGES', messages: [] })
-      dispatch({ type: 'SELECT_TOOL', tool: null })
-
-      try {
-        const backendMessages = await conversationService.getConversationHistory(threadId, {
-          page: 1,
-          pageSize: 100,
-        })
-
-        const formattedMessages: Message[] = backendMessages.map((msg) => {
-          let toolCalls: ToolCall[] | undefined
-          const toolCallsData = msg.metadata?.tool_calls
-          if (Array.isArray(toolCallsData) && toolCallsData.length > 0) {
-            toolCalls = toolCallsData.map((tc: any, index: number) => ({
-              id: `tool-${msg.id}-${index}`,
-              name: tc.name || 'unknown',
-              args: tc.arguments || {},
-              status: 'completed' as const,
-              result: tc.output,
-              startTime: new Date(msg.created_at).getTime(),
-              endTime: new Date(msg.created_at).getTime(),
-            }))
-          }
-
-          return {
-            id: msg.id,
-            role: msg.role as 'user' | 'assistant' | 'system',
-            content: msg.content,
-            tool_calls: toolCalls,
-            timestamp: new Date(msg.created_at).getTime(),
-          }
-        })
-
-        dispatch({ type: 'SET_MESSAGES', messages: formattedMessages })
-      } catch (error) {
-        console.error('Failed to load messages:', error)
-        dispatch({ type: 'SET_MESSAGES', messages: [] })
-      }
-    },
-    [dispatch],
-  )
-
-  // Handle new chat
-  const handleNewChat = useCallback(() => {
-    router.push('/chat')
-    dispatch({ type: 'RESET' })
-  }, [router, dispatch])
-
-  // Handle message submit
-  const handleSubmit = useCallback(
-    async (
-      text: string,
-      mode?: string,
-      graphId?: string | null,
-      files?: Array<{ id: string; filename: string; path: string; size: number }>,
-    ) => {
-      // Save mode state
-      if (mode) {
-        dispatch({ type: 'SET_MODE', mode, graphId: graphId || null })
-      } else if (graphId !== undefined) {
-        dispatch({
-          type: 'SET_MODE',
-          mode: state.mode.currentMode || '',
-          graphId: graphId || null,
-        })
-      }
-
-      // APK special case: empty text just sets mode
-      if (!text.trim() && mode === 'apk-vulnerability' && (!files || files.length === 0)) {
-        return
-      }
-
-      if ((!text.trim() && (!files || files.length === 0)) || stream.isProcessing) return
-
-      // Resolve graphId
-      let resolvedGraphId = graphId || state.mode.currentGraphId
-      if (!resolvedGraphId && mode) {
-        const modeContext = {
-          workspaces: workspacesData || [],
-          deployedAgents,
-          selectedAgentId: null,
-          personalWorkspaceId: workspacesData?.find((w) => w.type === 'personal')?.id || null,
-          t,
-          router: { push: () => {} },
-          queryClient: { invalidateQueries: () => {} },
-        }
-        const resolution = await graphResolutionService.resolve(mode, modeContext, false)
-        resolvedGraphId = resolution.graphId
-        if (resolvedGraphId) {
-          dispatch({
-            type: 'SET_MODE',
-            mode: mode || state.mode.currentMode || '',
-            graphId: resolvedGraphId,
-          })
-        }
-      }
-
-      // Add user message
-      const userMsg: Message = {
-        id: generateId(),
-        role: 'user',
-        content: text,
-        timestamp: Date.now(),
-      }
-      dispatch({ type: 'APPEND_MESSAGE', message: userMsg })
-      dispatch({ type: 'SET_INPUT', value: '' })
-      dispatch({ type: 'STREAM_START' })
-
-      const inputFiles =
-        files?.map((f) => ({
-          filename: f.filename,
-          path: f.path,
-          size: f.size,
-        })) || []
-
-      const messageOpts: {
-        threadId?: string | null
-        graphId?: string | null
-      } = {
-        threadId: state.threadId || null,
-        graphId: resolvedGraphId || null,
-      }
-
-      try {
-        await stream.sendMessage({
-          input: {
-            message: text,
-            ...(inputFiles.length > 0 ? { files: inputFiles } : {}),
-          },
-          threadId: messageOpts.threadId,
-          graphId: messageOpts.graphId,
-          extension: null,
-          metadata: {},
-        })
-      } catch (error) {
-        console.error('[ChatLayout] Unexpected error in sendMessage:', error)
-      }
-    },
-    [dispatch, stream, state.threadId, state.mode, workspacesData, deployedAgents, t],
-  )
-
-  const handleStop = useCallback(() => {
-    stream.stopMessage(stream.activeRequestId)
-  }, [stream])
-
-  const hasFiles = Object.keys(state.preview.fileTree).length > 0
-  const hasMessages = state.messages.length > 0 || !!state.threadId || !!propChatId
-
-  // ─── Header ──────────────────────────────────────────────────────────────
-  const headerTitle = (state.mode.currentMode && getModeConfig(state.mode.currentMode)?.labelKey) || 'chat.defaultChat'
-  const renderHeader = () => (
-    <div className="z-10 flex h-14 flex-shrink-0 items-center gap-2 border-b border-[var(--border)] bg-[var(--surface-1)] px-6">
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={toggleSidebar}
-              aria-label={state.ui.sidebarVisible ? t('chat.hideHistory') : t('chat.showHistory')}
-              className="h-9 w-9 rounded-lg p-0 transition-colors hover:bg-[var(--surface-2)]"
-            >
-              <List size={18} className="text-[var(--text-secondary)]" />
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p>{state.ui.sidebarVisible ? t('chat.hideHistory') : t('chat.showHistory')}</p>
-          </TooltipContent>
-        </Tooltip>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button
-              variant="ghost"
-              size="sm"
-              onClick={handleNewChat}
-              aria-label={t('chat.newChat')}
-              className="h-9 w-9 rounded-full bg-primary p-0 text-white transition-colors hover:bg-primary/90"
-            >
-              <Plus size={18} />
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent>
-            <p>{t('chat.newChat')}</p>
-          </TooltipContent>
-        </Tooltip>
-        <div className="flex min-w-0 flex-1 items-center justify-center gap-3">
-          <span className="truncate text-sm font-medium text-[var(--text-primary)]">
-            {t(headerTitle)}
-          </span>
-        </div>
-        {state.threadId && hasFiles && (
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                variant="ghost"
-                size="sm"
-                onClick={() => {
-                  if (state.preview.visible) {
-                    dispatch({ type: 'HIDE_PREVIEW' })
-                  } else {
-                    dispatch({ type: 'SHOW_PREVIEW' })
-                  }
-                }}
-                aria-label={state.preview.visible
-                  ? t('chat.closeArtifacts', { defaultValue: 'Close artifacts' })
-                  : t('chat.openArtifacts', { defaultValue: 'Open artifacts' })}
-                className="h-9 w-9 rounded-lg p-0 transition-colors hover:bg-[var(--surface-2)]"
-              >
-                <FolderOpen size={18} className="text-[var(--text-secondary)]" />
-              </Button>
-            </TooltipTrigger>
-            <TooltipContent>
-              <p>
-                {state.preview.visible
-                  ? t('chat.closeArtifacts', { defaultValue: 'Close artifacts' })
-                  : t('chat.openArtifacts', { defaultValue: 'Open artifacts' })}
-              </p>
-            </TooltipContent>
-          </Tooltip>
-        )}
-      </TooltipProvider>
-    </div>
-  )
-
-  return (
-    <div className="relative flex h-full w-full flex-col overflow-hidden bg-[var(--bg)]">
-      <ResizablePanelGroup direction="horizontal" className="flex-1">
-        {/* Left Sidebar */}
-        <ResizablePanel
-          ref={sidebarPanelRef}
-          defaultSize={0}
-          minSize={10}
-          maxSize={25}
-          collapsible
-          collapsedSize={0}
-          onCollapse={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: false })}
-          onExpand={() => dispatch({ type: 'SET_SIDEBAR_VISIBLE', visible: true })}
-          className="overflow-hidden transition-all duration-300"
-        >
-          <ChatSidebar
-            isCollapsed={!state.ui.sidebarVisible}
-            onToggle={toggleSidebar}
-            onSelectConversation={handleSelectConversation}
-            currentThreadId={state.threadId}
-          />
-        </ResizablePanel>
-        <ResizableHandle className="w-px bg-[var(--border)]" />
-
-        {/* Main Panel */}
-        <ResizablePanel defaultSize={state.preview.visible ? 55 : 88} minSize={40}>
-          <div className="relative flex h-full flex-col overflow-hidden">
-            {renderHeader()}
-            <div className="flex-1 min-h-0 relative overflow-hidden">
-              {!hasMessages ? (
-                <ChatHome
-                  onStartChat={handleSubmit}
-                  onSelectConversation={handleSelectConversation}
-                  isProcessing={stream.isProcessing}
-                  onStop={handleStop}
-                />
-              ) : (
-                <ConversationPanel onSend={handleSubmit} onStop={handleStop} />
-              )}
-            </div>
-          </div>
-        </ResizablePanel>
-
-        {/* Preview Panel */}
-        {state.preview.visible && (
-          <>
-            <ResizableHandle className="w-px bg-[var(--border)]" />
-            <ResizablePanel defaultSize={45} minSize={30} maxSize={60}>
-              <PreviewPanel />
-            </ResizablePanel>
-          </>
-        )}
-      </ResizablePanelGroup>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/ChatProvider.tsx b/frontend/app/chat/ChatProvider.tsx
deleted file mode 100644
index 6a124eb10..000000000
--- a/frontend/app/chat/ChatProvider.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-'use client'
-
-import React, { createContext, useContext, useMemo } from 'react'
-
-import type { ChatSendInput, SkillCreatorExtension, ChatExtension } from '@/lib/ws/chat/types'
-
-import type { ChatState, ChatAction } from './hooks/useChatReducer'
-import { useChatReducer } from './hooks/useChatReducer'
-import { useChatWebSocket } from './hooks/useChatWebSocket'
-
-// ─── Low-frequency context: messages, UI, mode ──────────────────────────────
-
-interface ChatStateContextValue {
-  state: ChatState
-  dispatch: React.Dispatch<ChatAction>
-}
-
-// ─── High-frequency context: streaming text, isProcessing ───────────────────
-
-interface ChatStreamContextValue {
-  text: string
-  isProcessing: boolean
-  isSubmitting: boolean
-  isConnected: boolean
-  activeRequestId: string | null
-  runId: string | null
-  sendMessage: (opts: {
-    input: ChatSendInput
-    threadId?: string | null
-    graphId?: string | null
-    extension?: SkillCreatorExtension | ChatExtension | null
-    metadata?: Record<string, unknown>
-  }) => Promise<{ requestId: string }>
-  stopMessage: (requestId: string | null) => void
-  resumeChat: (opts: {
-    threadId: string
-    command: { update?: Record<string, any>; goto?: string | null }
-  }) => Promise<{ requestId: string }>
-}
-
-const ChatStateContext = createContext<ChatStateContextValue | null>(null)
-const ChatStreamContext = createContext<ChatStreamContextValue | null>(null)
-
-export function ChatProvider({ children }: { children: React.ReactNode }) {
-  const [state, dispatch] = useChatReducer()
-  const ws = useChatWebSocket(dispatch)
-
-  const stateValue = useMemo(
-    () => ({ state, dispatch }),
-    // Exclude streaming fields to avoid re-rendering state consumers on every delta
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [state.messages, state.threadId, state.input, state.preview, state.ui, state.mode, dispatch],
-  )
-
-  const streamValue = useMemo(
-    () => ({
-      text: state.streaming.text,
-      isProcessing: state.streaming.isProcessing,
-      isSubmitting: state.streaming.isSubmitting,
-      isConnected: ws.isConnected,
-      activeRequestId: ws.activeRequestId,
-      runId: ws.chatRunId,
-      sendMessage: ws.sendMessage,
-      stopMessage: ws.stopMessage,
-      resumeChat: ws.resumeChat,
-    }),
-    [
-      state.streaming.text,
-      state.streaming.isProcessing,
-      state.streaming.isSubmitting,
-      ws.isConnected,
-      ws.activeRequestId,
-      ws.chatRunId,
-      ws.sendMessage,
-      ws.stopMessage,
-      ws.resumeChat,
-    ],
-  )
-
-  return (
-    <ChatStateContext.Provider value={stateValue}>
-      <ChatStreamContext.Provider value={streamValue}>
-        {children}
-      </ChatStreamContext.Provider>
-    </ChatStateContext.Provider>
-  )
-}
-
-export function useChatState() {
-  const ctx = useContext(ChatStateContext)
-  if (!ctx) throw new Error('useChatState must be used within ChatProvider')
-  return ctx
-}
-
-export function useChatStream() {
-  const ctx = useContext(ChatStreamContext)
-  if (!ctx) throw new Error('useChatStream must be used within ChatProvider')
-  return ctx
-}
diff --git a/frontend/app/chat/README.md b/frontend/app/chat/README.md
deleted file mode 100644
index afc3fda9d..000000000
--- a/frontend/app/chat/README.md
+++ /dev/null
@@ -1,178 +0,0 @@
-# Chat Module Architecture
-
-## 概述
-
-Chat 模块采用分层架构设计，实现了清晰的职责分离和良好的扩展性。
-
-## 架构层次
-
-```
-┌─────────────────────────────────────┐
-│   UI Layer (ChatHome.tsx)          │  纯展示组件，只负责渲染
-└──────────────┬──────────────────────┘
-               │
-┌──────────────▼──────────────────────┐
-│   State Layer (useChatSession)     │  统一状态管理
-└──────────────┬──────────────────────┘
-               │
-┌──────────────▼──────────────────────┐
-│   Business Layer (ModeHandlers)    │  模式处理逻辑
-└──────────────┬──────────────────────┘
-               │
-┌──────────────▼──────────────────────┐
-│   Service Layer                     │  服务抽象
-│   - ChatModeService                 │
-│   - GraphResolutionService          │
-│   - CopilotRedirectService          │
-└──────────────┬──────────────────────┘
-               │
-┌──────────────▼──────────────────────┐
-│   API Layer                         │  API 调用
-└─────────────────────────────────────┘
-```
-
-## 核心模块
-
-### 1. 配置层 (Config)
-
-**文件**: `config/modeConfig.ts`
-
-- **职责**: 定义所有模式的配置（唯一数据源）
-- **内容**: 模式 ID、翻译 key、图标、类型等
-- **原则**: 配置是唯一数据源，避免重复定义
-
-### 2. 处理器层 (Mode Handlers)
-
-**目录**: `services/modeHandlers/`
-
-- **职责**: 实现不同模式的业务逻辑
-- **设计模式**: 策略模式（Strategy Pattern）
-- **核心接口**: `ModeHandler`
-
-#### 处理器类型
-
-1. **DynamicModeHandler**: 处理 dynamic 类型（直接跳转）
-2. **APKVulnerabilityHandler**: 处理 APK 漏洞检测（需要 Graph 创建）
-3. **SimpleModeHandler**: 处理简单模式（仅设置模式）
-4. **AgentModeHandler**: 处理 Agent 选择模式
-
-#### 工厂模式
-
-**文件**: `handlerFactory.ts`
-
-- 从配置创建处理器，确保配置和处理器的一致性
-- 特殊处理器（如 APK）有复杂逻辑，直接返回实例
-
-### 3. 注册机制
-
-**文件**: `registerHandlers.ts`
-
-- 从配置统一注册所有处理器
-- 确保配置和处理器一一对应
-
-### 4. 服务层
-
-#### ChatModeService
-
-- 提供模式处理器的查询和管理
-- 封装模式相关的业务逻辑
-
-#### GraphResolutionService
-
-- 统一 Graph ID 解析逻辑
-- 实现不同策略（Mode、AutoRedirect、AgentSelection）
-
-#### CopilotRedirectService
-
-- 处理自动重定向到 Copilot 的逻辑
-- 创建新 Graph 并跳转
-
-### 5. 状态管理
-
-**文件**: `hooks/useChatSession.ts`
-
-- 使用 reducer 统一管理所有聊天相关状态
-- 提供清晰的 action 接口
-
-## 数据流
-
-### 模式选择流程
-
-```
-用户点击模式卡片
-    ↓
-ChatHome.handleModeSelect()
-    ↓
-chatModeService.getHandler(modeId)
-    ↓
-handler.onSelect(context)
-    ↓
-更新状态（通过 useChatSession）
-```
-
-### 提交流程
-
-```
-用户提交
-    ↓
-ChatHome.handleSubmit()
-    ↓
-handler.validate() (验证)
-    ↓
-handler.onSubmit() (处理)
-    ↓
-graphResolutionService.resolve() (解析 Graph ID)
-    ↓
-copilotRedirectService.executeRedirect() (如果需要)
-    ↓
-onStartChat() (调用父组件回调)
-```
-
-## 扩展新模式
-
-### 步骤
-
-1. **在 `modeConfig.ts` 中添加配置**
-   ```typescript
-   {
-     id: 'new-mode',
-     labelKey: 'chat.newMode',
-     descriptionKey: 'chat.newModeDescription',
-     icon: SomeIcon,
-     type: 'simple', // 或 'dynamic', 'template'
-   }
-   ```
-
-2. **创建处理器**（如果需要特殊逻辑）
-   ```typescript
-   // 在相应的 handler 文件中实现
-   export const newModeHandler: ModeHandler = {
-     metadata: { ... },
-     onSelect: async (context) => { ... },
-     onSubmit: async (input, files, context) => { ... },
-   }
-   ```
-
-3. **在 `handlerFactory.ts` 中处理**（如果是特殊处理器）
-   ```typescript
-   if (config.id === 'new-mode') {
-     return newModeHandler
-   }
-   ```
-
-4. **注册会自动完成**（通过 `registerHandlers.ts`）
-
-## 设计原则
-
-1. **单一数据源**: 配置是唯一数据源，避免重复定义
-2. **职责分离**: UI、业务逻辑、服务层清晰分离
-3. **扩展性**: 新增模式只需实现接口并配置
-4. **一致性**: 通过工厂模式确保配置和处理器一致
-5. **可测试性**: 各层可独立测试
-
-## 注意事项
-
-- 配置中的 `label` 和 `description` 使用翻译 key，实际文本通过 `t()` 函数获取
-- 特殊处理器（如 APK）的 metadata 中的 label/description 也是翻译 key
-- 所有模式必须先在 `modeConfig.ts` 中定义，然后才能注册处理器
-- 使用 `modeConfigs` 作为 UI 渲染的数据源，确保一致性
diff --git a/frontend/app/chat/components/ArtifactPanel.tsx b/frontend/app/chat/components/ArtifactPanel.tsx
deleted file mode 100644
index b6a06f87e..000000000
--- a/frontend/app/chat/components/ArtifactPanel.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-'use client'
-
-import { FolderOpen } from 'lucide-react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-
-import CodeViewer from '@/app/chat/components/CodeViewer'
-import FileBrowser, { FileNode } from '@/app/chat/components/FileBrowser'
-import { cn } from '@/lib/utils'
-import { artifactService } from '@/services/artifactService'
-
-// ─── Helpers ────────────────────────────────────────────────────────────────
-
-
-function fileTreeToNodes(
-  tree: Record<string, { action: string; size?: number; timestamp?: number }>,
-): FileNode[] {
-  const root: FileNode[] = []
-
-  // Sort paths so parent dirs come first
-  const paths = Object.keys(tree).sort()
-
-  for (const fullPath of paths) {
-    const parts = fullPath.split('/').filter(Boolean)
-    let current = root
-
-    for (let i = 0; i < parts.length; i++) {
-      const name = parts[i]
-      const isLast = i === parts.length - 1
-
-      if (isLast) {
-        // Leaf file node
-        const ext = name.includes('.') ? (name.split('.').pop() ?? '') : ''
-        current.push({ name, path: fullPath, type: 'file', extension: ext })
-      } else {
-        // Directory node — find or create
-        const dirPath = parts.slice(0, i + 1).join('/')
-        let dir = current.find(n => n.type === 'directory' && n.path === dirPath)
-        if (!dir) {
-          dir = { name, path: dirPath, type: 'directory', children: [] }
-          current.push(dir)
-        }
-        current = dir.children!
-      }
-    }
-  }
-
-  // Sort: directories first, then alphabetically
-  const sortNodes = (nodes: FileNode[]) => {
-    nodes.sort((a, b) => {
-      if (a.type !== b.type) return a.type === 'directory' ? -1 : 1
-      return a.name.localeCompare(b.name)
-    })
-    nodes.filter(n => n.children).forEach(n => sortNodes(n.children!))
-  }
-  sortNodes(root)
-
-  return root
-}
-
-function findFileNode(nodes: FileNode[], path: string): FileNode | null {
-  for (const n of nodes) {
-    if (n.path === path) return n
-    if (n.children) {
-      const found = findFileNode(n.children, path)
-      if (found) return found
-    }
-  }
-  return null
-}
-
-// ─── Component ──────────────────────────────────────────────────────────────
-
-interface ArtifactPanelProps {
-  threadId: string
-  fileTree?: Record<string, { action: string; size?: number; timestamp?: number }>
-  className?: string
-  /** Maps a display path (fileTree key) to the actual path passed to liveReadFile. Defaults to identity. */
-  filePathResolver?: (displayPath: string) => string
-  /** When true, automatically selects and previews the most recently modified file on each file_event. */
-  autoPreview?: boolean
-}
-
-export function ArtifactPanel({ threadId, fileTree, className, filePathResolver, autoPreview }: ArtifactPanelProps) {
-  const files = useMemo(() => {
-    if (fileTree && Object.keys(fileTree).length > 0) {
-      return fileTreeToNodes(fileTree)
-    }
-    return []
-  }, [fileTree])
-  const [selectedPath, setSelectedPath] = useState<string | null>(null)
-  const [previewContent, setPreviewContent] = useState<string | null>(null)
-
-  // Refs for auto-preview debounce and previous fileTree snapshot
-  const refreshTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const prevFileTreeRef = useRef<typeof fileTree>(undefined)
-  const selectedPathRef = useRef<string | null>(null)
-
-  useEffect(() => {
-    selectedPathRef.current = selectedPath
-  }, [selectedPath])
-
-  const fetchContent = useCallback(
-    async (path: string) => {
-      setSelectedPath(path)
-      setPreviewContent(null)
-      if (!threadId) return
-      try {
-        const resolvedPath = filePathResolver ? filePathResolver(path) : path
-        const text = await artifactService.liveReadFile(threadId, resolvedPath)
-        setPreviewContent(text)
-      } catch {
-        setPreviewContent('(Failed to load preview)')
-      }
-    },
-    [threadId, filePathResolver],
-  )
-
-  const handleSelectFile = useCallback((path: string) => fetchContent(path), [fetchContent])
-
-  // Auto-preview: detect changed files on each fileTree update, debounce fetch
-  useEffect(() => {
-    if (!autoPreview || !fileTree) return
-
-    const prev = prevFileTreeRef.current
-    prevFileTreeRef.current = fileTree
-
-    // Find files whose timestamp changed (newly written or edited)
-    const changedPaths = Object.keys(fileTree).filter((p) => {
-      const prevEntry = prev?.[p]
-      const currEntry = fileTree[p]
-      // New file, or same file with updated timestamp
-      return !prevEntry || prevEntry.timestamp !== currEntry.timestamp
-    })
-
-    if (changedPaths.length === 0) return
-
-    // Pick the file with the latest timestamp among changed paths
-    const latestPath = changedPaths.reduce((a, b) =>
-      (fileTree[a]?.timestamp ?? 0) >= (fileTree[b]?.timestamp ?? 0) ? a : b,
-    )
-
-    // Only auto-switch if nothing is selected, or if the currently selected file was just modified
-    const current = selectedPathRef.current
-    if (current !== null && current !== latestPath) return
-
-    // Debounce: agent may write many small chunks; wait for a quiet moment
-    if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current)
-    refreshTimerRef.current = setTimeout(() => fetchContent(latestPath), 600)
-  }, [fileTree, autoPreview, fetchContent])
-
-  // Cleanup debounce timer on unmount
-  useEffect(() => () => {
-    if (refreshTimerRef.current) clearTimeout(refreshTimerRef.current)
-  }, [])
-
-  const selectedFile = selectedPath ? findFileNode(files, selectedPath) : null
-  const ext = selectedFile?.extension?.toLowerCase() ?? ''
-
-  return (
-    <div className={cn('flex flex-col bg-[var(--surface-2)] text-[var(--text-primary)]', className)}>
-      <div className="flex min-h-0 flex-1">
-        <div className="custom-scrollbar w-[168px] flex-shrink-0 overflow-y-auto border-r border-[var(--border)]">
-          <FileBrowser files={files} selectedPath={selectedPath} onSelect={handleSelectFile} />
-        </div>
-        <div className="flex min-w-0 flex-1 flex-col overflow-hidden">
-          {selectedPath && (
-            <div className="flex shrink-0 items-center gap-2 border-b border-[var(--border-muted)] bg-[var(--surface-2)] p-3">
-              <span className="flex-1 truncate text-sm">{selectedPath}</span>
-            </div>
-          )}
-          <div className="custom-scrollbar flex-1 overflow-auto p-3">
-            {previewContent !== null && (
-              <CodeViewer
-                code={previewContent}
-                language={ext || 'text'}
-                filename={selectedPath ?? undefined}
-                showLineNumbers
-              />
-            )}
-            {!selectedPath && (
-              <div className="flex flex-col items-center justify-center py-8 text-sm text-[var(--text-muted)]">
-                <FolderOpen className="mb-2 h-10 w-10 opacity-50" />
-                Select a file to preview
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default ArtifactPanel
diff --git a/frontend/app/chat/components/ChatHome.tsx b/frontend/app/chat/components/ChatHome.tsx
deleted file mode 100644
index 8632aee4a..000000000
--- a/frontend/app/chat/components/ChatHome.tsx
+++ /dev/null
@@ -1,620 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import {
-  MessageSquare,
-  ArrowRight,
-  X,
-  ChevronDown,
-  Square,
-  Loader2,
-  Sparkles,
-  Zap,
-  Paperclip,
-  Bot,
-} from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import React, { useRef, useEffect, useMemo, useCallback } from 'react'
-
-import { type AgentGraph } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { Button } from '@/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useDeployedGraphs, useWorkspaces } from '@/hooks/queries'
-import { ALLOWED_EXTENSIONS_STRING } from '@/lib/core/constants/upload-limits'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import { toastError } from '@/lib/utils/toast'
-
-import { modeConfigs } from '../config/modeConfig'
-import { useChatSession } from '../hooks/useChatSession'
-import { useFileUpload } from '../hooks/useFileUpload'
-import { chatModeService } from '../services/chatModeService'
-import { copilotRedirectService } from '../services/copilotRedirectService'
-import { graphResolutionService } from '../services/graphResolutionService'
-import { registerAllHandlers } from '../services/modeHandlers/registerHandlers'
-import type { UploadedFile, ModeSelectionResult } from '../services/modeHandlers/types'
-import { StarterPrompts } from '../shared/StarterPrompts'
-
-// Register all mode handlers (executed once when module loads)
-if (typeof window !== 'undefined') {
-  registerAllHandlers()
-}
-
-interface ChatHomeProps {
-  onStartChat: (
-    message: string,
-    mode?: string,
-    graphId?: string | null,
-    files?: UploadedFile[],
-  ) => void
-  onSelectConversation?: (threadId: string) => void
-  isProcessing?: boolean
-  onStop?: () => void
-}
-
-export default function ChatHome({
-  onStartChat,
-  onSelectConversation: _onSelectConversation,
-  isProcessing = false,
-  onStop,
-}: ChatHomeProps) {
-  const { t } = useTranslation()
-  const router = useRouter()
-  const queryClient = useQueryClient()
-
-  // Use unified state management
-  const {
-    state,
-    setInput,
-    addFile,
-    removeFile,
-    setMode,
-    clearMode,
-    setSelectedAgentId,
-    setAutoRedirect,
-    setIsRedirecting,
-    setShowCases,
-    resetInput,
-  } = useChatSession()
-
-  const { isUploading, fileInputRef, uploadFile, handleFileSelect } = useFileUpload({
-    onFileUploaded: (file) => {
-      addFile(file) // sync into useChatSession.state.files for submission
-    },
-  })
-
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const hasInitializedDefaultMode = useRef(false)
-
-  // Derive starter prompts from current mode
-  const starterPrompts = useMemo(() => {
-    if (!state.mode.type) return null
-    const config = modeConfigs.find((c) => c.id === state.mode.type)
-    return config?.starterPrompts && config.starterPrompts.length > 0 ? config.starterPrompts : null
-  }, [state.mode.type])
-
-  // Data fetching
-  const { data: deployedAgents = [], isLoading: isLoadingAgents } = useDeployedGraphs()
-  const { data: workspacesData } = useWorkspaces()
-
-  // Build mode context
-  const modeContext = {
-    workspaces: workspacesData || [],
-    deployedAgents,
-    selectedAgentId: state.selectedAgentId,
-    personalWorkspaceId: workspacesData?.find((w) => w.type === 'personal')?.id || null,
-    t,
-    router,
-    queryClient,
-  }
-
-  const modeContextRef = useRef(modeContext)
-  useEffect(() => {
-    modeContextRef.current = modeContext
-  })
-
-  // Build mode options (generated from config, ensuring config is the single source of truth)
-  const modeOptions = modeConfigs.map((config) => {
-    const handler = chatModeService.getHandler(config.id)
-    // Use config as data source, handler only for business logic
-    return {
-      id: config.id,
-      label: t(config.labelKey),
-      description: t(config.descriptionKey),
-      icon: config.icon,
-      type: config.type,
-      templateName: config.templateName,
-      templateGraphName: config.templateGraphName,
-      handler, // Used to execute mode-related business logic
-    }
-  })
-
-  // Auto-adjust textarea height
-  useEffect(() => {
-    if (textareaRef.current) {
-      textareaRef.current.style.height = 'auto'
-      textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-    }
-  }, [state.input])
-
-  // Handle mode selection
-  const handleModeSelect = useCallback(async (modeId: string): Promise<ModeSelectionResult | null> => {
-    const handler = chatModeService.getHandler(modeId)
-    if (!handler) {
-      console.warn(`No handler found for mode: ${modeId}`)
-      return null
-    }
-
-    setIsRedirecting(true)
-    try {
-      const result = await handler.onSelect(modeContextRef.current)
-      if (result.success) {
-        // Apply state updates
-        if (result.stateUpdates) {
-          if (result.stateUpdates.input !== undefined) {
-            setInput(result.stateUpdates.input)
-          }
-          if (result.stateUpdates.mode !== undefined || result.stateUpdates.graphId !== undefined) {
-            setMode({
-              type: result.stateUpdates.mode || modeId,
-              graphId: result.stateUpdates.graphId,
-            })
-          }
-        } else {
-          // If no special handling, just set the mode
-          setMode({ type: modeId })
-        }
-        return result
-      } else if (result.error) {
-        toastError(
-          result.error,
-          t('chat.modeSelectionFailed', { defaultValue: 'Mode selection failed' }),
-        )
-        return result
-      }
-      return null
-    } catch (error) {
-      console.error('Failed to select mode:', error)
-      const errorMessage =
-        error instanceof Error
-          ? error.message
-          : t('chat.modeSelectionFailed', { defaultValue: 'Mode selection failed' })
-      toastError(errorMessage, t('chat.retry', { defaultValue: 'Please try again' }))
-      return null
-    } finally {
-      setIsRedirecting(false)
-    }
-  }, [setIsRedirecting, setInput, setMode, t])
-
-  // Default chat: auto-select default-chat mode on first load (create_deep_agent + skills + Docker)
-  useEffect(() => {
-    if (
-      hasInitializedDefaultMode.current ||
-      state.mode.type != null ||
-      !modeContext.personalWorkspaceId ||
-      isProcessing
-    ) {
-      return
-    }
-    hasInitializedDefaultMode.current = true
-    handleModeSelect('default-chat').catch(() => {
-      hasInitializedDefaultMode.current = false
-    })
-  }, [state.mode.type, modeContext.personalWorkspaceId, isProcessing, handleModeSelect])
-
-  // Handle submission
-  const handleSubmit = async () => {
-    if (!state.input.trim() || isProcessing || state.isRedirecting) return
-
-    const currentMode = state.mode.type
-    const handler = currentMode ? chatModeService.getHandler(currentMode) : null
-
-    // Validation
-    if (handler?.validate) {
-      const validation = handler.validate(state.input, state.files)
-      if (!validation.valid) {
-        // Translate error message if it's a translation key
-        const errorMessage =
-          validation.error || t('chat.validationFailed', { defaultValue: 'Validation failed' })
-        toastError(errorMessage, t('chat.submitFailed', { defaultValue: 'Submit failed' }))
-        return
-      }
-    }
-
-    // Process input and files
-    let processedInput = state.input.trim()
-    let graphId: string | null = null
-
-    if (handler) {
-      try {
-        const submitResult = await handler.onSubmit(state.input, state.files, modeContext)
-        if (!submitResult.success) {
-          toastError(
-            submitResult.error || t('chat.submitFailed', { defaultValue: 'Submit failed' }),
-            t('chat.submitFailed', { defaultValue: 'Submit failed' }),
-          )
-          return
-        }
-        processedInput = submitResult.processedInput || processedInput
-        graphId = submitResult.graphId || null
-      } catch (error) {
-        console.error('Failed to process submit:', error)
-        toastError(
-          error instanceof Error
-            ? error.message
-            : t('chat.submitFailed', { defaultValue: 'Submit failed' }),
-          t('chat.submitFailed', { defaultValue: 'Submit failed' }),
-        )
-        return
-      }
-    } else {
-      // No mode handler, use Graph resolution service
-      const resolution = await graphResolutionService.resolve(
-        currentMode,
-        modeContext,
-        state.autoRedirect,
-      )
-      graphId = resolution.graphId
-    }
-
-    // If auto redirect is enabled
-    if (state.autoRedirect) {
-      const success = await copilotRedirectService.executeRedirect(processedInput, modeContext)
-      if (success) {
-        resetInput()
-        return
-      }
-    }
-
-    // Clear input and call onStartChat
-    resetInput()
-    onStartChat(
-      processedInput,
-      currentMode || undefined,
-      graphId,
-      state.files.length > 0 ? state.files : undefined,
-    )
-  }
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    setInput(e.target.value)
-  }
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault()
-      handleSubmit()
-    }
-  }
-
-  // Handle mode card click
-  const handleCaseClick = async (modeId: string, isSelected: boolean) => {
-    const mode = modeOptions.find((m) => m.id === modeId)
-    if (!mode) return
-
-    // Special handling for Skill Creator mode - navigate to dedicated page
-    if (modeId === 'skill-creator') {
-      router.push('/skills/creator')
-      return
-    }
-
-    // Special handling for APK vulnerability mode - initialize graph first
-    if (modeId === 'apk-vulnerability') {
-      // Use handleModeSelect to initialize graph if needed
-      const result = await handleModeSelect(modeId)
-      if (result?.success) {
-        // Get graphId from result or state
-        const graphId = result.stateUpdates?.graphId || state.mode.graphId
-        // After initialization, enter chat page with the graphId
-        onStartChat('', modeId, graphId)
-      }
-      // If initialization failed, error is already shown by handleModeSelect
-      return
-    }
-
-    // If already selected, deselect
-    if (isSelected) {
-      clearMode()
-      setSelectedAgentId(null)
-      return
-    }
-
-    // Select new mode
-    setSelectedAgentId(null)
-    await handleModeSelect(modeId)
-  }
-
-  // Handle agent selection
-  const handleAgentSelect = (agentId: string) => {
-    setAutoRedirect(false)
-    setSelectedAgentId(agentId)
-    clearMode()
-  }
-
-  return (
-    <div className="flex h-full w-full bg-[var(--bg)]">
-      <div className="relative flex flex-1 flex-col items-center justify-center p-8">
-        {/* Background kept clean — no gradient */}
-        <div className="relative flex w-full max-w-3xl flex-col gap-8">
-          <div className="text-center">
-            <h1 className="mb-2 text-3xl font-semibold tracking-tight text-[var(--text-primary)]">
-              {t('chat.createSomethingAwesome')}
-            </h1>
-          </div>
-
-          <div className="relative mx-auto w-full max-w-4xl">
-            <div className="rounded-2xl border border-[var(--border)] bg-[var(--surface-2)] shadow-sm transition-all focus-within:border-[hsl(var(--primary)/0.4)] focus-within:shadow-md">
-              <div className="flex w-full flex-col gap-2 px-4 py-3">
-                {state.selectedAgentId &&
-                  (() => {
-                    const selectedAgent = deployedAgents.find(
-                      (a: AgentGraph) => a.id === state.selectedAgentId,
-                    )
-                    return selectedAgent ? (
-                      <div className="flex items-center gap-2 px-3 pt-2">
-                        <div className="flex items-center gap-1.5 rounded-full bg-[var(--surface-3)] px-3 py-1.5 text-sm font-medium text-[var(--text-secondary)]">
-                          <MessageSquare size={14} />
-                          <span className="max-w-[120px] truncate">{selectedAgent.name}</span>
-                          <button
-                            onClick={() => setSelectedAgentId(null)}
-                            className="ml-1 rounded-full p-0.5 transition-colors hover:bg-[var(--surface-5)]"
-                            aria-label={t('chat.clearAgent')}
-                          >
-                            <X size={12} />
-                          </button>
-                        </div>
-                      </div>
-                    ) : null
-                  })()}
-
-                <div className="flex flex-col gap-2 px-3">
-                  <input
-                    type="file"
-                    ref={fileInputRef}
-                    onChange={handleFileSelect}
-                    multiple
-                    accept={ALLOWED_EXTENSIONS_STRING}
-                    className="hidden"
-                    disabled={isProcessing || isUploading}
-                  />
-                  {state.files.length > 0 && (
-                    <div className="flex flex-wrap gap-2 px-1 pb-1 pt-2">
-                      {state.files.map((file) => (
-                        <div
-                          key={file.id}
-                          className="flex items-center gap-1.5 rounded-md bg-[var(--surface-3)] px-2 py-1 text-xs text-[var(--text-secondary)]"
-                        >
-                          <Paperclip size={12} className="text-[var(--text-tertiary)]" />
-                          <span className="max-w-[150px] truncate">{file.filename}</span>
-                          <button
-                            onClick={() => removeFile(file.id)}
-                            className="ml-1 rounded-full p-0.5 transition-colors hover:bg-[var(--surface-5)]"
-                            aria-label="Remove file"
-                          >
-                            <X size={10} />
-                          </button>
-                        </div>
-                      ))}
-                    </div>
-                  )}
-                  <textarea
-                    ref={textareaRef}
-                    value={state.input}
-                    onChange={handleInputChange}
-                    onKeyDown={handleKeyDown}
-                    placeholder={t('chat.describeHelpNeeded')}
-                    className="max-h-[160px] min-h-[44px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm text-[var(--text-primary)] shadow-none placeholder:text-[var(--text-muted)] focus:outline-none focus-visible:ring-0"
-                    rows={1}
-                    disabled={isProcessing}
-                  />
-                  <div className="flex items-center justify-between pt-1">
-                    <div className="flex items-center gap-2">
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        onClick={() => !state.isRedirecting && setAutoRedirect(!state.autoRedirect)}
-                        disabled={state.isRedirecting}
-                        className={cn(
-                          'flex h-9 items-center gap-2 rounded-full border-[1.5px] bg-transparent px-3 transition-all duration-200',
-                          state.autoRedirect
-                            ? 'border-primary/30 text-primary hover:border-primary/50 hover:bg-primary/5'
-                            : 'border-[var(--border)] text-[var(--text-tertiary)] hover:border-[var(--border-strong)] hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)]',
-                        )}
-                      >
-                        <Zap size={16} />
-                        <span className="text-sm font-medium">
-                          {state.autoRedirect ? t('chat.agentModeOn') : t('chat.agentModeOff')}
-                        </span>
-                      </Button>
-                      <DropdownMenu>
-                        <DropdownMenuTrigger asChild>
-                          <Button
-                            variant="outline"
-                            size="sm"
-                            className="flex h-9 items-center gap-2 rounded-full border-[1.5px] border-[var(--border)] bg-transparent px-3 text-[var(--text-tertiary)] transition-all duration-200 hover:border-[var(--border-strong)] hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)]"
-                            disabled={isLoadingAgents}
-                          >
-                            <Bot size={16} />
-                            <span className="text-sm font-medium">{t('chat.selectAgent')}</span>
-                          </Button>
-                        </DropdownMenuTrigger>
-                        <DropdownMenuContent
-                          align="start"
-                          className="max-h-[300px] w-56 overflow-y-auto"
-                        >
-                          {isLoadingAgents ? (
-                            <DropdownMenuItem disabled>{t('chat.loading')}...</DropdownMenuItem>
-                          ) : deployedAgents.length === 0 ? (
-                            <DropdownMenuItem disabled>
-                              {t('chat.noDeployedAgents')}
-                            </DropdownMenuItem>
-                          ) : (
-                            <>
-                              {deployedAgents.map((agent: AgentGraph) => (
-                                <DropdownMenuItem
-                                  key={agent.id}
-                                  onClick={() => handleAgentSelect(agent.id)}
-                                  className={cn(
-                                    'flex items-center gap-2',
-                                    state.selectedAgentId === agent.id && 'bg-[var(--surface-3)]',
-                                  )}
-                                >
-                                  <MessageSquare size={14} className="text-[var(--text-muted)]" />
-                                  <span className="flex-1 truncate">{agent.name}</span>
-                                  {state.selectedAgentId === agent.id && (
-                                    <span className="text-xs text-[var(--text-muted)]">✓</span>
-                                  )}
-                                </DropdownMenuItem>
-                              ))}
-                            </>
-                          )}
-                        </DropdownMenuContent>
-                      </DropdownMenu>
-                    </div>
-                    <div className="flex flex-shrink-0 items-center gap-2">
-                      <TooltipProvider delayDuration={100}>
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <Button
-                              type="button"
-                              variant="ghost"
-                              size="sm"
-                              onClick={() => fileInputRef.current?.click()}
-                              disabled={isProcessing || isUploading}
-                              className={cn(
-                                'flex h-8 w-8 items-center justify-center rounded-full bg-transparent p-0 text-[var(--text-tertiary)] transition-all duration-200 hover:bg-[var(--surface-5)] hover:text-[var(--text-secondary)]',
-                                isUploading && 'cursor-not-allowed opacity-50',
-                              )}
-                            >
-                              {isUploading ? (
-                                <Loader2 size={14} className="animate-spin" />
-                              ) : (
-                                <Paperclip size={14} />
-                              )}
-                            </Button>
-                          </TooltipTrigger>
-                          <TooltipContent side="top" className="text-xs">
-                            {t('chat.uploadFile')}
-                          </TooltipContent>
-                        </Tooltip>
-                      </TooltipProvider>
-                      {isProcessing && onStop ? (
-                        <Button
-                          onClick={onStop}
-                          size="sm"
-                          className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full bg-[var(--status-error)] p-0 transition-all hover:bg-[var(--status-error-hover)]"
-                          title={t('chat.stop')}
-                        >
-                          <Square size={12} className="fill-white text-white" />
-                        </Button>
-                      ) : (
-                        <Button
-                          onClick={handleSubmit}
-                          disabled={!state.input.trim() || isProcessing || state.isRedirecting}
-                          size="sm"
-                          aria-label={t('chat.send', { defaultValue: 'Send message' })}
-                          className={cn(
-                            'flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full p-0 transition-all',
-                            state.input.trim() && !isProcessing && !state.isRedirecting
-                              ? 'bg-primary hover:bg-primary/90'
-                              : 'cursor-not-allowed bg-[var(--surface-3)]',
-                          )}
-                        >
-                          {state.isRedirecting ? (
-                            <Loader2 size={14} className="animate-spin text-[var(--text-muted)]" />
-                          ) : (
-                            <ArrowRight
-                              size={14}
-                              className={
-                                state.input.trim() && !isProcessing && !state.isRedirecting
-                                  ? 'text-white'
-                                  : 'text-[var(--text-subtle)]'
-                              }
-                            />
-                          )}
-                        </Button>
-                      )}
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div className="mt-4 w-full">
-            <button
-              onClick={() => setShowCases(!state.showCases)}
-              className="flex w-full items-center justify-between p-2 text-sm font-medium text-[var(--text-tertiary)] transition-colors hover:text-[var(--text-secondary)]"
-            >
-              <div className="flex items-center gap-2">
-                <Sparkles size={14} />
-                <span>{t('chat.exploreAgentModeCases')}</span>
-              </div>
-              <ChevronDown
-                size={14}
-                className={cn('transition-transform duration-300', state.showCases && 'rotate-180')}
-              />
-            </button>
-
-            <div
-              className={cn(
-                'grid grid-cols-2 gap-3 overflow-hidden transition-all duration-500 ease-in-out',
-                state.showCases ? 'mt-4 max-h-[500px] opacity-100' : 'max-h-0 opacity-0',
-              )}
-            >
-              {modeOptions.map((mode) => {
-                const isSelected = state.mode.type === mode.id
-                const Icon = mode.icon
-                return (
-                  <div
-                    key={mode.id}
-                    onClick={() => handleCaseClick(mode.id, isSelected)}
-                    className={cn(
-                      'group flex cursor-pointer items-start gap-4 overflow-hidden rounded-xl border bg-[var(--surface-2)] p-4 transition-all duration-200',
-                      isSelected
-                        ? 'border-[hsl(var(--primary)/0.5)] bg-[hsl(var(--primary)/0.05)] shadow-md ring-1 ring-[hsl(var(--primary)/0.15)]'
-                        : 'border-[var(--border)] hover:border-[hsl(var(--primary)/0.3)] hover:shadow-lg',
-                    )}
-                  >
-                    <div className="rounded-lg border border-[hsl(var(--primary)/0.2)] bg-[hsl(var(--primary)/0.08)] p-2">
-                      <Icon
-                        size={20}
-                        className={cn(isSelected ? 'text-primary' : 'text-[var(--text-tertiary)]')}
-                      />
-                    </div>
-                    <div>
-                      <h3
-                        className={cn(
-                          'text-sm font-medium',
-                          isSelected ? 'text-primary' : 'text-[var(--text-primary)] group-hover:text-primary',
-                        )}
-                      >
-                        {mode.label}
-                      </h3>
-                      <p className="mt-1 text-xs text-[var(--text-muted)]">{mode.description}</p>
-                    </div>
-                  </div>
-                )
-              })}
-            </div>
-
-            {starterPrompts && (
-              <div className="mt-4">
-                <StarterPrompts
-                  prompts={starterPrompts}
-                  onSelect={(prompt) => setInput(prompt)}
-                />
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/ChatInput.tsx b/frontend/app/chat/components/ChatInput.tsx
deleted file mode 100644
index 1adfc9077..000000000
--- a/frontend/app/chat/components/ChatInput.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-'use client'
-
-import { ArrowRight, Square, Paperclip, X, Loader2 } from 'lucide-react'
-import React, { useRef, useEffect, useState, useCallback } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { ALLOWED_EXTENSIONS_STRING } from '@/lib/core/constants/upload-limits'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { useFileUpload } from '../hooks/useFileUpload'
-import type { UploadedFile } from '../services/modeHandlers/types'
-
-interface ChatInputProps {
-  input: string
-  setInput: (value: string) => void
-  onSubmit: (text: string, mode?: string, graphId?: string | null, files?: UploadedFile[]) => void
-  isProcessing: boolean
-  onStop?: () => void
-  currentMode?: string
-  currentGraphId?: string | null
-}
-
-export default function ChatInput({
-  input,
-  setInput,
-  onSubmit,
-  isProcessing,
-  onStop,
-  currentMode,
-  currentGraphId,
-}: ChatInputProps) {
-  const { t } = useTranslation()
-  const textareaRef = useRef<HTMLTextAreaElement>(null)
-  const [isDragOver, setIsDragOver] = useState(false)
-
-  const apkAutoSubmitRef = useRef<((uploadedFile: UploadedFile, rawFile: File) => void) | undefined>(undefined)
-
-  const { files, isUploading, fileInputRef, uploadFile, handleFileSelect, removeFile, clearFiles } =
-    useFileUpload({
-      onFileUploaded: (uploadedFile, rawFile) => apkAutoSubmitRef.current?.(uploadedFile, rawFile),
-    })
-
-  const handleApkAutoSubmit = useCallback(
-    (uploadedFile: UploadedFile, rawFile: File) => {
-      if (currentMode === 'apk-vulnerability' && rawFile.name.toLowerCase().endsWith('.apk')) {
-        const taskText = t('chat.apkVulnerabilityTaskWithPath', {
-          defaultValue: 'Task: APK IntentBridge vulnerability mining, APK path: {{path}}',
-          path: uploadedFile.path,
-        })
-        onSubmit(taskText, currentMode, currentGraphId || undefined, [uploadedFile])
-        clearFiles()
-      }
-    },
-    [currentMode, currentGraphId, onSubmit, t, clearFiles],
-  )
-
-  useEffect(() => {
-    apkAutoSubmitRef.current = handleApkAutoSubmit
-  }, [handleApkAutoSubmit])
-
-  // Auto-resize textarea
-  useEffect(() => {
-    if (textareaRef.current) {
-      textareaRef.current.style.height = 'auto'
-      textareaRef.current.style.height = `${Math.min(textareaRef.current.scrollHeight, 160)}px`
-    }
-  }, [input])
-
-  const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault()
-      handleSubmit()
-    }
-  }
-
-  const handleSubmit = () => {
-    if (isProcessing) return
-    const text =
-      input.trim() ||
-      (currentMode === 'apk-vulnerability' && files.length > 0
-        ? t('chat.apkVulnerabilityTaskStart', {
-            defaultValue: 'Start task: APK IntentBridge vulnerability mining',
-          })
-        : '')
-    if (!text && files.length === 0) return
-
-    onSubmit(text, currentMode, null, files.length > 0 ? files : undefined)
-    clearFiles()
-  }
-
-  const handleDragOver = (e: React.DragEvent) => {
-    e.preventDefault()
-    setIsDragOver(true)
-  }
-
-  const handleDragLeave = (e: React.DragEvent) => {
-    e.preventDefault()
-    setIsDragOver(false)
-  }
-
-  const handleDrop = (e: React.DragEvent) => {
-    e.preventDefault()
-    setIsDragOver(false)
-
-    const droppedFiles = Array.from(e.dataTransfer.files)
-    droppedFiles.forEach((file) => {
-      uploadFile(file)
-    })
-  }
-
-  const canSubmit = input.trim() || (currentMode === 'apk-vulnerability' && files.length > 0)
-
-  return (
-    <div className="relative mx-auto w-full max-w-3xl">
-      {/* File List */}
-      {files.length > 0 && (
-        <div className="mb-3 flex flex-wrap gap-2">
-          {files.map((file) => (
-            <div
-              key={file.id}
-              className="flex items-center gap-1.5 rounded-md bg-[var(--surface-3)] px-3 py-1.5 text-sm text-[var(--text-secondary)]"
-            >
-              <Paperclip size={14} className="text-[var(--text-tertiary)]" />
-              <span className="max-w-[200px] truncate">{file.filename}</span>
-              <button
-                onClick={() => removeFile(file.id)}
-                className="ml-1 rounded-full p-0.5 transition-colors hover:bg-[var(--surface-5)]"
-                aria-label="Remove file"
-                disabled={isProcessing || isUploading}
-              >
-                <X size={12} />
-              </button>
-            </div>
-          ))}
-        </div>
-      )}
-
-      {/* Main Input Container */}
-      <div
-        className={cn(
-          'flex flex-col gap-2 rounded-2xl border border-[var(--border)] bg-[var(--surface-2)] px-4 py-3 transition-all',
-          isDragOver && 'border-primary/50 bg-primary/5',
-        )}
-        onDragOver={handleDragOver}
-        onDragLeave={handleDragLeave}
-        onDrop={handleDrop}
-      >
-        <input
-          type="file"
-          ref={fileInputRef}
-          onChange={handleFileSelect}
-          multiple
-          accept={ALLOWED_EXTENSIONS_STRING}
-          className="hidden"
-          disabled={isProcessing || isUploading}
-        />
-        <textarea
-          ref={textareaRef}
-          value={input}
-          onChange={(e) => setInput(e.target.value)}
-          onKeyDown={handleKeyDown}
-          placeholder={t('chat.describeHelpNeeded')}
-          className="max-h-[160px] min-h-[44px] w-full resize-none overflow-y-auto border-none bg-transparent text-sm shadow-none placeholder:text-[var(--text-muted)] focus:outline-none focus-visible:ring-0"
-          rows={1}
-          disabled={isProcessing || isUploading}
-        />
-        <div className="flex items-center justify-between pt-1">
-          <div className="flex items-center gap-2">
-            {/* Left side empty for now or add future quick actions */}
-          </div>
-          <div className="flex flex-shrink-0 items-center gap-2">
-            <Button
-              type="button"
-              variant="ghost"
-              size="sm"
-              onClick={() => fileInputRef.current?.click()}
-              disabled={isProcessing || isUploading}
-              className={cn(
-                'flex h-8 w-8 items-center justify-center rounded-full bg-transparent p-0 text-[var(--text-tertiary)] transition-all duration-200 hover:bg-[var(--surface-5)] hover:text-[var(--text-secondary)]',
-                (isUploading || isProcessing) && 'cursor-not-allowed opacity-50',
-              )}
-              title={t('chat.uploadFile')}
-            >
-              {isUploading ? <Loader2 size={14} className="animate-spin" /> : <Paperclip size={14} />}
-            </Button>
-            {isProcessing && onStop ? (
-              <Button
-                onClick={onStop}
-                size="sm"
-                className="flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full bg-[var(--status-error)] p-0 transition-all hover:bg-[var(--status-error-hover)]"
-                title={t('chat.stop')}
-              >
-                <Square size={12} className="fill-white text-white" />
-              </Button>
-            ) : (
-              <Button
-                onClick={handleSubmit}
-                disabled={!canSubmit || isProcessing || isUploading}
-                size="sm"
-                className={cn(
-                  'flex h-8 w-8 flex-shrink-0 items-center justify-center rounded-full p-0 transition-all',
-                  canSubmit && !isProcessing && !isUploading
-                    ? 'bg-primary hover:bg-primary/90'
-                    : 'cursor-not-allowed bg-[var(--surface-3)]',
-                )}
-              >
-                <ArrowRight
-                  size={14}
-                  className={
-                    canSubmit && !isProcessing && !isUploading ? 'text-white' : 'text-[var(--text-subtle)]'
-                  }
-                />
-              </Button>
-            )}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/ChatSidebar.tsx b/frontend/app/chat/components/ChatSidebar.tsx
deleted file mode 100644
index daf2e5fca..000000000
--- a/frontend/app/chat/components/ChatSidebar.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-'use client'
-
-import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query'
-import { MessageSquare, ChevronLeft, ChevronRight } from 'lucide-react'
-import React, { useState, useMemo, useCallback } from 'react'
-
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import { toastSuccess, toastError } from '@/lib/utils/toast'
-import { conversationService, type Conversation } from '@/services/conversationService'
-
-import ConversationGroup from './ConversationGroup'
-
-// Conversation type imported from conversationService
-
-interface ChatSidebarProps {
-  isCollapsed: boolean
-  onToggle: () => void
-  onSelectConversation: (threadId: string) => void
-  currentThreadId: string | null
-}
-
-export default function ChatSidebar({
-  isCollapsed,
-  onToggle,
-  onSelectConversation,
-  currentThreadId,
-}: ChatSidebarProps) {
-  const { t } = useTranslation()
-  const { data: conversationsData, isLoading } = useQuery({
-    queryKey: ['conversations'],
-    queryFn: () => conversationService.listConversations({ page: 1, pageSize: 100 }),
-  })
-
-  const conversations = useMemo(() => conversationsData || [], [conversationsData])
-
-  const { todayConvs, monthConvs, olderConvs } = useMemo(() => {
-    const now = new Date()
-    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-    const thisMonth = new Date(now.getFullYear(), now.getMonth(), 1)
-
-    const todayConvs: Conversation[] = []
-    const monthConvs: Conversation[] = []
-    const olderConvs: Conversation[] = []
-
-    conversations.forEach((conv) => {
-      const updatedAt = new Date(conv.updated_at)
-      if (updatedAt >= today) {
-        todayConvs.push(conv)
-      } else if (updatedAt >= thisMonth) {
-        monthConvs.push(conv)
-      } else {
-        olderConvs.push(conv)
-      }
-    })
-
-    return { todayConvs, monthConvs, olderConvs }
-  }, [conversations])
-
-  const queryClient = useQueryClient()
-  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false)
-  const [conversationToDelete, setConversationToDelete] = useState<{
-    threadId: string
-    title: string
-  } | null>(null)
-
-  // Expand states: today expanded by default, others collapsed
-  const [isTodayExpanded, setIsTodayExpanded] = useState(true)
-  const [isThisMonthExpanded, setIsThisMonthExpanded] = useState(false)
-  const [isOlderExpanded, setIsOlderExpanded] = useState(false)
-
-  const deleteConversationMutation = useMutation({
-    mutationFn: (threadId: string) => conversationService.deleteConversation(threadId),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['conversations'] })
-      toastSuccess(t('chat.deleteSuccess'))
-      setDeleteConfirmOpen(false)
-      setConversationToDelete(null)
-    },
-    onError: (error) => {
-      console.error('Failed to delete conversation:', error)
-      toastError(t('chat.deleteFailed'))
-      setDeleteConfirmOpen(false)
-      setConversationToDelete(null)
-    },
-  })
-
-  const handleDeleteConversation = (e: React.MouseEvent, threadId: string, title: string) => {
-    e.stopPropagation()
-    setConversationToDelete({ threadId, title })
-    setDeleteConfirmOpen(true)
-  }
-
-  const handleConfirmDelete = () => {
-    if (conversationToDelete) {
-      deleteConversationMutation.mutate(conversationToDelete.threadId)
-    }
-  }
-
-  const handleCancelDelete = () => {
-    setDeleteConfirmOpen(false)
-    setConversationToDelete(null)
-  }
-
-  const monthNames = useMemo(() => [
-    t('chat.jan'), t('chat.feb'), t('chat.mar'), t('chat.apr'),
-    t('chat.may'), t('chat.jun'), t('chat.jul'), t('chat.aug'),
-    t('chat.sep'), t('chat.oct'), t('chat.nov'), t('chat.dec'),
-  ], [t])
-
-  const formatTime = useCallback((dateString: string) => {
-    try {
-      const date = new Date(dateString)
-      const now = new Date()
-      const diffInMinutes = Math.floor((now.getTime() - date.getTime()) / 60000)
-
-      if (diffInMinutes < 1) return t('chat.now')
-      if (diffInMinutes < 60) return t('chat.minutesAgo', { m: diffInMinutes })
-      if (diffInMinutes < 1440) return t('chat.hoursAgo', { h: Math.floor(diffInMinutes / 60) })
-      return `${monthNames[date.getMonth()]} ${date.getDate()}`
-    } catch {
-      return ''
-    }
-  }, [t, monthNames])
-
-  return (
-    <div className="flex h-full flex-col bg-[var(--surface-1)]">
-      {/* Header */}
-      <div
-        className={cn(
-          'border-b border-[var(--border)] bg-[var(--surface-1)] p-3 transition-all',
-          isCollapsed ? 'px-2' : 'px-4',
-        )}
-      >
-        <div className={cn('flex items-center', isCollapsed ? 'justify-center' : 'justify-start')}>
-          {!isCollapsed && (
-            <h2 className="text-sm font-semibold text-[var(--text-primary)]">{t('chat.history')}</h2>
-          )}
-        </div>
-      </div>
-
-      {/* Conversations List */}
-      <div
-        className={cn(
-          'flex-1 overflow-y-auto transition-all',
-          isCollapsed ? 'px-1.5 py-2' : 'px-2 py-2',
-        )}
-      >
-        {isLoading ? (
-          <div className="space-y-2 px-2 py-3">
-            {[0, 1, 2].map((i) => (
-              <div key={i} className="flex items-center gap-2 rounded-md px-2 py-1.5">
-                <div className="h-4 w-4 flex-shrink-0 rounded bg-[var(--surface-3)] animate-pulse" />
-                <div className="flex-1 space-y-1.5">
-                  <div className="h-3 w-3/4 rounded bg-[var(--surface-3)] animate-pulse" />
-                  <div className="h-2.5 w-1/2 rounded bg-[var(--surface-2)] animate-pulse" />
-                </div>
-              </div>
-            ))}
-          </div>
-        ) : conversations.length === 0 ? (
-          <div className="flex flex-col items-center gap-2 py-6">
-            <div className="rounded-full bg-[var(--surface-2)] p-2">
-              <MessageSquare size={16} className="text-[var(--text-muted)]" />
-            </div>
-            <span className="text-xs text-[var(--text-muted)]">{t('chat.noConversations')}</span>
-          </div>
-        ) : (
-          <>
-            <ConversationGroup
-              label={t('chat.today')}
-              conversations={todayConvs}
-              isExpanded={isTodayExpanded}
-              onToggleExpand={() => setIsTodayExpanded(!isTodayExpanded)}
-              isCollapsed={isCollapsed}
-              currentThreadId={currentThreadId}
-              onSelectConversation={onSelectConversation}
-              onDeleteClick={handleDeleteConversation}
-              formatTime={formatTime}
-              deleteConfirmOpen={deleteConfirmOpen}
-              conversationToDelete={conversationToDelete}
-              onDeleteConfirmChange={setDeleteConfirmOpen}
-              onConfirmDelete={handleConfirmDelete}
-              onCancelDelete={handleCancelDelete}
-            />
-            <ConversationGroup
-              label={t('chat.thisMonth')}
-              conversations={monthConvs}
-              isExpanded={isThisMonthExpanded}
-              onToggleExpand={() => setIsThisMonthExpanded(!isThisMonthExpanded)}
-              isCollapsed={isCollapsed}
-              currentThreadId={currentThreadId}
-              onSelectConversation={onSelectConversation}
-              onDeleteClick={handleDeleteConversation}
-              formatTime={formatTime}
-              deleteConfirmOpen={deleteConfirmOpen}
-              conversationToDelete={conversationToDelete}
-              onDeleteConfirmChange={setDeleteConfirmOpen}
-              onConfirmDelete={handleConfirmDelete}
-              onCancelDelete={handleCancelDelete}
-            />
-            <ConversationGroup
-              label={t('chat.older')}
-              conversations={olderConvs}
-              isExpanded={isOlderExpanded}
-              onToggleExpand={() => setIsOlderExpanded(!isOlderExpanded)}
-              isCollapsed={isCollapsed}
-              currentThreadId={currentThreadId}
-              onSelectConversation={onSelectConversation}
-              onDeleteClick={handleDeleteConversation}
-              formatTime={formatTime}
-              maxItems={10}
-              deleteConfirmOpen={deleteConfirmOpen}
-              conversationToDelete={conversationToDelete}
-              onDeleteConfirmChange={setDeleteConfirmOpen}
-              onConfirmDelete={handleConfirmDelete}
-              onCancelDelete={handleCancelDelete}
-            />
-          </>
-        )}
-      </div>
-
-      {/* Collapse Button */}
-      <div className="flex-shrink-0 border-t border-[var(--border)] p-2">
-        <button
-          onClick={onToggle}
-          className={cn(
-            'flex w-full items-center justify-center rounded-lg py-1.5 text-[var(--text-secondary)] transition-colors hover:bg-[var(--surface-2)]',
-            isCollapsed ? 'px-0' : 'gap-2 px-2',
-          )}
-          title={isCollapsed ? t('chat.expand') : t('chat.collapse')}
-          aria-label={isCollapsed ? t('chat.expand') : t('chat.collapse')}
-        >
-          {isCollapsed ? (
-            <ChevronRight size={14} />
-          ) : (
-            <>
-              <ChevronLeft size={14} />
-              <span className="text-xs text-[var(--text-muted)]">{t('chat.collapse')}</span>
-            </>
-          )}
-        </button>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/CodeViewer.tsx b/frontend/app/chat/components/CodeViewer.tsx
deleted file mode 100644
index 57e98fe6a..000000000
--- a/frontend/app/chat/components/CodeViewer.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-'use client'
-
-import { Copy, Check, FileCode, ChevronDown, ChevronRight } from 'lucide-react'
-import { useState, useEffect } from 'react'
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
-import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism'
-
-import { Button } from '@/components/ui/button'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-interface CodeViewerProps {
-  code: string
-  language: string
-  filename?: string
-  className?: string
-  showLineNumbers?: boolean
-  collapsible?: boolean
-  defaultCollapsed?: boolean
-  maxHeight?: string
-}
-
-// Map file extensions to Prism language names
-const languageMap: Record<string, string> = {
-  py: 'python',
-  python: 'python',
-  js: 'javascript',
-  javascript: 'javascript',
-  jsx: 'jsx',
-  ts: 'typescript',
-  typescript: 'typescript',
-  tsx: 'tsx',
-  json: 'json',
-  md: 'markdown',
-  markdown: 'markdown',
-  sh: 'bash',
-  bash: 'bash',
-  shell: 'bash',
-  zsh: 'bash',
-  yaml: 'yaml',
-  yml: 'yaml',
-  html: 'markup',
-  css: 'css',
-  scss: 'scss',
-  sql: 'sql',
-  xml: 'xml',
-  go: 'go',
-  rust: 'rust',
-  java: 'java',
-  c: 'c',
-  cpp: 'cpp',
-  text: 'text',
-}
-
-// Get Prism language from file extension or language name
-const getPrismLanguage = (lang: string): string => {
-  const lower = lang.toLowerCase()
-  return languageMap[lower] || lower || 'text'
-}
-
-function LanguageBadge({ language }: { language: string }) {
-  const colors: Record<string, string> = {
-    python: 'bg-[var(--skill-brand-100)] text-[var(--skill-brand-700)] border-[var(--skill-brand-200)]',
-    typescript: 'bg-[var(--brand-100)] text-[var(--brand-700)] border-[var(--brand-200)]',
-    javascript: 'bg-[var(--status-warning-bg)] text-[var(--status-warning)] border-[var(--status-warning-border)]',
-    json: 'bg-[var(--brand-50)] text-[var(--brand-600)] border-[var(--brand-200)]',
-    markdown: 'bg-[var(--surface-3)] text-[var(--text-secondary)] border-[var(--border)]',
-    bash: 'bg-[var(--status-error-bg)] text-[var(--status-error)] border-[var(--status-error-border)]',
-    shell: 'bg-[var(--status-error-bg)] text-[var(--status-error)] border-[var(--status-error-border)]',
-    yaml: 'bg-[var(--status-error-bg)] text-[var(--status-error)] border-[var(--status-error-border)]',
-    html: 'bg-[var(--status-warning-bg)] text-[var(--status-warning)] border-[var(--status-warning-border)]',
-    css: 'bg-[var(--brand-100)] text-[var(--brand-700)] border-[var(--brand-200)]',
-    sql: 'bg-[var(--brand-100)] text-[var(--brand-600)] border-[var(--brand-200)]',
-  }
-
-  const colorClass = colors[language.toLowerCase()] || 'bg-[var(--surface-3)] text-[var(--text-secondary)] border-[var(--border)]'
-
-  return (
-    <span className={cn('rounded border px-2 py-0.5 text-xs font-medium', colorClass)}>
-      {language}
-    </span>
-  )
-}
-
-export default function CodeViewer({
-  code,
-  language,
-  filename,
-  className,
-  showLineNumbers = true,
-  collapsible = false,
-  defaultCollapsed = false,
-  maxHeight = '400px',
-}: CodeViewerProps) {
-  const { t } = useTranslation()
-  const [copied, setCopied] = useState(false)
-  const [isCollapsed, setIsCollapsed] = useState(defaultCollapsed)
-
-  useEffect(() => {
-    if (copied) {
-      const timer = setTimeout(() => setCopied(false), 2000)
-      return () => clearTimeout(timer)
-    }
-  }, [copied])
-
-  const handleCopy = async () => {
-    await navigator.clipboard.writeText(code)
-    setCopied(true)
-  }
-
-  const prismLanguage = getPrismLanguage(language)
-  const lines = code.split('\n')
-  const lineCount = lines.length
-
-  return (
-    <div
-      className={cn(
-        'flex flex-col overflow-hidden rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)]',
-        className,
-      )}
-    >
-      {/* Header */}
-      <div className="flex items-center justify-between border-b border-[var(--border-muted)] bg-[var(--surface-2)] px-3 py-2">
-        <div className="flex min-w-0 flex-1 items-center gap-2">
-          {collapsible && (
-            <button
-              onClick={() => setIsCollapsed(!isCollapsed)}
-              className="rounded p-0.5 transition-colors hover:bg-[var(--surface-5)]"
-              aria-label={isCollapsed ? 'Expand code' : 'Collapse code'}
-            >
-              {isCollapsed ? (
-                <ChevronRight size={14} className="text-[var(--text-tertiary)]" />
-              ) : (
-                <ChevronDown size={14} className="text-[var(--text-tertiary)]" />
-              )}
-            </button>
-          )}
-          <FileCode size={14} className="flex-shrink-0 text-[var(--text-muted)]" />
-          <span className="truncate text-xs font-medium text-[var(--text-secondary)]">
-            {filename || t('chat.untitled')}
-          </span>
-          <LanguageBadge language={prismLanguage} />
-          <span className="text-xs text-[var(--text-muted)]">{lineCount} {t('chat.lines')}</span>
-        </div>
-        <Button
-          variant="ghost"
-          size="sm"
-          onClick={handleCopy}
-          className="h-7 gap-1.5 px-2 text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]"
-        >
-          {copied ? (
-            <>
-              <Check size={12} className="text-[var(--status-success)]" />
-              <span className="text-xs">{t('chat.copied')}</span>
-            </>
-          ) : (
-            <>
-              <Copy size={12} />
-              <span className="text-xs">{t('chat.copy')}</span>
-            </>
-          )}
-        </Button>
-      </div>
-
-      {/* Code Content */}
-      {!isCollapsed && (
-        <div className="overflow-auto" style={{ maxHeight }}>
-          <SyntaxHighlighter
-            language={prismLanguage}
-            style={oneLight}
-            showLineNumbers={showLineNumbers}
-            showInlineLineNumbers={false}
-            lineNumberStyle={{
-              minWidth: '2.5em',
-              paddingRight: '1em',
-              color: 'var(--text-muted)',
-              fontSize: '11px',
-              textAlign: 'right',
-              userSelect: 'none',
-            }}
-            lineNumberContainerStyle={{
-              float: 'left',
-              paddingRight: '1em',
-            }}
-            customStyle={{
-              margin: 0,
-              padding: '0.75rem 1rem',
-              background: '#ffffff',
-              fontSize: '12px',
-              lineHeight: '1.6',
-              fontFamily: 'JetBrains Mono, Menlo, Monaco, Consolas, monospace',
-            }}
-            codeTagProps={{
-              style: {
-                fontFamily: 'JetBrains Mono, Menlo, Monaco, Consolas, monospace',
-              },
-            }}
-          >
-            {code}
-          </SyntaxHighlighter>
-        </div>
-      )}
-
-      {/* Collapsed preview */}
-      {isCollapsed && (
-        <div className="bg-[var(--surface-2)] px-3 py-2 text-xs text-[var(--text-tertiary)]">
-          <span className="font-mono">
-            {lines[0]?.slice(0, 60)}
-            {lines[0]?.length > 60 ? '...' : ''}
-          </span>
-          {lineCount > 1 && <span className="ml-2 text-[var(--text-muted)]">{t('chat.moreLines', { count: lineCount - 1 })}</span>}
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/ConversationGroup.tsx b/frontend/app/chat/components/ConversationGroup.tsx
deleted file mode 100644
index 7781a6d68..000000000
--- a/frontend/app/chat/components/ConversationGroup.tsx
+++ /dev/null
@@ -1,213 +0,0 @@
-'use client'
-
-import { MessageSquare, Trash2, ChevronDown, ChevronRight } from 'lucide-react'
-import React from 'react'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from '@/components/ui/alert-dialog'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import type { Conversation } from '@/services/conversationService'
-
-interface ConversationItemProps {
-  conv: Conversation
-  isActive: boolean
-  isCollapsed: boolean
-  onSelect: (threadId: string) => void
-  onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void
-  formatTime: (dateString: string) => string
-  deleteConfirmOpen: boolean
-  conversationToDelete: { threadId: string; title: string } | null
-  onDeleteConfirmChange: (open: boolean) => void
-  onConfirmDelete: () => void
-  onCancelDelete: () => void
-}
-
-function ConversationItem({
-  conv,
-  isActive,
-  isCollapsed,
-  onSelect,
-  onDeleteClick,
-  formatTime,
-  deleteConfirmOpen,
-  conversationToDelete,
-  onDeleteConfirmChange,
-  onConfirmDelete,
-  onCancelDelete,
-}: ConversationItemProps) {
-  const { t } = useTranslation()
-
-  return (
-    <div
-      className={cn(
-        'group relative flex w-full items-center rounded-md transition-colors duration-150',
-        isCollapsed ? 'justify-center px-1.5 py-1.5' : 'gap-2 px-2 py-1.5',
-        isActive
-          ? 'bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-sm ring-1 ring-primary/10'
-          : 'text-[var(--text-secondary)] hover:bg-[var(--surface-2)]',
-      )}
-    >
-      <button
-        onClick={() => onSelect(conv.thread_id)}
-        className={cn(
-          'flex min-w-0 flex-1 items-center text-left',
-          isCollapsed ? 'justify-center' : 'gap-2',
-        )}
-        title={conv.title || t('chat.newChat')}
-      >
-        <MessageSquare
-          size={14}
-          className={cn(
-            'flex-shrink-0',
-            isActive ? 'text-primary' : 'text-[var(--text-muted)]',
-          )}
-        />
-        {!isCollapsed && (
-          <>
-            <div className="min-w-0 flex-1 truncate text-xs">
-              {conv.title || t('chat.newChat')}
-            </div>
-            <div className="flex-shrink-0 text-xs text-[var(--text-muted)]">
-              {formatTime(conv.updated_at)}
-            </div>
-          </>
-        )}
-      </button>
-      {!isCollapsed && (
-        <AlertDialog
-          open={
-            deleteConfirmOpen && conversationToDelete?.threadId === conv.thread_id
-          }
-          onOpenChange={onDeleteConfirmChange}
-        >
-          <AlertDialogTrigger asChild>
-            <button
-              onClick={(e) =>
-                onDeleteClick(
-                  e,
-                  conv.thread_id,
-                  conv.title || t('chat.newChat'),
-                )
-              }
-              className="flex-shrink-0 rounded p-1 opacity-0 transition-all hover:bg-[var(--status-error-bg)] group-hover:opacity-100"
-              title={t('chat.delete')}
-            >
-              <Trash2 size={12} className="text-[var(--text-muted)] hover:text-[var(--status-error)]" />
-            </button>
-          </AlertDialogTrigger>
-          <AlertDialogContent variant="destructive">
-            <AlertDialogHeader>
-              <AlertDialogTitle>{t('chat.deleteConfirmTitle')}</AlertDialogTitle>
-              <AlertDialogDescription>
-                {t('chat.deleteConfirmMessage')}{' '}
-                <span className="font-semibold text-[var(--status-error)]">
-                  {conv.title || t('chat.newChat')}
-                </span>
-                {'?'}
-              </AlertDialogDescription>
-            </AlertDialogHeader>
-            <AlertDialogFooter>
-              <AlertDialogCancel onClick={onCancelDelete}>
-                {t('chat.cancel')}
-              </AlertDialogCancel>
-              <AlertDialogAction
-                onClick={onConfirmDelete}
-                className="bg-[var(--status-error)] text-white hover:bg-[var(--status-error-hover)]"
-              >
-                {t('chat.delete')}
-              </AlertDialogAction>
-            </AlertDialogFooter>
-          </AlertDialogContent>
-        </AlertDialog>
-      )}
-    </div>
-  )
-}
-
-interface ConversationGroupProps {
-  label: string
-  conversations: Conversation[]
-  isExpanded: boolean
-  onToggleExpand: () => void
-  isCollapsed: boolean
-  currentThreadId: string | null
-  onSelectConversation: (threadId: string) => void
-  onDeleteClick: (e: React.MouseEvent, threadId: string, title: string) => void
-  formatTime: (dateString: string) => string
-  maxItems?: number
-  deleteConfirmOpen: boolean
-  conversationToDelete: { threadId: string; title: string } | null
-  onDeleteConfirmChange: (open: boolean) => void
-  onConfirmDelete: () => void
-  onCancelDelete: () => void
-}
-
-export default function ConversationGroup({
-  label,
-  conversations,
-  isExpanded,
-  onToggleExpand,
-  isCollapsed,
-  currentThreadId,
-  onSelectConversation,
-  onDeleteClick,
-  formatTime,
-  maxItems,
-  deleteConfirmOpen,
-  conversationToDelete,
-  onDeleteConfirmChange,
-  onConfirmDelete,
-  onCancelDelete,
-}: ConversationGroupProps) {
-  if (conversations.length === 0) return null
-
-  const displayConversations = maxItems ? conversations.slice(0, maxItems) : conversations
-
-  return (
-    <div className="mb-2">
-      {!isCollapsed && (
-        <button
-          onClick={onToggleExpand}
-          className="mb-1.5 flex w-full items-center justify-between px-1.5 text-xs font-medium uppercase tracking-wider text-[var(--text-muted)] transition-colors hover:text-[var(--text-secondary)]"
-        >
-          <span>{label}</span>
-          {isExpanded ? (
-            <ChevronDown size={14} className="text-[var(--text-muted)]" />
-          ) : (
-            <ChevronRight size={14} className="text-[var(--text-muted)]" />
-          )}
-        </button>
-      )}
-      {(isExpanded || isCollapsed) && (
-        <div className="space-y-0.5">
-          {displayConversations.map((conv) => (
-            <ConversationItem
-              key={conv.thread_id}
-              conv={conv}
-              isActive={currentThreadId === conv.thread_id}
-              isCollapsed={isCollapsed}
-              onSelect={onSelectConversation}
-              onDeleteClick={onDeleteClick}
-              formatTime={formatTime}
-              deleteConfirmOpen={deleteConfirmOpen}
-              conversationToDelete={conversationToDelete}
-              onDeleteConfirmChange={onDeleteConfirmChange}
-              onConfirmDelete={onConfirmDelete}
-              onCancelDelete={onCancelDelete}
-            />
-          ))}
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/FileBrowser.tsx b/frontend/app/chat/components/FileBrowser.tsx
deleted file mode 100644
index bdd105e6f..000000000
--- a/frontend/app/chat/components/FileBrowser.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-'use client'
-
-import {
-  File,
-  Folder,
-  FolderOpen,
-  ChevronRight,
-  ChevronDown,
-  FileCode,
-  FileJson,
-  FileText,
-  Image as ImageIcon,
-} from 'lucide-react'
-import React, { useState } from 'react'
-
-import { cn } from '@/lib/utils'
-
-export interface FileNode {
-  name: string
-  path: string
-  type: 'file' | 'directory'
-  children?: FileNode[]
-  extension?: string
-  /** MIME content_type propagated from backend (e.g. "text/plain", "image/png") */
-  contentType?: string
-}
-
-interface FileBrowserProps {
-  files: FileNode[]
-  selectedPath: string | null
-  onSelect: (path: string) => void
-  className?: string
-}
-
-export default function FileBrowser({
-  files,
-  selectedPath,
-  onSelect,
-  className,
-}: FileBrowserProps) {
-  const [expandedDirs, setExpandedDirs] = useState<Set<string>>(new Set())
-
-  const toggleDir = (path: string) => {
-    setExpandedDirs((prev) => {
-      const next = new Set(prev)
-      if (next.has(path)) {
-        next.delete(path)
-      } else {
-        next.add(path)
-      }
-      return next
-    })
-  }
-
-  const getFileIcon = (node: FileNode) => {
-    if (node.type === 'directory') {
-      return expandedDirs.has(node.path) ? (
-        <FolderOpen size={16} className="text-[var(--brand-500)]" />
-      ) : (
-        <Folder size={16} className="text-[var(--brand-500)]" />
-      )
-    }
-
-    const ext = node.extension?.toLowerCase() || ''
-    if (['ts', 'tsx', 'js', 'jsx'].includes(ext)) {
-      return <FileCode size={16} className="text-[var(--brand-400)]" />
-    }
-    if (['json'].includes(ext)) {
-      return <FileJson size={16} className="text-[var(--status-warning)]" />
-    }
-    if (['md', 'txt'].includes(ext)) {
-      return <FileText size={16} className="text-[var(--text-tertiary)]" />
-    }
-    if (['png', 'jpg', 'jpeg', 'gif', 'svg'].includes(ext)) {
-      return <ImageIcon size={16} className="text-[var(--brand-600)]" />
-    }
-    return <File size={16} className="text-[var(--text-muted)]" />
-  }
-
-  const renderNode = (node: FileNode, level: number = 0): React.ReactNode => {
-    const isExpanded = expandedDirs.has(node.path)
-    const isSelected = selectedPath === node.path
-    const paddingLeft = level * 16 + 12
-
-    return (
-      <div key={node.path}>
-        <div
-          className={cn(
-            'flex cursor-pointer items-center gap-1.5 py-1.5 text-sm transition-colors hover:bg-[var(--surface-3)]',
-            isSelected && 'bg-[var(--brand-50)] hover:bg-[var(--brand-100)]',
-          )}
-          style={{ paddingLeft: `${paddingLeft}px` }}
-          onClick={() => {
-            if (node.type === 'directory') {
-              toggleDir(node.path)
-            } else {
-              onSelect(node.path)
-            }
-          }}
-        >
-          {node.type === 'directory' && (
-            <span className="flex-shrink-0">
-              {isExpanded ? <ChevronDown size={12} /> : <ChevronRight size={12} />}
-            </span>
-          )}
-          <span className="flex-shrink-0">{getFileIcon(node)}</span>
-          <span className={cn('flex-1 truncate', isSelected && 'font-medium text-[var(--brand-700)]')}>
-            {node.name}
-          </span>
-        </div>
-        {node.type === 'directory' && isExpanded && node.children && (
-          <div>{node.children.map((child) => renderNode(child, level + 1))}</div>
-        )}
-      </div>
-    )
-  }
-
-  return (
-    <div className={cn('h-full overflow-y-auto', className)}>
-      {files.length === 0 ? (
-        <div className="mt-8 text-center text-sm text-[var(--text-muted)]">No files available</div>
-      ) : (
-        <div className="py-2">{files.map((file) => renderNode(file))}</div>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/MessageItem.tsx b/frontend/app/chat/components/MessageItem.tsx
deleted file mode 100644
index 96dda85bf..000000000
--- a/frontend/app/chat/components/MessageItem.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-'use client'
-
-import DOMPurify from 'dompurify'
-import { motion } from 'framer-motion'
-import type { Variants } from 'framer-motion'
-import { User, Bot } from 'lucide-react'
-import React, { useMemo } from 'react'
-import ReactMarkdown from 'react-markdown'
-
-import { Notice } from '@/components/ui/notice'
-
-import { ActionBar } from '../shared/ActionBar'
-import { CodeBlock } from '../shared/CodeBlock'
-import { ToolCallBadge } from '../shared/ToolCallDisplay'
-import { Message, ToolCall } from '../types'
-
-// ─── Hoisted constants (stable references, no per-render allocation) ─────────
-
-const SANITIZE_CONFIG = {
-  ALLOWED_TAGS: [
-    'p', 'br', 'strong', 'em', 'code', 'pre', 'blockquote',
-    'ul', 'ol', 'li', 'a', 'img',
-    'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr',
-    'div', 'span', 'table', 'thead', 'tbody', 'tr', 'th', 'td',
-    'details', 'summary', 'sup', 'sub', 'del', 's', 'ins', 'mark',
-    'abbr', 'b', 'i', 'u', 'small', 'tt', 'kbd', 'samp', 'var',
-  ],
-  ALLOWED_ATTR: [
-    'href', 'src', 'alt', 'title', 'class', 'id',
-    'width', 'height', 'target', 'rel', 'name', 'open',
-  ],
-  ALLOW_DATA_ATTR: false,
-  ALLOW_UNKNOWN_PROTOCOLS: false,
-  ADD_ATTR: ['rel'],
-  FORBID_TAGS: ['script', 'style', 'iframe', 'form', 'input', 'button'],
-  FORBID_ATTR: ['onerror', 'onload', 'onclick', 'onmouseover', 'onfocus', 'onblur'],
-}
-
-const markdownComponents = {
-  code({ node: _node, inline, className, children, ...props }: any) {
-    const match = /language-(\w+)/.exec(className || '')
-    const content = String(children).replace(/\n$/, '')
-
-    return !inline && match ? (
-      <CodeBlock language={match[1]} code={content} />
-    ) : (
-      <code
-        {...props}
-        className="rounded border border-[var(--border)] bg-[var(--surface-3)] px-1.5 py-0.5 font-mono text-xs text-[var(--text-primary)]"
-      >
-        {children}
-      </code>
-    )
-  },
-}
-
-const messageVariants: Variants = {
-  hidden: { opacity: 0, y: 8 },
-  visible: { opacity: 1, y: 0, transition: { duration: 0.2, ease: 'easeOut' } },
-}
-
-// ─── Component ───────────────────────────────────────────────────────────────
-
-interface MessageItemProps {
-  message: Message
-  onToolClick?: (toolCall: ToolCall) => void
-  onRetry?: () => void
-}
-
-export default function MessageItem({ message, onToolClick, onRetry }: MessageItemProps) {
-  const isUser = message.role === 'user'
-
-  const sanitizedContent = useMemo(
-    () => (message.content ? DOMPurify.sanitize(message.content, SANITIZE_CONFIG) : ''),
-    [message.content],
-  )
-
-  if (isUser) {
-    return (
-      <motion.div
-        className="flex w-full gap-3 justify-end"
-        variants={messageVariants}
-        initial="hidden"
-        animate="visible"
-      >
-        <div className="max-w-[85%] rounded-2xl rounded-br-md bg-gray-900 px-4 py-2.5 text-sm leading-relaxed text-white">
-          <p className="whitespace-pre-wrap">
-            {message.content}
-          </p>
-        </div>
-        <div className="mt-0.5 flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-full bg-[var(--surface-5)]">
-          <User size={14} className="text-[var(--text-secondary)]" />
-        </div>
-      </motion.div>
-    )
-  }
-
-  // Assistant Message
-  return (
-    <motion.div
-      className="group flex w-full gap-3 justify-start"
-      variants={messageVariants}
-      initial="hidden"
-      animate="visible"
-    >
-      <div className="mt-0.5 flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-full bg-[var(--brand-50)]">
-        <Bot size={14} className="text-[var(--brand-500)]" />
-      </div>
-      <div className="max-w-[85%] rounded-2xl rounded-bl-md border border-[var(--border-muted)] bg-[var(--surface-2)] px-4 py-2.5 text-sm leading-relaxed text-[var(--text-primary)]">
-        {/* Tool Calls Area */}
-        {message.tool_calls && message.tool_calls.length > 0 && (
-          <div className="mb-2 space-y-1">
-            {message.tool_calls.map((tool) => (
-              <ToolCallBadge
-                key={tool.id}
-                name={tool.name}
-                args={tool.args}
-                status={tool.status}
-                onClick={onToolClick ? () => onToolClick(tool) : undefined}
-              />
-            ))}
-          </div>
-        )}
-
-        {/* Error indicator */}
-        {message.metadata?.error && (
-          <Notice variant="error" className="mb-2">
-            {message.metadata.error}
-          </Notice>
-        )}
-
-        {/* Main Content */}
-        <div className="prose prose-sm max-w-none prose-headings:my-2 prose-p:my-1 prose-ol:my-1 prose-ul:my-1 prose-li:my-0.5">
-          {sanitizedContent ? (
-            <ReactMarkdown components={markdownComponents}>
-              {sanitizedContent}
-            </ReactMarkdown>
-          ) : message.metadata?.error ? null : (
-            message.isStreaming && (
-              <span className="ml-0.5 inline-block h-4 w-1.5 animate-pulse rounded-sm bg-[var(--brand-500)] align-middle" />
-            )
-          )}
-        </div>
-
-        <ActionBar content={message.content} onRetry={onRetry} />
-      </div>
-    </motion.div>
-  )
-}
diff --git a/frontend/app/chat/components/ThreadContent.tsx b/frontend/app/chat/components/ThreadContent.tsx
deleted file mode 100644
index e71e8a899..000000000
--- a/frontend/app/chat/components/ThreadContent.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-'use client'
-
-import { Bot, MessageSquare } from 'lucide-react'
-import React, { useMemo } from 'react'
-
-
-import { useTranslation } from '@/lib/i18n'
-
-import { CopyAction } from '../shared/ActionBar'
-import { Message, ToolCall } from '../types'
-
-import MessageItem from './MessageItem'
-
-interface ThreadContentProps {
-  messages: Message[]
-  streamingText?: string
-  agentStatus: 'idle' | 'running' | 'connecting' | 'error'
-  currentNodeLabel?: string
-  onToolClick: (toolCall: ToolCall) => void
-  onRetry?: (messageContent: string) => void
-  scrollContainerRef: React.RefObject<HTMLDivElement | null>
-}
-
-export default function ThreadContent({
-  messages,
-  streamingText = '',
-  agentStatus,
-  currentNodeLabel,
-  onToolClick,
-  onRetry,
-  scrollContainerRef,
-}: ThreadContentProps) {
-  const { t } = useTranslation()
-
-  // When running and last message is assistant, it is shown by Streaming/Processing indicator only
-  const messagesToRender = useMemo(() => {
-    if (agentStatus === 'running' && messages[messages.length - 1]?.role === 'assistant') {
-      return messages.slice(0, -1)
-    }
-    return messages
-  }, [agentStatus, messages])
-
-  return (
-    <div
-      ref={scrollContainerRef}
-      className="h-full overflow-y-auto bg-[var(--bg)] [-ms-overflow-style:none] [scrollbar-width:none] [&::-webkit-scrollbar]:hidden"
-    >
-      <div className="mx-auto w-full min-w-0 max-w-3xl p-4">
-        <div className="min-w-0 space-y-4">
-          {/* Messages - history on top for waterfall layout */}
-          {messagesToRender.length === 0 ? (
-            <div className="flex flex-col items-center justify-center gap-3 py-20">
-              <div className="rounded-full bg-[var(--brand-50)] p-4">
-                <MessageSquare size={24} className="text-[var(--brand-500)]" />
-              </div>
-              <p className="text-base font-medium text-[var(--text-secondary)]">{t('chat.startConversation')}</p>
-              <p className="text-sm text-[var(--text-muted)]">{t('chat.askAnything', { defaultValue: 'Ask anything to get started' })}</p>
-            </div>
-          ) : (
-            messagesToRender.map((msg, idx) => (
-              <MessageItem
-                key={msg.id}
-                message={msg}
-                onToolClick={onToolClick}
-                onRetry={
-                  msg.role === 'assistant' && idx === messagesToRender.length - 1 && onRetry
-                    ? () => {
-                        // Find the preceding user message to re-send
-                        for (let i = idx - 1; i >= 0; i--) {
-                          if (messagesToRender[i].role === 'user') {
-                            onRetry(messagesToRender[i].content)
-                            return
-                          }
-                        }
-                      }
-                    : undefined
-                }
-              />
-            ))
-          )}
-
-          {/* Streaming indicator - current reply at bottom */}
-          {streamingText && agentStatus === 'running' && (
-            <div className="group flex w-full gap-3 justify-start duration-200 animate-in fade-in">
-              <div className="mt-0.5 flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-full bg-[var(--brand-50)]">
-                <Bot size={14} className="text-[var(--brand-500)]" />
-              </div>
-              <div className="max-w-[85%] rounded-2xl rounded-bl-md border border-[var(--border-muted)] bg-[var(--surface-2)] px-4 py-2.5 text-sm leading-relaxed text-[var(--text-primary)]">
-                <div className="prose prose-sm max-w-none prose-headings:my-2 prose-p:my-1 prose-ol:my-1 prose-ul:my-1 prose-li:my-0.5">
-                  <span className="mr-1 inline-block h-4 w-1.5 animate-pulse rounded-sm bg-[var(--brand-500)] align-middle" />
-                  {streamingText}
-                </div>
-                <div className="mt-1 opacity-0 transition-opacity group-hover:opacity-100">
-                  <CopyAction text={streamingText} />
-                </div>
-              </div>
-            </div>
-          )}
-
-          {/* Processing indicator - thinking at bottom */}
-          {agentStatus === 'running' && messages.length > 0 && !streamingText && (
-            <div className="flex w-full gap-3 justify-start duration-200 animate-in fade-in">
-              <div className="mt-0.5 flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-full bg-[var(--brand-50)]">
-                <div className="flex gap-0.5">
-                  <span className="h-1.5 w-1.5 animate-bounce rounded-full bg-[var(--brand-500)] [animation-delay:0ms]" />
-                  <span className="h-1.5 w-1.5 animate-bounce rounded-full bg-[var(--brand-500)] [animation-delay:150ms]" />
-                  <span className="h-1.5 w-1.5 animate-bounce rounded-full bg-[var(--brand-500)] [animation-delay:300ms]" />
-                </div>
-              </div>
-              <div className="flex items-center gap-2 rounded-2xl rounded-bl-md border border-[var(--border-muted)] bg-[var(--surface-2)] px-4 py-2.5">
-                <span className="animate-pulse text-sm text-[var(--text-secondary)]">
-                  {t('chat.thinking')}
-                </span>
-                {currentNodeLabel && (
-                  <span className="truncate text-xs text-[var(--text-muted)]" title={currentNodeLabel}>
-                    {currentNodeLabel}
-                  </span>
-                )}
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/components/icons/AndroidIcon.tsx b/frontend/app/chat/components/icons/AndroidIcon.tsx
deleted file mode 100644
index 6d033b6bc..000000000
--- a/frontend/app/chat/components/icons/AndroidIcon.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Android Icon Component
- */
-
-import { SVGProps } from 'react'
-
-export function AndroidIcon({
-  className,
-  size = 18,
-  ...props
-}: { className?: string; size?: number } & SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      width={size}
-      height={size}
-      viewBox="0 0 24 24"
-      fill="currentColor"
-      className={className}
-      {...props}
-    >
-      <path d="M17.523 15.3414c-.5511 0-.9993-.4486-.9993-.9997s.4482-.9993.9993-.9993c.5511 0 .9993.4482.9993.9993.0001.5511-.4482.9997-.9993.9997m-11.046 0c-.5511 0-.9993-.4486-.9993-.9997s.4482-.9993.9993-.9993c.551 0 .9993.4482.9993.9993 0 .5511-.4483.9997-.9993.9997m11.4045-6.02l1.9973-3.4592a.416.416 0 00-.1521-.5676.416.416 0 00-.5676.1521l-2.0223 3.503C15.5902 8.2439 13.8533 7.8508 12 7.8508s-3.5902.3931-5.1349 1.0987L4.8429 5.4467a.4161.4161 0 00-.5676-.1521.4157.4157 0 00-.1521.5676l1.9973 3.4592C2.6889 11.186.8532 13.3504.8532 16.2124v1.9967c0 .8548.6952 1.55 1.55 1.55h19.1934c.8548 0 1.55-.6952 1.55-1.55v-1.9967c0-2.8619-1.8357-5.0259-4.2677-5.891z" />
-    </svg>
-  )
-}
diff --git a/frontend/app/chat/config/modeConfig.ts b/frontend/app/chat/config/modeConfig.ts
deleted file mode 100644
index febcb1f17..000000000
--- a/frontend/app/chat/config/modeConfig.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Mode Configuration
- *
- * Mode configuration, defines all available chat modes and their metadata
- */
-
-import React from 'react'
-
-import { LucideIcon, Server, MessageSquare, Wand2 } from 'lucide-react'
-
-import { AndroidIcon } from '../components/icons/AndroidIcon'
-
-/**
- * Mode configuration type
- */
-export interface ModeConfig {
-  id: string
-  labelKey: string
-  descriptionKey: string
-  icon: LucideIcon | React.ComponentType<{ className?: string }>
-  type?: 'template' | 'simple' | 'agent'
-  templateName?: string
-  templateGraphName?: string
-  starterPrompts?: string[]
-}
-
-/**
- * Mode configuration list
- *
- * This configuration is used for:
- * 1. Generating mode cards in UI
- * 2. Associating with mode handlers
- */
-export const modeConfigs: ModeConfig[] = [
-  {
-    id: 'default-chat',
-    labelKey: 'chat.defaultChat',
-    descriptionKey: 'chat.defaultChatDescription',
-    icon: MessageSquare,
-    type: 'template',
-    templateName: 'default-chat',
-    templateGraphName: 'Default Chat',
-  },
-  {
-    id: 'mcp-scan',
-    labelKey: 'chat.mcpScan',
-    descriptionKey: 'chat.mcpScanDescription',
-    icon: Server,
-    type: 'simple',
-    starterPrompts: [
-      'Scan my MCP service configuration',
-      'Check if MCP permission settings are secure',
-    ],
-  },
-  {
-    id: 'apk-vulnerability',
-    labelKey: 'chat.apkVulnerability',
-    descriptionKey: 'chat.apkVulnerabilityDescription',
-    icon: AndroidIcon,
-    type: 'template',
-    templateName: 'apk-detector',
-    templateGraphName: 'APK Detector',
-    starterPrompts: [
-      'Upload APK for IntentBridge vulnerability detection',
-      'Analyze APK component exposure risks',
-    ],
-  },
-  {
-    id: 'skill-creator',
-    labelKey: 'chat.skillCreator',
-    descriptionKey: 'chat.skillCreatorDescription',
-    icon: Wand2,
-    type: 'template',
-    templateName: 'skill-creator',
-    templateGraphName: 'Skill Creator',
-    starterPrompts: [
-      'Create a network scanning skill',
-      'Help me design an automated penetration testing skill',
-    ],
-  },
-]
-
-/**
- * Get configuration by mode ID
- *
- * @param modeId Mode ID
- * @returns Mode configuration, or undefined if not found
- */
-export function getModeConfig(modeId: string): ModeConfig | undefined {
-  return modeConfigs.find((config) => config.id === modeId)
-}
-
-/**
- * Get all mode configurations
- */
-export function getAllModeConfigs(): ModeConfig[] {
-  return modeConfigs
-}
diff --git a/frontend/app/chat/conversation/ConversationPanel.tsx b/frontend/app/chat/conversation/ConversationPanel.tsx
deleted file mode 100644
index d1892682f..000000000
--- a/frontend/app/chat/conversation/ConversationPanel.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-'use client'
-
-import React, { useRef, useEffect, useCallback } from 'react'
-
-import { useChatState, useChatStream } from '../ChatProvider'
-import ChatInput from '../components/ChatInput'
-import ThreadContent from '../components/ThreadContent'
-import type { UploadedFile } from '../services/modeHandlers/types'
-import type { ToolCall } from '../types'
-
-interface ConversationPanelProps {
-  onSend: (text: string, mode?: string, graphId?: string | null, files?: UploadedFile[]) => void
-  onStop: () => void
-}
-
-export default function ConversationPanel({ onSend, onStop }: ConversationPanelProps) {
-  const { state, dispatch } = useChatState()
-  const { text: streamingText, isProcessing, resumeChat } = useChatStream()
-  const scrollRef = useRef<HTMLDivElement>(null)
-
-  // Determine agent status from streaming state
-  const agentStatus: 'idle' | 'running' | 'connecting' | 'error' = isProcessing ? 'running' : 'idle'
-
-  // Current node label from last message metadata
-  const lastMsg = state.messages[state.messages.length - 1]
-  const currentNodeLabel = lastMsg?.metadata?.currentNode
-
-  // Auto-scroll on new content
-  useEffect(() => {
-    if (scrollRef.current) {
-      scrollRef.current.scrollTop = scrollRef.current.scrollHeight
-    }
-  }, [state.messages, streamingText])
-
-  const handleToolClick = useCallback(
-    (toolCall: ToolCall) => {
-      dispatch({ type: 'SELECT_TOOL', tool: toolCall })
-      dispatch({ type: 'SHOW_PREVIEW' })
-    },
-    [dispatch],
-  )
-
-  const handleSetInput = useCallback(
-    (value: string) => {
-      dispatch({ type: 'SET_INPUT', value })
-    },
-    [dispatch],
-  )
-
-  const handleRetry = useCallback(
-    (messageContent: string) => {
-      if (!isProcessing) {
-        onSend(messageContent, state.mode.currentMode, state.mode.currentGraphId)
-      }
-    },
-    [isProcessing, onSend, state.mode.currentMode, state.mode.currentGraphId],
-  )
-
-  const handleResume = useCallback(async () => {
-    const interrupt = state.streaming.interrupt
-    if (!interrupt || isProcessing) return
-
-    dispatch({ type: 'STREAM_START' })
-    try {
-      await resumeChat({
-        threadId: interrupt.threadId,
-        command: { update: {}, goto: null },
-      })
-    } catch (error) {
-      console.error('[ConversationPanel] Unexpected error in resumeChat:', error)
-    }
-  }, [dispatch, isProcessing, resumeChat, state.streaming.interrupt])
-
-  return (
-    <div className="flex h-full flex-col">
-      {/* Message area */}
-      <div className="flex-1 overflow-hidden">
-        {state.streaming.interrupt && (
-          <div className="border-b border-[var(--status-warning-border)] bg-[var(--status-warning-bg)] px-6 py-3">
-            <div className="mx-auto flex max-w-3xl items-center justify-between gap-4">
-              <div className="min-w-0">
-                <p className="text-sm font-medium text-[var(--text-primary)]">
-                  Execution interrupted
-                </p>
-                <p className="truncate text-xs text-[var(--status-warning)]">
-                  {state.streaming.interrupt.nodeLabel || state.streaming.interrupt.nodeName}
-                </p>
-              </div>
-              <button
-                type="button"
-                onClick={handleResume}
-                disabled={isProcessing}
-                className="rounded-full bg-[var(--status-warning)] px-4 py-2 text-xs font-medium text-white transition hover:opacity-90 disabled:cursor-not-allowed disabled:opacity-60"
-              >
-                Resume
-              </button>
-            </div>
-          </div>
-        )}
-        <ThreadContent
-          messages={state.messages}
-          streamingText={streamingText}
-          agentStatus={agentStatus}
-          currentNodeLabel={currentNodeLabel}
-          onToolClick={handleToolClick}
-          onRetry={handleRetry}
-          scrollContainerRef={scrollRef}
-        />
-      </div>
-
-      {/* Input area */}
-      <div className="border-t border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-        <ChatInput
-          input={state.input}
-          setInput={handleSetInput}
-          onSubmit={onSend}
-          isProcessing={isProcessing}
-          onStop={onStop}
-          currentMode={state.mode.currentMode}
-          currentGraphId={state.mode.currentGraphId}
-        />
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/conversation/index.ts b/frontend/app/chat/conversation/index.ts
deleted file mode 100644
index 4413c6e7b..000000000
--- a/frontend/app/chat/conversation/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ConversationPanel } from './ConversationPanel'
diff --git a/frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts b/frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts
deleted file mode 100644
index 6a991cf3e..000000000
--- a/frontend/app/chat/hooks/__tests__/useChatWebSocket.test.ts
+++ /dev/null
@@ -1,368 +0,0 @@
-import type { Dispatch } from 'react'
-import { renderHook, act, waitFor } from '@testing-library/react'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-// Mock next-runtime-env so getWsBaseUrl falls through to the ws://localhost:8000 default
-vi.mock('next-runtime-env', () => ({ env: vi.fn(() => undefined) }))
-
-// Mock toast so it does not throw during error paths
-vi.mock('@/lib/utils/toast', () => ({ toastError: vi.fn() }))
-vi.stubGlobal(
-  'fetch',
-  vi.fn(async () => ({
-    ok: true,
-    json: async () => ({ data: { token: 'test-token' } }),
-  })),
-)
-
-// ---------------------------------------------------------------------------
-// Mock WebSocket
-// ---------------------------------------------------------------------------
-
-class MockWs {
-  static OPEN = 1
-  static CONNECTING = 0
-  static CLOSED = 3
-
-  readyState = MockWs.OPEN
-  sent: string[] = []
-  onopen: (() => void) | null = null
-  onmessage: ((e: { data: string }) => void) | null = null
-  onclose: ((e: { code: number }) => void) | null = null
-  onerror: (() => void) | null = null
-
-  send(data: string) {
-    this.sent.push(data)
-  }
-
-  close() {
-    this.readyState = MockWs.CLOSED
-  }
-
-  /** Simulate the server delivering a frame */
-  receive(frame: object) {
-    this.onmessage?.({ data: JSON.stringify(frame) })
-  }
-}
-
-let mockWsInstance: MockWs
-
-vi.stubGlobal(
-  'WebSocket',
-  class extends MockWs {
-    constructor(_url: string) {
-      super()
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      mockWsInstance = this
-      // Fire onopen asynchronously so the hook can attach its handlers first
-      Promise.resolve().then(() => this.onopen?.())
-    }
-  },
-)
-
-// ---------------------------------------------------------------------------
-// Import the hook
-// ---------------------------------------------------------------------------
-import { useChatWebSocket } from '../useChatWebSocket'
-import type { ChatAction } from '../../useChatReducer'
-
-// ---------------------------------------------------------------------------
-// Helper
-// ---------------------------------------------------------------------------
-
-/** Render the hook and wait until the WebSocket reports as connected */
-async function renderConnectedHook() {
-  const dispatch = vi.fn() as unknown as Dispatch<ChatAction> & ReturnType<typeof vi.fn>
-  const utils = renderHook(() => useChatWebSocket(dispatch))
-
-  // Wait for the hook's connect() useEffect + MockWs onopen microtask to settle
-  await waitFor(() => {
-    expect(utils.result.current.isConnected).toBe(true)
-  })
-
-  return { dispatch, utils, ws: mockWsInstance }
-}
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-describe('useChatWebSocket', () => {
-  afterEach(async () => {
-    vi.clearAllMocks()
-    const { getChatWsClient } = await import('@/lib/ws/chat/chatWsClient')
-    getChatWsClient().disconnect()
-  })
-
-  // -------------------------------------------------------------------------
-  // 1. 'content' event dispatches STREAM_CONTENT with correct delta
-  // -------------------------------------------------------------------------
-  it('content event dispatches STREAM_CONTENT action with the correct delta', async () => {
-    const { dispatch, utils, ws } = await renderConnectedHook()
-
-    // sendMessage returns only after a done frame, so we fire it concurrently
-    let requestId!: string
-    let sendP!: Promise<{ requestId: string }>
-
-    await act(async () => {
-      sendP = utils.result.current.sendMessage({
-        input: { message: 'hi' },
-        extension: null,
-      })
-      // Let the synchronous ws.send() inside sendMessage run
-      await Promise.resolve()
-    })
-
-    requestId = JSON.parse(ws.sent[ws.sent.length - 1]).request_id
-    expect(requestId).toBeTruthy()
-
-    // Find the aiMsgId dispatched via APPEND_MESSAGE
-    const appendCall = dispatch.mock.calls.find(([a]) => a.type === 'APPEND_MESSAGE')
-    expect(appendCall).toBeDefined()
-    const aiMsgId = (appendCall![0] as Extract<ChatAction, { type: 'APPEND_MESSAGE' }>).message.id
-
-    // Deliver a content frame
-    await act(async () => {
-      ws.receive({ type: 'content', request_id: requestId, data: { delta: 'Hello world' } })
-    })
-
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: 'STREAM_CONTENT',
-        delta: 'Hello world',
-        messageId: aiMsgId,
-      }),
-    )
-
-    // Clean up the dangling sendP
-    await act(async () => {
-      ws.receive({ type: 'done', request_id: requestId })
-    })
-    await sendP
-  })
-
-  // -------------------------------------------------------------------------
-  // 2. 'done' event dispatches STREAM_DONE and cleans up activeRequestsRef
-  // -------------------------------------------------------------------------
-  it('done event dispatches STREAM_DONE and removes the request from activeRequestsRef', async () => {
-    const { dispatch, utils, ws } = await renderConnectedHook()
-
-    let requestId!: string
-    let sendP!: Promise<{ requestId: string }>
-
-    await act(async () => {
-      sendP = utils.result.current.sendMessage({
-        input: { message: 'hi' },
-        extension: null,
-      })
-      await Promise.resolve()
-    })
-
-    requestId = JSON.parse(ws.sent[ws.sent.length - 1]).request_id
-
-    const appendCall = dispatch.mock.calls.find(([a]) => a.type === 'APPEND_MESSAGE')
-    const aiMsgId = (appendCall![0] as Extract<ChatAction, { type: 'APPEND_MESSAGE' }>).message.id
-
-    dispatch.mockClear()
-
-    await act(async () => {
-      ws.receive({ type: 'done', request_id: requestId, thread_id: 'thread-1' })
-    })
-    await sendP
-
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_DONE', messageId: aiMsgId }),
-    )
-
-    // Verify cleanup: a subsequent content frame for the same requestId is ignored
-    dispatch.mockClear()
-
-    await act(async () => {
-      ws.receive({ type: 'content', request_id: requestId, data: { delta: 'late delta' } })
-    })
-
-    expect(dispatch).not.toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_CONTENT' }),
-    )
-  })
-
-  // -------------------------------------------------------------------------
-  // 3. 'ws_error' event dispatches STREAM_DONE + STREAM_ERROR and cleans up
-  // -------------------------------------------------------------------------
-  it('ws_error event dispatches STREAM_DONE and STREAM_ERROR and cleans up activeRequestsRef', async () => {
-    const { dispatch, utils, ws } = await renderConnectedHook()
-
-    let requestId!: string
-
-    await act(async () => {
-      // Fire-and-forget: we don't await the promise because ws_error rejects it
-      utils.result.current
-        .sendMessage({
-          input: { message: 'hi' },
-          extension: null,
-        })
-        .catch(() => {
-          /* expected rejection path */
-        })
-      await Promise.resolve()
-    })
-
-    requestId = JSON.parse(ws.sent[ws.sent.length - 1]).request_id
-
-    const appendCall = dispatch.mock.calls.find(([a]) => a.type === 'APPEND_MESSAGE')
-    const aiMsgId = (appendCall![0] as Extract<ChatAction, { type: 'APPEND_MESSAGE' }>).message.id
-
-    dispatch.mockClear()
-
-    await act(async () => {
-      ws.receive({ type: 'ws_error', request_id: requestId, message: 'Protocol error occurred' })
-    })
-
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_DONE', messageId: aiMsgId }),
-    )
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_ERROR', error: 'Protocol error occurred' }),
-    )
-
-    // Verify cleanup: further content frames for the same request are ignored
-    dispatch.mockClear()
-
-    await act(async () => {
-      ws.receive({ type: 'content', request_id: requestId, data: { delta: 'ignored' } })
-    })
-
-    expect(dispatch).not.toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_CONTENT' }),
-    )
-  })
-
-  // -------------------------------------------------------------------------
-  // 4. 'interrupt' event dispatches STREAM_DONE + SET_INTERRUPT
-  // -------------------------------------------------------------------------
-  it('interrupt event dispatches STREAM_DONE and SET_INTERRUPT', async () => {
-    const { dispatch, utils, ws } = await renderConnectedHook()
-
-    let requestId!: string
-    let sendP!: Promise<{ requestId: string }>
-
-    await act(async () => {
-      sendP = utils.result.current.sendMessage({
-        input: { message: 'hi' },
-        threadId: 'thread-interrupt',
-        extension: null,
-      })
-      await Promise.resolve()
-    })
-
-    requestId = JSON.parse(ws.sent[ws.sent.length - 1]).request_id
-
-    const appendCall = dispatch.mock.calls.find(([a]) => a.type === 'APPEND_MESSAGE')
-    const aiMsgId = (appendCall![0] as Extract<ChatAction, { type: 'APPEND_MESSAGE' }>).message.id
-
-    dispatch.mockClear()
-
-    await act(async () => {
-      ws.receive({
-        type: 'interrupt',
-        request_id: requestId,
-        thread_id: 'thread-interrupt',
-        data: {
-          node_name: 'approval_node',
-          node_label: 'Approval',
-          state: { pending: true },
-        },
-      })
-    })
-    await sendP
-
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'STREAM_DONE', messageId: aiMsgId }),
-    )
-    expect(dispatch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        type: 'SET_INTERRUPT',
-        interrupt: expect.objectContaining({
-          threadId: 'thread-interrupt',
-          nodeName: 'approval_node',
-          nodeLabel: 'Approval',
-        }),
-      }),
-    )
-  })
-
-  // -------------------------------------------------------------------------
-  // 5. sendMessage sends a 'chat.start' WS frame with the correct fields
-  // -------------------------------------------------------------------------
-  it('sendMessage sends a typed chat.start frame with the expected fields', async () => {
-    const { utils, ws } = await renderConnectedHook()
-
-    let sendP!: Promise<{ requestId: string }>
-
-    await act(async () => {
-      sendP = utils.result.current.sendMessage({
-        input: { message: 'Hello!' },
-        threadId: 'thread-42',
-        graphId: 'graph-1',
-        extension: null,
-        metadata: { key: 'value' },
-      })
-      await Promise.resolve()
-    })
-
-    expect(ws.sent.length).toBeGreaterThanOrEqual(1)
-    const frame = JSON.parse(ws.sent[ws.sent.length - 1])
-
-    expect(frame).toMatchObject({
-      type: 'chat.start',
-      thread_id: 'thread-42',
-      graph_id: 'graph-1',
-      input: { message: 'Hello!' },
-      extension: null,
-      metadata: { key: 'value' },
-    })
-    expect(typeof frame.request_id).toBe('string')
-    expect(frame.request_id.length).toBeGreaterThan(0)
-
-    // Clean up the dangling promise
-    await act(async () => {
-      ws.receive({ type: 'done', request_id: frame.request_id })
-    })
-    await sendP
-  })
-
-  // -------------------------------------------------------------------------
-  // 6. stopMessage sends chat.stop by request_id before thread assignment
-  // -------------------------------------------------------------------------
-  it('stopMessage sends chat.stop with request_id before thread_id exists', async () => {
-    const { utils, ws } = await renderConnectedHook()
-    let sendP!: Promise<{ requestId: string }>
-
-    await act(async () => {
-      sendP = utils.result.current.sendMessage({
-        input: { message: 'hello' },
-        extension: null,
-      })
-      await Promise.resolve()
-    })
-
-    const startFrame = JSON.parse(ws.sent[ws.sent.length - 1])
-    expect(startFrame.type).toBe('chat.start')
-
-    act(() => {
-      utils.result.current.stopMessage(startFrame.request_id)
-    })
-
-    const stopFrame = JSON.parse(ws.sent[ws.sent.length - 1])
-    expect(stopFrame).toMatchObject({ type: 'chat.stop', request_id: startFrame.request_id })
-
-    await act(async () => {
-      ws.receive({
-        type: 'error',
-        request_id: startFrame.request_id,
-        data: { message: 'Stream stopped' },
-      })
-    })
-    await sendP
-  })
-})
diff --git a/frontend/app/chat/hooks/useChatReducer.ts b/frontend/app/chat/hooks/useChatReducer.ts
deleted file mode 100644
index 98f0d29d2..000000000
--- a/frontend/app/chat/hooks/useChatReducer.ts
+++ /dev/null
@@ -1,345 +0,0 @@
-'use client'
-
-import { useReducer } from 'react'
-
-import type { Message, ToolCall, FileTreeEntry, NodeLogEntry, InterruptState } from '../types'
-
-// ─── State ───────────────────────────────────────────────────────────────────
-
-export interface ChatState {
-  messages: Message[]
-  threadId: string | null
-  input: string
-  streaming: {
-    isProcessing: boolean
-    isSubmitting: boolean // optimistic "thinking" before SSE starts
-    text: string
-    messageId: string | null // id of the message being streamed
-    metadata: Record<string, any> | null // latest metadata from content events
-    nodeExecutionLog: NodeLogEntry[]
-    interrupt: InterruptState | null
-  }
-  preview: {
-    visible: boolean
-    fileTree: Record<string, FileTreeEntry>
-    activeFile: string | null
-    userDismissed: boolean // set when user manually closes preview, resets on new stream
-  }
-  ui: {
-    sidebarVisible: boolean
-    selectedTool: ToolCall | null
-  }
-  mode: {
-    currentMode: string | undefined
-    currentGraphId: string | null
-    hasShownApkPrompt: boolean
-  }
-}
-
-export const initialChatState: ChatState = {
-  messages: [],
-  threadId: null,
-  input: '',
-  streaming: {
-    isProcessing: false,
-    isSubmitting: false,
-    text: '',
-    messageId: null,
-    metadata: null,
-    nodeExecutionLog: [],
-    interrupt: null,
-  },
-  preview: {
-    visible: false,
-    fileTree: {},
-    activeFile: null,
-    userDismissed: false,
-  },
-  ui: {
-    sidebarVisible: false,
-    selectedTool: null,
-  },
-  mode: {
-    currentMode: undefined,
-    currentGraphId: null,
-    hasShownApkPrompt: false,
-  },
-}
-
-// ─── Actions ─────────────────────────────────────────────────────────────────
-
-export type ChatAction =
-  // Thread
-  | { type: 'SET_THREAD'; threadId: string }
-  | { type: 'RESET' }
-  // Messages
-  | { type: 'APPEND_MESSAGE'; message: Message }
-  | { type: 'UPDATE_MESSAGE'; id: string; patch: Partial<Message> }
-  | { type: 'SET_MESSAGES'; messages: Message[] }
-  // Input
-  | { type: 'SET_INPUT'; value: string }
-  // Streaming lifecycle
-  | { type: 'STREAM_START' }
-  | { type: 'STREAM_CONTENT'; delta: string; messageId: string; metadata?: Record<string, any> }
-  | { type: 'STREAM_DONE'; messageId?: string }
-  | { type: 'STREAM_ERROR'; error: string; messageId?: string }
-  | { type: 'SET_INTERRUPT'; interrupt: InterruptState }
-  | { type: 'CLEAR_INTERRUPT' }
-  // File & tool events
-  | { type: 'FILE_EVENT'; path: string; info: FileTreeEntry }
-  | { type: 'TOOL_START'; tool: ToolCall }
-  | { type: 'TOOL_END'; id: string; result: string }
-  // Node execution (agent mode)
-  | { type: 'NODE_START'; nodeId: string; label: string }
-  | { type: 'NODE_END'; nodeId: string }
-  | { type: 'NODE_LOG'; entry: NodeLogEntry }
-  // UI
-  | { type: 'SET_SIDEBAR_VISIBLE'; visible: boolean }
-  | { type: 'SHOW_PREVIEW' }
-  | { type: 'HIDE_PREVIEW' }
-  | { type: 'SELECT_TOOL'; tool: ToolCall | null }
-  // Mode
-  | { type: 'SET_MODE'; mode: string; graphId: string | null }
-  | { type: 'SET_APK_PROMPT_SHOWN' }
-
-// ─── Reducer ─────────────────────────────────────────────────────────────────
-
-export function chatReducer(state: ChatState, action: ChatAction): ChatState {
-  switch (action.type) {
-    case 'SET_THREAD':
-      return { ...state, threadId: action.threadId }
-
-    case 'RESET':
-      return {
-        ...initialChatState,
-        // Preserve sidebar visibility across reset
-        ui: { ...initialChatState.ui, sidebarVisible: state.ui.sidebarVisible },
-      }
-
-    case 'APPEND_MESSAGE':
-      return { ...state, messages: [...state.messages, action.message] }
-
-    case 'UPDATE_MESSAGE':
-      return {
-        ...state,
-        messages: state.messages.map((m) =>
-          m.id === action.id ? { ...m, ...action.patch } : m,
-        ),
-      }
-
-    case 'SET_MESSAGES':
-      return { ...state, messages: action.messages }
-
-    case 'SET_INPUT':
-      return { ...state, input: action.value }
-
-    case 'STREAM_START':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          isProcessing: true,
-          isSubmitting: false,
-          text: '',
-          messageId: null,
-          metadata: null,
-          nodeExecutionLog: [],
-          interrupt: null,
-        },
-        preview: { ...state.preview, userDismissed: false },
-      }
-
-    case 'STREAM_CONTENT': {
-      // Only update streaming state — messages[] stays stable for ChatStateContext
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          text: state.streaming.text + action.delta,
-          messageId: action.messageId,
-          metadata: action.metadata || state.streaming.metadata,
-        },
-      }
-    }
-
-    case 'STREAM_DONE': {
-      // Commit accumulated streaming text to the message
-      const mid = action.messageId || state.streaming.messageId
-      const hasContent = mid && state.streaming.text
-      return {
-        ...state,
-        messages: hasContent
-          ? state.messages.map((m) =>
-              m.id === mid
-                ? {
-                    ...m,
-                    content: state.streaming.text,
-                    isStreaming: false,
-                    metadata: state.streaming.metadata
-                      ? { ...m.metadata, ...state.streaming.metadata }
-                      : m.metadata,
-                  }
-                : m,
-            )
-          : state.messages,
-        streaming: {
-          ...state.streaming,
-          isProcessing: false,
-          isSubmitting: false,
-          text: '',
-          messageId: null,
-          metadata: null,
-          interrupt: state.streaming.interrupt,
-        },
-      }
-    }
-
-    case 'STREAM_ERROR': {
-      const errorMsgId = action.messageId || state.streaming.messageId
-      const hasTarget = errorMsgId && state.messages.some((m) => m.id === errorMsgId)
-      return {
-        ...state,
-        messages: hasTarget
-          ? state.messages.map((m) =>
-              m.id === errorMsgId
-                ? { ...m, isStreaming: false, metadata: { ...m.metadata, error: action.error } }
-                : m,
-            )
-          : state.messages,
-        streaming: {
-          ...state.streaming,
-          isProcessing: false,
-          isSubmitting: false,
-        },
-      }
-    }
-
-    case 'SET_INTERRUPT':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          interrupt: action.interrupt,
-          isProcessing: false,
-          isSubmitting: false,
-        },
-      }
-
-    case 'CLEAR_INTERRUPT':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          interrupt: null,
-        },
-      }
-
-    case 'FILE_EVENT':
-      return {
-        ...state,
-        preview: {
-          ...state.preview,
-          fileTree: {
-            ...state.preview.fileTree,
-            [action.path]: action.info,
-          },
-        },
-      }
-
-    case 'TOOL_START':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? { ...m, tool_calls: [...(m.tool_calls ?? []), action.tool] }
-            : m,
-        ),
-      }
-
-    case 'TOOL_END':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? {
-                ...m,
-                tool_calls: m.tool_calls?.map((tc) =>
-                  tc.id === action.id
-                    ? { ...tc, status: 'completed' as const, result: action.result, endTime: Date.now() }
-                    : tc,
-                ),
-              }
-            : m,
-        ),
-      }
-
-    case 'NODE_START':
-      return {
-        ...state,
-        messages: state.messages.map((m, i) =>
-          i === state.messages.length - 1
-            ? { ...m, metadata: { ...m.metadata, currentNode: action.label } }
-            : m,
-        ),
-      }
-
-    case 'NODE_END':
-      return state // currentNode cleared on next NODE_START or STREAM_DONE
-
-    case 'NODE_LOG':
-      return {
-        ...state,
-        streaming: {
-          ...state.streaming,
-          nodeExecutionLog: [...state.streaming.nodeExecutionLog, action.entry],
-        },
-      }
-
-    case 'SET_SIDEBAR_VISIBLE':
-      if (state.ui.sidebarVisible === action.visible) return state
-      return { ...state, ui: { ...state.ui, sidebarVisible: action.visible } }
-
-    case 'SHOW_PREVIEW':
-      return {
-        ...state,
-        preview: { ...state.preview, visible: true },
-      }
-
-    case 'HIDE_PREVIEW':
-      return {
-        ...state,
-        preview: { ...state.preview, visible: false, userDismissed: true },
-      }
-
-    case 'SELECT_TOOL':
-      return {
-        ...state,
-        ui: { ...state.ui, selectedTool: action.tool },
-      }
-
-    case 'SET_MODE':
-      return {
-        ...state,
-        mode: {
-          ...state.mode,
-          currentMode: action.mode,
-          currentGraphId: action.graphId,
-        },
-      }
-
-    case 'SET_APK_PROMPT_SHOWN':
-      return {
-        ...state,
-        mode: { ...state.mode, hasShownApkPrompt: true },
-      }
-
-    default:
-      return state
-  }
-}
-
-// ─── Hook ────────────────────────────────────────────────────────────────────
-
-export function useChatReducer(initialState?: Partial<ChatState>) {
-  return useReducer(chatReducer, { ...initialChatState, ...initialState })
-}
diff --git a/frontend/app/chat/hooks/useChatSession.ts b/frontend/app/chat/hooks/useChatSession.ts
deleted file mode 100644
index 7afe9c397..000000000
--- a/frontend/app/chat/hooks/useChatSession.ts
+++ /dev/null
@@ -1,253 +0,0 @@
-/**
- * useChatSession Hook
- *
- * Unified management of chat session state using reducer pattern to ensure consistent state updates
- */
-
-import { useReducer, useCallback, useEffect } from 'react'
-
-import type { UploadedFile } from '../services/modeHandlers/types'
-
-/**
- * Chat session state
- */
-export interface ChatSessionState {
-  /** Input content */
-  input: string
-  /** List of uploaded files */
-  files: UploadedFile[]
-  /** Mode configuration */
-  mode: {
-    /** Mode type */
-    type: string | null
-    /** Mode configuration */
-    config: Record<string, any>
-    /** Associated Graph ID */
-    graphId?: string | null
-  }
-  /** Selected agent ID */
-  selectedAgentId: string | null
-  /** Whether to auto redirect to Copilot */
-  autoRedirect: boolean
-  /** Whether redirecting is in progress */
-  isRedirecting: boolean
-  /** Whether to show case list */
-  showCases: boolean
-  /** Whether file upload is in progress */
-  isUploading: boolean
-}
-
-/**
- * Initial state
- */
-const initialState: ChatSessionState = {
-  input: '',
-  files: [],
-  mode: {
-    type: null,
-    config: {},
-    graphId: null,
-  },
-  selectedAgentId: null,
-  autoRedirect: false,
-  isRedirecting: false,
-  showCases: true,
-  isUploading: false,
-}
-
-/**
- * Action types
- */
-type ChatSessionAction =
-  | { type: 'SET_INPUT'; payload: string }
-  | { type: 'SET_FILES'; payload: UploadedFile[] }
-  | { type: 'ADD_FILE'; payload: UploadedFile }
-  | { type: 'REMOVE_FILE'; payload: string }
-  | {
-      type: 'SET_MODE'
-      payload: { type: string | null; config?: Record<string, any>; graphId?: string | null }
-    }
-  | { type: 'CLEAR_MODE' }
-  | { type: 'SET_SELECTED_AGENT_ID'; payload: string | null }
-  | { type: 'SET_AUTO_REDIRECT'; payload: boolean }
-  | { type: 'SET_IS_REDIRECTING'; payload: boolean }
-  | { type: 'SET_SHOW_CASES'; payload: boolean }
-  | { type: 'SET_IS_UPLOADING'; payload: boolean }
-  | { type: 'RESET' }
-  | { type: 'RESET_INPUT' }
-
-/**
- * Reducer function
- */
-function chatSessionReducer(state: ChatSessionState, action: ChatSessionAction): ChatSessionState {
-  switch (action.type) {
-    case 'SET_INPUT':
-      return { ...state, input: action.payload }
-
-    case 'SET_FILES':
-      return { ...state, files: action.payload }
-
-    case 'ADD_FILE':
-      return { ...state, files: [...state.files, action.payload] }
-
-    case 'REMOVE_FILE':
-      return {
-        ...state,
-        files: state.files.filter((f) => f.id !== action.payload),
-      }
-
-    case 'SET_MODE':
-      return {
-        ...state,
-        mode: {
-          type: action.payload.type,
-          config: action.payload.config || {},
-          graphId: action.payload.graphId ?? state.mode.graphId,
-        },
-      }
-
-    case 'CLEAR_MODE':
-      return {
-        ...state,
-        mode: {
-          type: null,
-          config: {},
-          graphId: null,
-        },
-      }
-
-    case 'SET_SELECTED_AGENT_ID':
-      return { ...state, selectedAgentId: action.payload }
-
-    case 'SET_AUTO_REDIRECT':
-      return { ...state, autoRedirect: action.payload }
-
-    case 'SET_IS_REDIRECTING':
-      return { ...state, isRedirecting: action.payload }
-
-    case 'SET_SHOW_CASES':
-      return { ...state, showCases: action.payload }
-
-    case 'SET_IS_UPLOADING':
-      return { ...state, isUploading: action.payload }
-
-    case 'RESET':
-      return initialState
-
-    case 'RESET_INPUT':
-      return {
-        ...state,
-        input: '',
-        files: [],
-        mode: {
-          type: null,
-          config: {},
-          graphId: null,
-        },
-      }
-
-    default:
-      return state
-  }
-}
-
-/**
- * Local storage key
- */
-const AUTO_REDIRECT_KEY = 'chat_auto_redirect_to_copilot'
-
-/**
- * useChatSession Hook
- *
- * Provides unified state management and operation methods
- */
-export function useChatSession() {
-  const [state, dispatch] = useReducer(chatSessionReducer, initialState)
-
-  // Load autoRedirect setting from local storage
-  useEffect(() => {
-    const saved = localStorage.getItem(AUTO_REDIRECT_KEY)
-    if (saved === 'true') {
-      dispatch({ type: 'SET_AUTO_REDIRECT', payload: true })
-    }
-  }, [])
-
-  // Actions
-  const setInput = useCallback((input: string) => {
-    dispatch({ type: 'SET_INPUT', payload: input })
-  }, [])
-
-  const setFiles = useCallback((files: UploadedFile[]) => {
-    dispatch({ type: 'SET_FILES', payload: files })
-  }, [])
-
-  const addFile = useCallback((file: UploadedFile) => {
-    dispatch({ type: 'ADD_FILE', payload: file })
-  }, [])
-
-  const removeFile = useCallback((fileId: string) => {
-    dispatch({ type: 'REMOVE_FILE', payload: fileId })
-  }, [])
-
-  const setMode = useCallback(
-    (mode: { type: string | null; config?: Record<string, any>; graphId?: string | null }) => {
-      dispatch({ type: 'SET_MODE', payload: mode })
-    },
-    [],
-  )
-
-  const clearMode = useCallback(() => {
-    dispatch({ type: 'CLEAR_MODE' })
-  }, [])
-
-  const setSelectedAgentId = useCallback((agentId: string | null) => {
-    dispatch({ type: 'SET_SELECTED_AGENT_ID', payload: agentId })
-  }, [])
-
-  const setAutoRedirect = useCallback((enabled: boolean) => {
-    dispatch({ type: 'SET_AUTO_REDIRECT', payload: enabled })
-    localStorage.setItem(AUTO_REDIRECT_KEY, enabled.toString())
-    if (enabled) {
-      dispatch({ type: 'SET_SELECTED_AGENT_ID', payload: null })
-    }
-  }, [])
-
-  const setIsRedirecting = useCallback((isRedirecting: boolean) => {
-    dispatch({ type: 'SET_IS_REDIRECTING', payload: isRedirecting })
-  }, [])
-
-  const setShowCases = useCallback((showCases: boolean) => {
-    dispatch({ type: 'SET_SHOW_CASES', payload: showCases })
-  }, [])
-
-  const setIsUploading = useCallback((isUploading: boolean) => {
-    dispatch({ type: 'SET_IS_UPLOADING', payload: isUploading })
-  }, [])
-
-  const reset = useCallback(() => {
-    dispatch({ type: 'RESET' })
-  }, [])
-
-  const resetInput = useCallback(() => {
-    dispatch({ type: 'RESET_INPUT' })
-  }, [])
-
-  return {
-    // State
-    state,
-    // Actions
-    setInput,
-    setFiles,
-    addFile,
-    removeFile,
-    setMode,
-    clearMode,
-    setSelectedAgentId,
-    setAutoRedirect,
-    setIsRedirecting,
-    setShowCases,
-    setIsUploading,
-    reset,
-    resetInput,
-  }
-}
diff --git a/frontend/app/chat/hooks/useChatWebSocket.ts b/frontend/app/chat/hooks/useChatWebSocket.ts
deleted file mode 100644
index 30a35d7c4..000000000
--- a/frontend/app/chat/hooks/useChatWebSocket.ts
+++ /dev/null
@@ -1,549 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-
-import { generateUUID } from '@/lib/utils/uuid'
-import { getChatWsClient } from '@/lib/ws/chat/chatWsClient'
-import type { ChatSendInput, IncomingChatWsEvent, SkillCreatorExtension, ChatExtension } from '@/lib/ws/chat/types'
-import { toastError } from '@/lib/utils/toast'
-import { useTranslation } from '@/lib/i18n'
-import { runService } from '@/services/runService'
-import type {
-  ChatStreamEvent,
-  CommandEventData,
-  ContentEventData,
-  ErrorEventData,
-  NodeEndEventData,
-  NodeStartEventData,
-  RouteDecisionEventData,
-  ToolEndEventData,
-  ToolStartEventData,
-} from '@/services/chatBackend'
-
-import { generateId, type Message } from '../types'
-
-import type { ChatAction } from './useChatReducer'
-
-function now() {
-  return Date.now()
-}
-
-interface ActiveRequest {
-  aiMsgId: string
-  lastRunningToolIdByName: Record<string, string>
-}
-
-interface SendMessageOpts {
-  input: ChatSendInput
-  threadId?: string | null
-  graphId?: string | null
-  extension?: SkillCreatorExtension | ChatExtension | null
-  metadata?: Record<string, unknown>
-}
-
-interface ResumeOpts {
-  threadId: string
-  command: { update?: Record<string, any>; goto?: string | null }
-}
-
-export interface UseChatWebSocketReturn {
-  isConnected: boolean
-  activeRequestId: string | null
-  chatRunId: string | null
-  sendMessage: (opts: SendMessageOpts) => Promise<{ requestId: string }>
-  stopMessage: (requestId: string | null) => void
-  resumeChat: (opts: ResumeOpts) => Promise<{ requestId: string }>
-}
-
-export function useChatWebSocket(dispatch: React.Dispatch<ChatAction>): UseChatWebSocketReturn {
-  const { t } = useTranslation()
-  const clientRef = useRef(getChatWsClient())
-  const activeRequestsRef = useRef<Record<string, ActiveRequest>>({})
-  const activeByThreadRef = useRef(new Map<string, string>())
-  const activeThreadIdRef = useRef<string | null>(null)
-  const currentRequestIdRef = useRef<string | null>(null)
-  const [isConnected, setIsConnected] = useState(clientRef.current.getConnectionState().isConnected)
-  const [activeRequestId, setActiveRequestIdState] = useState<string | null>(null)
-  const [chatRunId, setChatRunId] = useState<string | null>(null)
-
-  const setCurrentRequestId = useCallback((requestId: string | null) => {
-    currentRequestIdRef.current = requestId
-    setActiveRequestIdState(requestId)
-  }, [])
-
-  /** Clean up a failed request and surface the error to the user. */
-  const handleRequestError = useCallback(
-    (requestId: string, threadId: string | null | undefined, aiMsgId: string, error: unknown) => {
-      const pending = activeRequestsRef.current[requestId]
-      delete activeRequestsRef.current[requestId]
-      if (currentRequestIdRef.current === requestId) {
-        setCurrentRequestId(null)
-      }
-      if (threadId) {
-        activeByThreadRef.current.delete(threadId)
-      }
-      if (pending) {
-        const messageText = error instanceof Error ? error.message : 'Connection failed'
-        dispatch({ type: 'STREAM_ERROR', error: messageText, messageId: aiMsgId })
-        dispatch({ type: 'STREAM_DONE', messageId: aiMsgId })
-        toastError(messageText)
-      }
-    },
-    [dispatch, setCurrentRequestId],
-  )
-
-  const finalizeActiveRequests = useCallback(
-    (errorMessage: string) => {
-      const activeRequests = activeRequestsRef.current
-      Object.values(activeRequests).forEach(({ aiMsgId }) => {
-        dispatch({ type: 'STREAM_ERROR', error: errorMessage, messageId: aiMsgId })
-        dispatch({ type: 'STREAM_DONE', messageId: aiMsgId })
-      })
-      activeRequestsRef.current = {}
-      activeByThreadRef.current.clear()
-      activeThreadIdRef.current = null
-      setCurrentRequestId(null)
-    },
-    [dispatch, setCurrentRequestId],
-  )
-
-  const handleEvent = useCallback(
-    (evt: IncomingChatWsEvent) => {
-      const { request_id, thread_id, run_id, node_name, timestamp, data } = evt
-      const type = evt.type as string | undefined
-      const eventTimestamp = timestamp ?? now()
-
-      if (type === 'pong') return
-
-      if (type === 'ws_error') {
-        const message = evt.message || 'WebSocket protocol error'
-        const wsErrRequest = request_id ? activeRequestsRef.current[request_id] : undefined
-        if (request_id) {
-          if (wsErrRequest) {
-            dispatch({ type: 'STREAM_DONE', messageId: wsErrRequest.aiMsgId })
-            delete activeRequestsRef.current[request_id]
-          }
-          if (currentRequestIdRef.current === request_id) {
-            setCurrentRequestId(null)
-          }
-          if (thread_id) activeByThreadRef.current.delete(thread_id)
-        }
-        dispatch({ type: 'STREAM_ERROR', error: message, messageId: wsErrRequest?.aiMsgId })
-        toastError(message)
-        return
-      }
-
-      if (thread_id && request_id) {
-        activeByThreadRef.current.set(thread_id, request_id)
-        if (activeThreadIdRef.current !== thread_id) {
-          activeThreadIdRef.current = thread_id
-          dispatch({ type: 'SET_THREAD', threadId: thread_id })
-        }
-      }
-
-      const activeRequest = request_id ? activeRequestsRef.current[request_id] : undefined
-      if (type === 'thread_id') return
-
-      if (type === 'content') {
-        if (!activeRequest) return
-        const contentData = data as ContentEventData
-        const delta = contentData?.delta || ''
-        if (!delta) return
-        dispatch({
-          type: 'STREAM_CONTENT',
-          delta,
-          messageId: activeRequest.aiMsgId,
-          metadata: { lastNode: node_name, lastRunId: run_id, lastUpdate: timestamp },
-        })
-        return
-      }
-
-      if (type === 'tool_start') {
-        if (!activeRequest) return
-        const toolData = data as ToolStartEventData
-        const toolName = toolData?.tool_name || 'tool'
-        const toolInput = toolData?.tool_input || {}
-        const toolId = generateId()
-        activeRequest.lastRunningToolIdByName[toolName] = toolId
-        dispatch({
-          type: 'TOOL_START',
-          tool: {
-            id: toolId,
-            name: toolName,
-            args: toolInput,
-            status: 'running',
-            startTime: timestamp || now(),
-          },
-        })
-        return
-      }
-
-      if (type === 'file_event') {
-        const { action, path, size, timestamp: ts } = data as {
-          action: string
-          path: string
-          size?: number
-          timestamp?: number
-        }
-        dispatch({
-          type: 'FILE_EVENT',
-          path,
-          info: { action, size, timestamp: ts },
-        })
-        return
-      }
-
-      if (type === 'tool_end') {
-        if (!activeRequest) return
-        const toolData = data as ToolEndEventData
-        const toolName = toolData?.tool_name || 'tool'
-        const toolId = activeRequest.lastRunningToolIdByName[toolName]
-        if (!toolId) return
-        dispatch({ type: 'TOOL_END', id: toolId, result: (toolData?.tool_output ?? '') as string })
-        return
-      }
-
-      if (type === 'error') {
-        const errorData = data as ErrorEventData
-        const errorCode = errorData?.error_code
-        const rawMsg = errorData?.message || 'Unknown error'
-        const errorMsg = errorCode
-          ? t(`chat.error.${errorCode}`, { defaultValue: rawMsg, ...errorData?.params })
-          : rawMsg
-        if (rawMsg === 'Stream stopped' || rawMsg.includes('stopped')) {
-          if (activeRequest) {
-            dispatch({ type: 'STREAM_DONE', messageId: activeRequest.aiMsgId })
-            delete activeRequestsRef.current[request_id!]
-          }
-          if (thread_id) {
-            activeByThreadRef.current.delete(thread_id)
-          }
-          return
-        }
-        dispatch({ type: 'STREAM_ERROR', error: errorMsg, messageId: activeRequest?.aiMsgId })
-        toastError(errorMsg)
-        if (activeRequest) {
-          dispatch({ type: 'STREAM_DONE', messageId: activeRequest.aiMsgId })
-          delete activeRequestsRef.current[request_id!]
-        }
-        if (request_id && currentRequestIdRef.current === request_id) {
-          setCurrentRequestId(null)
-        }
-        if (thread_id) {
-          activeByThreadRef.current.delete(thread_id)
-        }
-        return
-      }
-
-      if (type === 'done') {
-        if (activeRequest) {
-          dispatch({ type: 'STREAM_DONE', messageId: activeRequest.aiMsgId })
-          delete activeRequestsRef.current[request_id!]
-        }
-        if (request_id && currentRequestIdRef.current === request_id) {
-          setCurrentRequestId(null)
-        }
-        if (thread_id) {
-          activeByThreadRef.current.delete(thread_id)
-        }
-        return
-      }
-
-      if (type === 'status') return
-
-      if (type === 'interrupt') {
-        if (activeRequest) {
-          dispatch({ type: 'STREAM_DONE', messageId: activeRequest.aiMsgId })
-          delete activeRequestsRef.current[request_id!]
-        }
-        if (request_id && currentRequestIdRef.current === request_id) {
-          setCurrentRequestId(null)
-        }
-        if (thread_id) {
-          activeByThreadRef.current.delete(thread_id)
-          dispatch({
-            type: 'SET_INTERRUPT',
-            interrupt: {
-              nodeName:
-                typeof data?.node_name === 'string' ? data.node_name : node_name || 'unknown',
-              nodeLabel:
-                typeof data?.node_label === 'string' ? data.node_label : node_name || 'Unknown Node',
-              state:
-                data && typeof data === 'object' && data.state && typeof data.state === 'object'
-                  ? (data.state as Record<string, unknown>)
-                  : undefined,
-              threadId: thread_id,
-            },
-          })
-        }
-        return
-      }
-
-      if (type === 'node_start') {
-        const nodeData = data as NodeStartEventData
-        const nodeLabel = nodeData?.node_label || node_name || 'Unknown Node'
-        const nodeId = nodeData?.node_id || node_name || ''
-        dispatch({ type: 'NODE_START', nodeId, label: nodeLabel })
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'node_start',
-            nodeName: nodeLabel,
-            timestamp: eventTimestamp,
-            data: { nodeId },
-          },
-        })
-        return
-      }
-
-      if (type === 'node_end') {
-        const nodeData = data as NodeEndEventData
-        const nodeLabel = nodeData?.node_label || node_name || 'Unknown Node'
-        const nodeId = nodeData?.node_id || node_name || ''
-        dispatch({ type: 'NODE_END', nodeId })
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'node_end',
-            nodeName: nodeLabel,
-            timestamp: eventTimestamp,
-            data: {
-              nodeId,
-              status: nodeData?.status || 'completed',
-              duration: nodeData?.duration,
-            },
-          },
-        })
-        if (activeRequest) {
-          dispatch({
-            type: 'UPDATE_MESSAGE',
-            id: activeRequest.aiMsgId,
-            patch: { metadata: { lastNode: nodeLabel } },
-          })
-        }
-        return
-      }
-
-      if (type === 'command') {
-        const commandData = data as CommandEventData
-        const stateUpdate = commandData?.update || {}
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'command',
-            nodeName: node_name || 'unknown',
-            timestamp: eventTimestamp,
-            data: {
-              update: stateUpdate,
-              goto: commandData?.goto,
-              reason: commandData?.reason,
-              hasStateChanges: Object.keys(stateUpdate).length > 0,
-            },
-          },
-        })
-        return
-      }
-
-      if (type === 'route_decision') {
-        const decisionData = data as RouteDecisionEventData
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'route_decision',
-            nodeName: decisionData?.node_id || 'unknown',
-            timestamp: eventTimestamp,
-            data: {
-              nodeType: decisionData?.node_type,
-              result: decisionData?.result,
-              reason: decisionData?.reason,
-              goto: decisionData?.goto,
-            },
-          },
-        })
-        return
-      }
-
-      if (type === 'loop_iteration') {
-        const iterationData = data as any
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'loop_iteration',
-            nodeName: iterationData?.loop_node_id || 'unknown',
-            timestamp: eventTimestamp,
-            data: {
-              iteration: iterationData?.iteration,
-              maxIterations: iterationData?.max_iterations,
-              conditionMet: iterationData?.condition_met,
-              reason: iterationData?.reason,
-            },
-          },
-        })
-        return
-      }
-
-      if (type === 'parallel_task') {
-        const taskData = data as any
-        dispatch({
-          type: 'NODE_LOG',
-          entry: {
-            type: 'parallel_task',
-            nodeName: 'system',
-            timestamp: eventTimestamp,
-            data: {
-              taskId: taskData?.task_id,
-              status: taskData?.status,
-              result: taskData?.result,
-              errorMsg: taskData?.error_msg,
-            },
-          },
-        })
-      }
-    },
-    [dispatch, setCurrentRequestId],
-  )
-
-  useEffect(() => {
-    const client = clientRef.current
-    let prevConnected = client.getConnectionState().isConnected
-    const unsubscribe = client.subscribeConnectionState((state) => {
-      setIsConnected(state.isConnected)
-      if (state.authExpired) {
-        finalizeActiveRequests('Authentication expired')
-        window.location.assign('/signin')
-        return
-      }
-      if (prevConnected && !state.isConnected && Object.keys(activeRequestsRef.current).length > 0) {
-        finalizeActiveRequests('Chat connection lost')
-      }
-      prevConnected = state.isConnected
-    })
-    void client.connect().catch(() => {
-      setIsConnected(false)
-    })
-
-    return () => {
-      unsubscribe()
-      activeRequestsRef.current = {}
-      activeByThreadRef.current.clear()
-      activeThreadIdRef.current = null
-    }
-  }, [finalizeActiveRequests])
-
-  const sendMessage = useCallback(
-    async ({ input, threadId, graphId, extension, metadata }: SendMessageOpts) => {
-      const requestId = generateUUID()
-      const aiMsgId = generateId()
-      const initialAiMsg: Message = {
-        id: aiMsgId,
-        role: 'assistant',
-        content: '',
-        timestamp: now(),
-        isStreaming: true,
-        tool_calls: [],
-      }
-
-      dispatch({ type: 'APPEND_MESSAGE', message: initialAiMsg })
-      dispatch({ type: 'CLEAR_INTERRUPT' })
-      setCurrentRequestId(requestId)
-      activeRequestsRef.current[requestId] = {
-        aiMsgId,
-        lastRunningToolIdByName: {},
-      }
-      if (threadId) {
-        activeByThreadRef.current.set(threadId, requestId)
-      }
-
-      try {
-        // Create chat run before sending WS frame (only for regular chat, not skill_creator)
-        let resolvedExtension = extension
-        if (!extension || extension.kind !== 'skill_creator') {
-          let newChatRunId: string | null = null
-          try {
-            const runResponse = await runService.createRun({
-              agent_name: 'chat',
-              graph_id: graphId || undefined,
-              message: input.message,
-              thread_id: threadId || undefined,
-            })
-            newChatRunId = runResponse.run_id
-          } catch (err) {
-            console.warn('[Chat] Failed to create chat run, proceeding without persistence', err)
-          }
-          setChatRunId(newChatRunId)
-          const chatExtension: ChatExtension | undefined = newChatRunId
-            ? { kind: 'chat' as const, runId: newChatRunId }
-            : undefined
-          resolvedExtension = chatExtension
-        }
-
-        const result = await clientRef.current.sendChat({
-          requestId,
-          input,
-          extension: resolvedExtension,
-          threadId,
-          graphId,
-          metadata,
-          onEvent: (evt) => handleEvent(evt as IncomingChatWsEvent),
-        })
-        return { requestId: result.requestId }
-      } catch (error) {
-        handleRequestError(requestId, threadId, aiMsgId, error)
-        return { requestId }
-      }
-    },
-    [dispatch, handleEvent, handleRequestError, setCurrentRequestId],
-  )
-
-  const stopMessage = useCallback((requestId: string | null) => {
-    if (!requestId) return
-    clientRef.current.stopByRequestId(requestId)
-  }, [])
-
-  const resumeChat = useCallback(
-    async ({ threadId, command }: ResumeOpts) => {
-      const requestId = generateUUID()
-      const aiMsgId = generateId()
-      const initialAiMsg: Message = {
-        id: aiMsgId,
-        role: 'assistant',
-        content: '',
-        timestamp: now(),
-        isStreaming: true,
-        tool_calls: [],
-      }
-
-      dispatch({ type: 'APPEND_MESSAGE', message: initialAiMsg })
-      dispatch({ type: 'CLEAR_INTERRUPT' })
-      setCurrentRequestId(requestId)
-      activeRequestsRef.current[requestId] = {
-        aiMsgId,
-        lastRunningToolIdByName: {},
-      }
-      activeByThreadRef.current.set(threadId, requestId)
-
-      try {
-        const result = await clientRef.current.sendResume({
-          requestId,
-          threadId,
-          command,
-          onEvent: (evt) => handleEvent(evt as IncomingChatWsEvent),
-        })
-        return { requestId: result.requestId }
-      } catch (error) {
-        handleRequestError(requestId, threadId, aiMsgId, error)
-        return { requestId }
-      }
-    },
-    [dispatch, handleEvent, handleRequestError, setCurrentRequestId],
-  )
-
-  return {
-    isConnected,
-    activeRequestId,
-    chatRunId,
-    sendMessage,
-    stopMessage,
-    resumeChat,
-  }
-}
diff --git a/frontend/app/chat/hooks/useFileUpload.ts b/frontend/app/chat/hooks/useFileUpload.ts
deleted file mode 100644
index 7b639aeed..000000000
--- a/frontend/app/chat/hooks/useFileUpload.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-'use client'
-
-import { useState, useRef, useCallback } from 'react'
-
-import { API_BASE, apiUpload } from '@/lib/api-client'
-import { isAllowedFile, UPLOAD_LIMITS } from '@/lib/core/constants/upload-limits'
-import { useTranslation } from '@/lib/i18n'
-import { toastSuccess, toastError } from '@/lib/utils/toast'
-
-import type { UploadedFile } from '../services/modeHandlers/types'
-
-interface UseFileUploadOptions {
-  onFileUploaded?: (file: UploadedFile, rawFile: File) => void
-}
-
-export function useFileUpload(options: UseFileUploadOptions = {}) {
-  const { t } = useTranslation()
-  const [files, setFiles] = useState<UploadedFile[]>([])
-  const [isUploading, setIsUploading] = useState(false)
-  const fileInputRef = useRef<HTMLInputElement>(null)
-
-  const uploadFile = useCallback(
-    async (file: File) => {
-      const validation = isAllowedFile(file)
-      if (!validation.allowed) {
-        toastError(
-          validation.reason || t('chat.fileNotAllowed', { defaultValue: 'File does not meet requirements' }),
-          t('chat.fileUploadFailed'),
-        )
-        return
-      }
-
-      setIsUploading(true)
-      try {
-        const fileData = await apiUpload<{
-          filename: string
-          path: string
-          size: number
-          message: string
-        }>(`${API_BASE}/files/upload`, file)
-
-        if (!fileData || !fileData.filename || !fileData.path) {
-          toastError(
-            t('chat.uploadFailed', { defaultValue: 'Upload failed, unexpected response format' }),
-            t('chat.fileUploadFailed'),
-          )
-          return
-        }
-
-        const uploadedFile: UploadedFile = {
-          id: Date.now().toString(),
-          filename: fileData.filename,
-          path: fileData.path,
-          size: fileData.size,
-        }
-        setFiles((prev) => [...prev, uploadedFile])
-        toastSuccess(fileData.filename, t('chat.fileUploaded'))
-        options.onFileUploaded?.(uploadedFile, file)
-      } catch (error) {
-        const errorMessage =
-          error instanceof Error
-            ? error.message
-            : typeof error === 'string'
-              ? error
-              : t('chat.retry', { defaultValue: 'Please retry' })
-        toastError(errorMessage, t('chat.fileUploadFailed'))
-      } finally {
-        setIsUploading(false)
-      }
-    },
-    [t, options],
-  )
-
-  const handleFileSelect = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      const selectedFiles = e.target.files
-      if (selectedFiles && selectedFiles.length > 0) {
-        if (selectedFiles.length > UPLOAD_LIMITS.MAX_FILES_PER_UPLOAD) {
-          toastError(
-            t('chat.tooManyFiles', {
-              defaultValue: 'You can upload at most {{maxFiles}} files at once',
-              maxFiles: UPLOAD_LIMITS.MAX_FILES_PER_UPLOAD,
-            }),
-            t('chat.fileUploadFailed'),
-          )
-          if (fileInputRef.current) {
-            fileInputRef.current.value = ''
-          }
-          return
-        }
-        Array.from(selectedFiles).forEach((file) => {
-          uploadFile(file)
-        })
-      }
-      if (fileInputRef.current) {
-        fileInputRef.current.value = ''
-      }
-    },
-    [t, uploadFile],
-  )
-
-  const removeFile = useCallback((fileId: string) => {
-    setFiles((prev) => prev.filter((f) => f.id !== fileId))
-  }, [])
-
-  const clearFiles = useCallback(() => {
-    setFiles([])
-  }, [])
-
-  const addFile = useCallback((file: UploadedFile) => {
-    setFiles((prev) => [...prev, file])
-  }, [])
-
-  return {
-    files,
-    isUploading,
-    fileInputRef,
-    uploadFile,
-    handleFileSelect,
-    removeFile,
-    clearFiles,
-    addFile,
-  }
-}
diff --git a/frontend/app/chat/hooks/usePreviewTrigger.ts b/frontend/app/chat/hooks/usePreviewTrigger.ts
deleted file mode 100644
index 409a42736..000000000
--- a/frontend/app/chat/hooks/usePreviewTrigger.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client'
-
-import React, { useEffect, useRef } from 'react'
-
-import type { ChatState, ChatAction } from './useChatReducer'
-
-export function usePreviewTrigger(
-  state: ChatState,
-  dispatch: React.Dispatch<ChatAction>,
-) {
-  const prevFileCountRef = useRef(0)
-
-  // Auto-show when new files appear (unless user dismissed)
-  useEffect(() => {
-    const currentFileCount = Object.keys(state.preview.fileTree).length
-    const isNew = currentFileCount > prevFileCountRef.current
-
-    if (isNew && currentFileCount > 0 && !state.preview.visible && !state.preview.userDismissed) {
-      dispatch({ type: 'SHOW_PREVIEW' })
-    }
-
-    prevFileCountRef.current = currentFileCount
-  }, [state.preview.fileTree, state.preview.visible, state.preview.userDismissed, dispatch])
-
-  // Auto-hide when stream ends with no files
-  useEffect(() => {
-    if (
-      !state.streaming.isProcessing &&
-      Object.keys(state.preview.fileTree).length === 0 &&
-      state.preview.visible
-    ) {
-      dispatch({ type: 'HIDE_PREVIEW' })
-    }
-  }, [state.streaming.isProcessing, state.preview.fileTree, state.preview.visible, dispatch])
-}
diff --git a/frontend/app/chat/layout.tsx b/frontend/app/chat/layout.tsx
deleted file mode 100644
index 903fb54b3..000000000
--- a/frontend/app/chat/layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Chat Page Layout
- * Authentication and Sidebar handled in root layout
- */
-export default function ChatLayout({ children }: { children: React.ReactNode }) {
-  return <>{children}</>
-}
diff --git a/frontend/app/chat/page.tsx b/frontend/app/chat/page.tsx
deleted file mode 100644
index cdb327f62..000000000
--- a/frontend/app/chat/page.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-'use client'
-
-import { useSearchParams } from 'next/navigation'
-
-import ChatLayout from './ChatLayout'
-import { ChatProvider } from './ChatProvider'
-
-/**
- * Chat Page — wraps ChatLayout in ChatProvider context
- */
-export default function ChatPage() {
-  const searchParams = useSearchParams()
-  const threadId = searchParams?.get('thread') || null
-
-  return (
-    <ChatProvider>
-      <ChatLayout chatId={threadId} />
-    </ChatProvider>
-  )
-}
diff --git a/frontend/app/chat/preview/PreviewPanel.tsx b/frontend/app/chat/preview/PreviewPanel.tsx
deleted file mode 100644
index 9c4cbf440..000000000
--- a/frontend/app/chat/preview/PreviewPanel.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-'use client'
-
-import { X, FolderTree, Wrench } from 'lucide-react'
-import React, { useState, useMemo } from 'react'
-
-import { useChatState } from '../ChatProvider'
-import ArtifactPanel from '../components/ArtifactPanel'
-import { ToolCallDetail } from '../shared/ToolCallDisplay'
-
-
-export default function PreviewPanel() {
-  const { state, dispatch } = useChatState()
-  const { preview, ui, threadId } = state
-  const [activeTab, setActiveTab] = useState<'files' | 'tool'>('files')
-
-  const fileKeys = useMemo(() => Object.keys(preview.fileTree), [preview.fileTree])
-  const hasFiles = fileKeys.length > 0
-  const hasTool = !!ui.selectedTool
-
-  return (
-    <div className="flex h-full flex-col bg-[var(--surface-elevated)]">
-      {/* Header with tabs */}
-      <div className="flex items-center justify-between border-b px-3 py-2">
-        <div className="flex gap-1">
-          {hasFiles && (
-            <button
-              onClick={() => setActiveTab('files')}
-              className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm transition-all duration-200 ${
-                activeTab === 'files'
-                  ? 'bg-[var(--surface-3)] font-medium'
-                  : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]'
-              }`}
-            >
-              <FolderTree size={14} />
-              Files ({fileKeys.length})
-            </button>
-          )}
-          {hasTool && (
-            <button
-              onClick={() => setActiveTab('tool')}
-              className={`flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm transition-all duration-200 ${
-                activeTab === 'tool'
-                  ? 'bg-[var(--surface-3)] font-medium'
-                  : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]'
-              }`}
-            >
-              <Wrench size={14} />
-              {ui.selectedTool?.name}
-            </button>
-          )}
-        </div>
-        <button
-          onClick={() => dispatch({ type: 'HIDE_PREVIEW' })}
-          className="rounded-md p-1 text-[var(--text-muted)] hover:bg-[var(--surface-3)] hover:text-[var(--text-secondary)]"
-          aria-label="Close"
-        >
-          <X size={16} />
-        </button>
-      </div>
-
-      {/* Content */}
-      <div className="min-h-0 flex-1 overflow-hidden">
-        {activeTab === 'files' && threadId && (
-          <ArtifactPanel threadId={threadId} fileTree={preview.fileTree} />
-        )}
-        {activeTab === 'tool' && ui.selectedTool && (
-          <div className="overflow-auto">
-            <ToolCallDetail
-              name={ui.selectedTool.name}
-              args={ui.selectedTool.args}
-              status={ui.selectedTool.status}
-              result={ui.selectedTool.result}
-              startTime={ui.selectedTool.startTime}
-              endTime={ui.selectedTool.endTime}
-            />
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/preview/index.ts b/frontend/app/chat/preview/index.ts
deleted file mode 100644
index 4cffa4754..000000000
--- a/frontend/app/chat/preview/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as PreviewPanel } from './PreviewPanel'
diff --git a/frontend/app/chat/services/chatModeService.ts b/frontend/app/chat/services/chatModeService.ts
deleted file mode 100644
index ae94000db..000000000
--- a/frontend/app/chat/services/chatModeService.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { modeHandlerRegistry } from './modeHandlers/registry'
-import type { ModeHandler } from './modeHandlers/types'
-
-class ChatModeService {
-  getHandler(modeId: string): ModeHandler | undefined {
-    return modeHandlerRegistry.get(modeId)
-  }
-}
-
-export const chatModeService = new ChatModeService()
diff --git a/frontend/app/chat/services/copilotRedirectService.ts b/frontend/app/chat/services/copilotRedirectService.ts
deleted file mode 100644
index b5f903b45..000000000
--- a/frontend/app/chat/services/copilotRedirectService.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copilot Redirect Service
- *
- * Handles automatic redirect to Copilot logic
- * When autoRedirect is enabled, creates a new Graph and redirects to Copilot page
- */
-
-import { agentService } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { graphKeys } from '@/hooks/queries'
-
-import type { ModeContext } from './modeHandlers/types'
-
-/**
- * Copilot Redirect Service
- */
-class CopilotRedirectService {
-  /**
-   * Redirect to Copilot
-   *
-   * Creates a new Graph and redirects to Copilot page
-   *
-   * @param userInput User input
-   * @param context Mode context
-   * @returns Redirect path, or null if failed
-   */
-  async redirectToCopilot(userInput: string, context: ModeContext): Promise<string | null> {
-    const { workspaces, t, queryClient } = context
-
-    try {
-      // 1. Get personal workspace
-      const personalWorkspace = workspaces.find((w) => w.type === 'personal')
-      if (!personalWorkspace) {
-        return null
-      }
-
-      const workspaceId = personalWorkspace.id
-      const graphName = t('workspace.defaultGraphName', {
-        defaultValue: 'New Graph',
-      })
-
-      // 2. Create Graph
-      const graph = await agentService.createGraph({
-        name: graphName,
-        description: t('workspace.defaultGraphDescription', {
-          defaultValue: 'Default graph created from chat',
-        }),
-        color: '',
-        workspaceId: workspaceId,
-      })
-
-      const graphId = graph.id
-
-      // 3. Save Graph state (empty graph)
-      await agentService.saveGraphState({
-        graphId,
-        nodes: [],
-        edges: [],
-        viewport: { x: 0, y: 0, zoom: 1 },
-      })
-
-      // 4. Refresh Graph list cache
-      queryClient.invalidateQueries({ queryKey: [...graphKeys.list(workspaceId)] })
-
-      // 5. Build redirect path
-      const encodedInput = encodeURIComponent(userInput)
-      const redirectPath = `/workspace/${workspaceId}/${graphId}?copilotInput=${encodedInput}`
-
-      return redirectPath
-    } catch (error) {
-      console.error('Failed to redirect to copilot:', error)
-      return null
-    }
-  }
-
-  /**
-   * Execute redirect
-   *
-   * @param userInput User input
-   * @param context Mode context
-   * @returns Whether the redirect was successful
-   */
-  async executeRedirect(userInput: string, context: ModeContext): Promise<boolean> {
-    const redirectPath = await this.redirectToCopilot(userInput, context)
-    if (redirectPath) {
-      context.router.push(redirectPath)
-      return true
-    }
-    return false
-  }
-}
-
-// Export singleton instance
-export const copilotRedirectService = new CopilotRedirectService()
diff --git a/frontend/app/chat/services/graphResolutionService.ts b/frontend/app/chat/services/graphResolutionService.ts
deleted file mode 100644
index 6917c2dce..000000000
--- a/frontend/app/chat/services/graphResolutionService.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Graph Resolution Service
- *
- * Unified Graph ID resolution logic, resolves which Graph to use based on different strategies
- */
-
-import { chatModeService } from './chatModeService'
-import type { ModeContext } from './modeHandlers/types'
-
-/**
- * Graph resolution result
- */
-export interface GraphResolutionResult {
-  /** Resolved Graph ID */
-  graphId: string | null
-  /** Resolution strategy */
-  strategy: 'mode' | 'autoRedirect' | 'agentSelection' | 'none'
-  /** Error message (if any) */
-  error?: string
-}
-
-/**
- * Graph Resolution Service
- */
-class GraphResolutionService {
-  /**
-   * Resolve Graph ID
-   *
-   * Resolves in the following priority order:
-   * 1. Graph specified by mode (if mode has graphId)
-   * 2. Auto Redirect strategy (create new Graph)
-   * 3. Agent Selection strategy (use selected Agent)
-   *
-   * @param mode Mode ID
-   * @param context Mode context
-   * @param autoRedirect Whether auto redirect is enabled
-   * @returns Graph resolution result
-   */
-  async resolve(
-    mode: string | null,
-    context: ModeContext,
-    autoRedirect: boolean,
-  ): Promise<GraphResolutionResult> {
-    // Strategy 1: Graph specified by mode
-    if (mode) {
-      const handler = chatModeService.getHandler(mode)
-      if (handler) {
-        const graphId = await handler.getGraphId?.(context)
-        if (graphId) {
-          return {
-            graphId,
-            strategy: 'mode',
-          }
-        }
-      }
-    }
-
-    // Strategy 2: Auto Redirect (create new Graph)
-    if (autoRedirect) {
-      // This strategy is handled by CopilotRedirectService
-      // Return null here to let caller know redirect is needed
-      return {
-        graphId: null,
-        strategy: 'autoRedirect',
-      }
-    }
-
-    // Strategy 3: Agent Selection
-    if (context.selectedAgentId) {
-      return {
-        graphId: context.selectedAgentId,
-        strategy: 'agentSelection',
-      }
-    }
-
-    // No suitable Graph found
-    return {
-      graphId: null,
-      strategy: 'none',
-    }
-  }
-
-  /**
-   * Get Graph ID from mode state
-   *
-   * @param modeType Mode type
-   * @param modeGraphId Graph ID stored in mode
-   * @param context Mode context
-   * @returns Graph ID
-   */
-  async getGraphIdFromMode(
-    modeType: string | null,
-    modeGraphId: string | null | undefined,
-    context: ModeContext,
-  ): Promise<string | null> {
-    if (modeGraphId) {
-      return modeGraphId
-    }
-
-    if (modeType) {
-      const handler = chatModeService.getHandler(modeType)
-      if (handler) {
-        return (await handler.getGraphId?.(context)) || null
-      }
-    }
-
-    return null
-  }
-}
-
-// Export singleton instance
-export const graphResolutionService = new GraphResolutionService()
diff --git a/frontend/app/chat/services/modeHandlers/agentModeHandler.ts b/frontend/app/chat/services/modeHandlers/agentModeHandler.ts
deleted file mode 100644
index a1c47bba0..000000000
--- a/frontend/app/chat/services/modeHandlers/agentModeHandler.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Agent Mode Handler
- *
- * Handles agent selection mode
- * Used when user selects a deployed agent
- */
-
-import { Bot } from 'lucide-react'
-
-import type {
-  ModeHandler,
-  ModeContext,
-  ModeSelectionResult,
-  SubmitResult,
-  ValidationResult,
-  UploadedFile,
-} from './types'
-
-/**
- * Agent Mode Handler
- *
- * This is a special handler for handling user selection of deployed agents
- */
-export const agentModeHandler: ModeHandler = {
-  metadata: {
-    id: 'agent',
-    label: 'Agent',
-    description: 'Use deployed agent',
-    icon: Bot,
-    type: 'agent',
-  },
-
-  async onSelect(context: ModeContext): Promise<ModeSelectionResult> {
-    const { selectedAgentId } = context
-
-    if (!selectedAgentId) {
-      return {
-        success: false,
-        error: 'No agent selected',
-      }
-    }
-
-    // Find the corresponding agent
-    const agent = context.deployedAgents.find((a) => a.id === selectedAgentId)
-    if (!agent) {
-      return {
-        success: false,
-        error: 'Selected agent not found',
-      }
-    }
-
-    return {
-      success: true,
-      stateUpdates: {
-        mode: 'agent',
-        graphId: selectedAgentId,
-      },
-    }
-  },
-
-  async onSubmit(input: string, files: UploadedFile[], context: ModeContext): Promise<SubmitResult> {
-    const { selectedAgentId } = context
-
-    if (!selectedAgentId) {
-      return {
-        success: false,
-        error: 'No agent selected',
-      }
-    }
-
-    return {
-      success: true,
-      processedInput: input,
-      graphId: selectedAgentId,
-    }
-  },
-
-  validate(_input: string, _files: UploadedFile[]): ValidationResult {
-    return { valid: true }
-  },
-
-  async getGraphId(context: ModeContext): Promise<string | null> {
-    return context.selectedAgentId || null
-  },
-}
diff --git a/frontend/app/chat/services/modeHandlers/apkVulnerabilityHandler.ts b/frontend/app/chat/services/modeHandlers/apkVulnerabilityHandler.ts
deleted file mode 100644
index ee4e76de7..000000000
--- a/frontend/app/chat/services/modeHandlers/apkVulnerabilityHandler.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { AndroidIcon } from '../../components/icons/AndroidIcon'
-import { createTemplateHandler } from './templateHandlerFactory'
-
-export const apkVulnerabilityHandler = createTemplateHandler({
-  modeId: 'apk-vulnerability',
-  graphName: 'APK Detector',
-  metadata: {
-    id: 'apk-vulnerability',
-    label: 'chat.apkVulnerability',
-    description: 'chat.apkVulnerabilityDescription',
-    icon: AndroidIcon,
-    type: 'template',
-  },
-})
diff --git a/frontend/app/chat/services/modeHandlers/defaultChatModeHandler.ts b/frontend/app/chat/services/modeHandlers/defaultChatModeHandler.ts
deleted file mode 100644
index 302336d74..000000000
--- a/frontend/app/chat/services/modeHandlers/defaultChatModeHandler.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { MessageSquare } from 'lucide-react'
-
-import { createTemplateHandler } from './templateHandlerFactory'
-
-export const defaultChatModeHandler = createTemplateHandler({
-  modeId: 'default-chat',
-  graphName: 'Default Chat',
-  metadata: {
-    id: 'default-chat',
-    label: 'chat.defaultChat',
-    description: 'chat.defaultChatDescription',
-    icon: MessageSquare,
-    type: 'template',
-  },
-})
diff --git a/frontend/app/chat/services/modeHandlers/handlerFactory.ts b/frontend/app/chat/services/modeHandlers/handlerFactory.ts
deleted file mode 100644
index 52bc3f3fa..000000000
--- a/frontend/app/chat/services/modeHandlers/handlerFactory.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Mode Handler Factory
- *
- * Creates mode handlers from configuration, ensuring consistency between config and handlers
- */
-
-import type { ModeConfig } from '../../config/modeConfig'
-
-import { agentModeHandler } from './agentModeHandler'
-import { apkVulnerabilityHandler } from './apkVulnerabilityHandler'
-import { defaultChatModeHandler } from './defaultChatModeHandler'
-import { createSimpleModeHandler } from './simpleModeHandler'
-import { skillCreatorHandler } from './skillCreatorHandler'
-import type { ModeHandler, ModeMetadata } from './types'
-
-/**
- * Create a mode handler from configuration
- *
- * @param config Mode configuration
- * @returns Mode handler instance, or null if creation fails
- */
-export function createHandlerFromConfig(config: ModeConfig): ModeHandler | null {
-  // Special handlers (have complex logic, cannot be created directly from config)
-  if (config.id === 'default-chat') {
-    return defaultChatModeHandler
-  }
-
-  if (config.id === 'apk-vulnerability') {
-    return apkVulnerabilityHandler
-  }
-
-  if (config.id === 'skill-creator') {
-    return skillCreatorHandler
-  }
-
-  if (config.id === 'agent') {
-    return agentModeHandler
-  }
-
-  // Create metadata from config
-  const metadata: ModeMetadata = {
-    id: config.id,
-    label: config.labelKey, // Note: stores the translation key, actual label needs translation
-    description: config.descriptionKey, // Note: stores the translation key, actual description needs translation
-    icon: config.icon,
-    type: config.type,
-    templateName: config.templateName,
-    templateGraphName: config.templateGraphName,
-  }
-
-  // Create handler based on type
-  if (config.type === 'simple') {
-    return createSimpleModeHandler(metadata)
-  }
-
-  return null
-}
diff --git a/frontend/app/chat/services/modeHandlers/registerHandlers.ts b/frontend/app/chat/services/modeHandlers/registerHandlers.ts
deleted file mode 100644
index 85f22cd0d..000000000
--- a/frontend/app/chat/services/modeHandlers/registerHandlers.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Register Mode Handlers
- *
- * Registers all mode handlers
- * Creates and registers handlers from configuration uniformly to ensure consistency
- */
-
-import { modeConfigs } from '../../config/modeConfig'
-
-import { createHandlerFromConfig } from './handlerFactory'
-import { modeHandlerRegistry } from './registry'
-
-/**
- * Register all mode handlers
- *
- * Creates handlers uniformly from modeConfigs to ensure consistency between config and handlers
- *
- * Note: Special handlers (apk-vulnerability, agent) are already handled in handlerFactory,
- * no need to register them again here
- */
-export function registerAllHandlers(): void {
-  // Iterate through all configs, create and register handlers
-  // handlerFactory will handle special handlers (apk-vulnerability, agent)
-  for (const config of modeConfigs) {
-    const handler = createHandlerFromConfig(config)
-    if (handler) {
-      modeHandlerRegistry.register(config.id, handler)
-    } else {
-      console.warn(`Failed to create handler for mode: ${config.id}`)
-    }
-  }
-}
diff --git a/frontend/app/chat/services/modeHandlers/registry.ts b/frontend/app/chat/services/modeHandlers/registry.ts
deleted file mode 100644
index f7c58990a..000000000
--- a/frontend/app/chat/services/modeHandlers/registry.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { ModeHandler } from './types'
-
-class ModeHandlerRegistry {
-  private handlers = new Map<string, ModeHandler>()
-
-  register(modeId: string, handler: ModeHandler): void {
-    if (this.handlers.has(modeId)) {
-      console.warn(`Mode handler for "${modeId}" is already registered. Overwriting...`)
-    }
-    this.handlers.set(modeId, handler)
-  }
-
-  get(modeId: string): ModeHandler | undefined {
-    return this.handlers.get(modeId)
-  }
-}
-
-export const modeHandlerRegistry = new ModeHandlerRegistry()
diff --git a/frontend/app/chat/services/modeHandlers/simpleModeHandler.ts b/frontend/app/chat/services/modeHandlers/simpleModeHandler.ts
deleted file mode 100644
index 865b8ff57..000000000
--- a/frontend/app/chat/services/modeHandlers/simpleModeHandler.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Simple Mode Handler
- *
- * Handles simple modes that only need to set the mode type, no special processing required
- */
-
-import type {
-  ModeHandler,
-  ModeContext,
-  ModeSelectionResult,
-  SubmitResult,
-  ValidationResult,
-  ModeMetadata,
-  UploadedFile,
-} from './types'
-
-/**
- * Create a simple mode handler
- *
- * @param metadata Mode metadata
- * @returns ModeHandler instance
- */
-export function createSimpleModeHandler(metadata: ModeMetadata): ModeHandler {
-  return {
-    metadata,
-
-    async onSelect(_context: ModeContext): Promise<ModeSelectionResult> {
-      return {
-        success: true,
-        stateUpdates: {
-          mode: metadata.id,
-        },
-      }
-    },
-
-    async onSubmit(input: string, _files: UploadedFile[], _context: ModeContext): Promise<SubmitResult> {
-      return {
-        success: true,
-        processedInput: input,
-        graphId: null,
-      }
-    },
-
-    validate(_input: string, _files: UploadedFile[]): ValidationResult {
-      return { valid: true }
-    },
-  }
-}
-
-// Note: These handlers are now created from config via handlerFactory
-// Keeping these exports for backward compatibility, but recommend using createHandlerFromConfig
diff --git a/frontend/app/chat/services/modeHandlers/skillCreatorHandler.ts b/frontend/app/chat/services/modeHandlers/skillCreatorHandler.ts
deleted file mode 100644
index 196f39840..000000000
--- a/frontend/app/chat/services/modeHandlers/skillCreatorHandler.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Wand2 } from 'lucide-react'
-
-import { createTemplateHandler } from './templateHandlerFactory'
-
-export const skillCreatorHandler = createTemplateHandler({
-  modeId: 'skill-creator',
-  graphName: 'Skill Creator',
-  metadata: {
-    id: 'skill-creator',
-    label: 'chat.skillCreator',
-    description: 'chat.skillCreatorDescription',
-    icon: Wand2,
-    type: 'template',
-  },
-})
diff --git a/frontend/app/chat/services/modeHandlers/templateHandlerFactory.ts b/frontend/app/chat/services/modeHandlers/templateHandlerFactory.ts
deleted file mode 100644
index 3c501869e..000000000
--- a/frontend/app/chat/services/modeHandlers/templateHandlerFactory.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Factory for template-based mode handlers.
- *
- * All "find-or-create a graph from a template" handlers share the same
- * onSelect / onSubmit / validate / getGraphId logic. Only the mode id,
- * graph display name, icon, and i18n keys differ.
- */
-
-import { graphKeys } from '@/hooks/queries/graphs'
-
-import { getModeConfig } from '../../config/modeConfig'
-import { findGraphByName, findOrCreateGraphByTemplate } from '../utils/graphLookup'
-
-import type {
-  ModeHandler,
-  ModeContext,
-  ModeSelectionResult,
-  SubmitResult,
-  ValidationResult,
-  UploadedFile,
-  ModeMetadata,
-} from './types'
-
-interface TemplateHandlerConfig {
-  modeId: string
-  graphName: string // display name used in findGraphByName (e.g. "Default Chat")
-  metadata: ModeMetadata
-}
-
-export function createTemplateHandler(cfg: TemplateHandlerConfig): ModeHandler {
-  return {
-    metadata: cfg.metadata,
-
-    requiresFiles: false,
-
-    async onSelect(context: ModeContext): Promise<ModeSelectionResult> {
-      if (!context.personalWorkspaceId) {
-        return {
-          success: false,
-          error: 'Personal workspace not found. Please ensure you have a personal workspace.',
-        }
-      }
-
-      const modeConfig = getModeConfig(cfg.modeId)
-      if (!modeConfig || !modeConfig.templateName || !modeConfig.templateGraphName) {
-        return {
-          success: false,
-          error: `${cfg.graphName} template configuration not found`,
-        }
-      }
-
-      try {
-        const graph = await findOrCreateGraphByTemplate(
-          modeConfig.templateGraphName,
-          modeConfig.templateName,
-          context.personalWorkspaceId,
-        )
-
-        if (context.queryClient.refetchQueries) {
-          await context.queryClient.refetchQueries({
-            queryKey: [...graphKeys.list(context.personalWorkspaceId)],
-          })
-        } else {
-          context.queryClient.invalidateQueries({
-            queryKey: [...graphKeys.list(context.personalWorkspaceId)],
-          })
-        }
-
-        return {
-          success: true,
-          stateUpdates: { mode: cfg.modeId, graphId: graph.id },
-        }
-      } catch (error) {
-        const message =
-          error instanceof Error ? error.message : `Failed to create ${cfg.graphName} graph`
-        return { success: false, error: message }
-      }
-    },
-
-    async onSubmit(
-      input: string,
-      _files: UploadedFile[],
-      _context: ModeContext,
-    ): Promise<SubmitResult> {
-      return { success: true, processedInput: input }
-    },
-
-    validate(_input: string, _files: UploadedFile[]): ValidationResult {
-      return { valid: true }
-    },
-
-    async getGraphId(context: ModeContext): Promise<string | null> {
-      const graph = await findGraphByName(cfg.graphName, context)
-      return graph?.id ?? null
-    },
-  }
-}
diff --git a/frontend/app/chat/services/modeHandlers/types.ts b/frontend/app/chat/services/modeHandlers/types.ts
deleted file mode 100644
index 392484591..000000000
--- a/frontend/app/chat/services/modeHandlers/types.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/**
- * Mode Handler Types
- *
- * Defines interfaces and types for mode handlers, used to uniformly handle different chat mode logic
- */
-
-import { LucideIcon } from 'lucide-react'
-
-/**
- * Uploaded file interface
- */
-export interface UploadedFile {
-  id: string
-  filename: string
-  path: string
-  size: number
-}
-
-/**
- * Mode context containing information needed for handler execution
- */
-export interface ModeContext {
-  /** Workspace data */
-  workspaces: Array<{ id: string; type?: string }>
-  /** List of deployed agents */
-  deployedAgents: Array<{ id: string; name: string }>
-  /** Currently selected agent ID */
-  selectedAgentId?: string | null
-  /** Personal workspace ID */
-  personalWorkspaceId?: string | null
-  /** Internationalization translation function */
-  t: (key: string, options?: Record<string, unknown>) => string
-  /** Router navigation function */
-  router: {
-    push: (path: string) => void
-  }
-  /** Query Client for cache management */
-  queryClient: {
-    invalidateQueries: (options: { queryKey: unknown[] }) => void
-    refetchQueries?: (options: { queryKey: unknown[] }) => Promise<unknown>
-    getQueryData?: <T = unknown>(queryKey: unknown[]) => T | undefined
-  }
-}
-
-/**
- * Mode selection result
- */
-export interface ModeSelectionResult {
-  /** Whether the operation was successful */
-  success: boolean
-  /** Error message (if any) */
-  error?: string
-  /** State updates to apply */
-  stateUpdates?: {
-    input?: string
-    graphId?: string | null
-    mode?: string
-  }
-}
-
-/**
- * Submit result
- */
-export interface SubmitResult {
-  /** Whether the operation was successful */
-  success: boolean
-  /** Error message (if any) */
-  error?: string
-  /** Processed input */
-  processedInput?: string
-  /** Graph ID to use */
-  graphId?: string | null
-  /** Whether redirect is needed */
-  shouldRedirect?: boolean
-  /** Redirect path */
-  redirectPath?: string
-}
-
-/**
- * Validation result
- */
-export interface ValidationResult {
-  /** Whether the input is valid */
-  valid: boolean
-  /** Error message */
-  error?: string
-}
-
-/**
- * Mode metadata
- */
-export interface ModeMetadata {
-  /** Mode ID */
-  id: string
-  /** Mode label */
-  label: string
-  /** Mode description */
-  description: string
-  /** Icon component */
-  icon: LucideIcon | React.ComponentType<{ className?: string }>
-  /** Mode type */
-  type?: 'template' | 'simple' | 'agent'
-  /** Template name (for template type) */
-  templateName?: string
-  /** Template graph name */
-  templateGraphName?: string
-}
-
-/**
- * Mode Handler Interface
- *
- * All mode handlers must implement this interface to uniformly handle different mode logic
- */
-export interface ModeHandler {
-  /**
-   * Handle mode selection
-   * Called when user clicks on a mode card
-   */
-  onSelect(context: ModeContext): Promise<ModeSelectionResult>
-
-  /**
-   * Handle submission
-   * Called when user submits chat input
-   */
-  onSubmit(input: string, files: UploadedFile[], context: ModeContext): Promise<SubmitResult>
-
-  /**
-   * Validate input and files
-   * Performs validation before submission
-   */
-  validate?(input: string, files: UploadedFile[]): ValidationResult
-
-  /**
-   * Get associated Graph ID
-   * Used to determine which Graph to use for processing the request
-   */
-  getGraphId?(context: ModeContext): Promise<string | null>
-
-  /**
-   * Whether file upload is required
-   */
-  requiresFiles?: boolean
-
-  /**
-   * Mode metadata
-   */
-  metadata: ModeMetadata
-}
diff --git a/frontend/app/chat/services/utils/graphLookup.ts b/frontend/app/chat/services/utils/graphLookup.ts
deleted file mode 100644
index bfd537fc2..000000000
--- a/frontend/app/chat/services/utils/graphLookup.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Shared graph-lookup utility
- *
- * Eliminates duplicate cache→API→find pattern in mode handlers.
- */
-
-import { agentService } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { graphKeys } from '@/hooks/queries/graphs'
-
-import type { ModeContext } from '../modeHandlers/types'
-
-/**
- * Fetch a graph template JSON from /data/graph-templates/{templateName}.json
- * and apply its nodes/edges/viewport to the given graph via saveGraphState.
- */
-async function applyTemplate(graphId: string, templateName: string): Promise<void> {
-  const res = await fetch(`/data/graph-templates/${templateName}.json`)
-  if (!res.ok) {
-    console.warn(`[graphLookup] Template "${templateName}" not found (${res.status}), skipping`)
-    return
-  }
-  const template = await res.json()
-  const nodes = template.nodes ?? []
-  if (nodes.length === 0) return
-
-  await agentService.saveGraphState({
-    graphId,
-    nodes,
-    edges: template.edges ?? [],
-    viewport: template.viewport,
-  })
-}
-
-// Module-level promise locks keyed by graph name — prevents concurrent creation across all callers
-const creationLocks = new Map<string, Promise<{ id: string; name: string }>>()
-
-/**
- * Look up a graph by name in the user's personal workspace.
- * Tries query cache first, then falls back to API.
- */
-export async function findGraphByName(
-  graphName: string,
-  context: ModeContext,
-): Promise<{ id: string; name: string } | null> {
-  if (!context.personalWorkspaceId) return null
-
-  // 1. Try query cache
-  let workspaceGraphs: Array<{ id: string; name: string }> | undefined
-  if (context.queryClient.getQueryData) {
-    workspaceGraphs = context.queryClient.getQueryData<Array<{ id: string; name: string }>>([
-      ...graphKeys.list(context.personalWorkspaceId),
-    ])
-  }
-
-  // 2. Fallback to API
-  if (!workspaceGraphs) {
-    try {
-      workspaceGraphs = await agentService.listGraphs(context.personalWorkspaceId)
-    } catch (error) {
-      console.error('Failed to fetch workspace graphs:', error)
-      return null
-    }
-  }
-
-  // 3. Find by name
-  return workspaceGraphs?.find((g) => g.name === graphName) ?? null
-}
-
-/**
- * Refresh graph list in query cache, then look up by name.
- * Used after creating a graph to verify it now exists.
- */
-export async function refreshAndFindGraph(
-  graphName: string,
-  context: ModeContext,
-): Promise<{ id: string; name: string } | null> {
-  if (!context.personalWorkspaceId) return null
-
-  if (context.queryClient.refetchQueries) {
-    await context.queryClient.refetchQueries({
-      queryKey: [...graphKeys.list(context.personalWorkspaceId)],
-    })
-  }
-
-  if (context.queryClient.getQueryData) {
-    const queryData = context.queryClient.getQueryData<Array<{ id: string; name: string }>>([
-      ...graphKeys.list(context.personalWorkspaceId),
-    ])
-    return queryData?.find((g) => g.name === graphName) ?? null
-  }
-
-  return null
-}
-
-/**
- * Find an existing graph by name with nodes, or create from template.
- * - If duplicates exist, keeps the one with most nodes and deletes the rest.
- * - If a graph exists but has no nodes, re-applies the template state.
- * - Uses a module-level promise lock keyed by graph name to prevent concurrent creation.
- */
-export async function findOrCreateGraphByTemplate(
-  graphName: string,
-  templateName: string,
-  workspaceId: string,
-): Promise<{ id: string; name: string }> {
-  // If a creation/repair is already in progress for this name, wait for it
-  const inflight = creationLocks.get(graphName)
-  if (inflight) {
-    return inflight
-  }
-
-  const promise = (async () => {
-    try {
-      const graphs = await agentService.listGraphs(workspaceId)
-      const matches = graphs.filter((g) => g.name === graphName)
-
-      if (matches.length > 0) {
-        // Deduplicate: keep the one with most nodes, delete the rest
-        let best = matches[0]
-        for (const g of matches) {
-          if ((g.nodeCount ?? 0) > (best.nodeCount ?? 0)) best = g
-        }
-        // Delete duplicates in the background
-        for (const g of matches) {
-          if (g.id !== best.id) {
-            agentService
-              .deleteGraph(g.id)
-              .catch((e) => console.warn(`Failed to delete duplicate graph ${g.id}:`, e))
-          }
-        }
-
-        // If the best graph has nodes, use it directly
-        if ((best.nodeCount ?? 0) > 0) {
-          return { id: best.id, name: best.name }
-        }
-
-        // Graph exists but has no nodes — apply template to populate it
-        await applyTemplate(best.id, templateName)
-        return { id: best.id, name: best.name }
-      }
-
-      // No existing graph — create and populate from template
-      const created = await agentService.createGraph({
-        name: graphName,
-        workspaceId,
-      })
-      await applyTemplate(created.id, templateName)
-      return { id: created.id, name: created.name }
-    } finally {
-      creationLocks.delete(graphName)
-    }
-  })()
-
-  creationLocks.set(graphName, promise)
-  return promise
-}
diff --git a/frontend/app/chat/shared/ActionBar/ActionBar.tsx b/frontend/app/chat/shared/ActionBar/ActionBar.tsx
deleted file mode 100644
index 42b595a12..000000000
--- a/frontend/app/chat/shared/ActionBar/ActionBar.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-'use client'
-
-import { CopyAction } from './CopyAction'
-import { RetryAction } from './RetryAction'
-
-interface ActionBarProps {
-  content: string
-  onRetry?: () => void
-}
-
-export function ActionBar({ content, onRetry }: ActionBarProps) {
-  if (!content) return null
-
-  return (
-    <div className="mt-1 flex items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-      <CopyAction text={content} />
-      {onRetry && <RetryAction onRetry={onRetry} />}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/shared/ActionBar/CopyAction.tsx b/frontend/app/chat/shared/ActionBar/CopyAction.tsx
deleted file mode 100644
index f50482b76..000000000
--- a/frontend/app/chat/shared/ActionBar/CopyAction.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-'use client'
-
-import { Check, Copy } from 'lucide-react'
-
-import { useCopyToClipboard } from '../hooks/useCopyToClipboard'
-
-interface CopyActionProps {
-  text: string
-}
-
-export function CopyAction({ text }: CopyActionProps) {
-  const { copied, handleCopy } = useCopyToClipboard()
-
-  return (
-    <button
-      onClick={() => handleCopy(text)}
-      className="rounded-md p-1 text-[var(--text-muted)] transition-colors hover:bg-[var(--surface-3)] hover:text-[var(--text-secondary)]"
-      aria-label="Copy message"
-    >
-      {copied ? <Check size={14} className="text-[var(--status-success)]" /> : <Copy size={14} />}
-    </button>
-  )
-}
diff --git a/frontend/app/chat/shared/ActionBar/RetryAction.tsx b/frontend/app/chat/shared/ActionBar/RetryAction.tsx
deleted file mode 100644
index 6d430b7c3..000000000
--- a/frontend/app/chat/shared/ActionBar/RetryAction.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-'use client'
-
-import { RotateCcw } from 'lucide-react'
-
-interface RetryActionProps {
-  onRetry: () => void
-}
-
-export function RetryAction({ onRetry }: RetryActionProps) {
-  return (
-    <button
-      onClick={onRetry}
-      className="rounded-md p-1 text-[var(--text-muted)] transition-colors hover:bg-[var(--surface-3)] hover:text-[var(--text-secondary)]"
-      aria-label="Retry message"
-    >
-      <RotateCcw size={14} />
-    </button>
-  )
-}
diff --git a/frontend/app/chat/shared/ActionBar/index.ts b/frontend/app/chat/shared/ActionBar/index.ts
deleted file mode 100644
index cb2e92996..000000000
--- a/frontend/app/chat/shared/ActionBar/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ActionBar } from './ActionBar'
-export { CopyAction } from './CopyAction'
-export { RetryAction } from './RetryAction'
diff --git a/frontend/app/chat/shared/CodeBlock/CodeBlock.tsx b/frontend/app/chat/shared/CodeBlock/CodeBlock.tsx
deleted file mode 100644
index bfa129acf..000000000
--- a/frontend/app/chat/shared/CodeBlock/CodeBlock.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-'use client'
-
-import { Check, Copy } from 'lucide-react'
-import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
-import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism'
-
-import { useCopyToClipboard } from '../hooks/useCopyToClipboard'
-
-interface CodeBlockProps {
-  language: string
-  code: string
-}
-
-const highlighterStyle = {
-  background: 'var(--surface-1)',
-  border: '1px solid var(--border)',
-  borderRadius: '0.5rem',
-  fontSize: '13px',
-  margin: '1em 0',
-}
-
-export function CodeBlock({ language, code }: CodeBlockProps) {
-  const { copied, handleCopy } = useCopyToClipboard()
-
-  return (
-    <div className="group/code relative">
-      <button
-        onClick={() => handleCopy(code)}
-        className="absolute right-2 top-2 z-10 rounded-md border border-[var(--border)] bg-[var(--surface-elevated)] p-1.5 text-[var(--text-muted)] opacity-0 transition-all hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)] group-hover/code:opacity-100"
-        aria-label="Copy code"
-      >
-        {copied ? <Check size={13} className="text-[var(--status-success)]" /> : <Copy size={13} />}
-      </button>
-      <SyntaxHighlighter
-        style={oneLight}
-        language={language}
-        PreTag="div"
-        customStyle={highlighterStyle}
-      >
-        {code}
-      </SyntaxHighlighter>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/shared/CodeBlock/index.ts b/frontend/app/chat/shared/CodeBlock/index.ts
deleted file mode 100644
index 9f4055ebe..000000000
--- a/frontend/app/chat/shared/CodeBlock/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { CodeBlock } from './CodeBlock'
diff --git a/frontend/app/chat/shared/StarterPrompts/StarterPrompts.tsx b/frontend/app/chat/shared/StarterPrompts/StarterPrompts.tsx
deleted file mode 100644
index aa8162ab8..000000000
--- a/frontend/app/chat/shared/StarterPrompts/StarterPrompts.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-'use client'
-
-import { Lightbulb } from 'lucide-react'
-
-interface StarterPromptsProps {
-  prompts: string[]
-  onSelect: (prompt: string) => void
-}
-
-export function StarterPrompts({ prompts, onSelect }: StarterPromptsProps) {
-  if (prompts.length === 0) return null
-
-  return (
-    <div className="flex flex-wrap gap-2">
-      {prompts.map((prompt) => (
-        <button
-          key={prompt}
-          onClick={() => onSelect(prompt)}
-          className="flex items-center gap-1.5 rounded-full border border-[var(--border)] bg-[var(--surface-elevated)] px-3 py-1.5 text-xs text-[var(--text-secondary)] transition-all hover:border-primary/30 hover:bg-[var(--brand-50)] hover:text-[var(--brand-700)]"
-        >
-          <Lightbulb size={12} className="flex-shrink-0" />
-          <span className="max-w-[250px] truncate">{prompt}</span>
-        </button>
-      ))}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/shared/StarterPrompts/index.ts b/frontend/app/chat/shared/StarterPrompts/index.ts
deleted file mode 100644
index 082bc706b..000000000
--- a/frontend/app/chat/shared/StarterPrompts/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { StarterPrompts } from './StarterPrompts'
diff --git a/frontend/app/chat/shared/ToolCallDisplay/ToolCallBadge.tsx b/frontend/app/chat/shared/ToolCallDisplay/ToolCallBadge.tsx
deleted file mode 100644
index d2b6f5629..000000000
--- a/frontend/app/chat/shared/ToolCallDisplay/ToolCallBadge.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-'use client'
-
-import { Check, Loader2, Search, ListTodo, Terminal, FileText, Code2, FolderSearch } from 'lucide-react'
-import React from 'react'
-
-import { cn } from '@/lib/utils'
-
-import { formatToolDisplay } from './toolDisplayRegistry'
-
-interface ToolCallBadgeProps {
-  name: string
-  args: Record<string, any>
-  status: 'running' | 'completed' | 'failed'
-  onClick?: () => void
-}
-
-const toolIconMap: Record<string, React.ElementType> = {
-  web_search: Search,
-  search: Search,
-  grep: Search,
-  planner: ListTodo,
-  write_todos: ListTodo,
-  todo_write: ListTodo,
-  read_file: FileText,
-  read: FileText,
-  write_file: Code2,
-  write: Code2,
-  create_file: Code2,
-  edit_file: Code2,
-  edit: Code2,
-  str_replace_editor: Code2,
-  glob: FolderSearch,
-  find_files: FolderSearch,
-  ls: FolderSearch,
-  list_directory: FolderSearch,
-}
-
-export function ToolCallBadge({ name, args, status, onClick }: ToolCallBadgeProps) {
-  const isCompleted = status === 'completed'
-  const display = formatToolDisplay(name, args)
-  const Icon = toolIconMap[name] || Terminal
-
-  return (
-    <div className="group/tool mb-2">
-      <div
-        onClick={onClick}
-        className={cn(
-          'flex w-fit items-center gap-2 rounded-lg border px-3 py-1.5 text-xs transition-all',
-          isCompleted
-            ? 'border-[var(--border)] bg-[var(--surface-1)] text-[var(--text-secondary)]'
-            : 'border-[var(--brand-100)] bg-[var(--brand-50)] text-[var(--brand-700)]',
-          onClick && 'cursor-pointer hover:shadow-sm',
-        )}
-      >
-        <Icon size={12} />
-        <span className="font-medium">{display.label}</span>
-
-        {display.detail && (
-          <span className="ml-1 hidden max-w-[200px] truncate font-mono text-[var(--text-muted)] group-hover/tool:inline">
-            {display.detail}
-          </span>
-        )}
-
-        <div className="ml-2 border-l border-[var(--border-strong)] pl-2">
-          {isCompleted ? (
-            <Check size={12} className="text-[var(--status-success)]" />
-          ) : (
-            <Loader2 size={12} className="animate-spin text-[var(--brand-500)]" />
-          )}
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/chat/shared/ToolCallDisplay/ToolCallDetail.tsx b/frontend/app/chat/shared/ToolCallDisplay/ToolCallDetail.tsx
deleted file mode 100644
index bc5c9ebdb..000000000
--- a/frontend/app/chat/shared/ToolCallDisplay/ToolCallDetail.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-'use client'
-
-import { useTranslation } from '@/lib/i18n'
-
-import { formatToolDisplay } from './toolDisplayRegistry'
-
-interface ToolCallDetailProps {
-  name: string
-  args: Record<string, any>
-  status: 'running' | 'completed' | 'failed'
-  result?: any
-  startTime?: number
-  endTime?: number
-}
-
-export function ToolCallDetail({ name, args, status, result, startTime, endTime }: ToolCallDetailProps) {
-  const { t } = useTranslation()
-  const display = formatToolDisplay(name, args)
-  const duration = startTime && endTime ? ((endTime - startTime) / 1000).toFixed(1) : null
-
-  return (
-    <div className="space-y-3 p-4">
-      <div className="flex items-center justify-between">
-        <h3 className="text-sm font-medium text-[var(--text-primary)]">{display.label}</h3>
-        <span className={`rounded-full px-2 py-0.5 text-xs ${
-          status === 'completed' ? 'bg-[var(--status-success-bg)] text-[var(--status-success)]' :
-          status === 'failed' ? 'bg-[var(--status-error-bg)] text-[var(--status-error)]' :
-          'bg-[var(--brand-50)] text-[var(--brand-700)]'
-        }`}>
-          {status === 'completed' ? t('common.statusCompleted') :
-           status === 'failed' ? t('common.statusFailed') :
-           t('common.statusRunning')}
-        </span>
-      </div>
-
-      {display.detail && (
-        <p className="font-mono text-xs text-[var(--text-tertiary)]">{display.detail}</p>
-      )}
-
-      {duration && (
-        <p className="text-xs text-[var(--text-muted)]">{duration}s</p>
-      )}
-
-      {Object.keys(args).length > 0 && (
-        <details className="text-xs">
-          <summary className="cursor-pointer text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]">{t('chat.arguments')}</summary>
-          <pre className="mt-1 max-h-[200px] overflow-auto rounded bg-[var(--surface-1)] p-2 text-[var(--text-secondary)]">
-            {JSON.stringify(args, null, 2)}
-          </pre>
-        </details>
-      )}
-
-      {result !== undefined && (
-        <details className="text-xs">
-          <summary className="cursor-pointer text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]">{t('chat.result')}</summary>
-          <pre className="mt-1 max-h-[300px] overflow-auto rounded bg-[var(--surface-1)] p-2 text-[var(--text-secondary)]">
-            {typeof result === 'string' ? result : JSON.stringify(result, null, 2)}
-          </pre>
-        </details>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/chat/shared/ToolCallDisplay/__tests__/toolDisplayRegistry.test.ts b/frontend/app/chat/shared/ToolCallDisplay/__tests__/toolDisplayRegistry.test.ts
deleted file mode 100644
index 4e178eb63..000000000
--- a/frontend/app/chat/shared/ToolCallDisplay/__tests__/toolDisplayRegistry.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { formatToolDisplay } from '../toolDisplayRegistry'
-
-describe('formatToolDisplay', () => {
-  it('labels preview_skill as previewing and shows the skill name', () => {
-    const display = formatToolDisplay('preview_skill', {
-      skill_name: 'network-scan',
-      skills_subdir: 'thread-123/skills',
-    })
-
-    expect(display).toEqual({
-      label: 'Previewing skill: network-scan',
-      detail: 'thread-123/skills',
-    })
-  })
-})
diff --git a/frontend/app/chat/shared/ToolCallDisplay/index.ts b/frontend/app/chat/shared/ToolCallDisplay/index.ts
deleted file mode 100644
index fa3319f97..000000000
--- a/frontend/app/chat/shared/ToolCallDisplay/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { ToolCallBadge } from './ToolCallBadge'
-export { ToolCallDetail } from './ToolCallDetail'
-export { formatToolDisplay } from './toolDisplayRegistry'
-export type { ToolDisplay } from './toolDisplayRegistry'
diff --git a/frontend/app/chat/shared/ToolCallDisplay/toolDisplayRegistry.ts b/frontend/app/chat/shared/ToolCallDisplay/toolDisplayRegistry.ts
deleted file mode 100644
index b7018004a..000000000
--- a/frontend/app/chat/shared/ToolCallDisplay/toolDisplayRegistry.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Shared tool display registry.
- * Maps raw tool names + args to user-friendly labels and details.
- */
-
-function basename(path: string): string {
-  return path.split('/').pop() || path
-}
-
-function shortenPath(path: string, maxLen = 40): string {
-  if (path.length <= maxLen) return path
-  const name = basename(path)
-  if (name.length >= maxLen - 4) return `.../${name}`
-  const budget = maxLen - name.length - 4
-  return path.slice(0, budget) + '.../' + name
-}
-
-export interface ToolDisplay {
-  label: string
-  detail: string
-}
-
-export function formatToolDisplay(toolName: string, toolInput: Record<string, any>): ToolDisplay {
-  if (toolName === 'read_file' || toolName === 'read') {
-    const path = toolInput?.file_path || toolInput?.path || ''
-    return { label: `Reading ${basename(path)}`, detail: path ? shortenPath(path) : '' }
-  }
-
-  if (toolName === 'write_file' || toolName === 'write' || toolName === 'create_file') {
-    const path = toolInput?.file_path || toolInput?.path || ''
-    return { label: `Writing ${basename(path)}`, detail: path ? shortenPath(path) : '' }
-  }
-
-  if (toolName === 'edit_file' || toolName === 'edit' || toolName === 'str_replace_editor') {
-    const path = toolInput?.file_path || toolInput?.path || ''
-    return { label: `Editing ${basename(path)}`, detail: path ? shortenPath(path) : '' }
-  }
-
-  if (toolName === 'execute' || toolName === 'bash' || toolName === 'run_command') {
-    const cmd = toolInput?.command || toolInput?.code || ''
-    const shortCmd = typeof cmd === 'string' ? cmd.slice(0, 60) : ''
-    return { label: 'Executing command', detail: shortCmd ? (shortCmd.length < cmd.length ? shortCmd + '...' : shortCmd) : '' }
-  }
-
-  if (toolName === 'python' || toolName === 'python_interpreter') {
-    const code = toolInput?.code || ''
-    const firstLine = typeof code === 'string' ? code.split('\n')[0].slice(0, 50) : ''
-    return { label: 'Running Python', detail: firstLine || '' }
-  }
-
-  if (toolName === 'preview_skill') {
-    const skillName = toolInput?.skill_name || ''
-    const skillsSubdir = toolInput?.skills_subdir || ''
-    return {
-      label: `Previewing skill${skillName ? ': ' + skillName : ''}`,
-      detail: typeof skillsSubdir === 'string' ? skillsSubdir : '',
-    }
-  }
-
-  if (toolName === 'glob' || toolName === 'find_files') {
-    const pattern = toolInput?.pattern || ''
-    return { label: 'Searching files', detail: pattern || '' }
-  }
-
-  if (toolName === 'grep' || toolName === 'search') {
-    const pattern = toolInput?.pattern || toolInput?.query || ''
-    return { label: 'Searching content', detail: pattern || '' }
-  }
-
-  if (toolName === 'ls' || toolName === 'list_directory') {
-    const path = toolInput?.path || ''
-    return { label: `Listing ${basename(path) || 'directory'}`, detail: path ? shortenPath(path) : '' }
-  }
-
-  if (toolName === 'write_todos' || toolName === 'todo_write') {
-    return { label: 'Updating plan', detail: '' }
-  }
-
-  if (toolName === 'think' || toolName === 'reasoning') {
-    return { label: 'Thinking...', detail: '' }
-  }
-
-  if (toolName === 'web_search') {
-    const query = toolInput?.query || ''
-    return { label: 'Web search', detail: query ? query.slice(0, 50) : '' }
-  }
-
-  if (toolName === 'planner') {
-    return { label: 'Planning', detail: '' }
-  }
-
-  const readableName = toolName
-    .replace(/_/g, ' ')
-    .replace(/-/g, ' ')
-    .replace(/\b\w/g, (c) => c.toUpperCase())
-  return { label: readableName, detail: '' }
-}
diff --git a/frontend/app/chat/shared/hooks/useCopyToClipboard.ts b/frontend/app/chat/shared/hooks/useCopyToClipboard.ts
deleted file mode 100644
index 1052a0d9e..000000000
--- a/frontend/app/chat/shared/hooks/useCopyToClipboard.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-'use client'
-
-import { useState, useRef, useCallback } from 'react'
-
-import { copyToClipboard } from '@/lib/utils/clipboard'
-
-/**
- * Hook that encapsulates the copy-to-clipboard pattern with visual feedback.
- * Returns `copied` (true for 2s after a successful copy) and `handleCopy`.
- */
-export function useCopyToClipboard() {
-  const [copied, setCopied] = useState(false)
-  const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-
-  const handleCopy = useCallback(async (text: string) => {
-    try {
-      await copyToClipboard(text)
-      if (timerRef.current) clearTimeout(timerRef.current)
-      setCopied(true)
-      timerRef.current = setTimeout(() => setCopied(false), 2000)
-    } catch {
-      // Silently fail
-    }
-  }, [])
-
-  return { copied, handleCopy }
-}
diff --git a/frontend/app/chat/types.ts b/frontend/app/chat/types.ts
deleted file mode 100644
index 39d18d078..000000000
--- a/frontend/app/chat/types.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import type { RouteDecisionEventData, LoopIterationEventData } from '@/services/chatBackend'
-
-/** Generate a short random ID for messages and temporary entities */
-export const generateId = () => Math.random().toString(36).substring(2, 11)
-
-export interface Position {
-  x: number
-  y: number
-}
-
-export interface Viewport {
-  x: number
-  y: number
-  zoom: number
-}
-
-export enum NodeType {
-  USER = 'USER',
-  AI = 'AI',
-}
-
-// ─── Typed metadata for streaming events ─────────────────────────────────────
-
-export interface FileTreeEntry {
-  action: string
-  size?: number
-  timestamp?: number
-}
-
-export interface NodeLogEntry {
-  type: string // common values: 'command' | 'route_decision' | 'loop_iteration' | 'parallel_task' | 'state_update' | 'node_transition'
-  nodeName: string
-  timestamp: number
-  data?: Record<string, unknown>
-}
-
-export interface MessageMetadata {
-  fileTree?: Record<string, FileTreeEntry>
-  nodeExecutionLog?: NodeLogEntry[]
-  currentNode?: string
-  lastNode?: string
-  lastRunId?: string
-  lastUpdate?: number
-  lastRouteDecision?: RouteDecisionEventData
-  lastLoopIteration?: LoopIterationEventData
-  error?: string
-  [key: string]: unknown // keep backwards compat
-}
-
-export interface InterruptState {
-  nodeName: string
-  nodeLabel?: string
-  state?: Record<string, unknown>
-  threadId: string
-}
-
-// LangGraph / OpenAI compatible message structure
-export interface Message {
-  id: string
-  role: 'user' | 'assistant' | 'system'
-  content: string
-  timestamp: number
-  tool_calls?: ToolCall[]
-  isStreaming?: boolean
-  metadata?: MessageMetadata
-}
-
-export interface ToolCall {
-  id: string
-  name: string
-  args: Record<string, unknown>
-  status: 'running' | 'completed' | 'failed'
-  result?: string | Record<string, unknown>
-  startTime: number
-  endTime?: number
-}
-
-// Legacy CanvasNode for Builder (keeping for compatibility with Builder)
-export interface CanvasNode {
-  id: string
-  parentId: string | null
-  type: NodeType
-  content: string
-  position: Position
-  width: number
-  isStreaming?: boolean
-  createdAt: number
-  toolCalls?: ToolCall[]
-  data?: Record<string, unknown>
-}
-
-export interface Edge {
-  id: string
-  source: string
-  target: string
-}
-
-export interface ChatMessage {
-  role: 'user' | 'model'
-  parts: { text: string }[]
-}
-
-export type ViewMode = 'chat' | 'builder'
diff --git a/frontend/app/dashboard/loading.tsx b/frontend/app/dashboard/loading.tsx
new file mode 100644
index 000000000..e9865ff59
--- /dev/null
+++ b/frontend/app/dashboard/loading.tsx
@@ -0,0 +1,7 @@
+export default function DashboardLoading() {
+  return (
+    <div className="flex h-full items-center justify-center bg-[var(--bg)]">
+      <div className="h-8 w-8 animate-spin rounded-full border-4 border-[var(--border)] border-t-[var(--brand-500)]" />
+    </div>
+  )
+}
diff --git a/frontend/app/dashboard/page.tsx b/frontend/app/dashboard/page.tsx
new file mode 100644
index 000000000..e2e67573e
--- /dev/null
+++ b/frontend/app/dashboard/page.tsx
@@ -0,0 +1,49 @@
+'use client'
+
+import { ActiveAgents } from '@/components/dashboard/active-agents'
+import { DashboardEmptyState } from '@/components/dashboard/empty-state'
+import { NeedsAttention } from '@/components/dashboard/needs-attention'
+import { RecentTasks } from '@/components/dashboard/recent-tasks'
+import { useAgents } from '@/hooks/queries/agents'
+import { useTasks } from '@/hooks/queries/tasks'
+import { useTranslation } from '@/lib/i18n'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
+export default function DashboardPage() {
+  const { t } = useTranslation()
+  const { workspaceId } = useCurrentWorkspace()
+
+  const { data: agents = [], isLoading: agentsLoading } = useAgents(workspaceId)
+  const { data: tasks = [], isLoading: tasksLoading } = useTasks(workspaceId)
+
+  if (agentsLoading || tasksLoading) return null
+
+  if (agents.length === 0) return <DashboardEmptyState />
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--bg)]">
+      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
+        <h1 className="text-lg font-semibold text-[var(--text-primary)]">
+          {t('dashboard.welcome', { name: '' })}
+        </h1>
+      </div>
+
+      <div className="flex-1 overflow-y-auto px-6 py-6">
+        {/* Top: NeedsAttention (1/3) + RecentTasks (2/3) */}
+        <div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
+          <div className="lg:col-span-1">
+            <NeedsAttention workspaceId={workspaceId} tasks={tasks} />
+          </div>
+          <div className="lg:col-span-2">
+            <RecentTasks workspaceId={workspaceId} tasks={tasks} />
+          </div>
+        </div>
+
+        {/* Bottom: ActiveAgents full-width */}
+        <div className="mt-4">
+          <ActiveAgents workspaceId={workspaceId} agents={agents} tasks={tasks} />
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/discover/page.tsx b/frontend/app/discover/page.tsx
deleted file mode 100644
index faffca792..000000000
--- a/frontend/app/discover/page.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-'use client'
-
-import { Compass } from 'lucide-react'
-
-import { useTranslation } from '@/lib/i18n'
-
-export default function DiscoverPage() {
-  const { t } = useTranslation()
-
-  return (
-    <div className="flex h-full flex-col">
-      {/* Header */}
-      <div className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-1)] px-6 py-4">
-        <div className="flex items-center gap-3">
-          <Compass className="h-6 w-6 text-[var(--text-primary)]" />
-          <h1 className="text-2xl font-semibold text-[var(--text-primary)]">
-            {t('sidebar.discover')}
-          </h1>
-        </div>
-      </div>
-
-      {/* Content */}
-      <div className="flex flex-1 items-center justify-center p-8">
-        <div className="text-center">
-          <Compass className="mx-auto mb-4 h-16 w-16 text-[var(--text-tertiary)]" />
-          <h2 className="mb-2 text-xl font-medium text-[var(--text-primary)]">
-            {t('sidebar.discover')}
-          </h2>
-          <p className="max-w-md text-[var(--text-secondary)]">{t('sidebar.discoverComingSoon')}</p>
-        </div>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/error.tsx b/frontend/app/error.tsx
new file mode 100644
index 000000000..a5ed0a631
--- /dev/null
+++ b/frontend/app/error.tsx
@@ -0,0 +1,36 @@
+'use client'
+
+import { AlertCircle, RefreshCw } from 'lucide-react'
+import { useEffect } from 'react'
+
+import { Button } from '@/components/ui/button'
+
+/**
+ * Page-level error boundary — catches errors in any page component under the root layout.
+ * The root layout (providers, shell, toaster) stays intact while this replaces the page content.
+ */
+export default function Error({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  useEffect(() => {
+    console.error('Page error:', error)
+  }, [error])
+
+  return (
+    <div className="flex h-full flex-col items-center justify-center gap-4 p-8">
+      <AlertCircle className="h-10 w-10 text-[var(--status-error)]" />
+      <h2 className="text-lg font-semibold text-[var(--text-primary)]">Something went wrong</h2>
+      <p className="max-w-md text-center text-sm text-[var(--text-secondary)]">
+        {error.message || 'An unexpected error occurred'}
+      </p>
+      <Button variant="outline" onClick={reset} className="gap-1.5">
+        <RefreshCw className="h-4 w-4" />
+        Try again
+      </Button>
+    </div>
+  )
+}
diff --git a/frontend/app/executions/[executionId]/page.tsx b/frontend/app/executions/[executionId]/page.tsx
new file mode 100644
index 000000000..51001dac9
--- /dev/null
+++ b/frontend/app/executions/[executionId]/page.tsx
@@ -0,0 +1,227 @@
+'use client'
+
+import { Activity, ArrowLeft, Clock, Loader2 } from 'lucide-react'
+import Link from 'next/link'
+import { useParams } from 'next/navigation'
+
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { ScrollArea } from '@/components/ui/scroll-area'
+import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
+import { ExecutionTimelineView } from '@/components/execution/ExecutionTimeline'
+import { ExecutionDetailPanel } from '@/components/execution/ExecutionDetailPanel'
+import { useExecution, useExecutionEvents } from '@/hooks/queries/agentRuns'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import { TERMINAL_EXECUTION_STATUSES } from '@/types/agent-run'
+
+function formatDateTime(value?: string | null): string {
+  if (!value) return '-'
+  return new Date(value).toLocaleString()
+}
+
+function formatDuration(startedAt?: string | null, endedAt?: string | null): string {
+  if (!startedAt) return '-'
+  const end = endedAt ? new Date(endedAt) : new Date()
+  const ms = end.getTime() - new Date(startedAt).getTime()
+  if (ms < 1000) return `${ms}ms`
+  if (ms < 60000) return `${(ms / 1000).toFixed(1)}s`
+  return `${Math.floor(ms / 60000)}m ${Math.floor((ms % 60000) / 1000)}s`
+}
+
+export default function ExecutionDetailPage() {
+  const params = useParams()
+  const executionId = params.executionId as string
+
+  const { workspaceId } = useCurrentWorkspace()
+
+  const { data: execution, isLoading: isExecutionLoading } = useExecution(executionId, {
+    enabled: Boolean(executionId),
+  })
+
+  const { data: events = [], isLoading: isEventsLoading } = useExecutionEvents(executionId, {
+    enabled: Boolean(executionId),
+  })
+
+  const isLoading = isExecutionLoading || isEventsLoading
+  const isTerminal = execution?.status && TERMINAL_EXECUTION_STATUSES.includes(execution.status)
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--bg)]">
+      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-3">
+            <Button variant="ghost" size="sm" asChild>
+              <Link href="/dashboard">
+                <ArrowLeft className="h-4 w-4" />
+              </Link>
+            </Button>
+            <Activity className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <div>
+              <h1 className="text-lg font-semibold text-[var(--text-primary)]">Execution Detail</h1>
+              <p className="text-xs text-[var(--text-muted)]">{executionId}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div className="flex-1 overflow-y-auto px-6 py-6">
+        {isLoading ? (
+          <div className="flex items-center gap-2 text-sm text-[var(--text-muted)]">
+            <Loader2 className="h-4 w-4 animate-spin" />
+            Loading execution...
+          </div>
+        ) : !execution ? (
+          <Card className="border-dashed border-[var(--border)] bg-[var(--surface-1)] p-8 text-center">
+            <p className="text-sm text-[var(--text-muted)]">Execution not found</p>
+          </Card>
+        ) : (
+          <div className="space-y-6">
+            {/* Metadata Cards */}
+            <div className="grid gap-4 lg:grid-cols-4">
+              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                <div className="mb-2 flex items-center gap-2">
+                  <Activity className="h-4 w-4 text-[var(--skill-brand-600)]" />
+                  <span className="text-sm font-medium text-[var(--text-secondary)]">Status</span>
+                </div>
+                <Badge variant="outline">{execution.status}</Badge>
+              </Card>
+
+              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                <div className="mb-2 flex items-center gap-2">
+                  <Clock className="h-4 w-4 text-[var(--skill-brand-600)]" />
+                  <span className="text-sm font-medium text-[var(--text-secondary)]">Started</span>
+                </div>
+                <div className="text-sm text-[var(--text-primary)]">
+                  {formatDateTime(execution.started_at)}
+                </div>
+              </Card>
+
+              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                <div className="mb-2 flex items-center gap-2">
+                  <Clock className="h-4 w-4 text-[var(--skill-brand-600)]" />
+                  <span className="text-sm font-medium text-[var(--text-secondary)]">Duration</span>
+                </div>
+                <div className="text-sm text-[var(--text-primary)]">
+                  {formatDuration(execution.started_at, execution.ended_at)}
+                </div>
+              </Card>
+
+              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                <div className="mb-2 flex items-center gap-2">
+                  <Activity className="h-4 w-4 text-[var(--skill-brand-600)]" />
+                  <span className="text-sm font-medium text-[var(--text-secondary)]">Executor</span>
+                </div>
+                <div className="text-sm text-[var(--text-primary)]">{execution.engine_kind}</div>
+              </Card>
+            </div>
+
+            {/* Tabs */}
+            <Tabs defaultValue="timeline" className="flex flex-col gap-4">
+              <TabsList className="w-fit">
+                <TabsTrigger value="timeline">Timeline</TabsTrigger>
+                <TabsTrigger value="events">Events</TabsTrigger>
+                <TabsTrigger value="metadata">Metadata</TabsTrigger>
+              </TabsList>
+
+              <TabsContent value="timeline" className="mt-0">
+                <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                  {events.length === 0 ? (
+                    <p className="text-sm text-[var(--text-muted)]">No events yet</p>
+                  ) : (
+                    <ExecutionTimelineView />
+                  )}
+                </Card>
+              </TabsContent>
+
+              <TabsContent value="events" className="mt-0">
+                <Card className="border-[var(--border)] bg-[var(--surface-1)]">
+                  <ScrollArea className="h-[520px] max-h-[60vh]">
+                    <div className="space-y-3 p-4">
+                      {events.length === 0 ? (
+                        <div className="rounded-lg border border-dashed border-[var(--border)] bg-[var(--surface-2)] p-6 text-sm text-[var(--text-muted)]">
+                          No events
+                        </div>
+                      ) : (
+                        events.map((event, idx) => (
+                          <div
+                            key={event.id || idx}
+                            className="rounded-lg border border-[var(--border)] bg-[var(--surface-2)] p-3"
+                          >
+                            <div className="mb-2 flex flex-wrap items-center gap-2">
+                              <Badge variant="outline" className="text-xs">
+                                {event.event_type}
+                              </Badge>
+                              <span className="text-xs text-[var(--text-muted)]">
+                                {formatDateTime(event.created_at)}
+                              </span>
+                            </div>
+                            <pre className="overflow-x-auto whitespace-pre-wrap break-words text-xs text-[var(--text-secondary)]">
+                              {JSON.stringify(event.payload, null, 2)}
+                            </pre>
+                          </div>
+                        ))
+                      )}
+                    </div>
+                  </ScrollArea>
+                </Card>
+              </TabsContent>
+
+              <TabsContent value="metadata" className="mt-0">
+                <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
+                  <dl className="grid gap-4 lg:grid-cols-2">
+                    <div>
+                      <dt className="text-xs text-[var(--text-muted)]">Execution ID</dt>
+                      <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">
+                        {execution.id}
+                      </dd>
+                    </div>
+                    <div>
+                      <dt className="text-xs text-[var(--text-muted)]">Run ID</dt>
+                      <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">
+                        {execution.run_id}
+                      </dd>
+                    </div>
+                    <div>
+                      <dt className="text-xs text-[var(--text-muted)]">Attempt Index</dt>
+                      <dd className="mt-1 text-sm text-[var(--text-primary)]">
+                        {execution.attempt_index}
+                      </dd>
+                    </div>
+                    <div>
+                      <dt className="text-xs text-[var(--text-muted)]">Engine Kind</dt>
+                      <dd className="mt-1 text-sm text-[var(--text-primary)]">
+                        {execution.engine_kind}
+                      </dd>
+                    </div>
+                    {execution.parent_execution_id && (
+                      <div className="lg:col-span-2">
+                        <dt className="text-xs text-[var(--text-muted)]">Parent Execution</dt>
+                        <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">
+                          <Link
+                            href={`/executions/${execution.parent_execution_id}`}
+                            className="text-[var(--skill-brand-600)] hover:underline"
+                          >
+                            {execution.parent_execution_id}
+                          </Link>
+                        </dd>
+                      </div>
+                    )}
+                    {execution.error && (
+                      <div className="lg:col-span-2">
+                        <dt className="text-xs text-[var(--text-muted)]">Error</dt>
+                        <dd className="mt-1 text-sm text-[var(--status-error)]">
+                          {execution.error.message}
+                        </dd>
+                      </div>
+                    )}
+                  </dl>
+                </Card>
+              </TabsContent>
+            </Tabs>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/global-error.tsx b/frontend/app/global-error.tsx
new file mode 100644
index 000000000..f11687898
--- /dev/null
+++ b/frontend/app/global-error.tsx
@@ -0,0 +1,48 @@
+'use client'
+
+/**
+ * Global error boundary — catches errors in the root layout itself.
+ * Must include <html> and <body> since the root layout unmounts on error.
+ */
+export default function GlobalError({
+  error,
+  reset,
+}: {
+  error: Error & { digest?: string }
+  reset: () => void
+}) {
+  return (
+    <html lang="en">
+      <body>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+            justifyContent: 'center',
+            height: '100vh',
+            gap: '16px',
+            fontFamily: 'system-ui, sans-serif',
+          }}
+        >
+          <h2 style={{ fontSize: '1.25rem', fontWeight: 600 }}>Something went wrong</h2>
+          <p style={{ fontSize: '0.875rem', color: '#6b7280' }}>
+            {error.message || 'An unexpected error occurred'}
+          </p>
+          <button
+            onClick={reset}
+            style={{
+              padding: '8px 16px',
+              borderRadius: '6px',
+              border: '1px solid #d1d5db',
+              cursor: 'pointer',
+              fontSize: '0.875rem',
+            }}
+          >
+            Try again
+          </button>
+        </div>
+      </body>
+    </html>
+  )
+}
diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
index 2a4fdebfb..b3f153f22 100644
--- a/frontend/app/layout.tsx
+++ b/frontend/app/layout.tsx
@@ -8,6 +8,7 @@ import { Toaster } from '@/components/ui/toaster'
 import { I18nProvider } from '@/providers/i18n-provider'
 import { NotificationProvider } from '@/providers/notification-provider'
 import { QueryProvider } from '@/providers/query-provider'
+import { WorkspaceProvider } from '@/providers/workspace-provider'
 import { ThemeProvider } from '@/providers/theme-provider'
 import '@/styles/globals.css'
 import { ZoomPrevention } from '@/providers/zoom-prevention'
@@ -56,11 +57,13 @@ export default function RootLayout({
           <I18nProvider>
             <QueryProvider>
               <AuthGuard>
-                <NotificationProvider>
-                  <ZoomPrevention />
-                  <AppShell>{children}</AppShell>
-                  <Toaster />
-                </NotificationProvider>
+                <WorkspaceProvider>
+                  <NotificationProvider>
+                    <ZoomPrevention />
+                    <AppShell>{children}</AppShell>
+                    <Toaster />
+                  </NotificationProvider>
+                </WorkspaceProvider>
               </AuthGuard>
             </QueryProvider>
           </I18nProvider>
diff --git a/frontend/app/memory/page.tsx b/frontend/app/memory/page.tsx
index 771b11f02..0706fb431 100644
--- a/frontend/app/memory/page.tsx
+++ b/frontend/app/memory/page.tsx
@@ -66,10 +66,12 @@ import {
 import { useToast } from '@/hooks/use-toast'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 
 export default function KnowledgePage() {
   const { t } = useTranslation()
   const { toast } = useToast()
+  const { canEdit, canAdmin } = useUserPermissionsContext()
 
   // State
   const [searchQuery, setSearchQuery] = useState('')
@@ -229,12 +231,8 @@ export default function KnowledgePage() {
               <Brain size={18} />
             </div>
             <div>
-              <h2 className="text-lg font-bold text-[var(--text-primary)]">
-                {t('memory.title')}
-              </h2>
-              <p className="mt-1 text-xs text-[var(--text-muted)]">
-                {t('memory.subtitle')}
-              </p>
+              <h2 className="text-lg font-bold text-[var(--text-primary)]">{t('memory.title')}</h2>
+              <p className="mt-1 text-xs text-[var(--text-muted)]">{t('memory.subtitle')}</p>
             </div>
           </div>
           <div className="flex items-center gap-2">
@@ -242,7 +240,7 @@ export default function KnowledgePage() {
               variant="outline"
               size="sm"
               onClick={handleOptimize}
-              disabled={optimizeMutation.isPending || memories.length === 0}
+              disabled={optimizeMutation.isPending || memories.length === 0 || !canAdmin}
               className="h-9 gap-1.5 text-xs"
             >
               {optimizeMutation.isPending ? (
@@ -252,14 +250,16 @@ export default function KnowledgePage() {
               )}
               {t('memory.optimize')}
             </Button>
-            <Button
-              size="sm"
-              onClick={openCreate}
-              className="h-9 gap-1.5 bg-[var(--skill-brand-600)] text-xs shadow-lg shadow-[var(--skill-brand-100)] hover:bg-[var(--skill-brand-700)]"
-            >
-              <Plus className="h-3.5 w-3.5" />
-              {t('memory.addMemory')}
-            </Button>
+            {canEdit && (
+              <Button
+                size="sm"
+                onClick={openCreate}
+                className="h-9 gap-1.5 bg-[var(--skill-brand-600)] text-xs shadow-lg shadow-[var(--skill-brand-100)] hover:bg-[var(--skill-brand-700)]"
+              >
+                <Plus className="h-3.5 w-3.5" />
+                {t('memory.addMemory')}
+              </Button>
+            )}
           </div>
         </div>
 
@@ -285,9 +285,7 @@ export default function KnowledgePage() {
               <SelectValue placeholder={t('memory.allTopics')} />
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="all">
-                {t('memory.allTopics')}
-              </SelectItem>
+              <SelectItem value="all">{t('memory.allTopics')}</SelectItem>
               {topics.map((topic) => (
                 <SelectItem key={topic} value={topic}>
                   {topic}
@@ -301,9 +299,7 @@ export default function KnowledgePage() {
             onClick={() => setSortOrder(sortOrder === 'desc' ? 'asc' : 'desc')}
             className="h-9 text-xs"
           >
-            {sortOrder === 'desc'
-              ? t('memory.newest')
-              : t('memory.oldest')}
+            {sortOrder === 'desc' ? t('memory.newest') : t('memory.oldest')}
           </Button>
         </div>
       </div>
@@ -326,8 +322,9 @@ export default function KnowledgePage() {
             return (
               <div
                 className={cn(
-                  'flex flex-col items-center justify-center gap-2 rounded-xl border border-dashed border-[var(--border-strong)] bg-[var(--surface-1)] p-4 text-center py-12',
-                  !hasFilters && 'cursor-pointer transition-colors hover:border-[var(--border-strong)] hover:bg-[var(--surface-2)]',
+                  'flex flex-col items-center justify-center gap-2 rounded-xl border border-dashed border-[var(--border-strong)] bg-[var(--surface-1)] p-4 py-12 text-center',
+                  !hasFilters &&
+                    'cursor-pointer transition-colors hover:border-[var(--border-strong)] hover:bg-[var(--surface-2)]',
                 )}
                 onClick={hasFilters ? undefined : openCreate}
               >
@@ -336,9 +333,7 @@ export default function KnowledgePage() {
                 </div>
                 <div>
                   <h4 className="text-sm font-medium text-[var(--text-primary)]">
-                    {hasFilters
-                      ? t('memory.noMemoriesFiltered')
-                      : t('memory.noMemories')}
+                    {hasFilters ? t('memory.noMemoriesFiltered') : t('memory.noMemories')}
                   </h4>
                   <p className="mt-1 max-w-md text-xs text-[var(--text-tertiary)]">
                     {hasFilters
@@ -391,32 +386,34 @@ export default function KnowledgePage() {
                 </div>
 
                 {/* Actions - consistent with McpServerCard */}
-                <DropdownMenu>
-                  <DropdownMenuTrigger asChild>
-                    <Button
-                      variant="ghost"
-                      size="icon"
-                      className="h-8 w-8 text-[var(--text-muted)] opacity-0 transition-opacity hover:text-[var(--text-primary)] group-hover:opacity-100"
-                      aria-label={t('memory.moreOptions')}
-                    >
-                      <MoreHorizontal size={16} />
-                    </Button>
-                  </DropdownMenuTrigger>
-                  <DropdownMenuContent align="end">
-                    <DropdownMenuItem onClick={() => openEdit(memory)}>
-                      <Edit3 size={14} className="mr-2" />
-                      {t('memory.edit')}
-                    </DropdownMenuItem>
-                    <DropdownMenuSeparator />
-                    <DropdownMenuItem
-                      onClick={() => setDeleteConfirmMemory(memory)}
-                      className="text-[var(--status-error)] focus:text-[var(--status-error)]"
-                    >
-                      <Trash2 size={14} className="mr-2" />
-                      {t('memory.delete')}
-                    </DropdownMenuItem>
-                  </DropdownMenuContent>
-                </DropdownMenu>
+                {canEdit && (
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button
+                        variant="ghost"
+                        size="icon"
+                        className="h-8 w-8 text-[var(--text-muted)] opacity-0 transition-opacity hover:text-[var(--text-primary)] group-hover:opacity-100"
+                        aria-label={t('memory.moreOptions')}
+                      >
+                        <MoreHorizontal size={16} />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end">
+                      <DropdownMenuItem onClick={() => openEdit(memory)}>
+                        <Edit3 size={14} className="mr-2" />
+                        {t('memory.edit')}
+                      </DropdownMenuItem>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem
+                        onClick={() => setDeleteConfirmMemory(memory)}
+                        className="text-[var(--status-error)] focus:text-[var(--status-error)]"
+                      >
+                        <Trash2 size={14} className="mr-2" />
+                        {t('memory.delete')}
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                )}
               </Card>
             ))}
           </div>
@@ -444,15 +441,11 @@ export default function KnowledgePage() {
               <Brain className="h-5 w-5 text-[var(--skill-brand-600)]" />
               {t('memory.createMemory')}
             </DialogTitle>
-            <DialogDescription>
-              {t('memory.createMemoryDescription')}
-            </DialogDescription>
+            <DialogDescription>{t('memory.createMemoryDescription')}</DialogDescription>
           </DialogHeader>
           <div className="space-y-4 py-2">
             <div className="space-y-2">
-              <Label className="text-xs font-medium">
-                {t('memory.memoryContent')}
-              </Label>
+              <Label className="text-xs font-medium">{t('memory.memoryContent')}</Label>
               <Textarea
                 value={formMemory}
                 onChange={(e) => setFormMemory(e.target.value)}
@@ -462,9 +455,7 @@ export default function KnowledgePage() {
               />
             </div>
             <div className="space-y-2">
-              <Label className="text-xs font-medium">
-                {t('memory.topics')}
-              </Label>
+              <Label className="text-xs font-medium">{t('memory.topics')}</Label>
               <Input
                 value={formTopics}
                 onChange={(e) => setFormTopics(e.target.value)}
@@ -500,9 +491,7 @@ export default function KnowledgePage() {
           </DialogHeader>
           <div className="space-y-4 py-2">
             <div className="space-y-2">
-              <Label className="text-xs font-medium">
-                {t('memory.memoryContent')}
-              </Label>
+              <Label className="text-xs font-medium">{t('memory.memoryContent')}</Label>
               <Textarea
                 value={formMemory}
                 onChange={(e) => setFormMemory(e.target.value)}
@@ -511,9 +500,7 @@ export default function KnowledgePage() {
               />
             </div>
             <div className="space-y-2">
-              <Label className="text-xs font-medium">
-                {t('memory.topics')}
-              </Label>
+              <Label className="text-xs font-medium">{t('memory.topics')}</Label>
               <Input
                 value={formTopics}
                 onChange={(e) => setFormTopics(e.target.value)}
@@ -545,12 +532,8 @@ export default function KnowledgePage() {
       >
         <AlertDialogContent variant="destructive">
           <AlertDialogHeader>
-            <AlertDialogTitle>
-              {t('memory.confirmDelete')}
-            </AlertDialogTitle>
-            <AlertDialogDescription>
-              {t('memory.confirmDeleteDescription')}
-            </AlertDialogDescription>
+            <AlertDialogTitle>{t('memory.confirmDelete')}</AlertDialogTitle>
+            <AlertDialogDescription>{t('memory.confirmDeleteDescription')}</AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
diff --git a/frontend/app/openclaw/components/InstanceManager.tsx b/frontend/app/openclaw/components/InstanceManager.tsx
index ef95ed1f1..ffefa78dc 100644
--- a/frontend/app/openclaw/components/InstanceManager.tsx
+++ b/frontend/app/openclaw/components/InstanceManager.tsx
@@ -22,11 +22,14 @@ interface InstanceStatus {
 }
 
 const statusStyles: Record<string, string> = {
-  running: 'bg-[color-mix(in_srgb,var(--status-success)_15%,transparent)] text-[var(--status-success)] border-[var(--status-success-border)]',
-  starting: 'bg-[color-mix(in_srgb,var(--brand-500)_15%,transparent)] text-[var(--brand-700)] border-[var(--brand-200)]',
+  running:
+    'bg-[color-mix(in_srgb,var(--status-success)_15%,transparent)] text-[var(--status-success)] border-[var(--status-success-border)]',
+  starting:
+    'bg-[color-mix(in_srgb,var(--brand-500)_15%,transparent)] text-[var(--brand-700)] border-[var(--brand-200)]',
   pending: 'bg-[var(--text-tertiary)] text-[var(--text-secondary)] border-[var(--border)]',
   stopped: 'bg-[var(--text-tertiary)] text-[var(--text-secondary)] border-[var(--border)]',
-  failed: 'bg-[color-mix(in_srgb,var(--status-error)_15%,transparent)] text-[var(--status-error)] border-[var(--status-error-border)]',
+  failed:
+    'bg-[color-mix(in_srgb,var(--status-error)_15%,transparent)] text-[var(--status-error)] border-[var(--status-error-border)]',
 }
 
 export function InstanceManager() {
diff --git a/frontend/app/openclaw/components/OpenClawManagement.tsx b/frontend/app/openclaw/components/OpenClawManagement.tsx
index 9a866cefb..34e679569 100644
--- a/frontend/app/openclaw/components/OpenClawManagement.tsx
+++ b/frontend/app/openclaw/components/OpenClawManagement.tsx
@@ -38,6 +38,7 @@ import {
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { useToast } from '@/hooks/use-toast'
+import { getErrorMessage } from '@/lib/utils/toast'
 import { apiDelete, apiGet, apiPost } from '@/lib/api-client'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
@@ -68,11 +69,14 @@ interface DeviceResponse {
 }
 
 const instanceStatusStyles: Record<string, string> = {
-  running: 'bg-[color-mix(in_srgb,var(--status-success)_15%,transparent)] text-[var(--status-success)] border-[var(--status-success-border)]',
-  starting: 'bg-[color-mix(in_srgb,var(--brand-500)_15%,transparent)] text-[var(--brand-700)] border-[var(--brand-200)]',
+  running:
+    'bg-[color-mix(in_srgb,var(--status-success)_15%,transparent)] text-[var(--status-success)] border-[var(--status-success-border)]',
+  starting:
+    'bg-[color-mix(in_srgb,var(--brand-500)_15%,transparent)] text-[var(--brand-700)] border-[var(--brand-200)]',
   pending: 'bg-[var(--text-tertiary)] text-[var(--text-secondary)] border-[var(--border)]',
   stopped: 'bg-[var(--text-tertiary)] text-[var(--text-secondary)] border-[var(--border)]',
-  failed: 'bg-[color-mix(in_srgb,var(--status-error)_15%,transparent)] text-[var(--status-error)] border-[var(--status-error-border)]',
+  failed:
+    'bg-[color-mix(in_srgb,var(--status-error)_15%,transparent)] text-[var(--status-error)] border-[var(--status-error-border)]',
 }
 
 export function OpenClawManagement() {
@@ -109,7 +113,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -120,7 +124,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -134,7 +138,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -145,7 +149,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -156,7 +160,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -167,7 +171,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('common.operationFailed'),
+        description: getErrorMessage(err, t('common.operationFailed')),
         variant: 'destructive',
       })
     },
@@ -184,7 +188,7 @@ export function OpenClawManagement() {
     onError: (err: unknown) => {
       toast({
         title: t('common.error'),
-        description: err instanceof Error ? err.message : t('openclaw.syncSkillsFailed'),
+        description: getErrorMessage(err, t('openclaw.syncSkillsFailed')),
         variant: 'destructive',
       })
     },
@@ -339,9 +343,7 @@ export function OpenClawManagement() {
                 </AlertDialogTrigger>
                 <AlertDialogContent>
                   <AlertDialogHeader>
-                    <AlertDialogTitle>
-                      {t('openclaw.confirmDeleteInstance')}
-                    </AlertDialogTitle>
+                    <AlertDialogTitle>{t('openclaw.confirmDeleteInstance')}</AlertDialogTitle>
                     <AlertDialogDescription>
                       {t('openclaw.confirmDeleteInstanceDesc')}
                     </AlertDialogDescription>
@@ -518,7 +520,7 @@ export function OpenClawManagement() {
             </div>
           ) : pending.length === 0 && paired.length === 0 ? (
             <div className="flex flex-col items-center justify-center p-8 text-center">
-              <div className="bg-[var(--muted)] mb-3 flex h-12 w-12 items-center justify-center rounded-full">
+              <div className="mb-3 flex h-12 w-12 items-center justify-center rounded-full bg-[var(--muted)]">
                 <Smartphone className="h-5 w-5 text-[var(--text-tertiary)]" />
               </div>
               <p className="text-sm font-medium text-[var(--text-secondary)]">
@@ -533,7 +535,7 @@ export function OpenClawManagement() {
               {pending.map((d) => (
                 <li
                   key={d.deviceId}
-                  className="hover:bg-[var(--muted)] flex flex-col justify-between gap-3 p-3 transition-colors sm:flex-row sm:items-center sm:px-4"
+                  className="flex flex-col justify-between gap-3 p-3 transition-colors hover:bg-[var(--muted)] sm:flex-row sm:items-center sm:px-4"
                 >
                   <div className="flex min-w-0 items-start gap-3">
                     <div className="mt-0.5 flex h-8 w-8 shrink-0 items-center justify-center rounded-md bg-[color-mix(in_srgb,var(--status-warning)_10%,transparent)] text-[var(--status-warning)] dark:bg-[color-mix(in_srgb,var(--status-warning)_20%,transparent)] dark:text-[var(--status-warning)]">
@@ -567,7 +569,7 @@ export function OpenClawManagement() {
               {paired.map((d) => (
                 <li
                   key={d.deviceId}
-                  className="hover:bg-[var(--muted)] flex items-center justify-between p-3 transition-colors sm:px-4"
+                  className="flex items-center justify-between p-3 transition-colors hover:bg-[var(--muted)] sm:px-4"
                 >
                   <div className="flex min-w-0 items-start gap-3">
                     <div className="mt-0.5 flex h-8 w-8 shrink-0 items-center justify-center rounded-md bg-[color-mix(in_srgb,var(--status-success)_10%,transparent)] text-[var(--status-success)] dark:bg-[color-mix(in_srgb,var(--status-success)_20%,transparent)] dark:text-[var(--status-success)]">
diff --git a/frontend/app/openclaw/components/OpenClawWebUI.tsx b/frontend/app/openclaw/components/OpenClawWebUI.tsx
index c94139e5c..0f8bf9816 100644
--- a/frontend/app/openclaw/components/OpenClawWebUI.tsx
+++ b/frontend/app/openclaw/components/OpenClawWebUI.tsx
@@ -16,7 +16,11 @@ interface InstanceStatus {
 
 function getApiBaseUrl(): string {
   const url = runtimeEnv('NEXT_PUBLIC_API_URL') || process.env.NEXT_PUBLIC_API_URL
-  return url?.replace(/\/api\/?$/, '') || process.env.NEXT_PUBLIC_API_URL?.replace(/\/api\/?$/, '') || 'http://localhost:8000'
+  return (
+    url?.replace(/\/api\/?$/, '') ||
+    process.env.NEXT_PUBLIC_API_URL?.replace(/\/api\/?$/, '') ||
+    'http://localhost:8000'
+  )
 }
 
 export function OpenClawWebUI() {
@@ -57,7 +61,8 @@ export function OpenClawWebUI() {
           {instance?.exists ? 'OpenClaw instance not running' : 'No OpenClaw instance created'}
         </h3>
         <p className="mb-8 max-w-md text-center leading-relaxed text-[var(--text-secondary)]">
-          You need to start an OpenClaw instance first to use the native Web UI for interacting with the Agent and managing devices.
+          You need to start an OpenClaw instance first to use the native Web UI for interacting with
+          the Agent and managing devices.
           <br />
           <span className="mt-2 block text-sm text-[var(--status-warning)]">
             Note: Instance startup takes about 4 minutes. Please be patient.
diff --git a/frontend/app/openclaw/components/Sidebar.tsx b/frontend/app/openclaw/components/Sidebar.tsx
index 11dd2d643..dbc9a39bd 100644
--- a/frontend/app/openclaw/components/Sidebar.tsx
+++ b/frontend/app/openclaw/components/Sidebar.tsx
@@ -3,7 +3,6 @@
 import { PanelLeft } from 'lucide-react'
 import { useCallback, useRef } from 'react'
 
-
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
@@ -58,7 +57,9 @@ export function Sidebar() {
       <div
         className="fixed top-[14px] z-10 rounded-lg border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 transition-all duration-300"
         style={{
-          left: isAppSidebarCollapsed ? 'calc(var(--sidebar-width-collapsed) + 14px)' : 'calc(var(--sidebar-width) + 14px)',
+          left: isAppSidebarCollapsed
+            ? 'calc(var(--sidebar-width-collapsed) + 14px)'
+            : 'calc(var(--sidebar-width) + 14px)',
         }}
       >
         <div className="flex items-center gap-1.5">
@@ -97,7 +98,11 @@ export function Sidebar() {
         isCollapsed ? 'pointer-events-none z-0' : 'z-10',
       )}
       style={{
-        left: isCollapsed ? '-1000px' : isAppSidebarCollapsed ? 'var(--sidebar-width-collapsed)' : 'var(--sidebar-width)',
+        left: isCollapsed
+          ? '-1000px'
+          : isAppSidebarCollapsed
+            ? 'var(--sidebar-width-collapsed)'
+            : 'var(--sidebar-width)',
         width: isCollapsed ? '0px' : `${sidebarWidth}px`,
         opacity: isCollapsed ? 0 : 1,
         visibility: isCollapsed ? 'hidden' : 'visible',
@@ -145,7 +150,7 @@ export function Sidebar() {
 
       {/* Resize Handle */}
       <div
-        className="hover:bg-[var(--brand-500)] absolute inset-y-0 right-0 w-[4px] cursor-col-resize transition-colors active:bg-[var(--brand-500)]"
+        className="absolute inset-y-0 right-0 w-[4px] cursor-col-resize transition-colors hover:bg-[var(--brand-500)] active:bg-[var(--brand-500)]"
         onMouseDown={handleMouseDown}
       />
     </aside>
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
index c9791cef8..dc31332eb 100644
--- a/frontend/app/page.tsx
+++ b/frontend/app/page.tsx
@@ -5,11 +5,6 @@ import { useEffect } from 'react'
 
 import { useSession } from '@/lib/auth/auth-client'
 
-/**
- * Root page - redirects based on auth status
- * Logged in -> /chat
- * Not logged in -> /signin
- */
 export default function Page() {
   const router = useRouter()
   const session = useSession()
@@ -17,7 +12,7 @@ export default function Page() {
   useEffect(() => {
     if (!session.isPending) {
       if (session.data?.user) {
-        router.replace('/chat')
+        router.replace('/dashboard')
       } else {
         router.replace('/signin')
       }
diff --git a/frontend/app/runs/[runId]/page.tsx b/frontend/app/runs/[runId]/page.tsx
deleted file mode 100644
index 19def1c83..000000000
--- a/frontend/app/runs/[runId]/page.tsx
+++ /dev/null
@@ -1,613 +0,0 @@
-'use client'
-
-import {
-  Activity,
-  ArrowLeft,
-  Bot,
-  Clock3,
-  Loader2,
-  Sparkles,
-  Square,
-} from 'lucide-react'
-import Link from 'next/link'
-import { useParams } from 'next/navigation'
-import { useEffect, useMemo, useRef, useState } from 'react'
-
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card } from '@/components/ui/card'
-import { ScrollArea } from '@/components/ui/scroll-area'
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-import { useCancelRun } from '@/hooks/queries/runs'
-import { useTranslation } from '@/lib/i18n'
-import { ACTIVE_RUN_STATUSES, buildRunHref, formatRunStatus } from '@/lib/utils/runHelpers'
-import { getRunWsClient } from '@/lib/ws/runs/runWsClient'
-import type { RunEventFrame, RunSnapshotFrame, RunStatusFrame } from '@/lib/ws/runs/types'
-import type { RunEvent, RunSnapshot, RunSummary } from '@/services/runService'
-import { runService } from '@/services/runService'
-
-function formatDateTime(value?: string | null): string {
-  if (!value) return '-'
-  return new Date(value).toLocaleString()
-}
-
-function buildPrimaryHref(run: RunSummary): string | null {
-  const href = buildRunHref(run)
-  return href === '#' ? null : href
-}
-
-function renderEventPayload(payload: Record<string, unknown>): string {
-  try {
-    return JSON.stringify(payload, null, 2)
-  } catch {
-    return String(payload)
-  }
-}
-
-interface CopilotTurnProjection {
-  run_type: string
-  status: string
-  stage?: string | null
-  content?: string
-  thought_steps?: Array<{ index: number; content: string }>
-  tool_calls?: Array<{ tool: string; input?: Record<string, unknown> }>
-  tool_results?: Array<{ type: string; payload: Record<string, unknown>; reasoning?: string }>
-  result_message?: string | null
-  result_actions?: Array<{ type: string; payload: Record<string, unknown>; reasoning?: string }>
-  error?: string | null
-  graph_id?: string | null
-  mode?: string | null
-}
-
-interface ChatTurnProjection {
-  run_type: 'chat_turn'
-  user_message?: { content: string }
-  assistant_message?: {
-    content: string
-    tool_calls?: Array<{ id?: string; name: string; status: string; args?: Record<string, unknown>; result?: string }>
-  }
-  file_tree?: Record<string, { action: string; size?: number; timestamp?: number }>
-  preview_data?: Record<string, unknown>
-  node_execution_log?: Array<{ status: string; node_name: string }>
-}
-
-function ChatTurnOverview({ projection: p, t }: { projection: Record<string, unknown>; t: (key: string) => string }) {
-  const projection = p as unknown as ChatTurnProjection
-  return (
-    <div className="space-y-4">
-      {projection.user_message && (
-        <Card className="p-4">
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">{t('runs.chat.userMessage')}</h4>
-          <p className="text-sm whitespace-pre-wrap">{projection.user_message.content}</p>
-        </Card>
-      )}
-
-      {projection.assistant_message && (
-        <Card className="p-4">
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">{t('runs.chat.assistantResponse')}</h4>
-          <p className="text-sm whitespace-pre-wrap">{projection.assistant_message.content}</p>
-
-          {projection.assistant_message.tool_calls && projection.assistant_message.tool_calls.length > 0 && (
-            <div className="mt-3 space-y-2">
-              <h5 className="text-xs font-medium text-muted-foreground">{t('runs.chat.toolCalls')}</h5>
-              {projection.assistant_message.tool_calls.map((tool, i) => (
-                <details key={tool.id || i} className="text-xs border rounded p-2">
-                  <summary className="cursor-pointer font-medium">
-                    {tool.name} — {tool.status}
-                  </summary>
-                  {tool.args && (
-                    <pre className="mt-1 text-muted-foreground overflow-x-auto">
-                      {JSON.stringify(tool.args, null, 2)}
-                    </pre>
-                  )}
-                  {tool.result && (
-                    <pre className="mt-1 text-muted-foreground overflow-x-auto">
-                      {JSON.stringify(tool.result, null, 2)}
-                    </pre>
-                  )}
-                </details>
-              ))}
-            </div>
-          )}
-        </Card>
-      )}
-
-      {projection.file_tree && Object.keys(projection.file_tree).length > 0 && (
-        <Card className="p-4">
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">{t('runs.chat.files')}</h4>
-          <ul className="text-xs space-y-1">
-            {Object.entries(projection.file_tree).map(([path, info]) => (
-              <li key={path} className="flex items-center gap-2">
-                <Badge variant="outline" className="text-xs">{info.action}</Badge>
-                <span className="font-mono truncate">{path}</span>
-              </li>
-            ))}
-          </ul>
-        </Card>
-      )}
-
-      {projection.preview_data && (
-        <Card className="p-4">
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">{t('runs.chat.preview')}</h4>
-          <pre className="text-xs overflow-x-auto">
-            {JSON.stringify(projection.preview_data, null, 2)}
-          </pre>
-        </Card>
-      )}
-
-      {projection.node_execution_log && projection.node_execution_log.length > 0 && (
-        <Card className="p-4">
-          <h4 className="text-sm font-medium text-muted-foreground mb-2">{t('runs.chat.executionLog')}</h4>
-          <ul className="text-xs space-y-1">
-            {projection.node_execution_log.map((entry, i) => (
-              <li key={i} className="flex items-center gap-2">
-                <Badge variant={entry.status === 'completed' ? 'default' : 'secondary'} className="text-xs">
-                  {entry.status}
-                </Badge>
-                <span className="font-mono">{entry.node_name}</span>
-              </li>
-            ))}
-          </ul>
-        </Card>
-      )}
-    </div>
-  )
-}
-
-function CopilotTurnOverview({ projection, t }: { projection: CopilotTurnProjection; t: (key: string) => string }) {
-
-  return (
-    <div className="space-y-4">
-      {/* Stage indicator */}
-      {projection.stage && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.stage')}</p>
-          <p className="text-sm text-muted-foreground">{projection.stage}</p>
-        </div>
-      )}
-
-      {/* Mode */}
-      {projection.mode && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.mode')}</p>
-          <p className="text-sm text-muted-foreground">{projection.mode}</p>
-        </div>
-      )}
-
-      {/* Content */}
-      {projection.content && (
-        <div className="rounded-md border p-3">
-          <p className="text-sm font-medium">{t('runs.content')}</p>
-          <p className="mt-1 whitespace-pre-wrap text-sm">{projection.content}</p>
-        </div>
-      )}
-
-      {/* Thought Steps (collapsible) */}
-      {projection.thought_steps && projection.thought_steps.length > 0 && (
-        <details className="rounded-md border p-3">
-          <summary className="cursor-pointer text-sm font-medium">
-            {t('runs.thoughtSteps')} ({projection.thought_steps.length})
-          </summary>
-          <div className="mt-2 space-y-2">
-            {projection.thought_steps.map((step, i) => (
-              <div key={i} className="text-sm text-muted-foreground">
-                <span className="font-mono text-xs">#{step.index}</span> {step.content}
-              </div>
-            ))}
-          </div>
-        </details>
-      )}
-
-      {/* Tool Calls (collapsible) */}
-      {projection.tool_calls && projection.tool_calls.length > 0 && (
-        <details className="rounded-md border p-3">
-          <summary className="cursor-pointer text-sm font-medium">
-            {t('runs.toolCalls')} ({projection.tool_calls.length})
-          </summary>
-          <div className="mt-2 space-y-2">
-            {projection.tool_calls.map((tc, i) => (
-              <div key={i} className="text-sm">
-                <span className="font-medium">{tc.tool}</span>
-                {tc.input && (
-                  <pre className="mt-1 overflow-x-auto text-xs text-muted-foreground">
-                    {JSON.stringify(tc.input, null, 2)}
-                  </pre>
-                )}
-              </div>
-            ))}
-          </div>
-        </details>
-      )}
-
-      {/* Result */}
-      {projection.result_message && (
-        <div className="rounded-md border border-[var(--status-success-border)] bg-[var(--status-success-bg)] p-3">
-          <p className="text-sm font-medium">{t('runs.result')}</p>
-          <p className="mt-1 whitespace-pre-wrap text-sm">{projection.result_message}</p>
-          {projection.result_actions && projection.result_actions.length > 0 && (
-            <div className="mt-2">
-              <p className="text-xs font-medium text-muted-foreground">
-                {projection.result_actions.length} action(s)
-              </p>
-              {projection.result_actions.map((action, i) => (
-                <div key={i} className="mt-1 text-xs text-muted-foreground">
-                  {action.type}{action.reasoning ? ` — ${action.reasoning}` : ''}
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-      )}
-
-      {/* Error */}
-      {projection.error && (
-        <div className="rounded-md border border-[var(--status-error-border)] bg-[var(--status-error-bg)] p-3">
-          <p className="text-sm font-medium text-[var(--status-error)]">{t('runs.error')}</p>
-          <p className="mt-1 text-sm text-[var(--status-error)]">{projection.error}</p>
-        </div>
-      )}
-    </div>
-  )
-}
-
-export default function RunDetailPage() {
-  const params = useParams<{ runId: string }>()
-  const runId = String(params?.runId || '')
-  const { t } = useTranslation()
-  const cancelRunMutation = useCancelRun()
-  const runWsClientRef = useRef(getRunWsClient())
-
-  const [run, setRun] = useState<RunSummary | null>(null)
-  const [snapshot, setSnapshot] = useState<RunSnapshot | null>(null)
-  const [events, setEvents] = useState<RunEvent[]>([])
-  const [isLoading, setIsLoading] = useState(true)
-  const [loadError, setLoadError] = useState<string | null>(null)
-  const [subscriptionAfterSeq, setSubscriptionAfterSeq] = useState<number | null>(null)
-
-  useEffect(() => {
-    if (!runId) return
-
-    let cancelled = false
-    setIsLoading(true)
-    setLoadError(null)
-    setSubscriptionAfterSeq(null)
-
-    void Promise.all([
-      runService.getRun(runId),
-      runService.getRunSnapshot(runId),
-      runService.getRunEvents(runId, { afterSeq: 0, limit: 500 }),
-    ])
-      .then(([runData, snapshotData, eventsData]) => {
-        if (cancelled) return
-        setRun(runData)
-        setSnapshot(snapshotData)
-        setEvents(eventsData.events)
-        setSubscriptionAfterSeq(
-          Math.max(runData.last_seq, snapshotData.last_seq, eventsData.next_after_seq),
-        )
-      })
-      .catch((error) => {
-        if (cancelled) return
-        setLoadError(error instanceof Error ? error.message : 'Failed to load run details')
-      })
-      .finally(() => {
-        if (!cancelled) {
-          setIsLoading(false)
-        }
-      })
-
-    return () => {
-      cancelled = true
-    }
-  }, [runId])
-
-  useEffect(() => {
-    if (!runId || subscriptionAfterSeq === null) {
-      return
-    }
-
-    void runWsClientRef.current.subscribe(runId, subscriptionAfterSeq, {
-      onSnapshot: (frame: RunSnapshotFrame) => {
-        setSnapshot((current) => ({
-          run_id: frame.run_id,
-          status: typeof frame.data?.status === 'string' ? frame.data.status : current?.status || 'running',
-          last_seq: frame.last_seq,
-          projection: frame.data,
-        }))
-        setRun((current) =>
-          current
-            ? {
-                ...current,
-                status: typeof frame.data?.status === 'string' ? frame.data.status : current.status,
-                last_seq: frame.last_seq,
-                thread_id:
-                  typeof frame.data?.thread_id === 'string' ? frame.data.thread_id : current.thread_id,
-              }
-            : current,
-        )
-      },
-      onEvent: (frame: RunEventFrame) => {
-        setEvents((current) => {
-          if (current.some((item) => item.seq === frame.seq)) {
-            return current
-          }
-          return [
-            ...current,
-            {
-              seq: frame.seq,
-              event_type: frame.event_type,
-              payload: frame.data,
-              trace_id: frame.trace_id,
-              observation_id: frame.observation_id,
-              parent_observation_id: frame.parent_observation_id,
-              created_at: frame.created_at || new Date().toISOString(),
-            },
-          ].sort((left, right) => left.seq - right.seq)
-        })
-        setRun((current) =>
-          current
-            ? {
-                ...current,
-                last_seq: Math.max(current.last_seq, frame.seq),
-                updated_at: frame.created_at || new Date().toISOString(),
-                error_message:
-                  frame.event_type === 'error' && typeof frame.data?.message === 'string'
-                    ? frame.data.message
-                    : current.error_message,
-              }
-            : current,
-        )
-      },
-      onStatus: (frame: RunStatusFrame) => {
-        setRun((current) =>
-          current
-            ? {
-                ...current,
-                status: frame.status,
-                error_code: frame.error_code ?? current.error_code,
-                error_message: frame.error_message ?? current.error_message,
-                updated_at: new Date().toISOString(),
-              }
-            : current,
-        )
-        setSnapshot((current) =>
-          current
-            ? {
-                ...current,
-                status: frame.status,
-              }
-            : current,
-        )
-      },
-      onError: (message) => {
-        setLoadError(message)
-      },
-    })
-
-    return () => {
-      runWsClientRef.current.unsubscribe(runId)
-    }
-  }, [runId, subscriptionAfterSeq])
-
-  const primaryHref = useMemo(() => (run ? buildPrimaryHref(run) : null), [run])
-  const isActive = run ? ACTIVE_RUN_STATUSES.has(run.status) : false
-
-  return (
-    <div className="flex h-full flex-col bg-[var(--bg)]">
-      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
-        <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-          <div>
-            <div className="flex items-center gap-2">
-              <Button asChild variant="ghost" size="sm" className="px-2">
-                <Link href="/runs" aria-label={t('runs.backToList')}>
-                  <ArrowLeft className="h-4 w-4" />
-                </Link>
-              </Button>
-              <Activity className="h-5 w-5 text-[var(--skill-brand-600)]" />
-              <h1 className="text-lg font-semibold text-[var(--text-primary)]">
-                {run?.title || t('runs.detailTitle')}
-              </h1>
-            </div>
-            <p className="mt-1 text-sm text-[var(--text-muted)]">
-              {runId}
-            </p>
-          </div>
-
-          {run && (
-            <div className="flex items-center gap-2">
-              {primaryHref && (
-                <Button asChild variant="outline" size="sm">
-                  <Link href={primaryHref}>{t('runs.open')}</Link>
-                </Button>
-              )}
-              {isActive && (
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={() => cancelRunMutation.mutate(run.run_id)}
-                  disabled={cancelRunMutation.isPending}
-                  className="gap-1.5"
-                >
-                  {cancelRunMutation.isPending ? (
-                    <Loader2 className="h-4 w-4 animate-spin" />
-                  ) : (
-                    <Square className="h-3.5 w-3.5" />
-                  )}
-                  {t('runs.cancel')}
-                </Button>
-              )}
-            </div>
-          )}
-        </div>
-      </div>
-
-      <div className="flex-1 overflow-y-auto px-6 py-6">
-        {isLoading ? (
-          <div className="flex items-center gap-2 text-sm text-[var(--text-muted)]">
-            <Loader2 className="h-4 w-4 animate-spin" />
-            {t('runs.loading')}
-          </div>
-        ) : loadError ? (
-          <Card className="border-[var(--status-error-border)] bg-[var(--status-error-bg)] p-6 text-sm text-[var(--status-error)]">
-            {loadError}
-          </Card>
-        ) : !run ? (
-          <Card className="border-dashed border-[var(--border)] bg-[var(--surface-1)] p-8 text-center text-sm text-[var(--text-muted)]">
-            {t('runs.emptyDescription')}
-          </Card>
-        ) : (
-          <div className="space-y-6">
-            <div className="grid gap-4 lg:grid-cols-4">
-              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-                <div className="mb-2 flex items-center gap-2">
-                  <Bot className="h-4 w-4 text-[var(--skill-brand-600)]" />
-                  <span className="text-sm font-medium text-[var(--text-secondary)]">
-                    {t('runs.statusLabel')}
-                  </span>
-                </div>
-                <Badge
-                  variant="outline"
-                  className="border-[var(--skill-brand-200)] bg-[var(--skill-brand-50)] text-[var(--skill-brand-700)]"
-                >
-                  {formatRunStatus(run.status, t)}
-                </Badge>
-              </Card>
-
-              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-                <div className="mb-2 flex items-center gap-2">
-                  <Clock3 className="h-4 w-4 text-[var(--skill-brand-600)]" />
-                  <span className="text-sm font-medium text-[var(--text-secondary)]">
-                    {t('runs.startedAt')}
-                  </span>
-                </div>
-                <div className="text-sm text-[var(--text-primary)]">{formatDateTime(run.started_at)}</div>
-              </Card>
-
-              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-                <div className="mb-2 flex items-center gap-2">
-                  <Sparkles className="h-4 w-4 text-[var(--skill-brand-600)]" />
-                  <span className="text-sm font-medium text-[var(--text-secondary)]">
-                    {t('runs.lastSeq')}
-                  </span>
-                </div>
-                <div className="text-sm text-[var(--text-primary)]">{run.last_seq}</div>
-              </Card>
-
-              <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-                <div className="mb-2 flex items-center gap-2">
-                  <Activity className="h-4 w-4 text-[var(--skill-brand-600)]" />
-                  <span className="text-sm font-medium text-[var(--text-secondary)]">
-                    {t('runs.typeLabel')}
-                  </span>
-                </div>
-                <div className="text-sm text-[var(--text-primary)]">{run.run_type}</div>
-              </Card>
-            </div>
-
-            <Tabs defaultValue="events" className="flex flex-col gap-4">
-              <TabsList className="w-fit">
-                <TabsTrigger value="events">{t('runs.eventsTab')}</TabsTrigger>
-                <TabsTrigger value="snapshot">{t('runs.snapshotTab')}</TabsTrigger>
-                <TabsTrigger value="overview">{t('runs.overviewTab')}</TabsTrigger>
-              </TabsList>
-
-              <TabsContent value="events" className="mt-0">
-                <Card className="border-[var(--border)] bg-[var(--surface-1)]">
-                  <ScrollArea className="h-[520px] max-h-[60vh]">
-                    <div className="space-y-3 p-4">
-                      {events.length === 0 ? (
-                        <div className="rounded-lg border border-dashed border-[var(--border)] bg-[var(--surface-2)] p-6 text-sm text-[var(--text-muted)]">
-                          {t('runs.noEvents')}
-                        </div>
-                      ) : (
-                        events.map((event) => (
-                          <div
-                            key={event.seq}
-                            className="rounded-lg border border-[var(--border)] bg-[var(--surface-2)] p-3"
-                          >
-                            <div className="mb-2 flex flex-wrap items-center gap-2">
-                              <Badge variant="outline">#{event.seq}</Badge>
-                              <Badge variant="outline" className="text-xs">
-                                {event.event_type}
-                              </Badge>
-                              <span className="text-xs text-[var(--text-muted)]">
-                                {formatDateTime(event.created_at)}
-                              </span>
-                            </div>
-                            <pre className="overflow-x-auto whitespace-pre-wrap break-words text-xs text-[var(--text-secondary)]">
-                              {renderEventPayload(event.payload)}
-                            </pre>
-                          </div>
-                        ))
-                      )}
-                    </div>
-                  </ScrollArea>
-                </Card>
-              </TabsContent>
-
-              <TabsContent value="snapshot" className="mt-0">
-                <Card className="border-[var(--border)] bg-[var(--surface-1)]">
-                  <ScrollArea className="h-[520px] max-h-[60vh]">
-                    <pre className="p-4 text-xs text-[var(--text-secondary)]">
-                      {JSON.stringify(snapshot?.projection || {}, null, 2)}
-                    </pre>
-                  </ScrollArea>
-                </Card>
-              </TabsContent>
-
-              <TabsContent value="overview" className="mt-0">
-                <div className="space-y-4">
-                  <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-                    <dl className="grid gap-4 lg:grid-cols-2">
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">Run ID</dt>
-                        <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">{run.run_id}</dd>
-                      </div>
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">{t('runs.typeLabel')}</dt>
-                        <dd className="mt-1 text-sm text-[var(--text-primary)]">{run.run_type}</dd>
-                      </div>
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">{t('runs.startedAt')}</dt>
-                        <dd className="mt-1 text-sm text-[var(--text-primary)]">{formatDateTime(run.started_at)}</dd>
-                      </div>
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">{t('runs.finishedAt')}</dt>
-                        <dd className="mt-1 text-sm text-[var(--text-primary)]">{formatDateTime(run.finished_at)}</dd>
-                      </div>
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">{t('runs.lastHeartbeat')}</dt>
-                        <dd className="mt-1 text-sm text-[var(--text-primary)]">
-                          {formatDateTime(run.last_heartbeat_at)}
-                        </dd>
-                      </div>
-                      <div>
-                        <dt className="text-xs text-[var(--text-muted)]">Thread ID</dt>
-                        <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">{run.thread_id || '-'}</dd>
-                      </div>
-                      <div className="lg:col-span-2">
-                        <dt className="text-xs text-[var(--text-muted)]">Graph ID</dt>
-                        <dd className="mt-1 break-all text-sm text-[var(--text-primary)]">{run.graph_id || '-'}</dd>
-                      </div>
-                      <div className="lg:col-span-2">
-                        <dt className="text-xs text-[var(--text-muted)]">{t('runs.errorLabel')}</dt>
-                        <dd className="mt-1 text-sm text-[var(--text-primary)]">{run.error_message || '-'}</dd>
-                      </div>
-                    </dl>
-                  </Card>
-
-                  {snapshot?.projection && (snapshot.projection as Record<string, unknown>).run_type === 'chat_turn' && (
-                    <ChatTurnOverview projection={snapshot.projection as Record<string, unknown>} t={t} />
-                  )}
-                  {snapshot?.projection && (snapshot.projection as Record<string, unknown>).run_type === 'copilot_turn' && (
-                    <CopilotTurnOverview projection={snapshot.projection as unknown as CopilotTurnProjection} t={t} />
-                  )}
-                </div>
-              </TabsContent>
-            </Tabs>
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/runs/page.tsx b/frontend/app/runs/page.tsx
deleted file mode 100644
index 96837d604..000000000
--- a/frontend/app/runs/page.tsx
+++ /dev/null
@@ -1,329 +0,0 @@
-'use client'
-
-import { Activity, Bot, Clock3, Loader2, Search, Sparkles, Square } from 'lucide-react'
-import Link from 'next/link'
-import { useRouter, useSearchParams } from 'next/navigation'
-import { useEffect, useMemo, useRef, useState } from 'react'
-
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card } from '@/components/ui/card'
-import { Input } from '@/components/ui/input'
-import { useAgents, useCancelRun, useRuns } from '@/hooks/queries/runs'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import {
-  ACTIVE_RUN_STATUSES,
-  applyRunEvent,
-  applyRunSnapshot,
-  applyRunStatus,
-  buildRunHref,
-  formatRelativeTime,
-  formatRunStatus,
-} from '@/lib/utils/runHelpers'
-import { getRunWsClient } from '@/lib/ws/runs/runWsClient'
-import type { RunEventFrame, RunSnapshotFrame, RunStatusFrame } from '@/lib/ws/runs/types'
-import type { RunSummary } from '@/services/runService'
-
-function RunRow({
-  run,
-  onCancel,
-  isCancelling,
-}: {
-  run: RunSummary
-  onCancel: (runId: string) => void
-  isCancelling: boolean
-}) {
-  const { t } = useTranslation()
-  const href = buildRunHref(run)
-  const resumable = href !== '#'
-  const isActive = ACTIVE_RUN_STATUSES.has(run.status)
-
-  return (
-    <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-      <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-        <div className="min-w-0 flex-1">
-          <div className="mb-2 flex flex-wrap items-center gap-2">
-            <div className="flex h-8 w-8 items-center justify-center rounded-lg bg-[var(--skill-brand-50)] text-[var(--skill-brand-600)]">
-              <Bot className="h-4 w-4" />
-            </div>
-            <span className="truncate text-sm font-semibold text-[var(--text-primary)]">
-              {run.title || t('runs.untitled')}
-            </span>
-            <Badge
-              variant="outline"
-              className={cn(
-                'text-xs',
-                isActive
-                  ? 'border-[var(--skill-brand-200)] bg-[var(--skill-brand-50)] text-[var(--skill-brand-700)]'
-                  : 'border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-secondary)]',
-              )}
-            >
-              {formatRunStatus(run.status, t)}
-            </Badge>
-            <Badge
-              variant="outline"
-              className="border-[var(--border)] bg-[var(--surface-2)] text-xs text-[var(--text-secondary)]"
-            >
-              {run.agent_display_name || run.agent_name}
-            </Badge>
-          </div>
-
-          <div className="flex flex-wrap items-center gap-4 text-xs text-[var(--text-muted)]">
-            <span className="flex items-center gap-1">
-              <Clock3 className="h-3.5 w-3.5" />
-              {t('runs.startedAt')} {formatRelativeTime(run.started_at, t)}
-            </span>
-            <span className="flex items-center gap-1">
-              <Sparkles className="h-3.5 w-3.5" />
-              seq {run.last_seq}
-            </span>
-            {run.last_heartbeat_at && (
-              <span className="flex items-center gap-1">
-                <Activity className="h-3.5 w-3.5" />
-                {t('runs.lastHeartbeat')} {formatRelativeTime(run.last_heartbeat_at, t)}
-              </span>
-            )}
-            {run.error_message && (
-              <span className="truncate text-[var(--text-error)]">{run.error_message}</span>
-            )}
-          </div>
-        </div>
-
-        <div className="flex items-center gap-2">
-          <Button asChild variant="outline" size="sm">
-            <Link href={`/runs/${encodeURIComponent(run.run_id)}`}>{t('runs.details')}</Link>
-          </Button>
-          {resumable && (
-            <Button asChild variant="outline" size="sm">
-              <Link href={href}>{t('runs.open')}</Link>
-            </Button>
-          )}
-          {isActive && (
-            <Button
-              variant="outline"
-              size="sm"
-              onClick={() => onCancel(run.run_id)}
-              disabled={isCancelling}
-              className="gap-1.5"
-            >
-              {isCancelling ? <Loader2 className="h-4 w-4 animate-spin" /> : <Square className="h-3.5 w-3.5" />}
-              {t('runs.cancel')}
-            </Button>
-          )}
-        </div>
-      </div>
-    </Card>
-  )
-}
-
-export default function RunsPage() {
-  const { t } = useTranslation()
-  const router = useRouter()
-  const searchParams = useSearchParams()
-  const selectedAgent = searchParams.get('agent') || 'all'
-  const statusFilter = searchParams.get('status') || 'all'
-  const querySearch = searchParams.get('q') || ''
-  const [searchInput, setSearchInput] = useState(querySearch)
-  const { data: agentData } = useAgents()
-  const { data, isLoading } = useRuns({
-    agentName: selectedAgent !== 'all' ? selectedAgent : undefined,
-    status: statusFilter !== 'all' ? statusFilter : undefined,
-    search: querySearch || undefined,
-    limit: 100,
-  })
-  const cancelRunMutation = useCancelRun()
-  const runWsClientRef = useRef(getRunWsClient())
-  const [liveRuns, setLiveRuns] = useState<RunSummary[]>([])
-  const statusOptions = ['all', 'queued', 'running', 'interrupt_wait', 'completed', 'failed', 'cancelled']
-
-  useEffect(() => {
-    setSearchInput(querySearch)
-  }, [querySearch])
-
-  useEffect(() => {
-    const handle = window.setTimeout(() => {
-      if (searchInput === querySearch) {
-        return
-      }
-      const nextParams = new URLSearchParams(searchParams.toString())
-      if (searchInput.trim()) {
-        nextParams.set('q', searchInput.trim())
-      } else {
-        nextParams.delete('q')
-      }
-      const nextQuery = nextParams.toString()
-      router.replace(nextQuery ? `/runs?${nextQuery}` : '/runs')
-    }, 250)
-    return () => window.clearTimeout(handle)
-  }, [querySearch, router, searchInput, searchParams])
-
-  function updateFilter(key: 'agent' | 'status', value: string) {
-    const nextParams = new URLSearchParams(searchParams.toString())
-    if (value === 'all') {
-      nextParams.delete(key)
-    } else {
-      nextParams.set(key, value)
-    }
-    const nextQuery = nextParams.toString()
-    router.replace(nextQuery ? `/runs?${nextQuery}` : '/runs')
-  }
-
-  const runIds = useMemo(() => (data?.items || []).map((r) => r.run_id).join(','), [data?.items])
-  useEffect(() => {
-    const incoming = data?.items || []
-    setLiveRuns((current) => {
-      const currentMap = new Map(current.map((run) => [run.run_id, run]))
-      return incoming.map((run) => {
-        const existing = currentMap.get(run.run_id)
-        if (!existing) {
-          return run
-        }
-        const wsIsFresher = existing.last_seq > run.last_seq
-        return {
-          ...run,
-          status: wsIsFresher ? existing.status : run.status,
-          last_seq: Math.max(existing.last_seq, run.last_seq),
-          error_code: wsIsFresher ? (existing.error_code ?? run.error_code) : run.error_code,
-          error_message: wsIsFresher ? (existing.error_message ?? run.error_message) : run.error_message,
-          updated_at:
-            new Date(existing.updated_at).getTime() > new Date(run.updated_at).getTime()
-              ? existing.updated_at
-              : run.updated_at,
-        }
-      })
-    })
-  }, [data?.items])
-
-  useEffect(() => {
-    const targets = data?.items || []
-    if (!targets.length) {
-      return
-    }
-
-    targets.forEach((run) => {
-      void runWsClientRef.current.subscribe(run.run_id, run.last_seq, {
-        onSnapshot: (frame) => {
-          setLiveRuns((current) =>
-            current.map((item) => (item.run_id === frame.run_id ? applyRunSnapshot(item, frame) : item)),
-          )
-        },
-        onEvent: (frame) => {
-          setLiveRuns((current) =>
-            current.map((item) => (item.run_id === frame.run_id ? applyRunEvent(item, frame) : item)),
-          )
-        },
-        onStatus: (frame) => {
-          setLiveRuns((current) =>
-            current.map((item) => (item.run_id === frame.run_id ? applyRunStatus(item, frame) : item)),
-          )
-        },
-      })
-    })
-
-    return () => {
-      targets.forEach((run) => {
-        runWsClientRef.current.unsubscribe(run.run_id)
-      })
-    }
-  }, [runIds])
-
-  const runs = useMemo(() => liveRuns, [liveRuns])
-
-  return (
-    <div className="flex h-full flex-col bg-[var(--bg)]">
-      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
-        <div className="flex flex-col gap-4 lg:flex-row lg:items-center lg:justify-between">
-          <div>
-            <div className="flex items-center gap-2">
-              <Activity className="h-5 w-5 text-[var(--skill-brand-600)]" />
-              <h1 className="text-lg font-semibold text-[var(--text-primary)]">
-                {t('runs.title')}
-              </h1>
-            </div>
-            <p className="mt-1 text-sm text-[var(--text-muted)]">
-              {t('runs.description')}
-            </p>
-          </div>
-
-          <div className="w-full max-w-xl">
-            <div className="relative">
-              <Search className="pointer-events-none absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-[var(--text-muted)]" />
-              <Input
-                value={searchInput}
-                onChange={(event) => setSearchInput(event.target.value)}
-                placeholder={t('runs.searchPlaceholder')}
-                className="pl-9"
-              />
-            </div>
-          </div>
-        </div>
-        <div className="mt-4 flex flex-col gap-3">
-          <div className="flex flex-wrap items-center gap-2">
-            <Button
-              variant={selectedAgent === 'all' ? 'default' : 'outline'}
-              size="sm"
-              onClick={() => updateFilter('agent', 'all')}
-            >
-              {t('runs.filterAllAgents')}
-            </Button>
-            {(agentData?.items || []).map((agent) => (
-              <Button
-                key={agent.agent_name}
-                variant={selectedAgent === agent.agent_name ? 'default' : 'outline'}
-                size="sm"
-                onClick={() => updateFilter('agent', agent.agent_name)}
-              >
-                {agent.display_name}
-              </Button>
-            ))}
-          </div>
-          <div className="flex flex-wrap items-center gap-2">
-            {statusOptions.map((status) => (
-              <Button
-                key={status}
-                variant={statusFilter === status ? 'default' : 'outline'}
-                size="sm"
-                onClick={() => updateFilter('status', status)}
-              >
-                {status === 'all' ? t('runs.filterAll') : formatRunStatus(status, t)}
-              </Button>
-            ))}
-          </div>
-        </div>
-      </div>
-
-      <div className="flex-1 overflow-y-auto px-6 py-6">
-        {isLoading ? (
-          <div className="flex items-center gap-2 text-sm text-[var(--text-muted)]">
-            <Loader2 className="h-4 w-4 animate-spin" />
-            {t('runs.loading')}
-          </div>
-        ) : runs.length === 0 ? (
-          <Card className="border-dashed border-[var(--border)] bg-[var(--surface-1)] p-8 text-center">
-            <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-2xl bg-[var(--surface-3)] text-[var(--text-muted)]">
-              <Activity className="h-5 w-5" />
-            </div>
-            <h2 className="mt-4 text-sm font-semibold text-[var(--text-primary)]">
-              {t('runs.emptyTitle')}
-            </h2>
-            <p className="mt-1 text-sm text-[var(--text-muted)]">
-              {t('runs.emptyDescription')}
-            </p>
-          </Card>
-        ) : (
-          <div className="space-y-3">
-            {runs.map((run) => (
-              <RunRow
-                key={run.run_id}
-                run={run}
-                onCancel={(runId) => cancelRunMutation.mutate(runId)}
-                isCancelling={cancelRunMutation.isPending && cancelRunMutation.variables === run.run_id}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/settings/layout.tsx b/frontend/app/settings/layout.tsx
index 593fd745b..da4de133f 100644
--- a/frontend/app/settings/layout.tsx
+++ b/frontend/app/settings/layout.tsx
@@ -1,6 +1,93 @@
+'use client'
+
+import { Cpu, Users, Box, Key } from 'lucide-react'
+import Link from 'next/link'
+import { usePathname, useParams } from 'next/navigation'
+
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
 /**
  * Global settings layout (e.g. /settings/models)
  */
 export default function SettingsLayout({ children }: { children: React.ReactNode }) {
-  return <>{children}</>
+  const { t } = useTranslation()
+  const pathname = usePathname()
+  const params = useParams()
+  const { workspaceId: currentWorkspaceId } = useCurrentWorkspace()
+  const workspaceId = (params?.workspaceId as string) || currentWorkspaceId
+
+  const navItems = [
+    {
+      id: 'members',
+      label: t('settings.membersManagementTitle'),
+      icon: Users,
+      href: workspaceId ? `/settings/members/${workspaceId}` : '/settings/members',
+    },
+    {
+      id: 'models',
+      label: t('settings.models'),
+      icon: Cpu,
+      href: '/settings/models',
+    },
+    {
+      id: 'sandboxes',
+      label: t('settings.sandboxes.title'),
+      icon: Box,
+      href: '/settings/sandboxes',
+    },
+    {
+      id: 'tokens',
+      label: t('settings.tokens.title'),
+      icon: Key,
+      href: '/settings/tokens',
+    },
+  ]
+
+  return (
+    <div className="flex h-screen overflow-hidden bg-[var(--bg)]">
+      {/* Settings Internal Sidebar */}
+      <aside className="w-64 flex-shrink-0 border-r border-[var(--border)] bg-[var(--surface-elevated)]">
+        <div className="flex h-full flex-col">
+          <div className="flex h-14 items-center border-b border-[var(--border)] px-6">
+            <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+              {t('settings.workspace')}
+            </h2>
+          </div>
+
+          <nav className="flex-1 space-y-1 px-3 py-4">
+            {navItems.map((item) => {
+              const Icon = item.icon
+              const isActive = pathname?.startsWith(item.href)
+
+              return (
+                <Link
+                  key={item.id}
+                  href={item.href}
+                  className={cn(
+                    'flex items-center gap-3 rounded-lg px-3 py-2.5 text-sm transition-all duration-200',
+                    isActive
+                      ? 'bg-[var(--surface-5)] font-medium text-[var(--text-primary)] shadow-sm'
+                      : 'text-[var(--text-tertiary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)]',
+                  )}
+                >
+                  <Icon
+                    size={18}
+                    className={cn(
+                      isActive ? 'text-[var(--brand-600)]' : 'text-[var(--text-muted)]',
+                    )}
+                  />
+                  {item.label}
+                </Link>
+              )
+            })}
+          </nav>
+        </div>
+      </aside>
+
+      {/* Settings Content Area */}
+      <main className="flex min-w-0 flex-1 flex-col overflow-hidden">{children}</main>
+    </div>
+  )
 }
diff --git a/frontend/app/workspace/[workspaceId]/settings/members/page.tsx b/frontend/app/settings/members/[workspaceId]/page.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/settings/members/page.tsx
rename to frontend/app/settings/members/[workspaceId]/page.tsx
index 4011dc4e0..f2a42f740 100644
--- a/frontend/app/workspace/[workspaceId]/settings/members/page.tsx
+++ b/frontend/app/settings/members/[workspaceId]/page.tsx
@@ -49,13 +49,10 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
 import { useToast } from '@/hooks/use-toast'
 import { useUserPermissions } from '@/hooks/use-user-permissions'
 import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
+import { ApiError } from '@/lib/api-client'
 import { useTranslation } from '@/lib/i18n'
 import { toastError, toastSuccess } from '@/lib/utils/toast'
-import {
-  workspaceService,
-  type PaginatedMembersResponse,
-} from '@/services/workspaceService'
-import { useSidebarStore } from '@/stores/sidebar/store'
+import { workspaceService, type PaginatedMembersResponse } from '@/services/workspaceService'
 
 // WorkspaceMember and PaginatedMembersResponse types imported from workspaceService
 
@@ -78,9 +75,6 @@ export default function WorkspaceMembersPage() {
   const { permissions, loading: permissionsLoading, refetch } = useWorkspacePermissions(workspaceId)
   const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
 
-  // Get sidebar state to adjust layout
-  const isSidebarCollapsed = useSidebarStore((state) => state.isCollapsed)
-
   const [inviteDialogOpen, setInviteDialogOpen] = useState(false)
   const [inviteEmail, setInviteEmail] = useState('')
   const [inviteRole, setInviteRole] = useState<'admin' | 'member' | 'viewer'>('member')
@@ -137,24 +131,20 @@ export default function WorkspaceMembersPage() {
       refetch()
     },
     onError: (error: any) => {
-      const rawMessage = error?.message || error?.detail || String(error) || ''
-      const errorMessage = rawMessage.toLowerCase()
-
-      const isAlreadyMember =
-        errorMessage.includes('already a member') || errorMessage.includes('is already a member')
-
-      const isUserNotFound =
-        errorMessage.includes('user not found') || errorMessage.includes('not found')
+      const apiError = error instanceof ApiError ? error : null
 
-      if (isAlreadyMember) {
+      if (apiError?.code === 'WORKSPACE_MEMBER_ALREADY_EXISTS') {
         toastError(
           t('workspace.userAlreadyMemberDescription', { email: inviteEmail }),
           t('workspace.userAlreadyMember'),
         )
-      } else if (isUserNotFound) {
+      } else if (apiError?.code === 'USER_NOT_FOUND') {
         toastError(t('workspace.userNotFoundDescription'), t('workspace.userNotFound'))
       } else {
-        toastError(rawMessage || t('workspace.addMemberFailed'), t('workspace.addMemberFailed'))
+        toastError(
+          apiError?.message || t('workspace.addMemberFailed'),
+          t('workspace.addMemberFailed'),
+        )
       }
     },
   })
@@ -175,8 +165,8 @@ export default function WorkspaceMembersPage() {
       refetch()
     },
     onError: (error: any) => {
-      const status = error?.status || error?.response?.status
-      if (status === 403) {
+      const apiError = error instanceof ApiError ? error : null
+      if (apiError?.status === 403) {
         toast({
           title: t('workspace.updateFailed'),
           description: t('workspace.insufficientPermission'),
@@ -187,7 +177,7 @@ export default function WorkspaceMembersPage() {
       }
       toast({
         title: t('workspace.updateFailed'),
-        description: error.message,
+        description: apiError?.message || t('workspace.updateFailed'),
         variant: 'destructive',
       })
     },
@@ -208,8 +198,8 @@ export default function WorkspaceMembersPage() {
       refetch()
     },
     onError: (error: any) => {
-      const status = error?.status || error?.response?.status
-      if (status === 403) {
+      const apiError = error instanceof ApiError ? error : null
+      if (apiError?.status === 403) {
         toast({
           title: t('workspace.removeFailed'),
           description: t('workspace.insufficientPermission'),
@@ -220,7 +210,7 @@ export default function WorkspaceMembersPage() {
       }
       toast({
         title: t('workspace.removeFailed'),
-        description: error.message,
+        description: apiError?.message || t('workspace.removeFailed'),
         variant: 'destructive',
       })
     },
@@ -262,8 +252,12 @@ export default function WorkspaceMembersPage() {
       <div className="flex h-full items-center justify-center">
         <div className="text-center">
           <Shield className="mx-auto mb-4 h-12 w-12 text-[var(--text-muted)]" />
-          <h2 className="mb-2 text-base font-semibold text-[var(--text-primary)]">{t('workspace.noAccess')}</h2>
-          <p className="text-xs text-[var(--text-tertiary)]">{t('workspace.noAccessDescription')}</p>
+          <h2 className="mb-2 text-base font-semibold text-[var(--text-primary)]">
+            {t('workspace.noAccess')}
+          </h2>
+          <p className="text-xs text-[var(--text-tertiary)]">
+            {t('workspace.noAccessDescription')}
+          </p>
         </div>
       </div>
     )
@@ -271,12 +265,7 @@ export default function WorkspaceMembersPage() {
 
   return (
     <div className="flex h-full flex-col">
-      <div
-        className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4 transition-all duration-300"
-        style={{
-          marginLeft: isSidebarCollapsed ? '280px' : '0px',
-        }}
-      >
+      <div className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-4">
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-3">
             <Users className="h-6 w-6 text-[var(--text-secondary)]" />
@@ -434,12 +423,7 @@ export default function WorkspaceMembersPage() {
         </div>
       </div>
 
-      <div
-        className="flex-1 overflow-y-auto p-6 transition-all duration-300"
-        style={{
-          marginLeft: isSidebarCollapsed ? '280px' : '0px',
-        }}
-      >
+      <div className="flex-1 overflow-y-auto p-6">
         {membersLoading ? (
           <div className="flex h-64 items-center justify-center">
             <Loader2 className="h-8 w-8 animate-spin text-[var(--text-muted)]" />
@@ -447,8 +431,12 @@ export default function WorkspaceMembersPage() {
         ) : members.length === 0 ? (
           <div className="flex h-64 flex-col items-center justify-center text-center">
             <Users className="mb-4 h-16 w-16 text-[var(--text-subtle)]" />
-            <h3 className="mb-2 text-base font-medium text-[var(--text-primary)]">{t('workspace.noMembers')}</h3>
-            <p className="mb-4 text-xs text-[var(--text-tertiary)]">{t('workspace.noMembersDescription')}</p>
+            <h3 className="mb-2 text-base font-medium text-[var(--text-primary)]">
+              {t('workspace.noMembers')}
+            </h3>
+            <p className="mb-4 text-xs text-[var(--text-tertiary)]">
+              {t('workspace.noMembersDescription')}
+            </p>
             {userPermissions.canAdmin && (
               <Button onClick={() => setInviteDialogOpen(true)}>
                 <UserPlus className="mr-2 h-4 w-4" />
diff --git a/frontend/app/settings/page.tsx b/frontend/app/settings/page.tsx
new file mode 100644
index 000000000..b9e7d2d8a
--- /dev/null
+++ b/frontend/app/settings/page.tsx
@@ -0,0 +1,23 @@
+'use client'
+
+import { useEffect } from 'react'
+import { useRouter } from 'next/navigation'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
+/**
+ * Main settings page - redirects to the default settings tab
+ */
+export default function SettingsPage() {
+  const router = useRouter()
+  const { workspaceId } = useCurrentWorkspace()
+
+  useEffect(() => {
+    if (workspaceId) {
+      router.replace(`/settings/members/${workspaceId}`)
+    } else {
+      router.replace('/settings/models')
+    }
+  }, [workspaceId, router])
+
+  return null
+}
diff --git a/frontend/app/settings/sandboxes/page.tsx b/frontend/app/settings/sandboxes/page.tsx
new file mode 100644
index 000000000..a39e38283
--- /dev/null
+++ b/frontend/app/settings/sandboxes/page.tsx
@@ -0,0 +1,11 @@
+'use client'
+
+import { SandboxesPage } from '@/components/settings/sandboxes-page'
+
+export default function SettingsSandboxesPage() {
+  return (
+    <div className="flex-1 overflow-hidden p-6">
+      <SandboxesPage />
+    </div>
+  )
+}
diff --git a/frontend/app/settings/tokens/page.tsx b/frontend/app/settings/tokens/page.tsx
new file mode 100644
index 000000000..09389974d
--- /dev/null
+++ b/frontend/app/settings/tokens/page.tsx
@@ -0,0 +1,11 @@
+'use client'
+
+import { TokensPage } from '@/components/settings/tokens-page'
+
+export default function SettingsTokensPage() {
+  return (
+    <div className="flex-1 overflow-hidden p-6">
+      <TokensPage />
+    </div>
+  )
+}
diff --git a/frontend/app/skills/SkillsManager.tsx b/frontend/app/skills/SkillsManager.tsx
index 1bdfd1151..0454f3b34 100644
--- a/frontend/app/skills/SkillsManager.tsx
+++ b/frontend/app/skills/SkillsManager.tsx
@@ -4,20 +4,13 @@ import { Plus } from 'lucide-react'
 import React, { useState, useEffect, useCallback, useMemo } from 'react'
 
 import { Button } from '@/components/ui/button'
-import {
-  ResizableHandle,
-  ResizablePanel,
-  ResizablePanelGroup,
-} from '@/components/ui/resizable'
+import { ResizableHandle, ResizablePanel, ResizablePanelGroup } from '@/components/ui/resizable'
 import { useSkillCollaborators } from '@/hooks/queries/skillCollaborators'
 import { useCreateSkill, useUpdateSkill } from '@/hooks/queries/skills'
 import { useToast } from '@/hooks/use-toast'
 import { useSession } from '@/lib/auth/auth-client'
 import { useTranslation } from '@/lib/i18n'
-import {
-  generateSkillMd,
-  parseSkillMd,
-} from '@/services/skillService'
+import { generateSkillMd, parseSkillMd } from '@/services/skillService'
 import { SkillFile } from '@/types'
 import { getSkillValidationMessage } from '@/lib/utils/skillValidationI18n'
 
@@ -318,7 +311,12 @@ export default function SkillsManager({ requestedAction, onActionConsumed }: Ski
     <div className="flex h-full w-full overflow-hidden bg-[var(--bg)] text-[var(--text-primary)]">
       <ResizablePanelGroup direction="horizontal">
         {/* 1. List Sidebar */}
-        <ResizablePanel defaultSize={20} minSize={15} maxSize={40} className="flex shrink-0 flex-col bg-[var(--surface-1)]">
+        <ResizablePanel
+          defaultSize={20}
+          minSize={15}
+          maxSize={40}
+          className="flex shrink-0 flex-col bg-[var(--surface-1)]"
+        >
           <SkillListSidebar
             searchQuery={searchQuery}
             onSearchChange={setSearchQuery}
@@ -333,12 +331,20 @@ export default function SkillsManager({ requestedAction, onActionConsumed }: Ski
         <ResizableHandle withHandle />
 
         {/* 2. File Explorer & Editor */}
-        <ResizablePanel defaultSize={80} className="flex flex-col bg-[var(--surface-2)] outline-none">
+        <ResizablePanel
+          defaultSize={80}
+          className="flex flex-col bg-[var(--surface-2)] outline-none"
+        >
           <div className="flex flex-1 overflow-hidden">
             {selectedSkill || formData.name ? (
               <ResizablePanelGroup direction="horizontal">
                 {/* Hierarchical File Explorer */}
-                <ResizablePanel defaultSize={20} minSize={10} maxSize={30} className="flex shrink-0 flex-col border-r border-[var(--border-muted)] bg-[var(--surface-2)]">
+                <ResizablePanel
+                  defaultSize={20}
+                  minSize={10}
+                  maxSize={30}
+                  className="flex shrink-0 flex-col border-r border-[var(--border-muted)] bg-[var(--surface-2)]"
+                >
                   <div className="flex items-center justify-between border-b border-[var(--border-muted)] p-3">
                     <span className="text-xs font-bold uppercase tracking-widest text-[var(--text-muted)]">
                       {t('skills.workspace') || 'Workspace'}
@@ -366,7 +372,10 @@ export default function SkillsManager({ requestedAction, onActionConsumed }: Ski
                 <ResizableHandle withHandle />
 
                 {/* Editor Area */}
-                <ResizablePanel defaultSize={80} className="flex min-w-0 flex-col bg-[var(--surface-2)] outline-none">
+                <ResizablePanel
+                  defaultSize={80}
+                  className="flex min-w-0 flex-col bg-[var(--surface-2)] outline-none"
+                >
                   <EditorHeader
                     skillName={formData.name}
                     activeFilePath={activeFilePath}
@@ -448,8 +457,8 @@ export default function SkillsManager({ requestedAction, onActionConsumed }: Ski
               description: frontmatter.description || '',
               license: frontmatter.license || '',
               content:
-                parseSkillMd(skillFiles.find((f) => f.path === 'SKILL.md')?.content || '')
-                  .body || '',
+                parseSkillMd(skillFiles.find((f) => f.path === 'SKILL.md')?.content || '').body ||
+                '',
               source_type: 'local',
               tags: frontmatter.tags || [],
               is_public: false,
diff --git a/frontend/app/skills/SkillsStore.tsx b/frontend/app/skills/SkillsStore.tsx
index 6a6a7cbc2..01c00eedd 100644
--- a/frontend/app/skills/SkillsStore.tsx
+++ b/frontend/app/skills/SkillsStore.tsx
@@ -15,7 +15,7 @@ import {
 } from 'lucide-react'
 import React, { useState, useMemo, useEffect } from 'react'
 
-import CodeViewer from '@/app/chat/components/CodeViewer'
+import CodeViewer from '@/components/shared/code-viewer'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
@@ -37,7 +37,6 @@ import { Skill, SkillFile } from '@/types'
 
 import { SkillCard } from './components/SkillCard'
 
-
 interface SkillsStoreProps {
   currentUserId?: string
   onSkillCopied?: () => void
@@ -195,7 +194,7 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
       {/* Header with search and filters */}
       <div className="flex-shrink-0 border-b border-[var(--border-muted)] bg-[var(--surface-elevated)] px-6 py-4">
         <div className="flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between">
-          <div className="flex items-center gap-4 flex-1 min-w-0">
+          <div className="flex min-w-0 flex-1 items-center gap-4">
             {/* Search bar */}
             <div className="relative max-w-sm flex-1">
               <Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-[var(--text-muted)]" />
@@ -209,7 +208,7 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
 
             {/* Tag filters */}
             {allTags.length > 0 && (
-              <div className="hide-scrollbar flex items-center gap-2 overflow-x-auto min-w-0 hidden md:flex">
+              <div className="hide-scrollbar flex hidden min-w-0 items-center gap-2 overflow-x-auto md:flex">
                 <Filter className="h-4 w-4 flex-shrink-0 text-[var(--text-muted)]" />
                 {allTags.slice(0, 5).map((tag) => (
                   <Badge
@@ -235,8 +234,8 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
             )}
           </div>
 
-          <div className="flex items-center gap-3 shrink-0">
-            <Badge variant="secondary" className="text-xs shrink-0">
+          <div className="flex shrink-0 items-center gap-3">
+            <Badge variant="secondary" className="shrink-0 text-xs">
               {filteredSkills.length} {t('skills.skillsAvailable')}
             </Badge>
 
@@ -245,7 +244,7 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
                 variant="ghost"
                 size="sm"
                 onClick={clearFilters}
-                className="text-xs text-[var(--text-tertiary)] hover:text-[var(--text-secondary)] px-2 h-8"
+                className="h-8 px-2 text-xs text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]"
               >
                 <X className="mr-1 h-3 w-3" />
                 {t('skills.clearFilters')}
@@ -309,7 +308,10 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
           }
         }}
       >
-        <SheetContent side="right" className="flex w-full flex-col overflow-hidden p-0 sm:max-w-4xl">
+        <SheetContent
+          side="right"
+          className="flex w-full flex-col overflow-hidden p-0 sm:max-w-4xl"
+        >
           {viewSkill && (
             <div className="flex h-full flex-1 flex-col overflow-hidden bg-[var(--surface-elevated)] p-6">
               <SheetHeader className="flex-shrink-0 text-left">
@@ -335,7 +337,9 @@ export default function SkillsStore({ currentUserId, onSkillCopied }: SkillsStor
                 {/* Tags */}
                 {viewSkill.tags && viewSkill.tags.length > 0 && (
                   <div className="flex-shrink-0">
-                    <h4 className="mb-2 text-xs font-medium text-[var(--text-tertiary)]">{t('skills.tags')}</h4>
+                    <h4 className="mb-2 text-xs font-medium text-[var(--text-tertiary)]">
+                      {t('skills.tags')}
+                    </h4>
                     <div className="flex flex-wrap gap-1.5">
                       {viewSkill.tags.map((tag, i) => (
                         <Badge key={i} variant="secondary" className="text-xs">
diff --git a/frontend/app/skills/components/ActiveSkillCreatorRunCard.tsx b/frontend/app/skills/components/ActiveSkillCreatorRunCard.tsx
deleted file mode 100644
index 0c7eb35d2..000000000
--- a/frontend/app/skills/components/ActiveSkillCreatorRunCard.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-'use client'
-
-import { ArrowUpRight, Bot, Loader2, Sparkles } from 'lucide-react'
-import Link from 'next/link'
-import { useEffect, useRef, useState } from 'react'
-
-import { Badge } from '@/components/ui/badge'
-import { Button } from '@/components/ui/button'
-import { Card } from '@/components/ui/card'
-import { Skeleton } from '@/components/ui/skeleton'
-import { useActiveSkillCreatorRun } from '@/hooks/queries/runs'
-import { useTranslation } from '@/lib/i18n'
-import {
-  applyRunEvent,
-  applyRunSnapshot,
-  applyRunStatus,
-  buildRunHref,
-  formatRelativeTime,
-  formatRunStatus,
-} from '@/lib/utils/runHelpers'
-import { getRunWsClient } from '@/lib/ws/runs/runWsClient'
-import type { RunSummary } from '@/services/runService'
-
-export function ActiveSkillCreatorRunCard() {
-  const { data: activeRun, isLoading } = useActiveSkillCreatorRun()
-  const { t } = useTranslation()
-  const runWsClientRef = useRef(getRunWsClient())
-  const [liveRun, setLiveRun] = useState<RunSummary | null>(null)
-
-  // Sync query result into liveRun, preserving WS-updated fields when fresher
-  useEffect(() => {
-    if (!activeRun) {
-      setLiveRun(null)
-      return
-    }
-    setLiveRun((current) => {
-      if (!current || current.run_id !== activeRun.run_id) return activeRun
-      // Keep WS-updated fields only if they are fresher (higher seq)
-      const wsIsFresher = current.last_seq > activeRun.last_seq
-      return {
-        ...activeRun,
-        status: wsIsFresher ? current.status : activeRun.status,
-        last_seq: Math.max(current.last_seq, activeRun.last_seq),
-        error_code: wsIsFresher ? (current.error_code ?? activeRun.error_code) : activeRun.error_code,
-        error_message: wsIsFresher ? (current.error_message ?? activeRun.error_message) : activeRun.error_message,
-      }
-    })
-  }, [activeRun])
-
-  const lastSeqAtSubscribeRef = useRef(0)
-
-  useEffect(() => {
-    if (!activeRun?.run_id) {
-      return
-    }
-
-    lastSeqAtSubscribeRef.current = activeRun.last_seq
-
-    void runWsClientRef.current.subscribe(activeRun.run_id, lastSeqAtSubscribeRef.current, {
-      onSnapshot: (frame) => {
-        setLiveRun((current) => (current ? applyRunSnapshot(current, frame) : current))
-      },
-      onEvent: (frame) => {
-        setLiveRun((current) => (current ? applyRunEvent(current, frame) : current))
-      },
-      onStatus: (frame) => {
-        setLiveRun((current) => (current ? applyRunStatus(current, frame) : current))
-      },
-    })
-
-    return () => {
-      runWsClientRef.current.unsubscribe(activeRun.run_id)
-    }
-  }, [activeRun?.run_id])
-
-  if (isLoading) {
-    return (
-      <div className="mb-4 px-6 pt-4">
-        <Card className="border-[var(--border)] bg-[var(--surface-1)] p-4">
-          <div className="flex items-center gap-3">
-            <Skeleton className="h-10 w-10 rounded-xl" />
-            <div className="flex-1 space-y-2">
-              <Skeleton className="h-4 w-40" />
-              <Skeleton className="h-3 w-64" />
-            </div>
-            <Skeleton className="h-8 w-24 rounded-md" />
-          </div>
-        </Card>
-      </div>
-    )
-  }
-
-  if (!liveRun?.run_id) {
-    return null
-  }
-
-  const href = buildRunHref(liveRun)
-
-  return (
-    <div className="mb-4 px-6 pt-4">
-      <Card className="overflow-hidden border-[var(--skill-brand-200)] bg-[linear-gradient(135deg,var(--skill-brand-50),var(--surface-1))] p-4 shadow-sm">
-        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
-          <div className="flex min-w-0 items-start gap-3">
-            <div className="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl border border-[var(--skill-brand-200)] bg-[var(--surface-elevated)] text-[var(--skill-brand-600)]">
-              {liveRun.status === 'running' ? <Loader2 className="h-5 w-5 animate-spin" /> : <Bot className="h-5 w-5" />}
-            </div>
-            <div className="min-w-0">
-              <div className="mb-1 flex flex-wrap items-center gap-2">
-                <span className="text-sm font-semibold text-[var(--text-primary)]">
-                  {t('runs.skillCreatorInProgress', 'Skill Creator in progress')}
-                </span>
-                <Badge
-                  variant="outline"
-                  className="border-[var(--skill-brand-200)] bg-[var(--surface-elevated)] text-xs text-[var(--skill-brand-700)]"
-                >
-                  {formatRunStatus(liveRun.status, t)}
-                </Badge>
-              </div>
-              <p className="truncate text-sm text-[var(--text-secondary)]">
-                {liveRun.title || t('runs.untitledSkillCreatorRun', 'Untitled Skill Creator run')}
-              </p>
-              <p className="mt-1 flex items-center gap-1 text-xs text-[var(--text-muted)]">
-                <Sparkles className="h-3.5 w-3.5" />
-                {t('runs.startedAt', 'Started')} {liveRun.started_at ? formatRelativeTime(liveRun.started_at, t) : ''}
-              </p>
-            </div>
-          </div>
-
-          <Button asChild className="gap-1.5 self-start md:self-center">
-            <Link href={href}>
-              {t('runs.resume', 'Resume')}
-              <ArrowUpRight className="h-4 w-4" />
-            </Link>
-          </Button>
-        </div>
-      </Card>
-    </div>
-  )
-}
diff --git a/frontend/app/skills/components/ApiTokensTab.tsx b/frontend/app/skills/components/ApiTokensTab.tsx
index c4c4cc443..86e250c0a 100644
--- a/frontend/app/skills/components/ApiTokensTab.tsx
+++ b/frontend/app/skills/components/ApiTokensTab.tsx
@@ -53,7 +53,10 @@ export function ApiTokensTab({ skillId }: ApiTokensTabProps) {
       setTokenName('')
       setShowCreateForm(false)
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
   }
 
@@ -70,7 +73,9 @@ export function ApiTokensTab({ skillId }: ApiTokensTabProps) {
         {t('settings.tokens.create')}
       </Button>
       {tokens.length >= 50 && (
-        <p className="mt-1 text-xs text-[var(--status-warning)]">{t('settings.tokens.limitReached')}</p>
+        <p className="mt-1 text-xs text-[var(--status-warning)]">
+          {t('settings.tokens.limitReached')}
+        </p>
       )}
 
       {showCreateForm && (
diff --git a/frontend/app/skills/components/CollaboratorsTab.tsx b/frontend/app/skills/components/CollaboratorsTab.tsx
index 249d6a079..13b66407e 100644
--- a/frontend/app/skills/components/CollaboratorsTab.tsx
+++ b/frontend/app/skills/components/CollaboratorsTab.tsx
@@ -83,7 +83,10 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
       setNewRole('viewer')
       setShowAddForm(false)
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
   }
 
@@ -92,7 +95,10 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
       await updateRoleMutation.mutateAsync({ userId, role })
       toast({ title: t('skillCollaborators.updatedSuccess') })
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
   }
 
@@ -101,7 +107,10 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
       await removeMutation.mutateAsync(removeTarget.userId)
       toast({ title: t('skillCollaborators.removedSuccess') })
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
     setRemoveTarget({ userId: '', open: false })
   }
@@ -114,7 +123,10 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
       setTransferDialog(false)
       setTransferTargetId('')
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
   }
 
@@ -158,10 +170,7 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
               </div>
               <div className="w-32">
                 <Label className="text-xs">{t('skillCollaborators.role')}</Label>
-                <Select
-                  value={newRole}
-                  onValueChange={(v) => setNewRole(v as CollaboratorRole)}
-                >
+                <Select value={newRole} onValueChange={(v) => setNewRole(v as CollaboratorRole)}>
                   <SelectTrigger className="mt-1">
                     <SelectValue />
                   </SelectTrigger>
@@ -174,7 +183,12 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
                   </SelectContent>
                 </Select>
               </div>
-              <Button size="sm" onClick={handleAdd} disabled={addMutation.isPending} aria-label="Add collaborator">
+              <Button
+                size="sm"
+                onClick={handleAdd}
+                disabled={addMutation.isPending}
+                aria-label="Add collaborator"
+              >
                 <Plus size={14} />
               </Button>
             </div>
@@ -194,9 +208,7 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
               {ownerDisplayName}
             </p>
             {ownerDisplayEmail && ownerInfo?.name && (
-              <p className="truncate text-xs text-[var(--text-tertiary)]">
-                {ownerDisplayEmail}
-              </p>
+              <p className="truncate text-xs text-[var(--text-tertiary)]">{ownerDisplayEmail}</p>
             )}
           </div>
           <div className="flex items-center gap-2">
@@ -228,9 +240,7 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
                   {displayName}
                 </p>
                 {displayEmail && c.userName && (
-                  <p className="truncate text-xs text-[var(--text-tertiary)]">
-                    {displayEmail}
-                  </p>
+                  <p className="truncate text-xs text-[var(--text-tertiary)]">{displayEmail}</p>
                 )}
               </div>
               {canManage ? (
@@ -312,9 +322,7 @@ export function CollaboratorsTab({ skillId, ownerId, userRole }: CollaboratorsTa
         <DialogContent>
           <DialogHeader>
             <DialogTitle>{t('skillCollaborators.transferConfirmTitle')}</DialogTitle>
-            <DialogDescription>
-              {t('skillCollaborators.transferConfirmMessage')}
-            </DialogDescription>
+            <DialogDescription>{t('skillCollaborators.transferConfirmMessage')}</DialogDescription>
           </DialogHeader>
           <div className="py-4">
             <Label>{t('skillCollaborators.newOwner')}</Label>
diff --git a/frontend/app/skills/components/EditorHeader.tsx b/frontend/app/skills/components/EditorHeader.tsx
index b3be1fc72..5929a273a 100644
--- a/frontend/app/skills/components/EditorHeader.tsx
+++ b/frontend/app/skills/components/EditorHeader.tsx
@@ -42,25 +42,29 @@ export function EditorHeader({
       <div className="flex h-14 shrink-0 items-center justify-between border-b border-[var(--border-muted)] bg-[var(--surface-2)] px-4 lg:px-6">
         <div className="flex items-center gap-4 lg:gap-6">
           <div className="flex flex-col">
-            <h1 className="text-sm font-bold leading-tight text-[var(--text-primary)] line-clamp-1 max-w-[200px]" title={skillName}>
+            <h1
+              className="line-clamp-1 max-w-[200px] text-sm font-bold leading-tight text-[var(--text-primary)]"
+              title={skillName}
+            >
               {skillName}
             </h1>
             <div className="flex items-center gap-1.5 font-mono text-xs text-[var(--text-muted)]">
-              <ChevronRight size={10} /> <span className="truncate max-w-[180px]">{activeFilePath || 'No file selected'}</span>
+              <ChevronRight size={10} />{' '}
+              <span className="max-w-[180px] truncate">{activeFilePath || 'No file selected'}</span>
             </div>
           </div>
 
           {/* Pill Tab Bar integrated in header */}
-          <div className="hidden lg:flex items-center space-x-1 rounded-lg bg-[var(--surface-3)] p-1">
+          <div className="hidden items-center space-x-1 rounded-lg bg-[var(--surface-3)] p-1 lg:flex">
             {(['editor', 'versions', 'collaborators'] as const).map((tab) => (
               <button
                 key={tab}
                 onClick={() => onTabChange(tab)}
                 className={cn(
-                  'px-3 py-1 text-xs font-medium rounded-md transition-colors',
+                  'rounded-md px-3 py-1 text-xs font-medium transition-colors',
                   activeTab === tab
                     ? 'bg-[var(--surface-elevated)] text-[var(--text-primary)] shadow-sm'
-                    : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]'
+                    : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]',
                 )}
               >
                 {tab === 'editor' && t('skills.editor')}
@@ -80,29 +84,33 @@ export function EditorHeader({
             className="h-8 gap-1.5 px-3 text-xs"
           >
             <Terminal size={14} />
-            <span className="hidden lg:inline">{t('skills.accessApi', { defaultValue: 'Access API' })}</span>
+            <span className="hidden lg:inline">
+              {t('skills.accessApi', { defaultValue: 'Access API' })}
+            </span>
             <span className="lg:hidden">API</span>
           </Button>
 
           {/* Publish Toggle */}
-          <div className="flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--surface-1)] px-2 lg:px-3 py-1.5">
+          <div className="flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--surface-1)] px-2 py-1.5 lg:px-3">
             {isPublic ? (
               <Globe size={14} className="text-[var(--skill-brand)]" />
             ) : (
               <Lock size={14} className="text-[var(--text-muted)]" />
             )}
-            <span className="hidden lg:inline text-xs text-[var(--text-secondary)]">{t('skills.publishToStore')}</span>
+            <span className="hidden text-xs text-[var(--text-secondary)] lg:inline">
+              {t('skills.publishToStore')}
+            </span>
             <Switch
               checked={isPublic}
               onCheckedChange={onPublicChange}
-              className="data-[state=checked]:bg-[var(--skill-brand)] scale-75 lg:scale-100"
+              className="scale-75 data-[state=checked]:bg-[var(--skill-brand)] lg:scale-100"
             />
           </div>
 
           <Button
             onClick={onSave}
             disabled={isSaving}
-            className="h-8 gap-1.5 lg:gap-2 bg-[var(--skill-brand-600)] px-3 lg:px-4 text-xs shadow-sm hover:bg-[var(--skill-brand-700)] disabled:cursor-not-allowed disabled:opacity-50"
+            className="h-8 gap-1.5 bg-[var(--skill-brand-600)] px-3 text-xs shadow-sm hover:bg-[var(--skill-brand-700)] disabled:cursor-not-allowed disabled:opacity-50 lg:gap-2 lg:px-4"
           >
             {isSaving ? <Loader2 size={14} className="animate-spin" /> : <Save size={14} />}
             <span className="hidden lg:inline">{t('skills.saveChanges')}</span>
@@ -112,16 +120,16 @@ export function EditorHeader({
       </div>
 
       {/* Fallback Tab Bar for smaller screens within the pane */}
-      <div className="flex lg:hidden border-b border-[var(--border)] px-2 overflow-x-auto hide-scrollbar">
+      <div className="hide-scrollbar flex overflow-x-auto border-b border-[var(--border)] px-2 lg:hidden">
         {(['editor', 'versions', 'collaborators'] as const).map((tab) => (
           <button
             key={tab}
             onClick={() => onTabChange(tab)}
             className={cn(
-              'px-3 py-2 text-xs font-medium transition-colors whitespace-nowrap',
+              'whitespace-nowrap px-3 py-2 text-xs font-medium transition-colors',
               activeTab === tab
                 ? 'border-b-2 border-[var(--brand-500)] text-[var(--brand-600)]'
-                : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]'
+                : 'text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]',
             )}
           >
             {tab === 'editor' && t('skills.editor')}
diff --git a/frontend/app/skills/components/EmptyState.tsx b/frontend/app/skills/components/EmptyState.tsx
index 47159b4be..e35cc620f 100644
--- a/frontend/app/skills/components/EmptyState.tsx
+++ b/frontend/app/skills/components/EmptyState.tsx
@@ -20,7 +20,9 @@ export function EmptyState({ onNewSkillManual, onImportLocal }: EmptyStateProps)
       <div className="mb-6 rounded-full border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-8 shadow-xl">
         <ShieldCheck size={48} className="text-[var(--skill-brand-200)]" />
       </div>
-      <h3 className="text-sm font-bold text-[var(--text-primary)]">{t('skills.chooseCreationMethod')}</h3>
+      <h3 className="text-sm font-bold text-[var(--text-primary)]">
+        {t('skills.chooseCreationMethod')}
+      </h3>
       <p className="mt-1 text-xs text-[var(--text-muted)]">{t('skills.populateSkillsLibrary')}</p>
       <div className="mt-8 flex max-w-lg flex-wrap justify-center gap-3">
         <Link href="/skills/creator">
diff --git a/frontend/app/skills/components/NewSkillDialog.tsx b/frontend/app/skills/components/NewSkillDialog.tsx
index 1c3a8ff7c..399df8d5c 100644
--- a/frontend/app/skills/components/NewSkillDialog.tsx
+++ b/frontend/app/skills/components/NewSkillDialog.tsx
@@ -35,7 +35,9 @@ export function NewSkillDialog({ open, onOpenChange, onSelectOption }: NewSkillD
             <Wand2 size={32} />
           </div>
           <div>
-            <h3 className="font-semibold text-[var(--skill-brand-700)]">{t('skills.aiCreate', 'AI Create')}</h3>
+            <h3 className="font-semibold text-[var(--skill-brand-700)]">
+              {t('skills.aiCreate', 'AI Create')}
+            </h3>
             <p className="mt-1 text-xs text-[var(--skill-brand-600)] opacity-80">
               {t('skills.aiCreateDesc', 'Generate automatically via chat.')}
             </p>
@@ -54,7 +56,9 @@ export function NewSkillDialog({ open, onOpenChange, onSelectOption }: NewSkillD
             <FileCode size={32} />
           </div>
           <div>
-            <h3 className="font-semibold text-[var(--text-primary)]">{t('skills.manual', 'Blank Template')}</h3>
+            <h3 className="font-semibold text-[var(--text-primary)]">
+              {t('skills.manual', 'Blank Template')}
+            </h3>
             <p className="mt-1 text-xs text-[var(--text-tertiary)]">
               {t('skills.manualDesc', 'Start from scratch with a basic Markdown template.')}
             </p>
@@ -73,7 +77,9 @@ export function NewSkillDialog({ open, onOpenChange, onSelectOption }: NewSkillD
             <FolderOpen size={32} />
           </div>
           <div>
-            <h3 className="font-semibold text-[var(--text-primary)]">{t('skills.importFromLocal', 'Import Folder')}</h3>
+            <h3 className="font-semibold text-[var(--text-primary)]">
+              {t('skills.importFromLocal', 'Import Folder')}
+            </h3>
             <p className="mt-1 text-xs text-[var(--text-tertiary)]">
               {t('skills.importDesc', 'Upload an existing folder of skill files.')}
             </p>
diff --git a/frontend/app/skills/components/SkillApiAccessDialog.tsx b/frontend/app/skills/components/SkillApiAccessDialog.tsx
index 72fa5ea1a..2169fe6c5 100644
--- a/frontend/app/skills/components/SkillApiAccessDialog.tsx
+++ b/frontend/app/skills/components/SkillApiAccessDialog.tsx
@@ -12,7 +12,7 @@ import {
 } from '@/components/ui/dialog'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useCopyToClipboard } from '@/app/chat/shared/hooks/useCopyToClipboard'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
 import { API_BASE } from '@/lib/api-client'
 import { useTranslation } from '@/lib/i18n'
 
@@ -24,11 +24,7 @@ interface SkillApiAccessDialogProps {
   skillId: string
 }
 
-export function SkillApiAccessDialog({
-  open,
-  onOpenChange,
-  skillId,
-}: SkillApiAccessDialogProps) {
+export function SkillApiAccessDialog({ open, onOpenChange, skillId }: SkillApiAccessDialogProps) {
   const { t } = useTranslation()
   const { copied: copiedUrl, handleCopy: copyUrl } = useCopyToClipboard()
   const { copied: copiedCode, handleCopy: copyCode } = useCopyToClipboard()
@@ -49,12 +45,8 @@ export function SkillApiAccessDialog({
               <Terminal className="h-4 w-4 text-[var(--skill-brand-600)]" />
             </div>
             <div>
-              <DialogTitle className="text-xl">
-                {t('skills.apiAccess')}
-              </DialogTitle>
-              <DialogDescription>
-                {t('skills.apiAccessDescription')}
-              </DialogDescription>
+              <DialogTitle className="text-xl">{t('skills.apiAccess')}</DialogTitle>
+              <DialogDescription>{t('skills.apiAccessDescription')}</DialogDescription>
             </div>
           </div>
         </DialogHeader>
@@ -75,10 +67,14 @@ export function SkillApiAccessDialog({
             <TabsContent value="integration" className="space-y-6">
               {/* Endpoint Information */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('skills.baseUrl')}</h3>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('skills.baseUrl')}
+                </h3>
                 <div className="flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-2.5">
                   <div className="flex flex-col gap-1 overflow-hidden">
-                    <span className="text-xs font-semibold uppercase tracking-wider text-[var(--text-tertiary)]">{t('skills.endpoint')}</span>
+                    <span className="text-xs font-semibold uppercase tracking-wider text-[var(--text-tertiary)]">
+                      {t('skills.endpoint')}
+                    </span>
                     <code
                       className="truncate break-all font-mono text-sm text-[var(--text-primary)]"
                       title={apiUrl}
@@ -102,9 +98,7 @@ export function SkillApiAccessDialog({
                           )}
                         </Button>
                       </TooltipTrigger>
-                      <TooltipContent>
-                        {t('common.copy')}
-                      </TooltipContent>
+                      <TooltipContent>{t('common.copy')}</TooltipContent>
                     </Tooltip>
                   </TooltipProvider>
                 </div>
@@ -112,10 +106,10 @@ export function SkillApiAccessDialog({
 
               {/* Authentication */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('skills.authentication')}</h3>
-                <p className="text-sm text-[var(--text-tertiary)]">
-                  {t('skills.authDescription')}
-                </p>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('skills.authentication')}
+                </h3>
+                <p className="text-sm text-[var(--text-tertiary)]">{t('skills.authDescription')}</p>
                 <div className="rounded-lg border border-[var(--skill-brand-200)] bg-[var(--skill-brand-50)] p-4">
                   <code className="font-mono text-sm font-semibold text-[var(--skill-brand-700)]">
                     Authorization: Bearer YOUR_API_TOKEN
@@ -125,10 +119,14 @@ export function SkillApiAccessDialog({
 
               {/* Example Request */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('skills.exampleRequest')}</h3>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('skills.exampleRequest')}
+                </h3>
                 <div className="relative overflow-hidden rounded-lg border border-[var(--border)]">
                   <div className="flex items-center justify-between border-b border-[var(--border)] bg-[var(--surface-3)] px-4 py-2">
-                    <span className="text-mono text-xs font-semibold text-[var(--text-secondary)]">{t('skills.curl')}</span>
+                    <span className="text-mono text-xs font-semibold text-[var(--text-secondary)]">
+                      {t('skills.curl')}
+                    </span>
                     <TooltipProvider delayDuration={300}>
                       <Tooltip>
                         <TooltipTrigger asChild>
@@ -145,9 +143,7 @@ export function SkillApiAccessDialog({
                             )}
                           </Button>
                         </TooltipTrigger>
-                        <TooltipContent>
-                          {t('common.copyCode')}
-                        </TooltipContent>
+                        <TooltipContent>{t('common.copyCode')}</TooltipContent>
                       </Tooltip>
                     </TooltipProvider>
                   </div>
diff --git a/frontend/app/skills/components/SkillCard.tsx b/frontend/app/skills/components/SkillCard.tsx
index 465146841..7787cc218 100644
--- a/frontend/app/skills/components/SkillCard.tsx
+++ b/frontend/app/skills/components/SkillCard.tsx
@@ -1,15 +1,6 @@
 'use client'
 
-import {
-  ShieldCheck,
-  FileText,
-  Clock,
-  User,
-  Scale,
-  Copy,
-  Eye,
-  MoreHorizontal,
-} from 'lucide-react'
+import { ShieldCheck, FileText, Clock, User, Scale, Copy, Eye, MoreHorizontal } from 'lucide-react'
 
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
@@ -107,7 +98,9 @@ export function SkillCard({
                     </Badge>
                   ))}
                   {skill.tags.length > 3 && (
-                    <span className="text-xs text-[var(--text-muted)]">+{skill.tags.length - 3}</span>
+                    <span className="text-xs text-[var(--text-muted)]">
+                      +{skill.tags.length - 3}
+                    </span>
                   )}
                 </div>
               )}
@@ -126,7 +119,7 @@ export function SkillCard({
         </div>
 
         {/* Actions */}
-        <div className="flex items-center gap-2 opacity-0 transition-opacity group-hover:opacity-100 group-focus-within:opacity-100">
+        <div className="flex items-center gap-2 opacity-0 transition-opacity group-focus-within:opacity-100 group-hover:opacity-100">
           <Button
             variant="ghost"
             size="sm"
@@ -201,7 +194,7 @@ export function SkillCard({
               <Button
                 variant="ghost"
                 size="icon"
-                className="h-7 w-7 text-[var(--text-muted)] opacity-0 transition-opacity hover:text-[var(--text-primary)] group-hover:opacity-100 focus-visible:opacity-100"
+                className="h-7 w-7 text-[var(--text-muted)] opacity-0 transition-opacity hover:text-[var(--text-primary)] focus-visible:opacity-100 group-hover:opacity-100"
                 aria-label={t('skills.moreOptions', { defaultValue: 'More options' })}
               >
                 <MoreHorizontal size={14} />
diff --git a/frontend/app/skills/components/SkillDialogs.tsx b/frontend/app/skills/components/SkillDialogs.tsx
index 25cd5a6cf..45e90d634 100644
--- a/frontend/app/skills/components/SkillDialogs.tsx
+++ b/frontend/app/skills/components/SkillDialogs.tsx
@@ -275,7 +275,10 @@ export function NewFileDialog({
             </div>
           </div>
           <DialogFooter>
-            <Button type="submit" className="w-full bg-[var(--skill-brand-600)] hover:bg-[var(--skill-brand-700)]">
+            <Button
+              type="submit"
+              className="w-full bg-[var(--skill-brand-600)] hover:bg-[var(--skill-brand-700)]"
+            >
               <Plus size={16} className="mr-2" />
               Create File
             </Button>
@@ -316,18 +319,10 @@ export function DeleteFileDialog({
           </DialogDescription>
         </DialogHeader>
         <DialogFooter className="gap-2 sm:gap-0">
-          <Button
-            variant="outline"
-            onClick={onClose}
-            disabled={loading}
-          >
+          <Button variant="outline" onClick={onClose} disabled={loading}>
             {t('common.cancel')}
           </Button>
-          <Button
-            variant="destructive"
-            onClick={onConfirm}
-            disabled={loading}
-          >
+          <Button variant="destructive" onClick={onConfirm} disabled={loading}>
             {loading ? (
               <Loader2 size={16} className="mr-2 animate-spin" />
             ) : (
@@ -363,10 +358,7 @@ export function RenameFileDialog({
   const { t } = useTranslation()
 
   return (
-    <Dialog
-      open={!!fileToRename}
-      onOpenChange={() => onClose()}
-    >
+    <Dialog open={!!fileToRename} onOpenChange={() => onClose()}>
       <DialogContent>
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
@@ -397,11 +389,7 @@ export function RenameFileDialog({
           )}
         </div>
         <DialogFooter className="gap-2 sm:gap-0">
-          <Button
-            variant="outline"
-            onClick={onClose}
-            disabled={loading}
-          >
+          <Button variant="outline" onClick={onClose} disabled={loading}>
             {t('common.cancel')}
           </Button>
           <Button
diff --git a/frontend/app/skills/components/SkillFileTree.tsx b/frontend/app/skills/components/SkillFileTree.tsx
index 6c6c7b9a8..a78781e7d 100644
--- a/frontend/app/skills/components/SkillFileTree.tsx
+++ b/frontend/app/skills/components/SkillFileTree.tsx
@@ -36,11 +36,14 @@ export const getFileIcon = (path: string, _fileType: string) => {
 
   if (filename === 'SKILL.md') return <FileText size={14} className="text-[var(--skill-brand)]" />
   if (filename.endsWith('.md')) return <FileText size={14} className="text-[var(--brand-400)]" />
-  if (filename.endsWith('.py')) return <Terminal size={14} className="text-[var(--status-warning)]" />
+  if (filename.endsWith('.py'))
+    return <Terminal size={14} className="text-[var(--status-warning)]" />
   if (filename.endsWith('.js') || filename.endsWith('.ts'))
     return <FileCode size={14} className="text-[var(--status-warning)]" />
-  if (filename.endsWith('.json')) return <FileCode size={14} className="text-[var(--status-success)]" />
-  if (filename.endsWith('.sh')) return <Terminal size={14} className="text-[var(--text-tertiary)]" />
+  if (filename.endsWith('.json'))
+    return <FileCode size={14} className="text-[var(--status-success)]" />
+  if (filename.endsWith('.sh'))
+    return <Terminal size={14} className="text-[var(--text-tertiary)]" />
   if (filename.endsWith('.yaml') || filename.endsWith('.yml'))
     return <FileCode size={14} className="text-[var(--brand-400)]" />
   if (filename.endsWith('.html') || filename.endsWith('.css'))
diff --git a/frontend/app/skills/components/SkillForm.tsx b/frontend/app/skills/components/SkillForm.tsx
index 15cdec6af..6797a76d7 100644
--- a/frontend/app/skills/components/SkillForm.tsx
+++ b/frontend/app/skills/components/SkillForm.tsx
@@ -165,7 +165,9 @@ export function SkillForm({ form, showAdvancedFields, onToggleAdvancedFields }:
                     <div className="flex items-center justify-between">
                       <FormLabel className="text-xs font-bold uppercase text-[var(--text-muted)]">
                         Compatibility
-                        <span className="ml-1 font-normal text-[var(--text-muted)]">(optional)</span>
+                        <span className="ml-1 font-normal text-[var(--text-muted)]">
+                          (optional)
+                        </span>
                       </FormLabel>
                       <span
                         className={`text-xs ${
@@ -236,7 +238,9 @@ export function SkillForm({ form, showAdvancedFields, onToggleAdvancedFields }:
                   <FormItem>
                     <FormLabel className="text-xs font-bold uppercase text-[var(--text-muted)]">
                       Metadata
-                      <span className="ml-1 font-normal text-[var(--text-muted)]">(optional, JSON)</span>
+                      <span className="ml-1 font-normal text-[var(--text-muted)]">
+                        (optional, JSON)
+                      </span>
                     </FormLabel>
                     <FormControl>
                       <Textarea
diff --git a/frontend/app/skills/components/VersionHistoryTab.tsx b/frontend/app/skills/components/VersionHistoryTab.tsx
index 24077afbf..d7f135eb5 100644
--- a/frontend/app/skills/components/VersionHistoryTab.tsx
+++ b/frontend/app/skills/components/VersionHistoryTab.tsx
@@ -18,10 +18,7 @@ import {
   useRestoreDraft,
 } from '@/hooks/queries/skillVersions'
 import { useTranslation } from '@/lib/i18n'
-import {
-  versionPublishSchema,
-  type VersionPublishFormData,
-} from '../schemas/versionPublishSchema'
+import { versionPublishSchema, type VersionPublishFormData } from '../schemas/versionPublishSchema'
 
 interface VersionHistoryTabProps {
   skillId: string
@@ -79,7 +76,10 @@ export function VersionHistoryTab({ skillId, userRole }: VersionHistoryTabProps)
         toast({ title: t('skillVersions.deletedSuccess', { version }) })
       }
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
     setConfirmDialog((prev) => ({ ...prev, open: false }))
   }
@@ -218,9 +218,7 @@ export function VersionHistoryTab({ skillId, userRole }: VersionHistoryTabProps)
             : t('skillVersions.deleteConfirmMessage')
         }
         confirmLabel={
-          confirmDialog.type === 'restore'
-            ? t('skillVersions.restore')
-            : t('skillVersions.delete')
+          confirmDialog.type === 'restore' ? t('skillVersions.restore') : t('skillVersions.delete')
         }
         cancelLabel={t('common.cancel')}
         variant={confirmDialog.type === 'delete' ? 'destructive' : 'default'}
diff --git a/frontend/app/skills/creator/components/SkillCreatorChat.tsx b/frontend/app/skills/creator/components/SkillCreatorChat.tsx
index 70fa53a17..4d4bd0ad7 100644
--- a/frontend/app/skills/creator/components/SkillCreatorChat.tsx
+++ b/frontend/app/skills/creator/components/SkillCreatorChat.tsx
@@ -4,12 +4,11 @@ import { ArrowRight, Square, Wand2, Bot, User } from 'lucide-react'
 import React, { useRef, useEffect, useState, useCallback } from 'react'
 import ReactMarkdown from 'react-markdown'
 
-import { ToolCallBadge } from '@/app/chat/shared/ToolCallDisplay'
-import type { Message } from '@/app/chat/types'
+import { ToolCallBadge } from '@/components/shared/tool-call-display'
+import type { Message } from '@/types/chat'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 
-
 // ---------------------------------------------------------------------------
 // Props
 // ---------------------------------------------------------------------------
@@ -35,7 +34,9 @@ function summarizeToolResult(rawName: string, result: unknown): string | null {
       validation?: { valid?: boolean; errors?: Array<unknown> }
     }
     const fileCount = Array.isArray(preview.files) ? preview.files.length : 0
-    const errorCount = Array.isArray(preview.validation?.errors) ? preview.validation.errors.length : 0
+    const errorCount = Array.isArray(preview.validation?.errors)
+      ? preview.validation.errors.length
+      : 0
 
     if (preview.validation?.valid === true) {
       return `Preview ready: ${fileCount} file${fileCount === 1 ? '' : 's'}, validation passed`
@@ -97,14 +98,10 @@ function MessageBubble({ message }: { message: Message }) {
                 <div key={tc.id}>
                   <ToolCallBadge
                     name={rawName}
-                    args={tc.args as Record<string, any> || {}}
+                    args={(tc.args as Record<string, any>) || {}}
                     status={tc.status}
                   />
-                  {summary && (
-                    <p className="mt-1 text-xs text-[var(--text-tertiary)]">
-                      {summary}
-                    </p>
-                  )}
+                  {summary && <p className="mt-1 text-xs text-[var(--text-tertiary)]">{summary}</p>}
                 </div>
               )
             })}
@@ -218,7 +215,11 @@ export default function SkillCreatorChat({
             value={input}
             onChange={(e) => setInput(e.target.value)}
             onKeyDown={handleKeyDown}
-            placeholder={inputDisabled ? 'Initializing Skill Creator...' : 'Describe the skill you want to create...'}
+            placeholder={
+              inputDisabled
+                ? 'Initializing Skill Creator...'
+                : 'Describe the skill you want to create...'
+            }
             className="max-h-[160px] min-h-[24px] flex-1 resize-none border-none bg-transparent text-sm shadow-none placeholder:text-[var(--text-muted)] focus:outline-none"
             rows={1}
             disabled={isProcessing || isSubmitting || inputDisabled}
@@ -246,7 +247,10 @@ export default function SkillCreatorChat({
                   : 'cursor-not-allowed bg-[var(--surface-5)]',
               )}
             >
-              <ArrowRight size={14} className={input.trim() ? 'text-white' : 'text-[var(--text-muted)]'} />
+              <ArrowRight
+                size={14}
+                className={input.trim() ? 'text-white' : 'text-[var(--text-muted)]'}
+              />
             </Button>
           )}
         </div>
diff --git a/frontend/app/skills/creator/components/SkillPreviewPanel.tsx b/frontend/app/skills/creator/components/SkillPreviewPanel.tsx
index ff2346e74..840520b1b 100644
--- a/frontend/app/skills/creator/components/SkillPreviewPanel.tsx
+++ b/frontend/app/skills/creator/components/SkillPreviewPanel.tsx
@@ -1,12 +1,19 @@
 'use client'
 
-import { Save, RefreshCw, AlertTriangle, CheckCircle2, PackageOpen, FileCode, Loader2 } from 'lucide-react'
-import { ArtifactPanel } from '@/app/chat/components/ArtifactPanel'
+import {
+  Save,
+  RefreshCw,
+  AlertTriangle,
+  CheckCircle2,
+  PackageOpen,
+  FileCode,
+  Loader2,
+} from 'lucide-react'
+import { ArtifactPanel } from '@/components/shared/artifact-panel'
 import { Button } from '@/components/ui/button'
 
 import type { SkillPreviewData } from '../page'
 
-
 // ---------------------------------------------------------------------------
 // Props
 // ---------------------------------------------------------------------------
@@ -46,7 +53,9 @@ export default function SkillPreviewPanel({
             <div className="mx-auto mb-3 flex h-12 w-12 items-center justify-center rounded-2xl bg-[var(--surface-3)]">
               <PackageOpen size={22} className="text-[var(--text-muted)]" />
             </div>
-            <h4 className="mb-1 text-sm font-medium text-[var(--text-secondary)]">No preview yet</h4>
+            <h4 className="mb-1 text-sm font-medium text-[var(--text-secondary)]">
+              No preview yet
+            </h4>
             <p className="max-w-[220px] text-xs leading-relaxed text-[var(--text-muted)]">
               Start a conversation to generate skill files. The preview will appear here.
             </p>
@@ -98,13 +107,19 @@ export default function SkillPreviewPanel({
       {validation && (!validation.valid || validation.warnings.length > 0) && (
         <div className="flex-shrink-0 space-y-1 border-b border-[var(--border-muted)] px-4 py-2">
           {validation.errors.map((err, i) => (
-            <div key={`e-${i}`} className="flex items-center gap-1.5 text-xs text-[var(--status-error)]">
+            <div
+              key={`e-${i}`}
+              className="flex items-center gap-1.5 text-xs text-[var(--status-error)]"
+            >
               <AlertTriangle size={10} className="flex-shrink-0" />
               <span>{err}</span>
             </div>
           ))}
           {validation.warnings.map((w, i) => (
-            <div key={`w-${i}`} className="flex items-center gap-1.5 text-xs text-[var(--status-warning)]">
+            <div
+              key={`w-${i}`}
+              className="flex items-center gap-1.5 text-xs text-[var(--status-warning)]"
+            >
               <AlertTriangle size={10} className="flex-shrink-0" />
               <span>{w}</span>
             </div>
diff --git a/frontend/app/skills/creator/components/SkillSaveDialog.tsx b/frontend/app/skills/creator/components/SkillSaveDialog.tsx
index 593c51349..094f0c15c 100644
--- a/frontend/app/skills/creator/components/SkillSaveDialog.tsx
+++ b/frontend/app/skills/creator/components/SkillSaveDialog.tsx
@@ -13,8 +13,8 @@ import {
   DialogFooter,
 } from '@/components/ui/dialog'
 import { Input } from '@/components/ui/input'
-import { API_BASE } from '@/lib/api-client'
-import { toastSuccess, toastError } from '@/lib/utils/toast'
+import { API_BASE, createApiError } from '@/lib/api-client'
+import { toastSuccess, toastError, getErrorMessage } from '@/lib/utils/toast'
 import { getFilenameFromPath } from '@/services/skillService'
 
 import type { SkillPreviewData } from '../page'
@@ -75,9 +75,8 @@ export default function SkillSaveDialog({
         size: f.size,
       }))
 
-      const skillMdContent = files.find(f => f.path === 'SKILL.md')?.content
-      const effectiveDescription =
-        description.trim() || extractDescription(skillMdContent) || name
+      const skillMdContent = files.find((f) => f.path === 'SKILL.md')?.content
+      const effectiveDescription = description.trim() || extractDescription(skillMdContent) || name
 
       const body = {
         name: name.trim(),
@@ -100,7 +99,11 @@ export default function SkillSaveDialog({
 
       if (!resp.ok) {
         const errText = await resp.text()
-        throw new Error(errText || `HTTP ${resp.status}`)
+        throw createApiError(resp.status, resp.statusText, {
+          code: 'SKILL_SAVE_FAILED',
+          message: errText || 'Failed to save skill',
+          data: { skill_id: editSkillId ?? null, name: name.trim() },
+        })
       }
 
       const result = await resp.json()
@@ -111,7 +114,7 @@ export default function SkillSaveDialog({
       onSaved?.(skillId)
     } catch (err: unknown) {
       console.error('Failed to save skill:', err)
-      toastError(err instanceof Error ? err.message : 'Failed to save skill')
+      toastError(getErrorMessage(err, 'Failed to save skill'))
     } finally {
       setIsSaving(false)
     }
@@ -173,7 +176,9 @@ export default function SkillSaveDialog({
 
           {/* Name input */}
           <div>
-            <label className="mb-1 block text-sm font-medium text-[var(--text-secondary)]">Skill Name</label>
+            <label className="mb-1 block text-sm font-medium text-[var(--text-secondary)]">
+              Skill Name
+            </label>
             <Input
               value={name}
               onChange={(e) => setName(e.target.value)}
@@ -198,7 +203,8 @@ export default function SkillSaveDialog({
           {/* File count */}
           {previewData && (
             <p className="text-xs text-[var(--text-tertiary)]">
-              {previewData.files.length} file{previewData.files.length !== 1 ? 's' : ''} will be saved.
+              {previewData.files.length} file{previewData.files.length !== 1 ? 's' : ''} will be
+              saved.
             </p>
           )}
         </div>
diff --git a/frontend/app/skills/creator/page.tsx b/frontend/app/skills/creator/page.tsx
index 08eb99254..36de81d3d 100644
--- a/frontend/app/skills/creator/page.tsx
+++ b/frontend/app/skills/creator/page.tsx
@@ -2,14 +2,8 @@
 
 import { ArrowLeft } from 'lucide-react'
 import Link from 'next/link'
-import React from 'react'
 
 import { Button } from '@/components/ui/button'
-import { useSkillCreatorRun } from '@/hooks/use-skill-creator-run'
-
-import SkillCreatorChat from './components/SkillCreatorChat'
-import SkillPreviewPanel from './components/SkillPreviewPanel'
-import SkillSaveDialog from './components/SkillSaveDialog'
 
 export interface SkillPreviewData {
   skill_name: string
@@ -27,81 +21,26 @@ export interface SkillPreviewData {
 }
 
 export default function SkillCreatorPage() {
-  const {
-    messages,
-    isProcessing,
-    isSubmitting,
-    threadId,
-    previewData,
-    fileTree,
-    graphReady,
-    graphError,
-    effectiveEditSkillId,
-    hasRunState,
-    showSaveDialog,
-    setShowSaveDialog,
-    sendMessage,
-    stopMessage,
-    handleRegenerate,
-    handleSaved,
-  } = useSkillCreatorRun()
-
   return (
     <div className="flex h-screen flex-col bg-[var(--bg)]">
       <div className="flex flex-shrink-0 items-center gap-3 border-b border-[var(--border-muted)] px-4 py-2.5">
         <Link href="/skills">
-          <Button variant="ghost" size="sm" className="gap-1.5 text-[var(--text-secondary)] hover:text-[var(--text-primary)]">
+          <Button
+            variant="ghost"
+            size="sm"
+            className="gap-1.5 text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
+          >
             <ArrowLeft size={14} />
             <span className="text-xs">Skills</span>
           </Button>
         </Link>
         <div className="h-4 w-px bg-[var(--border)]" />
-        <h1 className="text-sm font-semibold text-[var(--text-primary)]">
-          {effectiveEditSkillId ? 'Edit Skill' : 'Create Skill'}
-        </h1>
+        <h1 className="text-sm font-semibold text-[var(--text-primary)]">Create Skill</h1>
       </div>
 
-      <div className="flex min-h-0 flex-1">
-        <div className="flex min-w-0 flex-1 flex-col border-r border-[var(--border-muted)]">
-          {graphError && !hasRunState ? (
-            <div className="flex flex-1 items-center justify-center text-sm text-[var(--text-error)]">
-              {graphError}
-            </div>
-          ) : !graphReady && !hasRunState ? (
-            <div className="flex flex-1 items-center justify-center text-sm text-[var(--text-muted)]">
-              Initializing Skill Creator...
-            </div>
-          ) : (
-            <SkillCreatorChat
-              messages={messages}
-              isProcessing={isProcessing}
-              isSubmitting={isSubmitting}
-              inputDisabled={!graphReady}
-              onSendMessage={sendMessage}
-              onStop={stopMessage}
-            />
-          )}
-        </div>
-
-        <div className="flex w-[480px] flex-shrink-0 flex-col">
-          <SkillPreviewPanel
-            previewData={previewData}
-            fileTree={fileTree}
-            threadId={threadId}
-            isProcessing={isProcessing}
-            onSave={() => setShowSaveDialog(true)}
-            onRegenerate={handleRegenerate}
-          />
-        </div>
+      <div className="flex flex-1 items-center justify-center text-sm text-[var(--text-muted)]">
+        Skill Creator is being migrated to the execution-centric architecture.
       </div>
-
-      <SkillSaveDialog
-        open={showSaveDialog}
-        onOpenChange={setShowSaveDialog}
-        previewData={previewData}
-        editSkillId={effectiveEditSkillId}
-        onSaved={handleSaved}
-      />
     </div>
   )
 }
diff --git a/frontend/app/skills/hooks/useSkillManager.ts b/frontend/app/skills/hooks/useSkillManager.ts
index 6c55542a2..2af411c1d 100644
--- a/frontend/app/skills/hooks/useSkillManager.ts
+++ b/frontend/app/skills/hooks/useSkillManager.ts
@@ -60,6 +60,5 @@ export function useSkillManager() {
     handleSelectSkill,
     handleDelete,
     filteredSkills,
-    form: null, // Placeholder for form integration
   }
 }
diff --git a/frontend/app/skills/page.tsx b/frontend/app/skills/page.tsx
index 1a33d9830..60f3b5910 100644
--- a/frontend/app/skills/page.tsx
+++ b/frontend/app/skills/page.tsx
@@ -8,7 +8,6 @@ import { useTranslation } from '@/lib/i18n'
 
 import { Plus, Store, FolderOpen } from 'lucide-react'
 
-import { ActiveSkillCreatorRunCard } from './components/ActiveSkillCreatorRunCard'
 import { NewSkillDialog } from './components/NewSkillDialog'
 import SkillsManager from './SkillsManager'
 import SkillsStore from './SkillsStore'
@@ -27,8 +26,6 @@ export default function SkillsPage() {
 
   return (
     <div className="flex h-full w-full flex-col">
-      <ActiveSkillCreatorRunCard />
-
       <Tabs value={activeTab} onValueChange={setActiveTab} className="flex h-full flex-col">
         {/* Tab navigation header */}
         <div className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-elevated)] px-6 py-3">
diff --git a/frontend/app/tasks/layout.tsx b/frontend/app/tasks/layout.tsx
new file mode 100644
index 000000000..bb5719782
--- /dev/null
+++ b/frontend/app/tasks/layout.tsx
@@ -0,0 +1,3 @@
+export default function TasksLayout({ children }: { children: React.ReactNode }) {
+  return <>{children}</>
+}
diff --git a/frontend/app/tasks/page.tsx b/frontend/app/tasks/page.tsx
new file mode 100644
index 000000000..7fd0ea8b2
--- /dev/null
+++ b/frontend/app/tasks/page.tsx
@@ -0,0 +1,247 @@
+'use client'
+
+import { ArrowRight, Kanban, List, Loader2, Plus, Target } from 'lucide-react'
+import Link from 'next/link'
+import { useSearchParams, useRouter } from 'next/navigation'
+import { useCallback, useMemo, useState } from 'react'
+
+import { TaskAttentionPanel } from '@/components/tasks/task-attention-panel'
+import { TaskActivitySummary } from '@/components/tasks/task-activity-summary'
+import { TaskBoard } from '@/components/tasks/task-board'
+import { TaskCreateDialog } from '@/components/tasks/task-create-dialog'
+import { TaskDetailPanel } from '@/components/tasks/task-detail-panel'
+import { TaskListView } from '@/components/tasks/task-list-view'
+import { Button } from '@/components/ui/button'
+import { useAgentNameMap, useAgents } from '@/hooks/queries/agents'
+import { useTasks } from '@/hooks/queries/tasks'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+
+type ViewMode = 'board' | 'list'
+
+export default function TasksPage() {
+  const { t } = useTranslation()
+  const [viewMode, setViewMode] = useState<ViewMode>('board')
+  const searchParams = useSearchParams()
+  const router = useRouter()
+  const selectedTaskId = searchParams.get('task')
+  const agentFilter = searchParams.get('agent')
+
+  const setSelectedTaskId = useCallback(
+    (id: string | null) => {
+      const params = new URLSearchParams(searchParams.toString())
+      if (id) {
+        params.set('task', id)
+      } else {
+        params.delete('task')
+      }
+      router.replace(`/tasks?${params.toString()}`, { scroll: false })
+    },
+    [searchParams, router],
+  )
+
+  const setAgentFilter = useCallback(
+    (agentId: string | null) => {
+      const params = new URLSearchParams(searchParams.toString())
+      if (agentId) {
+        params.set('agent', agentId)
+      } else {
+        params.delete('agent')
+      }
+      params.delete('task')
+      router.replace(`/tasks?${params.toString()}`, { scroll: false })
+    },
+    [searchParams, router],
+  )
+
+  const { workspaceId, isLoading: isWorkspacesLoading } = useCurrentWorkspace()
+  const { canEdit } = useUserPermissionsContext()
+
+  const { data: allTasks = [], isLoading: isTasksLoading } = useTasks(workspaceId)
+  const { data: agents = [] } = useAgents(workspaceId)
+  const agentsMap = useAgentNameMap(workspaceId)
+
+  const isLoading = isWorkspacesLoading || isTasksLoading
+
+  const tasks = useMemo(() => {
+    if (!agentFilter) return allTasks
+    return allTasks.filter((t) => t.agent_id === agentFilter)
+  }, [allTasks, agentFilter])
+
+  const attentionTasks = useMemo(() => allTasks.filter((t) => t.status === 'in_review'), [allTasks])
+
+  const inProgressTasks = useMemo(
+    () => allTasks.filter((t) => t.status === 'in_progress'),
+    [allTasks],
+  )
+
+  const recentlyDoneTasks = useMemo(() => {
+    const oneDayAgo = Date.now() - 24 * 60 * 60 * 1000
+    return allTasks
+      .filter(
+        (t) => t.status === 'done' && t.updated_at && new Date(t.updated_at).getTime() > oneDayAgo,
+      )
+      .sort((a, b) => new Date(b.updated_at!).getTime() - new Date(a.updated_at!).getTime())
+  }, [allTasks])
+
+  const filterAgentName = agentFilter ? agentsMap[agentFilter] : null
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--bg)]">
+      {/* Header */}
+      <div className="border-b border-[var(--border)] bg-[var(--surface-elevated)] px-8 py-5">
+        <div className="flex items-center justify-between">
+          <div className="flex items-center gap-2">
+            <Target className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <h1 className="text-lg font-semibold text-[var(--text-primary)]">{t('tasks.title')}</h1>
+          </div>
+
+          <div className="flex items-center gap-2">
+            {/* Agent filter */}
+            <select
+              value={agentFilter || ''}
+              onChange={(e) => setAgentFilter(e.target.value || null)}
+              className="h-8 rounded-md border border-[var(--border)] bg-[var(--surface-1)] px-2 text-xs text-[var(--text-secondary)]"
+            >
+              <option value="">{t('tasks.allAgents')}</option>
+              {agents.map((a) => (
+                <option key={a.id} value={a.id}>
+                  {a.name}
+                </option>
+              ))}
+            </select>
+
+            {/* View toggle */}
+            <div className="flex items-center rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-0.5">
+              <button
+                type="button"
+                onClick={() => setViewMode('board')}
+                className={cn(
+                  'inline-flex items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors',
+                  viewMode === 'board'
+                    ? 'bg-[var(--surface-5)] text-[var(--text-primary)]'
+                    : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]',
+                )}
+                aria-label="Board view"
+              >
+                <Kanban className="h-3.5 w-3.5" />
+                {t('tasks.boardView')}
+              </button>
+              <button
+                type="button"
+                onClick={() => setViewMode('list')}
+                className={cn(
+                  'inline-flex items-center gap-1 rounded-md px-2.5 py-1 text-xs font-medium transition-colors',
+                  viewMode === 'list'
+                    ? 'bg-[var(--surface-5)] text-[var(--text-primary)]'
+                    : 'text-[var(--text-muted)] hover:text-[var(--text-secondary)]',
+                )}
+                aria-label="List view"
+              >
+                <List className="h-3.5 w-3.5" />
+                {t('tasks.listView')}
+              </button>
+            </div>
+
+            {workspaceId && canEdit && (
+              <TaskCreateDialog
+                workspaceId={workspaceId}
+                trigger={
+                  <Button size="sm">
+                    <Plus className="mr-1 h-4 w-4" />
+                    {t('tasks.newTask')}
+                  </Button>
+                }
+              />
+            )}
+          </div>
+        </div>
+
+        {filterAgentName && (
+          <div className="mt-2 flex items-center gap-2 text-xs text-[var(--text-muted)]">
+            <span>{t('tasks.filterBy', { name: filterAgentName })}</span>
+            <button
+              onClick={() => setAgentFilter(null)}
+              className="text-[var(--brand-500)] hover:underline"
+            >
+              {t('tasks.clearFilter')}
+            </button>
+          </div>
+        )}
+      </div>
+
+      {/* Content */}
+      <div className="flex-1 overflow-y-auto">
+        {isLoading ? (
+          <div className="flex h-full items-center justify-center">
+            <Loader2 className="h-6 w-6 animate-spin text-[var(--text-muted)]" />
+          </div>
+        ) : allTasks.length === 0 ? (
+          <div className="flex h-full flex-col items-center justify-center gap-4">
+            <Target className="h-10 w-10 text-[var(--text-muted)]" />
+            <h2 className="text-lg font-semibold text-[var(--text-primary)]">
+              {t('tasks.emptyTitle')}
+            </h2>
+            <p className="text-sm text-[var(--text-muted)]">{t('tasks.emptyDescription')}</p>
+            <Link
+              href="/agents"
+              className="inline-flex items-center gap-1 text-sm font-medium text-[var(--brand-500)] hover:underline"
+            >
+              {t('tasks.emptyAction')} <ArrowRight className="h-4 w-4" />
+            </Link>
+          </div>
+        ) : (
+          <>
+            {/* Attention + Activity summary — only show when not filtered */}
+            {!agentFilter &&
+              (attentionTasks.length > 0 ||
+                inProgressTasks.length > 0 ||
+                recentlyDoneTasks.length > 0) && (
+                <div className="space-y-4 px-8 py-6">
+                  <TaskAttentionPanel
+                    tasks={attentionTasks}
+                    agentsMap={agentsMap}
+                    onSelectTask={setSelectedTaskId}
+                  />
+                  <TaskActivitySummary
+                    inProgressTasks={inProgressTasks}
+                    recentlyDoneTasks={recentlyDoneTasks}
+                    agentsMap={agentsMap}
+                    onSelectTask={setSelectedTaskId}
+                  />
+                </div>
+              )}
+
+            {/* Full task board/list */}
+            <div className="flex-1 overflow-hidden">
+              {viewMode === 'board' ? (
+                <TaskBoard
+                  tasks={tasks}
+                  workspaceId={workspaceId}
+                  agentsMap={agentsMap}
+                  onSelectTask={setSelectedTaskId}
+                />
+              ) : (
+                <TaskListView
+                  tasks={tasks}
+                  agentsMap={agentsMap}
+                  onSelectTask={setSelectedTaskId}
+                />
+              )}
+            </div>
+          </>
+        )}
+      </div>
+
+      {selectedTaskId && workspaceId && (
+        <TaskDetailPanel
+          taskId={selectedTaskId}
+          workspaceId={workspaceId}
+          onClose={() => setSelectedTaskId(null)}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/AgentBuilder.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/AgentBuilder.tsx
deleted file mode 100644
index de94ce625..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/AgentBuilder.tsx
+++ /dev/null
@@ -1,712 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import { Loader2, AlertTriangle, FilePlus } from 'lucide-react'
-import { useParams } from 'next/navigation'
-import React, { useEffect, useState } from 'react'
-import { ReactFlowProvider } from 'reactflow'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { useGraphs, useDeploymentStatus, useGraphState, graphKeys } from '@/hooks/queries/graphs'
-import { useToast } from '@/hooks/use-toast'
-import { useTranslation } from '@/lib/i18n'
-import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
-
-import { BuilderCanvas } from './components/BuilderCanvas'
-import { BuilderSidebarTabs } from './components/BuilderSidebarTabs'
-import { BuilderToolbar } from './components/BuilderToolbar'
-import { ExecutionPanelNew as ExecutionPanel } from './components/execution/ExecutionPanelNew'
-import { LoadModal } from './components/LoadModal'
-import { RunInputModal } from './components/RunInputModal'
-import { CodeEditorPage } from './CodeEditorPage'
-import { useCodeEditorStore } from './stores/codeEditorStore'
-import { ErrorBoundary } from './error-boundary'
-import { agentService, AgentGraph } from './services/agentService'
-import { useBuilderStore } from './stores/builderStore'
-import { useExecutionStore } from './stores/executionStore'
-import type { StateField } from './types/graph'
-
-/** Typed shape of graph variables stored alongside canvas state. */
-interface BuilderVariables {
-  graph_mode?: string
-  state_fields?: StateField[]
-  code_content?: string
-  fallback_node_id?: string
-  context?: Record<string, { type?: string; description?: string; value?: unknown }>
-}
-
-const isValidUUID = (str: string): boolean => {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-  return uuidRegex.test(str)
-}
-
-const AgentBuilderContent = () => {
-  const { t } = useTranslation()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-  const rawAgentId = params.agentId as string | undefined
-  const agentId = rawAgentId && isValidUUID(rawAgentId) ? rawAgentId : null
-
-  const {
-    isInitializing,
-    rfInstance,
-    nodes,
-    loadGraph,
-    exportGraph,
-    importGraph,
-    setWorkspaceId,
-    setGraphId,
-    setGraphName,
-    startAutoSave,
-    stopAutoSave,
-    setDeployedAt,
-  } = useBuilderStore()
-
-  const { showPanel: showExecutionPanel, startExecution, setCurrentGraphId } = useExecutionStore()
-
-  const queryClient = useQueryClient()
-
-  // Use React Query hooks to fetch data (automatic caching and deduplication)
-  // These hooks automatically share cache with other components like sidebar
-  const { data: graphsData } = useGraphs(workspaceId)
-  const { data: deploymentStatus } = useDeploymentStatus(agentId ?? undefined)
-
-  // Use React Query to fetch graph state uniformly, avoiding duplicate requests
-  // refetchOnMount: 'always' ensures latest data is fetched when switching graphs
-  const { data: graphStateData, isSuccess: isGraphStateLoaded } = useGraphState(
-    agentId ?? undefined,
-    {
-      refetchOnMount: 'always',
-    },
-  )
-
-  const { toast } = useToast()
-  const [showLoadModal, setShowLoadModal] = useState(false)
-  const [showOverwriteConfirm, setShowOverwriteConfirm] = useState(false)
-  const [showNewConfirm, setShowNewConfirm] = useState(false)
-  const [pendingGraph, setPendingGraph] = useState<
-    AgentGraph | { type: 'import'; file: File } | null
-  >(null)
-  const [isLoadingGraph, setIsLoadingGraph] = useState(false)
-  const [isRunModalOpen, setIsRunModalOpen] = useState(false)
-  const [runInput, setRunInput] = useState('')
-
-  // Set workspaceId and agentId in the store
-  useEffect(() => {
-    if (workspaceId) {
-      setWorkspaceId(workspaceId)
-    }
-  }, [workspaceId, setWorkspaceId])
-
-  // Sync currentGraphId in executionStore when agentId changes
-  // This ensures each graph has its own execution state
-  useEffect(() => {
-    setCurrentGraphId(agentId || null)
-  }, [agentId, setCurrentGraphId])
-
-  const graphId = useBuilderStore((state) => state.graphId)
-  const graphName = useBuilderStore((state) => state.graphName)
-
-  useEffect(() => {
-    if (graphId && graphId === agentId && graphName && !isInitializing) {
-      startAutoSave()
-    }
-
-    return () => {
-      stopAutoSave()
-    }
-  }, [graphId, graphName, isInitializing, agentId, startAutoSave, stopAutoSave])
-
-  useEffect(() => {
-    const handleOnline = () => {
-      const { hasPendingChanges, lastSaveError } = useBuilderStore.getState()
-      if (hasPendingChanges || lastSaveError === 'offline') {
-        useBuilderStore.setState({ saveRetryCount: 0, lastSaveError: null })
-        useBuilderStore.getState().autoSave()
-      }
-    }
-
-    window.addEventListener('online', handleOnline)
-    return () => {
-      window.removeEventListener('online', handleOnline)
-    }
-  }, [])
-
-  useEffect(() => {
-    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
-      const { hasPendingChanges, autoSaveDebounceTimer, nodes, edges, rfInstance, graphId } =
-        useBuilderStore.getState()
-
-      if (!graphId || graphId !== agentId || !isValidUUID(graphId)) {
-        return
-      }
-
-      if (hasPendingChanges || autoSaveDebounceTimer) {
-        if (autoSaveDebounceTimer) {
-          clearTimeout(autoSaveDebounceTimer)
-        }
-
-        try {
-          const viewport = rfInstance?.getViewport() || { x: 0, y: 0, zoom: 1 }
-          const payload = JSON.stringify({
-            nodes,
-            edges,
-            viewport,
-          })
-
-          const apiBaseUrl = process.env.NEXT_PUBLIC_API_URL || ''
-          const url = `${apiBaseUrl}/v1/graphs/${graphId}/state`
-          const blob = new Blob([payload], { type: 'application/json' })
-          navigator.sendBeacon(url, blob)
-        } catch {
-          // Silent fail for sendBeacon
-        }
-
-        e.preventDefault()
-        e.returnValue = ''
-        return ''
-      }
-    }
-
-    window.addEventListener('beforeunload', handleBeforeUnload)
-    return () => {
-      window.removeEventListener('beforeunload', handleBeforeUnload)
-    }
-  }, [agentId])
-
-  // Use ref to track loaded graphId, avoiding duplicate initialization
-  const loadedGraphIdRef = React.useRef<string | null>(null)
-  // Track viewport setting timers for cleanup
-  const viewportTimersRef = React.useRef<NodeJS.Timeout[]>([])
-
-  // Load graph when agentId changes and graph state is loaded from React Query
-  // Key optimization: Use React Query cached data instead of directly calling agentService.loadGraphState
-  useEffect(() => {
-    // Wait for necessary data to load
-    if (!agentId) {
-      loadGraph()
-      return
-    }
-
-    // When switching to a different agent
-    if (loadedGraphIdRef.current !== agentId) {
-      // Important: DO NOT clear the canvas yet.
-      // Wait until we have the new data to avoid triggering auto-save on an empty state.
-      useBuilderStore.setState({ isInitializing: true })
-      // Clear stale rfInstance so setViewportWhenReady waits for the new ReactFlow instance
-      useBuilderStore.setState({ rfInstance: null })
-
-      // If we don't have data yet, we must stop here and wait for the next run
-      if (!isGraphStateLoaded || !graphStateData) {
-        return
-      }
-    }
-
-    // Wait for graph state data to load
-    if (!isGraphStateLoaded || !graphStateData) {
-      useBuilderStore.setState({ isInitializing: true })
-      return
-    }
-
-    // Avoid duplicate initialization for the same graphId
-    if (loadedGraphIdRef.current === agentId && !useBuilderStore.getState().isInitializing) {
-      return
-    }
-
-    // Use React Query cached state data
-    const state = graphStateData
-
-    // Code mode: hydrate code editor store instead of canvas
-    const loadedVars = (state.variables ?? {}) as BuilderVariables
-    const graphMode = loadedVars.graph_mode
-    if (graphMode === 'code' && agentId) {
-      const currentGraph = graphsData?.find((g) => g.id === agentId)
-      useCodeEditorStore.getState().hydrate(
-        agentId,
-        loadedVars.code_content ?? '',
-        currentGraph?.name ?? '',
-      )
-      loadedGraphIdRef.current = agentId
-      useBuilderStore.setState({ isInitializing: false })
-      return
-    }
-
-    // CRITICAL: Ensure we are applying data for the CORRECT agentId
-    if (agentId) {
-      agentService.setCachedGraphId(agentId)
-      setGraphId(agentId)
-    }
-
-    // Sync other metadata...
-    const currentGraph = graphsData?.find((g) => g.id === agentId)
-    if (currentGraph) {
-      if (currentGraph.name) {
-        agentService.setCachedGraphName(currentGraph.name)
-        setGraphName(currentGraph.name)
-      }
-      if (currentGraph.updatedAt) {
-        const updatedAtTime = new Date(currentGraph.updatedAt).getTime()
-        useBuilderStore.setState({ lastAutoSaveTime: updatedAtTime })
-      }
-    }
-
-    // Parse stateFields and fallbackNodeId from the loaded graph state
-    // so the hash is computed with the correct values for THIS graph,
-    // not stale values from the previous graph still in the store.
-    const loadedVariables = (state.variables || {}) as BuilderVariables
-    const loadedStateFields = (() => {
-      const sf = loadedVariables.state_fields || []
-      if (sf.length > 0) return sf
-      const ctx = loadedVariables.context || {}
-      if (Object.keys(ctx).length === 0) return []
-      return Object.entries(ctx).map(([key, v]) => ({
-        name: key,
-        type: (v?.type === 'number' ? 'int' : v?.type === 'boolean' ? 'bool' : v?.type || 'string') as StateField['type'],
-        description: v?.description || '',
-        defaultValue: v?.value,
-      }))
-    })()
-    const loadedFallbackNodeId = loadedVariables.fallback_node_id ?? null
-
-    // Calculate hash of initial state (same 4 params as SaveManager for consistency)
-    const initialHash = computeGraphStateHash(
-      state.nodes || [],
-      state.edges || [],
-      loadedStateFields,
-      loadedFallbackNodeId,
-    )
-
-    // Apply multiple state changes in one batch to ensure consistency
-    useBuilderStore.setState({
-      nodes: state.nodes || [],
-      edges: state.edges || [],
-      graphStateFields: loadedStateFields,
-      fallbackNodeId: loadedFallbackNodeId,
-      past: [],
-      future: [],
-      selectedNodeId: null,
-      lastSavedStateHash: initialHash,
-      saveRetryCount: 0,
-      lastSaveError: null,
-      isInitializing: false, // FINALLY mark as non-initializing
-    })
-
-    // Now we are officially initialized for this agentId
-    loadedGraphIdRef.current = agentId
-
-    // Wait for ReactFlow instance to be ready
-    let retryCount = 0
-    const maxRetries = 40
-    const setViewportWhenReady = () => {
-      const currentRfInstance = useBuilderStore.getState().rfInstance
-      const currentNodes = useBuilderStore.getState().nodes
-
-      if (currentRfInstance && currentNodes.length > 0) {
-        const finalTimer = setTimeout(() => {
-          if (state.viewport) {
-            currentRfInstance.setViewport(state.viewport, { duration: 0 })
-          } else {
-            currentRfInstance.fitView({ padding: 0.2, duration: 0 })
-          }
-        }, 150)
-        viewportTimersRef.current.push(finalTimer)
-      } else if (retryCount < maxRetries) {
-        retryCount++
-        const retryTimer = setTimeout(setViewportWhenReady, 50)
-        viewportTimersRef.current.push(retryTimer)
-      }
-    }
-
-    setViewportWhenReady()
-
-    return () => {
-      viewportTimersRef.current.forEach((timer) => {
-        if (timer) clearTimeout(timer)
-      })
-      viewportTimersRef.current = []
-    }
-  }, [agentId, isGraphStateLoaded, graphStateData, graphsData, loadGraph, setGraphId, setGraphName])
-
-  // Sync deployment status from React Query to builderStore
-  // Deployment status is fetched via useDeploymentStatus hook, automatically sharing cache with other components
-  useEffect(() => {
-    if (deploymentStatus) {
-      if (deploymentStatus.isDeployed && deploymentStatus.deployedAt) {
-        setDeployedAt(deploymentStatus.deployedAt)
-      } else {
-        setDeployedAt(null)
-      }
-    }
-  }, [deploymentStatus, setDeployedAt])
-
-  const applyLoadedGraph = async (graph: AgentGraph) => {
-    setIsLoadingGraph(true)
-    try {
-      agentService.setCachedGraphId(graph.id)
-      setGraphId(graph.id)
-      // Sync executionStore currentGraphId when loading a different graph
-      setCurrentGraphId(graph.id)
-      if (graph.name) {
-        agentService.setCachedGraphName(graph.name)
-        setGraphName(graph.name)
-      } else {
-        // Set default name if graph.name is not available
-        const defaultName = '(not set)'
-        agentService.setCachedGraphName(defaultName)
-        setGraphName(defaultName)
-      }
-
-      // Use React Query to fetch state, invalidate cache first to ensure latest data
-      await queryClient.invalidateQueries({ queryKey: graphKeys.state(graph.id) })
-      const stateResult = await queryClient.fetchQuery({
-        queryKey: graphKeys.state(graph.id),
-        queryFn: async () => {
-          const response = await agentService.loadGraphState(graph.id)
-          return response
-        },
-      })
-      const state = stateResult || { nodes: [], edges: [] }
-
-      if (graph.updatedAt) {
-        const updatedAtTime = new Date(graph.updatedAt).getTime()
-        useBuilderStore.setState({ lastAutoSaveTime: updatedAtTime })
-      }
-
-      // Parse stateFields and fallbackNodeId from loaded state for consistent hash computation
-      const applyVariables = (state.variables || {}) as BuilderVariables
-      const applyStateFields = (() => {
-        const sf = applyVariables.state_fields || []
-        if (sf.length > 0) return sf
-        const ctx = applyVariables.context || {}
-        if (Object.keys(ctx).length === 0) return []
-        return Object.entries(ctx).map(([key, v]) => ({
-          name: key,
-          type: (v?.type === 'number' ? 'int' : v?.type === 'boolean' ? 'bool' : v?.type || 'string') as StateField['type'],
-          description: v?.description || '',
-          defaultValue: v?.value,
-        }))
-      })()
-      const applyFallbackNodeId = applyVariables.fallback_node_id ?? null
-
-      // Calculate hash of initial state (all 4 params, consistent with SaveManager)
-      const initialHash = computeGraphStateHash(
-        state.nodes || [],
-        state.edges || [],
-        applyStateFields,
-        applyFallbackNodeId,
-      )
-
-      useBuilderStore.setState({
-        nodes: state.nodes || [],
-        edges: state.edges || [],
-        graphStateFields: applyStateFields,
-        fallbackNodeId: applyFallbackNodeId,
-        past: [],
-        future: [],
-        selectedNodeId: null,
-        lastSavedStateHash: initialHash,
-        saveRetryCount: 0,
-        lastSaveError: null,
-      })
-
-      if (state.viewport && rfInstance) {
-        rfInstance.setViewport(state.viewport)
-      } else {
-        setTimeout(() => {
-          rfInstance?.fitView({ padding: 0.2 })
-        }, 100)
-      }
-
-      // Reset loadedGraphIdRef to allow reloading
-      loadedGraphIdRef.current = graph.id
-
-      toast({
-        title: t('workspace.graphLoaded'),
-        description: t('workspace.graphLoadedSuccess', { name: graph.name }),
-      })
-    } catch (error) {
-      console.error('Failed to load graph state:', error)
-      toast({
-        variant: 'destructive',
-        title: t('common.error'),
-        description: t('workspace.graphLoadFailed'),
-      })
-    } finally {
-      setIsLoadingGraph(false)
-    }
-  }
-
-  const handleLoadAttempt = (graph: AgentGraph) => {
-    setShowLoadModal(false)
-
-    // Check if the current canvas is empty
-    if (nodes.length > 0) {
-      setPendingGraph(graph)
-      setShowOverwriteConfirm(true)
-    } else {
-      applyLoadedGraph(graph)
-    }
-  }
-
-  const handleImport = async (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (!file) return
-
-    // Check if current canvas has nodes
-    if (nodes.length > 0) {
-      // Show confirmation dialog
-      setPendingGraph({ type: 'import', file })
-      setShowOverwriteConfirm(true)
-      // Reset file input
-      e.target.value = ''
-      return
-    }
-
-    // Import directly if canvas is empty
-    try {
-      await importGraph(file)
-      toast({
-        title: t('workspace.graphImported'),
-        description: t('workspace.graphImportedSuccess', { name: file.name }),
-      })
-
-      // Fit view after import
-      setTimeout(() => {
-        rfInstance?.fitView({ padding: 0.2 })
-      }, 100)
-    } catch (error: unknown) {
-      console.error('Failed to import graph:', error)
-      toast({
-        variant: 'destructive',
-        title: t('workspace.importFailed'),
-        description: error instanceof Error ? error.message : t('workspace.importFailedMessage'),
-      })
-    }
-
-    // Reset file input
-    e.target.value = ''
-  }
-
-  const handleConfirmOverwrite = async () => {
-    if (!pendingGraph) {
-      setShowOverwriteConfirm(false)
-      return
-    }
-
-    // Handle import case
-    if ('type' in pendingGraph && pendingGraph.type === 'import' && pendingGraph.file) {
-      try {
-        await importGraph(pendingGraph.file)
-        toast({
-          title: t('workspace.graphImported'),
-          description: t('workspace.graphImportedSuccess', { name: pendingGraph.file.name }),
-        })
-
-        // Fit view after import
-        setTimeout(() => {
-          rfInstance?.fitView({ padding: 0.2 })
-        }, 100)
-      } catch (error: unknown) {
-        console.error('Failed to import graph:', error)
-        toast({
-          variant: 'destructive',
-          title: t('workspace.importFailed'),
-          description: error instanceof Error ? error.message : t('workspace.importFailedMessage'),
-        })
-      }
-    } else {
-      // Handle load case (existing logic)
-      await applyLoadedGraph(pendingGraph as AgentGraph)
-    }
-
-    setPendingGraph(null)
-    setShowOverwriteConfirm(false)
-  }
-
-  const handleCancelOverwrite = () => {
-    const wasImport = pendingGraph && 'type' in pendingGraph && pendingGraph.type === 'import'
-    setPendingGraph(null)
-    setShowOverwriteConfirm(false)
-    // Only reopen load modal if it was a load operation, not an import
-    if (!wasImport) {
-      setShowLoadModal(true)
-    }
-  }
-
-  const createNewGraph = () => {
-    agentService.clearCachedGraphId()
-    agentService.clearCachedGraphName()
-    setGraphId(null)
-    setGraphName(null)
-    // Clear executionStore currentGraphId for new graph
-    setCurrentGraphId(null)
-
-    useBuilderStore.setState({
-      nodes: [],
-      edges: [],
-      past: [],
-      future: [],
-      selectedNodeId: null,
-      lastSavedStateHash: null,
-      saveRetryCount: 0,
-      lastSaveError: null,
-      lastAutoSaveTime: null,
-    })
-
-    // Reset viewport
-    setTimeout(() => {
-      rfInstance?.setViewport({ x: 0, y: 0, zoom: 1 })
-    }, 100)
-
-    toast({
-      title: t('workspace.newGraphCreated'),
-      description: t('workspace.newGraphCreatedDescription'),
-    })
-  }
-
-  const handleConfirmNew = () => {
-    setShowNewConfirm(false)
-    createNewGraph()
-  }
-
-  const handleRunClick = () => {
-    setIsRunModalOpen(true)
-  }
-
-  const handleStartExecution = () => {
-    if (!runInput.trim()) return
-    setIsRunModalOpen(false)
-    startExecution(runInput)
-    setRunInput('')
-  }
-
-  // Code mode: render CodeEditorPage instead of canvas
-  const graphMode = (graphStateData?.variables as BuilderVariables | undefined)?.graph_mode
-  if (graphMode === 'code' && agentId && !isInitializing) {
-    return <CodeEditorPage graphId={agentId} workspaceId={workspaceId} />
-  }
-
-  return (
-    <div className="relative flex h-full w-full flex-col overflow-hidden bg-[var(--bg)] text-[var(--text-primary)]">
-      {showLoadModal && (
-        <LoadModal onClose={() => setShowLoadModal(false)} onLoad={handleLoadAttempt} />
-      )}
-
-      <AlertDialog open={showOverwriteConfirm} onOpenChange={setShowOverwriteConfirm}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <div className="mb-2 flex items-center gap-1 text-[var(--status-warning)]">
-              <AlertTriangle size={20} />
-              <AlertDialogTitle>{t('workspace.overwriteCanvas')}</AlertDialogTitle>
-            </div>
-            <AlertDialogDescription>
-              {pendingGraph && 'type' in pendingGraph && pendingGraph.type === 'import'
-                ? t('workspace.importOverwriteWarning')
-                : t('workspace.loadOverwriteWarning', {
-                    name: pendingGraph && 'name' in pendingGraph ? pendingGraph.name : '',
-                  })}
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel onClick={handleCancelOverwrite}>
-              {t('common.cancel')}
-            </AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleConfirmOverwrite}
-              className="bg-primary hover:bg-primary/90"
-            >
-              {pendingGraph && 'type' in pendingGraph && pendingGraph.type === 'import'
-                ? t('workspace.import')
-                : t('workspace.overwriteAndLoad')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-
-      <AlertDialog open={showNewConfirm} onOpenChange={setShowNewConfirm}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <div className="mb-2 flex items-center gap-1 text-[var(--status-success)]">
-              <FilePlus size={20} />
-              <AlertDialogTitle>{t('workspace.createNewGraph')}</AlertDialogTitle>
-            </div>
-            <AlertDialogDescription>{t('workspace.newGraphWarning')}</AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>{t('common.cancel')}</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleConfirmNew}
-              className="bg-[var(--status-success)] hover:bg-[var(--status-success-hover)]"
-            >
-              {t('workspace.createNew')}
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-
-      {(isInitializing || isLoadingGraph) && (
-        <div className="absolute inset-0 z-50 flex flex-col items-center justify-center bg-[var(--bg)] backdrop-blur-sm">
-          <Loader2 size={40} className="mb-3 animate-spin text-[var(--brand-500)]" />
-          <p className="font-medium text-[var(--text-muted)]">
-            {isLoadingGraph ? t('workspace.loadingGraph') : t('workspace.loadingWorkspace')}
-          </p>
-        </div>
-      )}
-
-      {/* Main Content Area - Canvas takes full space, panels overlay on top */}
-      <div className="relative min-h-0 flex-1">
-        <ErrorBoundary>
-          <BuilderCanvas key={agentId || 'empty'} />
-        </ErrorBoundary>
-      </div>
-
-      {/* RIGHT: Panel - Fixed Position (combines Toolbar and Sidebar) */}
-      <aside className="fixed inset-y-0 right-0 z-20 flex w-[320px] flex-col overflow-hidden border-l border-[var(--border-muted)] bg-[var(--surface-2)]">
-        {/* Header with Toolbar */}
-        <div className="flex-shrink-0 border-b border-[var(--border)]">
-          <BuilderToolbar
-            onImport={handleImport}
-            onExport={exportGraph}
-            onRunClick={handleRunClick}
-            agentId={agentId || ''}
-            nodesCount={nodes.length}
-          />
-        </div>
-
-        {/* Sidebar Content with Tabs (Copilot and Toolbox) */}
-        <div className="min-h-0 flex-1 overflow-hidden">
-          <BuilderSidebarTabs />
-        </div>
-      </aside>
-
-      {/* Run Input Modal - Below Toolbar */}
-      <RunInputModal
-        isOpen={isRunModalOpen}
-        input={runInput}
-        onInputChange={setRunInput}
-        onStart={handleStartExecution}
-        onClose={() => setIsRunModalOpen(false)}
-      />
-
-      {/* Execution Panel - Bottom Dock */}
-      {showExecutionPanel && <ExecutionPanel />}
-    </div>
-  )
-}
-
-const AgentBuilder = () => (
-  <ReactFlowProvider>
-    <AgentBuilderContent />
-  </ReactFlowProvider>
-)
-
-export default AgentBuilder
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/CodeEditorPage.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/CodeEditorPage.tsx
deleted file mode 100644
index cbfce842b..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/CodeEditorPage.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-'use client'
-
-import { useRef } from 'react'
-import { CodeEditor, type CodeEditorHandle } from './components/CodeEditor'
-import { CodeEditorToolbar } from './components/CodeEditorToolbar'
-
-interface Props {
-  graphId: string
-  workspaceId: string
-}
-
-export function CodeEditorPage({ graphId, workspaceId }: Props) {
-  const editorRef = useRef<CodeEditorHandle>(null)
-
-  return (
-    <div className="flex h-full flex-col">
-      <CodeEditorToolbar graphId={graphId} workspaceId={workspaceId} />
-
-      <div className="flex-1 overflow-hidden">
-        <CodeEditor ref={editorRef} />
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderSidebarTabs.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderSidebarTabs.tsx
deleted file mode 100644
index 1ee7cc279..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderSidebarTabs.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-'use client'
-
-import { Sparkles, Wrench } from 'lucide-react'
-
-import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
-import { useTranslation } from '@/lib/i18n'
-
-import { ComponentsSidebar } from './ComponentsSidebar'
-import { CopilotPanel } from './CopilotPanel'
-
-export function BuilderSidebarTabs() {
-  const { t } = useTranslation()
-
-  return (
-    <Tabs defaultValue="copilot" className="flex h-full flex-col">
-      {/* Tab Headers */}
-      <div className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-2)] px-5 pb-0 pt-0">
-        <TabsList className="flex h-auto w-full space-x-6 bg-transparent p-0">
-          <TabsTrigger
-            value="copilot"
-            className="relative flex cursor-pointer flex-col items-start gap-0 rounded-none border-b-2 border-transparent bg-transparent px-0 pb-2 pt-1 text-base font-semibold tracking-tight shadow-none transition-all duration-200 ease-out data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:font-semibold data-[state=inactive]:font-medium data-[state=active]:text-[var(--text-primary)] data-[state=inactive]:text-[var(--text-tertiary)] data-[state=inactive]:hover:text-[var(--text-secondary)]"
-          >
-            <span className="flex items-center gap-2.5">
-              <Sparkles size={15} strokeWidth={2.5} className="flex-shrink-0" />
-              <span className="whitespace-nowrap">
-                {t('workspace.copilot', { defaultValue: 'Copilot' })}
-              </span>
-            </span>
-            <span className="pl-[23px] text-xs font-normal leading-tight text-[var(--text-tertiary)]">
-              {t('workspace.copilotSubtitle')}
-            </span>
-          </TabsTrigger>
-          <TabsTrigger
-            value="components"
-            className="relative flex cursor-pointer items-center gap-2.5 rounded-none border-b-2 border-transparent bg-transparent px-0 pb-2.5 pt-1 text-base font-semibold tracking-tight shadow-none transition-all duration-200 ease-out data-[state=active]:border-primary data-[state=active]:bg-transparent data-[state=active]:font-semibold data-[state=inactive]:font-medium data-[state=active]:text-[var(--text-primary)] data-[state=inactive]:text-[var(--text-tertiary)] data-[state=inactive]:hover:text-[var(--text-secondary)]"
-          >
-            <Wrench size={15} strokeWidth={2.5} className="flex-shrink-0" />
-            <span className="whitespace-nowrap">{t('workspace.components')}</span>
-          </TabsTrigger>
-        </TabsList>
-      </div>
-
-      {/* Tab Contents */}
-      <div className="min-h-0 flex-1 overflow-hidden">
-        <TabsContent
-          value="copilot"
-          className="m-0 h-full p-0 focus-visible:outline-none data-[state=active]:block data-[state=inactive]:hidden"
-        >
-          <div className="h-full">
-            <CopilotPanel />
-          </div>
-        </TabsContent>
-        <TabsContent
-          value="components"
-          className="m-0 h-full p-0 focus-visible:outline-none data-[state=active]:block data-[state=inactive]:hidden"
-        >
-          <div className="h-full">
-            <ComponentsSidebar showHeader={false} />
-          </div>
-        </TabsContent>
-      </div>
-    </Tabs>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderToolbar.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderToolbar.tsx
deleted file mode 100644
index 00d60c807..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderToolbar.tsx
+++ /dev/null
@@ -1,346 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import {
-  Upload,
-  Download,
-  Play,
-  Square,
-  MoreHorizontal,
-  ChevronDown,
-  Rocket,
-  Loader2,
-  History,
-  Terminal,
-} from 'lucide-react'
-import { useParams } from 'next/navigation'
-import React, { useRef, useState, useEffect } from 'react'
-
-import { Button } from '@/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useToast } from '@/hooks/use-toast'
-import { useDeploymentStatus, graphKeys } from '@/hooks/queries/graphs'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import { useDeploymentStore } from '@/stores/deploymentStore'
-
-import { useBuilderStore } from '../stores/builderStore'
-import { useExecutionStore } from '../stores/executionStore'
-
-import { ApiAccessDialog } from './ApiAccessDialog'
-import { DeploymentHistoryPanel } from './DeploymentHistoryPanel'
-
-interface BuilderToolbarProps {
-  onImport: (e: React.ChangeEvent<HTMLInputElement>) => void
-  onExport: () => void
-  onRunClick: () => void
-  agentId?: string
-  nodesCount?: number
-}
-
-export function BuilderToolbar({
-  onImport,
-  onExport,
-  onRunClick,
-  agentId,
-  nodesCount = 0,
-}: BuilderToolbarProps) {
-  const { workspaceId = '' } = useParams() as { workspaceId: string }
-  const { t } = useTranslation()
-  const { toast } = useToast()
-  const queryClient = useQueryClient()
-  const {
-    isExecuting,
-    stopExecution,
-    showPanel: showExecutionPanel,
-    togglePanel: toggleExecutionPanel,
-  } = useExecutionStore()
-
-  // Use React Query hook to get deployment status (automatic caching and deduplication)
-  const { data: deploymentStatus } = useDeploymentStatus(agentId)
-
-  // Get UI state and operation methods from Zustand store
-  const { isDeploying, deploy } = useDeploymentStore()
-
-  const {
-    setDeployedAt,
-  } = useBuilderStore()
-
-  const fileInputRef = useRef<HTMLInputElement>(null)
-  const [showDeploymentHistory, setShowDeploymentHistory] = useState(false)
-  const [showApiAccess, setShowApiAccess] = useState(false)
-
-  // Sync deployment status with builderStore
-  useEffect(() => {
-    if (deploymentStatus) {
-      if (deploymentStatus.isDeployed && deploymentStatus.deployedAt) {
-        setDeployedAt(deploymentStatus.deployedAt)
-      } else {
-        setDeployedAt(null)
-      }
-    }
-  }, [deploymentStatus, setDeployedAt])
-
-  const handleImportClick = () => {
-    fileInputRef.current?.click()
-  }
-
-  const toggleRun = () => {
-    if (isExecuting) {
-      stopExecution()
-      return
-    }
-    onRunClick()
-  }
-
-  const handleDeploy = async () => {
-    if (isDeploying || !agentId || nodesCount === 0) return
-
-    try {
-      const result = await deploy(agentId)
-
-      // Refresh deployment status cache after successful deployment
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployment(agentId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(agentId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployed() })
-
-      if (result.message.includes('No changes')) {
-        toast({
-          title: t('workspace.noChanges'),
-          description: t('workspace.noChangesDescription', { version: result.version }),
-        })
-      } else {
-        toast({
-          title: t('workspace.deploySuccess'),
-          description: t('workspace.deploySuccessDescription', { version: result.version }),
-          variant: 'success',
-        })
-      }
-    } catch (error) {
-      console.error('Deploy failed:', error)
-      toast({
-        title: t('workspace.deployFailed'),
-        description: t('workspace.deployFailedDescription'),
-        variant: 'destructive',
-      })
-    }
-  }
-
-  const getDeployTooltip = () => {
-    if (nodesCount === 0) {
-      return t('workspace.cannotDeployEmpty')
-    }
-    if (isDeploying) {
-      return t('workspace.deploying')
-    }
-    if (deploymentStatus?.isDeployed) {
-      if ((deploymentStatus as any).needsRedeployment) {
-        return t('workspace.needsRedeployment')
-      }
-      return t('workspace.activeDeployment')
-    }
-    return t('workspace.deployAgent')
-  }
-
-  const getDeployText = () => {
-    if (isDeploying) {
-      return t('workspace.deploying', { defaultValue: 'Publishing' })
-    }
-    if (deploymentStatus?.isDeployed) {
-      if ((deploymentStatus as any).needsRedeployment) {
-        return t('workspace.publishUpdate', { defaultValue: 'Publish Update' })
-      }
-      return t('workspace.activeDeploymentShort', { defaultValue: 'Published' })
-    }
-    return t('workspace.publish', { defaultValue: 'Publish' })
-  }
-
-  const isDeployed = deploymentStatus?.isDeployed || false
-  const needsRedeployment = (deploymentStatus as any)?.needsRedeployment || false
-
-  return (
-    <>
-      <TooltipProvider delayDuration={300}>
-        <div className="flex items-center justify-between border-b border-[var(--border)] px-3 py-1">
-          {/* Left: Menu and Controls */}
-          <div className="flex items-center gap-1">
-            <input
-              type="file"
-              ref={fileInputRef}
-              onChange={onImport}
-              accept=".json"
-              className="hidden"
-            />
-            {/* More Menu */}
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="h-7 w-7 rounded-md hover:bg-[var(--surface-2)]"
-                  aria-label={t('workspace.moreOptions', { defaultValue: 'More options' })}
-                >
-                  <MoreHorizontal size={16} className="text-[var(--text-secondary)]" />
-                </Button>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent align="start" side="bottom" sideOffset={8}>
-                <DropdownMenuItem onClick={handleImportClick}>
-                  <Upload size={14} className="mr-2" /> {t('workspace.importGraph')}
-                </DropdownMenuItem>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem onClick={onExport}>
-                  <Download size={14} className="mr-2" /> {t('workspace.exportGraph')}
-                </DropdownMenuItem>
-                {agentId && (
-                  <>
-                    <DropdownMenuSeparator />
-                    <DropdownMenuItem onClick={() => setShowDeploymentHistory(true)}>
-                      <History size={14} className="mr-2" /> {t('workspace.deploymentHistory')}
-                    </DropdownMenuItem>
-                  </>
-                )}
-              </DropdownMenuContent>
-            </DropdownMenu>
-
-            {/* Toggle Execution Panel */}
-            {!showExecutionPanel && (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <Button
-                    variant="ghost"
-                    size="icon"
-                    onClick={() => toggleExecutionPanel(true)}
-                    className="h-7 w-7 rounded-md hover:bg-[var(--surface-2)]"
-                  >
-                    <ChevronDown size={16} className="text-[var(--text-secondary)]" />
-                  </Button>
-                </TooltipTrigger>
-                <TooltipContent side="bottom">{t('workspace.showExecutionPanel')}</TooltipContent>
-              </Tooltip>
-            )}
-          </div>
-
-          {/* Right: Action Buttons */}
-          <div className="flex items-center gap-2">
-            {/* Deploy Dropdown */}
-            <DropdownMenu>
-              <div className="group flex rounded-md shadow-sm transition-all hover:shadow">
-                {/* Main Deploy Action Button */}
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <span>
-                      <Button
-                        size="sm"
-                        onClick={handleDeploy}
-                        disabled={isDeploying || nodesCount === 0}
-                        className={cn(
-                          'h-7 gap-1.5 rounded-r-none px-3 text-base font-medium transition-all',
-                          isDeployed
-                            ? needsRedeployment
-                              ? 'border border-primary border-r-white/20 bg-primary text-primary-foreground hover:bg-primary/90'
-                              : 'border border-[var(--status-success-border)] border-r-[var(--status-success-border)] bg-[var(--status-success-bg)] text-[var(--status-success-strong)] hover:bg-[var(--status-success-bg)]'
-                            : 'border border-[var(--border)] border-r-black/10 bg-[var(--surface-2)] text-[var(--text-secondary)] hover:bg-[var(--surface-3)]',
-                        )}
-                        style={{ borderRightWidth: '1px' }}
-                      >
-                        {isDeploying ? (
-                          <Loader2 size={13} className="animate-spin" />
-                        ) : (
-                          <Rocket size={13} strokeWidth={2} />
-                        )}
-                        <span>{getDeployText()}</span>
-                      </Button>
-                    </span>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom">{getDeployTooltip()}</TooltipContent>
-                </Tooltip>
-
-                {/* Dropdown Trigger */}
-                <DropdownMenuTrigger asChild>
-                  <Button
-                    size="sm"
-                    className={cn(
-                      'h-7 rounded-l-none px-1 transition-all',
-                      isDeployed
-                        ? needsRedeployment
-                          ? 'border border-l-0 border-primary bg-primary text-primary-foreground hover:bg-primary/90'
-                          : 'border border-l-0 border-[var(--status-success-border)] bg-[var(--status-success-bg)] text-[var(--status-success-strong)] hover:bg-[var(--status-success-bg)]'
-                        : 'border border-l-0 border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-secondary)] hover:bg-[var(--surface-3)]',
-                    )}
-                    aria-label={t('workspace.deployOptions', { defaultValue: 'Deploy options' })}
-                  >
-                    <ChevronDown size={14} />
-                  </Button>
-                </DropdownMenuTrigger>
-              </div>
-
-              <DropdownMenuContent align="end" side="bottom" sideOffset={8}>
-                <DropdownMenuItem onClick={handleDeploy} disabled={isDeploying || nodesCount === 0}>
-                  <Rocket size={14} className="mr-2" />
-                  {getDeployText()}
-                </DropdownMenuItem>
-                {agentId && (
-                  <DropdownMenuItem onClick={() => setShowApiAccess(true)}>
-                    <Terminal size={14} className="mr-2" />
-                    {t('workspace.accessApi', { defaultValue: 'Access API' })}
-                  </DropdownMenuItem>
-                )}
-              </DropdownMenuContent>
-            </DropdownMenu>
-
-            {/* Run Button */}
-            <Button
-              size="sm"
-              onClick={toggleRun}
-              className={cn(
-                'h-7 gap-1.5 rounded-md px-3 text-base font-medium shadow-sm transition-all hover:shadow',
-                isExecuting
-                  ? 'bg-[var(--status-error)] text-white hover:bg-[var(--status-error-hover)]'
-                  : 'bg-primary text-white hover:bg-primary/90',
-              )}
-            >
-              {isExecuting ? (
-                <>
-                  <Square size={13} className="fill-current" />
-                  <span>{t('workspace.stop')}</span>
-                </>
-              ) : (
-                <>
-                  <Play size={13} className="fill-current" />
-                  <span>{t('workspace.run')}</span>
-                </>
-              )}
-            </Button>
-          </div>
-        </div>
-      </TooltipProvider>
-
-      {/* Deployment History Panel */}
-      {agentId && (
-        <DeploymentHistoryPanel
-          graphId={agentId}
-          open={showDeploymentHistory}
-          onOpenChange={setShowDeploymentHistory}
-          nodesCount={nodesCount}
-        />
-      )}
-
-      {/* API Access Dialog */}
-      {agentId && (
-        <ApiAccessDialog
-          open={showApiAccess}
-          onOpenChange={setShowApiAccess}
-          agentId={agentId}
-          workspaceId={workspaceId}
-        />
-      )}
-    </>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/CodeEditorToolbar.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/components/CodeEditorToolbar.tsx
deleted file mode 100644
index c33956ab2..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/CodeEditorToolbar.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-'use client'
-
-import { Loader2, Play, Save } from 'lucide-react'
-import { useState, useRef } from 'react'
-import { useCodeEditorStore } from '../stores/codeEditorStore'
-import { apiPost } from '@/lib/api-client'
-import { useTranslation } from '@/lib/i18n'
-
-interface Props {
-  graphId: string
-  workspaceId: string
-}
-
-export function CodeEditorToolbar({ graphId, workspaceId }: Props) {
-  const { t } = useTranslation()
-  const isDirty = useCodeEditorStore((s) => s.isDirty)
-  const isSaving = useCodeEditorStore((s) => s.isSaving)
-  const save = useCodeEditorStore((s) => s.save)
-  const graphName = useCodeEditorStore((s) => s.graphName)
-  const setGraphName = useCodeEditorStore((s) => s.setGraphName)
-
-  const [isRunning, setIsRunning] = useState(false)
-  const [runResult, setRunResult] = useState<any>(null)
-  const [runError, setRunError] = useState<string | null>(null)
-  const [runDuration, setRunDuration] = useState<number | null>(null)
-  const startTimeRef = useRef<number>(0)
-
-  const handleRun = async () => {
-    if (isDirty) {
-      await save()
-    }
-    setIsRunning(true)
-    setRunResult(null)
-    setRunError(null)
-    setRunDuration(null)
-    startTimeRef.current = Date.now()
-    try {
-      const result = await apiPost<any>(`graphs/${graphId}/code/run`, { input: {} })
-      setRunResult(result?.result ?? result)
-    } catch (e: unknown) {
-      setRunError(e instanceof Error ? e.message : t('common.operationFailed'))
-    } finally {
-      setRunDuration(Date.now() - startTimeRef.current)
-      setIsRunning(false)
-    }
-  }
-
-  return (
-    <div className="flex flex-col shrink-0">
-      <div className="flex items-center justify-between px-4 py-2 border-b border-[var(--border)] bg-[var(--surface-1)]">
-        {/* Left: graph name */}
-        <input
-          className="text-sm font-medium bg-transparent border-none outline-none min-w-0 flex-1 max-w-xs text-[var(--text-primary)]"
-          value={graphName ?? ''}
-          onChange={(e) => setGraphName(e.target.value)}
-          placeholder={t('workspace.untitledGraph')}
-        />
-
-        {/* Right: actions */}
-        <div className="flex items-center gap-2">
-          <button
-            className="flex items-center gap-1.5 px-3 py-1.5 text-xs border border-[var(--border)] rounded-md hover:bg-[var(--surface-2)] disabled:opacity-40 disabled:cursor-not-allowed transition-colors"
-            onClick={() => save()}
-            disabled={!isDirty || isSaving}
-          >
-            {isSaving ? (
-              <Loader2 size={13} className="animate-spin" />
-            ) : (
-              <Save size={13} />
-            )}
-            {isSaving ? t('workspace.savingEllipsis') : t('workspace.save')}
-          </button>
-
-          <button
-            className={`flex items-center gap-1.5 px-3 py-1.5 text-xs rounded-md text-white transition-colors disabled:opacity-40 disabled:cursor-not-allowed ${
-              isRunning
-                ? 'bg-[var(--status-warning)]'
-                : 'bg-primary hover:bg-primary/90'
-            }`}
-            onClick={handleRun}
-            disabled={isRunning}
-          >
-            {isRunning ? (
-              <Loader2 size={13} className="animate-spin" />
-            ) : (
-              <Play size={13} />
-            )}
-            {isRunning ? t('workspace.runningEllipsis') : t('workspace.runButton')}
-          </button>
-        </div>
-      </div>
-
-      {/* Run result / error panel */}
-      {(runResult || runError) && (
-        <div className={`border-b border-[var(--border)] px-4 py-3 text-sm ${
-          runError
-            ? 'bg-[var(--status-error-bg)] text-[var(--status-error)]'
-            : 'bg-[var(--status-success-bg)] text-[var(--status-success)]'
-        }`}>
-          <div className="flex items-center justify-between mb-1.5">
-            <div className="flex items-center gap-2">
-              <span className="font-medium text-xs">{runError ? t('workspace.error') : t('workspace.result')}</span>
-              {runDuration !== null && (
-                <span className="text-xs opacity-60">
-                  {(runDuration / 1000).toFixed(1)}s
-                </span>
-              )}
-            </div>
-            <button
-              className="text-xs opacity-50 hover:opacity-100 transition-opacity"
-              onClick={() => { setRunResult(null); setRunError(null); setRunDuration(null) }}
-            >
-              {t('workspace.close')}
-            </button>
-          </div>
-          <pre className="whitespace-pre-wrap font-mono text-sm max-h-60 overflow-auto leading-relaxed">
-            {runError || JSON.stringify(runResult, null, 2)}
-          </pre>
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/LoadModal.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/components/LoadModal.tsx
deleted file mode 100644
index 6fcffccb5..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/LoadModal.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-'use client'
-
-import { FolderOpen, Loader2, Box, Clock, Trash2 } from 'lucide-react'
-import React, { useState, useEffect } from 'react'
-
-import { Button } from '@/components/ui/button'
-import { UnifiedDialog } from '@/components/ui/unified-dialog'
-import { ToastAction } from '@/components/ui/toast'
-import { useToast } from '@/hooks/use-toast'
-import { useTranslation } from '@/lib/i18n'
-
-import { agentService, AgentGraph } from '../services/agentService'
-
-interface LoadModalProps {
-  onClose: () => void
-  onLoad: (graph: AgentGraph) => void
-}
-
-export function LoadModal({ onClose, onLoad }: LoadModalProps) {
-  const { t } = useTranslation()
-  const [graphs, setGraphs] = useState<AgentGraph[]>([])
-  const [loading, setLoading] = useState(true)
-  const { toast: triggerToast } = useToast()
-
-  useEffect(() => {
-    const fetchGraphs = async () => {
-      try {
-        const data = await agentService.listGraphs()
-        setGraphs(data)
-      } catch (e) {
-        console.error('Failed to load graphs', e)
-      } finally {
-        setLoading(false)
-      }
-    }
-    fetchGraphs()
-  }, [])
-
-  const performDelete = async (id: string) => {
-    setGraphs((prev) => prev.filter((g) => g.id !== id))
-    try {
-      await agentService.deleteGraph(id)
-      triggerToast({
-        title: t('workspace.graphDeleted'),
-        description: t('workspace.graphDeletedDescription'),
-      })
-    } catch (e) {
-      console.error('Delete failed', e)
-      triggerToast({
-        variant: 'destructive',
-        title: t('workspace.deleteFailed'),
-        description: t('workspace.deleteFailedDescription'),
-      })
-    }
-  }
-
-  const handleDeleteRequest = (e: React.MouseEvent, id: string, name: string) => {
-    e.stopPropagation()
-
-    triggerToast({
-      variant: 'destructive',
-      title: t('workspace.confirmDeletion'),
-      description: t('workspace.confirmDeletionDescription', { name }),
-      action: (
-        <ToastAction
-          altText="Delete"
-          onClick={() => performDelete(id)}
-          className="border-white/20 text-white hover:bg-white/20"
-        >
-          {t('workspace.deleteNow')}
-        </ToastAction>
-      ),
-    })
-  }
-
-  return (
-    <UnifiedDialog
-      open={true}
-      onOpenChange={(open) => !open && onClose()}
-      maxWidth="md"
-      title={t('workspace.loadSavedGraph')}
-      icon={<FolderOpen size={18} />}
-      iconBgColor="bg-primary/10"
-      iconColor="text-primary"
-      showContentBg={false}
-    >
-      <div className="custom-scrollbar max-h-[60vh] min-h-[200px] overflow-y-auto p-1">
-        {loading ? (
-          <div className="flex h-40 flex-col items-center justify-center gap-2 text-[var(--text-muted)]">
-            <Loader2 size={24} className="animate-spin text-primary" />
-            <span className="text-sm">{t('workspace.fetchingProjects')}</span>
-          </div>
-        ) : graphs.length === 0 ? (
-          <div className="flex h-40 flex-col items-center justify-center gap-2 text-[var(--text-muted)]">
-            <Box size={32} className="opacity-20" />
-            <span className="text-sm">{t('workspace.noSavedGraphs')}</span>
-          </div>
-        ) : (
-          <div className="space-y-2">
-            {graphs.map((g) => (
-              <div
-                key={g.id}
-                onClick={() => onLoad(g)}
-                className="group flex cursor-pointer items-center justify-between rounded-xl border border-transparent p-3 transition-all hover:border-primary/20 hover:bg-primary/5"
-              >
-                <div className="flex flex-col gap-1">
-                  <span className="text-sm font-medium text-[var(--text-secondary)]">{g.name}</span>
-                  <div className="flex items-center gap-2 text-xs text-[var(--text-muted)]">
-                    <Clock size={10} />
-                    <span>{new Date(g.createdAt).toLocaleString()}</span>
-                    <span className="h-1 w-1 rounded-full bg-[var(--text-subtle)]" />
-                    <span>
-                      {g.nodeCount ?? 0} {t('workspace.nodes')}
-                    </span>
-                  </div>
-                </div>
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  onClick={(e) => handleDeleteRequest(e, g.id, g.name)}
-                  className="h-8 w-8 text-[var(--text-muted)] opacity-0 transition-all hover:bg-[var(--status-error-bg)] hover:text-[var(--status-error)] group-hover:opacity-100"
-                >
-                  <Trash2 size={14} />
-                </Button>
-              </div>
-            ))}
-          </div>
-        )}
-      </div>
-    </UnifiedDialog>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/PropertiesPanel.tsx b/frontend/app/workspace/[workspaceId]/[agentId]/components/PropertiesPanel.tsx
deleted file mode 100644
index 60e4b56c6..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/PropertiesPanel.tsx
+++ /dev/null
@@ -1,348 +0,0 @@
-'use client'
-
-import { X, AlertCircle, Settings, Hammer, Sparkles } from 'lucide-react'
-import { useParams } from 'next/navigation'
-import React, { useCallback, useMemo } from 'react'
-import { Node, Edge } from 'reactflow'
-
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { Label } from '@/components/ui/label'
-import { useToast } from '@/hooks/use-toast'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { nodeRegistry, FieldSchema } from '../services/nodeRegistry'
-import { useBuilderStore } from '../stores/builderStore'
-
-import { MemorySection } from './MemorySection'
-import { SchemaFieldRenderer } from './SchemaFieldRenderer'
-import { SectionHeader } from './SectionHeader'
-
-// Re-export SectionHeader for any existing consumers
-export { SectionHeader } from './SectionHeader'
-
-interface PropertiesPanelProps {
-  node: Node
-  nodes: Node[]
-  edges: Edge[]
-  onUpdate: (id: string, data: { label: string; config?: Record<string, unknown> }) => void
-  onClose: () => void
-}
-
-// ============================================================================
-// Utility Functions
-// ============================================================================
-
-function normalizeValue(value: unknown): string | boolean | number {
-  if (typeof value === 'boolean') return value
-  if (typeof value === 'number') return value
-  if (typeof value === 'string') {
-    const lower = value.toLowerCase()
-    return lower === 'true' ? true : lower === 'false' ? false : value
-  }
-  return String(value)
-}
-
-function shouldShowField(field: FieldSchema, config: Record<string, unknown>): boolean {
-  if (!field.showWhen) return true
-  const dependentValue = config[field.showWhen.field]
-  const normalizedDependent = normalizeValue(dependentValue)
-  return field.showWhen.values.some((val) => normalizeValue(val) === normalizedDependent)
-}
-
-// ============================================================================
-// Sub-components
-// ============================================================================
-
-/** Renders a list of SchemaFieldRenderer items under a SectionHeader */
-const FieldListSection = React.memo(function FieldListSection({
-  icon,
-  title,
-  fields,
-  config,
-  updateConfig,
-  canEdit,
-  t,
-  nodes,
-  edges,
-  currentNodeId,
-  graphStateFields,
-}: {
-  icon: React.ElementType
-  title: string
-  fields: FieldSchema[]
-  config: Record<string, unknown>
-  updateConfig: (key: string, value: unknown) => void
-  canEdit: boolean
-  t: (key: string, options?: Record<string, unknown>) => string
-  nodes: Node[]
-  edges: Edge[]
-  currentNodeId: string
-  graphStateFields?: import('../types/graph').StateField[]
-}) {
-  if (fields.length === 0) return null
-  return (
-    <div className="space-y-4">
-      <SectionHeader icon={icon} title={title} />
-      {fields.map((field) => (
-        <SchemaFieldRenderer
-          key={field.key}
-          schema={field}
-          value={config[field.key]}
-          onChange={(val) => updateConfig(field.key, val)}
-          canEdit={canEdit}
-          t={t}
-          nodes={nodes}
-          edges={edges}
-          currentNodeId={currentNodeId}
-          onCreateEdge={undefined}
-          graphStateFields={graphStateFields}
-        />
-      ))}
-    </div>
-  )
-})
-
-export default function PropertiesPanel({
-  node,
-  nodes,
-  edges,
-  onUpdate,
-  onClose,
-}: PropertiesPanelProps) {
-  const { t } = useTranslation()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-  const { toast } = useToast()
-  const { permissions, loading: permissionsLoading } = useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
-  const { onConnect, updateEdge, graphStateFields } = useBuilderStore()
-  const nodeData = node?.data as
-    | { type: string; label?: string; config?: Record<string, unknown> }
-    | undefined
-  const def = nodeData ? nodeRegistry.get(nodeData.type) : undefined
-
-  const config = useMemo(() => nodeData?.config || {}, [nodeData?.config])
-
-  const validationErrors = useMemo(() => {
-    const errors: { field: string; message: string; severity?: string }[] = []
-    if (!def) return errors
-    def.schema.forEach((field) => {
-      if (field.required && !config[field.key] && config[field.key] !== 0 && config[field.key] !== false) {
-        if (field.showWhen) {
-          const dependentValue = config[field.showWhen.field]
-          if (!field.showWhen.values.includes(String(dependentValue))) return
-        }
-        errors.push({
-          field: field.label || field.key,
-          message: t('workspace.fieldRequired', { defaultValue: 'Field is required' }),
-          severity: 'error',
-        })
-      }
-    })
-    return errors
-  }, [def, config, t])
-
-  const updateConfig = useCallback((key: string, value: unknown) => {
-    if (!userPermissions.canEdit) {
-      toast({ title: t('workspace.noPermission'), description: t('workspace.cannotEditNode'), variant: 'destructive' })
-      return
-    }
-    onUpdate(node.id, { label: nodeData?.label || '', config: { ...config, [key]: value } })
-  }, [userPermissions.canEdit, toast, t, onUpdate, node.id, nodeData?.label, config])
-
-  const updateModelConfig = useCallback((modelName: string, providerName: string) => {
-    onUpdate(node.id, {
-      label: nodeData?.label || '',
-      config: { ...config, provider_name: providerName, model_name: modelName },
-    })
-  }, [onUpdate, node.id, nodeData?.label, config])
-
-  const handleMemoryModelChange = useCallback((modelName: string, providerName: string) => {
-    onUpdate(node.id, {
-      label: nodeData?.label || '',
-      config: { ...config, memory_provider_name: providerName, memory_model_name: modelName },
-    })
-  }, [onUpdate, node.id, nodeData?.label, config])
-
-  if (!node || !nodeData) return null
-
-  const Icon = def?.icon || AlertCircle
-  const enableMemory = config.enableMemory === true
-
-  const parentNodes = edges
-    .filter((edge) => edge.target === node.id)
-    .map((edge) => nodes.find((n) => n.id === edge.source))
-    .filter(Boolean) as Node[]
-  const hasParentWithDeepAgents = parentNodes.some((p) => {
-    const pd = p?.data as { config?: Record<string, unknown> }
-    return pd?.config?.useDeepAgents === true
-  })
-
-  const basicFields = def?.schema.filter(
-    (s) => !['enableMemory', 'memory_model_name', 'memoryPrompt', 'description'].includes(s.key) && s.type !== 'toolSelector' && !(s.type === 'skillSelector' && !s.showWhen),
-  ) || []
-  const toolsFields = def?.schema.filter((s) => s.type === 'toolSelector') || []
-  const skillsFields = def?.schema.filter((s) => s.type === 'skillSelector' && !s.showWhen) || []
-  const memoryFields = def?.schema.filter((s) => ['enableMemory', 'memory_model_name', 'memoryPrompt'].includes(s.key)) || []
-  const descriptionField = def?.schema.find((s) => s.key === 'description')
-
-  return (
-    <div className="absolute bottom-[60px] right-[336px] top-[56px] z-50 flex w-[400px] flex-col overflow-hidden rounded-2xl border border-[var(--border)] bg-[var(--surface-1)] shadow-2xl duration-300 animate-in fade-in slide-in-from-right-10">
-      {/* Header */}
-      <div className="flex shrink-0 items-center justify-between border-b border-[var(--border)] bg-[var(--surface-1)] px-4 py-3.5">
-        <div className="flex items-center gap-3 overflow-hidden text-[var(--text-primary)]">
-          <div className={cn('shrink-0 rounded-lg border border-[var(--border)] p-1.5 shadow-sm', def?.style.bg, def?.style.color)}>
-            <Icon size={14} />
-          </div>
-          <div className="flex min-w-0 flex-col">
-            <h3 className="truncate text-sm font-bold leading-tight">{nodeData.label || def?.label}</h3>
-            <span className="text-xs font-bold uppercase tracking-widest text-[var(--text-muted)]">{def?.label}</span>
-          </div>
-        </div>
-        <Button variant="ghost" size="icon" onClick={onClose} className="h-7 w-7 text-[var(--text-disabled)] hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)]" aria-label={t('workspace.closePanel', { defaultValue: 'Close panel' })}>
-          <X size={16} />
-        </Button>
-      </div>
-
-      {/* Body */}
-      <div className="custom-scrollbar flex-1 space-y-6 overflow-y-auto p-4 pb-12">
-        {/* Validation Errors */}
-        {validationErrors.length > 0 && (
-          <div className="space-y-2">
-            <Label className="text-xs font-bold uppercase tracking-wider text-[var(--status-error)]">Configuration Errors</Label>
-            <div className="space-y-1">
-              {validationErrors.map((error, idx) => (
-                <div key={idx} className="flex items-start gap-2 rounded border border-[var(--status-error-border)] bg-[var(--status-error-bg)] p-2 text-xs">
-                  <AlertCircle size={14} className="mt-0.5 flex-shrink-0 text-[var(--status-error)]" />
-                  <div className="text-[var(--status-error-strong)]">
-                    <div className="font-medium">{error.field}</div>
-                    <div className="text-[var(--status-error)]">{error.message}</div>
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-        )}
-
-        {/* Section: General */}
-        <div className="space-y-4">
-          <SectionHeader icon={Settings} title={t('workspace.general')} />
-          <div className="space-y-4">
-            <div className="space-y-1.5">
-              <Label className="text-xs font-bold uppercase tracking-wider text-[var(--text-muted)]">{t('workspace.displayName')}</Label>
-              <Input
-                value={nodeData.label || ''}
-                onChange={(e) => {
-                  if (!userPermissions.canEdit) {
-                    toast({ title: t('workspace.noPermission'), description: t('workspace.cannotEditNode'), variant: 'destructive' })
-                    return
-                  }
-                  onUpdate(node.id, { label: e.target.value, config })
-                }}
-                disabled={!userPermissions.canEdit}
-                className="h-8 text-xs font-medium"
-              />
-            </div>
-            {basicFields
-              .filter((field) => shouldShowField(field, config))
-              .map((field) => (
-                <SchemaFieldRenderer
-                  key={field.key}
-                  schema={field}
-                  value={
-                    field.key === 'model_name' && config.provider_name
-                      ? `${config.provider_name}:${config.model_name || ''}`
-                      : field.key === 'memory_model_name' && config.memory_provider_name
-                        ? `${config.memory_provider_name}:${config.memory_model_name || ''}`
-                        : config[field.key]
-                  }
-                  onChange={(val) => updateConfig(field.key, val)}
-                  canEdit={userPermissions.canEdit}
-                  t={t}
-                  onModelChange={field.key === 'model_name' ? updateModelConfig : undefined}
-                  nodes={nodes}
-                  edges={edges}
-                  currentNodeId={node.id}
-                  onCreateEdge={undefined}
-                  graphStateFields={graphStateFields}
-                />
-              ))}
-
-            {hasParentWithDeepAgents && descriptionField && (
-              <div className="space-y-1.5 border-l-2 border-[var(--brand-200)] pl-4 duration-300 animate-in slide-in-from-top-2">
-                <SchemaFieldRenderer
-                  schema={{ ...descriptionField, required: true }}
-                  value={config[descriptionField.key]}
-                  onChange={(val) => updateConfig(descriptionField.key, val)}
-                  canEdit={userPermissions.canEdit}
-                  t={t}
-                  nodes={nodes}
-                  edges={edges}
-                  currentNodeId={node.id}
-                  onCreateEdge={undefined}
-                  graphStateFields={graphStateFields}
-                />
-              </div>
-            )}
-          </div>
-        </div>
-
-        {/* Section: Tools */}
-        <FieldListSection
-          icon={Hammer}
-          title={t('workspace.capabilities')}
-          fields={toolsFields}
-          config={config}
-          updateConfig={updateConfig}
-          canEdit={userPermissions.canEdit}
-          t={t}
-          nodes={nodes}
-          edges={edges}
-          currentNodeId={node.id}
-          graphStateFields={graphStateFields}
-        />
-
-        {/* Section: Skills */}
-        <FieldListSection
-          icon={Sparkles}
-          title={t('workspace.skills', { defaultValue: 'Skills' })}
-          fields={skillsFields}
-          config={config}
-          updateConfig={updateConfig}
-          canEdit={userPermissions.canEdit}
-          t={t}
-          nodes={nodes}
-          edges={edges}
-          currentNodeId={node.id}
-          graphStateFields={graphStateFields}
-        />
-
-        {/* Section: Memory */}
-        <MemorySection
-          memoryFields={memoryFields}
-          config={config}
-          enableMemory={enableMemory}
-          updateConfig={updateConfig}
-          canEdit={userPermissions.canEdit}
-          nodes={nodes}
-          edges={edges}
-          currentNodeId={node.id}
-          graphStateFields={graphStateFields}
-          onMemoryModelChange={handleMemoryModelChange}
-        />
-      </div>
-
-      {/* Footer */}
-      <div className="flex items-center justify-between border-t border-[var(--border)] bg-[var(--surface-2)] px-4 py-2 font-mono text-xs text-[var(--text-muted)]">
-        <span className="truncate">TYPE: {nodeData.type}</span>
-        <span className="flex items-center gap-1">
-          <div className="h-1.5 w-1.5 rounded-full bg-[var(--status-success)]" /> {t('workspace.synced')}
-        </span>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotActions.ts b/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotActions.ts
deleted file mode 100644
index 7994d4da3..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotActions.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * useCopilotActions - Business logic hook for Copilot actions
- *
- * Handles all user interactions: send, stop, reset, AI decision, etc.
- * Uses Run Center (runService.createRun) + shared chat WS (getChatWsClient) for execution.
- */
-
-import { useQueryClient } from '@tanstack/react-query'
-import { useParams } from 'next/navigation'
-import { useCallback, useRef } from 'react'
-
-import { graphKeys } from '@/hooks/queries/graphs'
-import { useTranslation } from '@/lib/i18n'
-import { generateUUID } from '@/lib/utils/uuid'
-import { getChatWsClient } from '@/lib/ws/chat/chatWsClient'
-import type { CopilotExtension } from '@/lib/ws/chat/types'
-import type { ChatStreamEvent } from '@/services/chatBackend'
-import { copilotService } from '@/services/copilotService'
-import { runService } from '@/services/runService'
-
-import { useBuilderStore } from '../stores/builderStore'
-
-import type { CopilotState, CopilotActions, CopilotRefs } from './useCopilotState'
-
-export type CopilotMode = 'standard' | 'deepagents'
-
-interface UseCopilotActionsOptions {
-  state: CopilotState
-  actions: CopilotActions
-  refs: CopilotRefs
-  graphId?: string
-  copilotMode?: CopilotMode
-  selectedProviderName?: string
-  selectedModelName?: string
-  onCopilotEvent?: (evt: ChatStreamEvent) => void
-}
-
-export function useCopilotActions({
-  state,
-  actions,
-  refs,
-  graphId,
-  copilotMode = 'deepagents',
-  selectedProviderName,
-  selectedModelName,
-  onCopilotEvent,
-}: UseCopilotActionsOptions) {
-  const { t } = useTranslation()
-  const queryClient = useQueryClient()
-  const params = useParams()
-  const currentGraphId = params.agentId as string | undefined
-  const { getGraphContext } = useBuilderStore()
-  const activeRequestIdRef = useRef<string | null>(null)
-
-  const handleSendWithInput = useCallback(
-    async (userText: string) => {
-      if (!userText.trim() || state.loading || !refs.isMountedRef.current) return
-
-      actions.setInput('')
-      actions.addMessage({ role: 'user', text: userText })
-
-      if (!refs.isMountedRef.current) return
-      actions.setLoading(true)
-      actions.clearStreaming()
-
-      // Mark that we're creating a new session
-      // eslint-disable-next-line react-hooks/immutability
-      refs.isCreatingSessionRef.current = true
-      actions.clearSession()
-
-      // Get serialized context from store
-      const graphContext = getGraphContext()
-      const storeGraphId = useBuilderStore.getState().graphId
-
-      if (!storeGraphId) {
-        console.error('[CopilotPanel] No graphId in store')
-        if (refs.isMountedRef.current) {
-          actions.setLoading(false)
-        }
-        return
-      }
-
-      try {
-        // Convert conversation history to OpenAI format
-        const historyMessages = copilotService.convertConversationHistory(state.messages)
-
-        // 1. Create run via Run Center
-        let runId: string | null = null
-        try {
-          const runResponse = await runService.createRun({
-            agent_name: 'copilot',
-            graph_id: graphId || storeGraphId,
-            message: userText,
-          })
-          runId = runResponse.run_id
-        } catch (err) {
-          console.warn('[Copilot] Failed to create run, proceeding without persistence', err)
-        }
-
-        // Check if component is still mounted
-        if (!refs.isMountedRef.current) return
-
-        // Save run_id
-        if (runId) {
-          actions.setSession(runId)
-        }
-
-        // Show initial loading state
-        actions.setCurrentStage({ stage: 'thinking', message: 'Connecting...' })
-        actions.setThinkingMessage()
-
-        // 2. Send via shared chat WS
-        const extension: CopilotExtension = {
-          kind: 'copilot',
-          runId,
-          graphContext,
-          conversationHistory: historyMessages as unknown as Array<Record<string, unknown>>,
-          mode: copilotMode || 'deepagents',
-        }
-
-        const requestId = generateUUID()
-        activeRequestIdRef.current = requestId
-
-        const result = await getChatWsClient().sendChat({
-          requestId,
-          input: {
-            message: userText,
-            provider_name: selectedProviderName,
-            model_name: selectedModelName,
-          },
-          graphId: graphId || storeGraphId,
-          extension,
-          onEvent: (evt) => onCopilotEvent?.(evt),
-        })
-
-        if (result.terminal === 'error' && refs.isMountedRef.current) {
-          actions.setLoading(false)
-          actions.clearStreaming()
-          refs.isCreatingSessionRef.current = false
-          actions.clearSession()
-        }
-      } catch (e: unknown) {
-        console.error('[CopilotPanel] Failed to send copilot message:', e)
-
-        if (!refs.isMountedRef.current) return
-
-        actions.setLoading(false)
-        actions.clearStreaming()
-
-        // Provide user-friendly error messages
-        let errorMessage = t('workspace.couldNotProcessRequest')
-
-        if (e && typeof e === 'object') {
-          const error = e as { response?: { status?: number }; message?: string }
-          if (error.response?.status === 401 || error.response?.status === 403) {
-            errorMessage = t('workspace.copilot.error.auth', {
-              defaultValue: 'Authentication error. Please check your credentials.',
-            })
-          } else if (error.message?.includes('fetch') || error.message?.includes('network')) {
-            errorMessage = t('workspace.copilot.error.network', {
-              defaultValue: 'Network error. Please check your connection and try again.',
-            })
-          }
-        }
-
-        actions.finalizeCurrentMessage(`${t('workspace.systemError')}: ${errorMessage}`)
-        refs.isCreatingSessionRef.current = false
-        actions.clearSession()
-      } finally {
-        activeRequestIdRef.current = null
-      }
-    },
-    [state.loading, state.messages, actions, refs, graphId, copilotMode, selectedProviderName, selectedModelName, getGraphContext, t, onCopilotEvent],
-  )
-
-  const handleSend = useCallback(async () => {
-    if (!state.input.trim() || state.loading) return
-    await handleSendWithInput(state.input.trim())
-  }, [state.input, state.loading, handleSendWithInput])
-
-  const handleStop = useCallback(() => {
-    // Send chat.stop frame to cancel the backend stream
-    const requestId = activeRequestIdRef.current
-    if (requestId) {
-      getChatWsClient().stopByRequestId(requestId)
-      activeRequestIdRef.current = null
-    }
-
-    actions.clearSession()
-
-    if (!refs.isMountedRef.current) return
-    actions.setLoading(false)
-    actions.clearStreaming()
-
-    // eslint-disable-next-line react-hooks/immutability
-    refs.isCreatingSessionRef.current = false
-    actions.removeCurrentMessage()
-    actions.addMessage({ role: 'model', text: t('workspace.requestCancelled') })
-  }, [actions, refs, t])
-
-  const handleReset = useCallback(async () => {
-    actions.clearSession()
-
-    const idToClear = graphId ?? currentGraphId
-    let serverCleared = true
-    if (idToClear) {
-      serverCleared = await copilotService.clearHistory(idToClear)
-      if (!refs.isMountedRef.current) return
-      if (serverCleared && idToClear) {
-        queryClient.invalidateQueries({ queryKey: graphKeys.copilotHistory(idToClear) })
-      }
-    }
-
-    if (!serverCleared) {
-      console.warn('[Copilot] Clear history failed on server, keeping local list')
-      return
-    }
-
-    if (!refs.isMountedRef.current) return
-    actions.clearMessages()
-    actions.setInput('')
-    actions.setLoading(false)
-    actions.clearStreaming()
-    actions.clearExpandedItems()
-    // eslint-disable-next-line react-hooks/immutability
-    refs.hasProcessedUrlInputRef.current = false
-  }, [actions, refs, graphId, currentGraphId, queryClient])
-
-  const handleAIDecision = useCallback(() => {
-    if (!state.loading) {
-      handleSendWithInput(t('workspace.aiDecisionPrompt'))
-    }
-  }, [state.loading, handleSendWithInput, t])
-
-  return {
-    handleSend,
-    handleSendWithInput,
-    handleStop,
-    handleReset,
-    handleAIDecision,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotEffects.ts b/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotEffects.ts
deleted file mode 100644
index dc6f6e72e..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotEffects.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-/**
- * useCopilotEffects - Side effects hook for Copilot
- *
- * Handles UI side effects: page title, auto-scroll, URL parameter cleanup.
- * Run restoration is handled by useCopilotSession (init) and this hook (fetch via Run Center).
- */
-
-import { useSearchParams, useRouter } from 'next/navigation'
-import { useEffect, useRef } from 'react'
-
-import { useToast } from '@/hooks/use-toast'
-import { createLogger } from '@/lib/logs/console/logger'
-import type { RunEventFrame, RunStatusFrame } from '@/lib/ws/runs/types'
-import { getRunWsClient } from '@/lib/ws/runs/runWsClient'
-import type { ChatStreamEvent } from '@/services/chatBackend'
-import { runService } from '@/services/runService'
-
-import { hasCurrentMessage } from '../utils/copilotUtils'
-
-import type { CopilotState, CopilotActions, CopilotRefs } from './useCopilotState'
-
-const logger = createLogger('CopilotEffects')
-
-interface UseCopilotEffectsOptions {
-  state: CopilotState
-  actions: CopilotActions
-  refs: CopilotRefs
-  graphId?: string
-  handleSendWithInput: (input: string) => Promise<void>
-  handleCopilotEvent: (evt: ChatStreamEvent) => void
-}
-
-/** Map a persisted RunEventFrame back to the ChatStreamEvent shape that handleCopilotEvent expects. */
-function runEventToChatEvent(frame: RunEventFrame): ChatStreamEvent {
-  // _mirror_run_stream_event stores "content" as "content_delta"; reverse it
-  const type = frame.event_type === 'content_delta' ? 'content' : frame.event_type
-  return { type, data: frame.data } as ChatStreamEvent
-}
-
-export function useCopilotEffects({
-  state,
-  actions,
-  refs,
-  handleSendWithInput,
-  handleCopilotEvent,
-}: UseCopilotEffectsOptions) {
-  const searchParams = useSearchParams()
-  const router = useRouter()
-  const { toast } = useToast()
-  const lastRestoredSessionIdRef = useRef<string | null>(null)
-  const activeSubscriptionRef = useRef<string | null>(null)
-
-  // Cleanup run subscription on unmount
-  useEffect(() => {
-    return () => {
-      if (activeSubscriptionRef.current) {
-        getRunWsClient().unsubscribe(activeSubscriptionRef.current)
-        activeSubscriptionRef.current = null
-      }
-    }
-  }, [])
-
-  // Session recovery: restore state from run snapshot when runId is restored
-  useEffect(() => {
-    const currentRunId = state.currentRunId
-    if (
-      !currentRunId ||
-      refs.isCreatingSessionRef.current ||
-      lastRestoredSessionIdRef.current === currentRunId
-    )
-      return
-
-    const restoreSession = async () => {
-      logger.debug('Restoring from run snapshot:', currentRunId)
-      lastRestoredSessionIdRef.current = currentRunId
-
-      try {
-        actions.setLoading(true)
-        const snapshot = await runService.getRunSnapshot(currentRunId)
-        if (!refs.isMountedRef.current) return
-
-        if (!snapshot) {
-          actions.clearSession()
-          return
-        }
-
-        const projection = snapshot.projection as Record<string, unknown> | undefined
-        const status = snapshot.status as string
-
-        if (status === 'running' || status === 'queued') {
-          // Run still active -- show last known state from snapshot
-          if (projection) {
-            const content = projection.content as string | undefined
-            if (content) {
-              actions.setStreamingContent(content)
-            }
-            const stage = projection.stage as string | undefined
-            actions.setCurrentStage({ stage: (stage || 'processing') as any, message: 'Processing...' })
-            if (!hasCurrentMessage(state.messages, false)) actions.setThinkingMessage()
-          }
-
-          // Subscribe to /ws/runs for live event replay from where snapshot left off
-          const afterSeq = snapshot.last_seq ?? 0
-          activeSubscriptionRef.current = currentRunId
-          getRunWsClient()
-            .subscribe(currentRunId, afterSeq, {
-              onEvent: (frame: RunEventFrame) => {
-                if (!refs.isMountedRef.current) return
-                handleCopilotEvent(runEventToChatEvent(frame))
-              },
-              onStatus: (frame: RunStatusFrame) => {
-                if (!refs.isMountedRef.current) return
-                if (frame.status === 'completed' || frame.status === 'failed') {
-                  getRunWsClient().unsubscribe(currentRunId)
-                  activeSubscriptionRef.current = null
-                  // Re-fetch final snapshot to get complete projection
-                  runService.getRunSnapshot(currentRunId).then((finalSnapshot) => {
-                    if (!refs.isMountedRef.current || !finalSnapshot) return
-                    const fp = finalSnapshot.projection as Record<string, unknown> | undefined
-                    if (frame.status === 'completed' && fp) {
-                      const resultMessage = (fp.result_message as string) ?? ''
-                      const resultActions = fp.result_actions as Array<Record<string, unknown>> | undefined
-                      actions.clearStreaming()
-                      actions.finalizeCurrentMessage(resultMessage, resultActions as any)
-                      if (resultActions && resultActions.length > 0) {
-                        actions.executeActions(resultActions as any)
-                      }
-                    } else if (frame.status === 'failed') {
-                      actions.clearStreaming()
-                      actions.finalizeCurrentMessage(
-                        (fp?.error as string) || frame.error_message || 'Copilot task failed',
-                      )
-                    }
-                    actions.clearSession()
-                    actions.setLoading(false)
-                  }).catch(() => {
-                    actions.clearSession()
-                    actions.setLoading(false)
-                  })
-                }
-              },
-              onError: (message: string) => {
-                logger.warn('Run subscription error:', message)
-              },
-            })
-            .catch((err) => {
-              logger.warn('Failed to subscribe to run events:', err)
-            })
-        } else if (status === 'completed') {
-          if (projection) {
-            const resultMessage = (projection.result_message as string) ?? ''
-            const resultActions = projection.result_actions as Array<Record<string, unknown>> | undefined
-            if (resultMessage || (resultActions && resultActions.length > 0)) {
-              actions.finalizeCurrentMessage(resultMessage, resultActions as any)
-            }
-          }
-          actions.clearSession()
-          actions.clearStreaming()
-        } else if (status === 'failed') {
-          toast({
-            title: 'Copilot task failed',
-            description: (projection?.error as string) || 'An error occurred during execution. Please retry.',
-            variant: 'destructive',
-          })
-          actions.clearSession()
-        }
-      } catch (error) {
-        logger.warn('Failed to restore from run snapshot:', error)
-      } finally {
-        if (refs.isMountedRef.current) actions.setLoading(false)
-      }
-    }
-
-    restoreSession()
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.currentRunId, actions, refs, handleCopilotEvent])
-
-  // Update page title to show loading status
-  useEffect(() => {
-    const baseTitle = 'Agent Platform'
-    document.title =
-      state.loading && state.currentStage
-        ? `⏳ ${state.currentStage.message} - ${baseTitle}`
-        : baseTitle
-  }, [state.loading, state.currentStage])
-
-  // Auto-scroll to bottom when content changes
-  useEffect(() => {
-    const scrollEl = refs.scrollRef.current
-    if (!scrollEl) return
-
-    const contentSignature = `${state.messages.length}-${state.streamingContent.length}-${state.loading}`
-    if (contentSignature === refs.lastScrollContentRef.current) return
-    refs.lastScrollContentRef.current = contentSignature
-
-    requestAnimationFrame(() => {
-      if (!refs.isMountedRef.current || !scrollEl) return
-      scrollEl.scrollTo({
-        top: scrollEl.scrollHeight,
-        behavior: state.streamingContent ? 'smooth' : 'auto',
-      })
-      if (refs.streamingContentRef.current) {
-        refs.streamingContentRef.current.scrollTo({
-          top: refs.streamingContentRef.current.scrollHeight,
-          behavior: 'smooth',
-        })
-      }
-    })
-  }, [state.messages, state.loading, state.streamingContent, refs])
-
-  // Warn user before leaving page during generation
-  useEffect(() => {
-    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
-      if (state.loading || state.executingActions) {
-        e.preventDefault()
-        e.returnValue = ''
-        return ''
-      }
-    }
-    window.addEventListener('beforeunload', handleBeforeUnload)
-    return () => window.removeEventListener('beforeunload', handleBeforeUnload)
-  }, [state.loading, state.executingActions])
-
-  // Handle URL parameter for auto-executing copilot input
-  useEffect(() => {
-    const copilotInput = searchParams.get('copilotInput')
-    if (!copilotInput || refs.hasProcessedUrlInputRef.current || state.loading) return
-
-    refs.hasProcessedUrlInputRef.current = true
-    const decodedInput = decodeURIComponent(copilotInput)
-    const params = new URLSearchParams(searchParams.toString())
-    params.delete('copilotInput')
-    const newSearch = params.toString()
-    router.replace(
-      newSearch ? `${window.location.pathname}?${newSearch}` : window.location.pathname,
-      { scroll: false },
-    )
-
-    setTimeout(() => {
-      if (!refs.isMountedRef.current) return
-      actions.setInput(decodedInput)
-      setTimeout(() => {
-        if (refs.isMountedRef.current) handleSendWithInput(decodedInput)
-      }, 100)
-    }, 300)
-  }, [searchParams, state.loading, router, actions, refs, handleSendWithInput])
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useDeploymentHistory.ts b/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useDeploymentHistory.ts
deleted file mode 100644
index b588bdf8f..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useDeploymentHistory.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import { useEffect, useState, useCallback, useMemo } from 'react'
-
-import { useToast } from '@/hooks/use-toast'
-import { useDeploymentStatus, useDeploymentVersions, graphKeys } from '@/hooks/queries/graphs'
-import { useTranslation } from '@/lib/i18n'
-import {
-  graphDeploymentService,
-  type GraphDeploymentVersion,
-  type GraphVersionState,
-} from '@/services/graphDeploymentService'
-import { useDeploymentStore } from '@/stores/deploymentStore'
-
-import { agentService } from '../services/agentService'
-import { useBuilderStore } from '../stores/builderStore'
-
-type PreviewMode = 'current' | 'selected'
-
-export function useDeploymentHistory(
-  graphId: string,
-  open: boolean,
-  onOpenChange: (open: boolean) => void,
-) {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-  const queryClient = useQueryClient()
-
-  // Pagination state
-  const [currentPage, setCurrentPage] = useState(1)
-  const pageSize = 10
-
-  const { data: deploymentStatus } = useDeploymentStatus(graphId, { enabled: open })
-  const {
-    data: versionsData,
-    isLoading: isLoadingVersions,
-  } = useDeploymentVersions(graphId, currentPage, pageSize, { enabled: open })
-
-  const versions = versionsData?.versions || []
-  const totalVersions = versionsData?.total || 0
-  const totalPages = versionsData?.totalPages || 1
-
-  const { revertToVersion, renameVersion, deleteVersion, undeploy, isUndeploying } =
-    useDeploymentStore()
-
-  const [editingVersion, setEditingVersion] = useState<number | null>(null)
-  const [editName, setEditName] = useState('')
-  const [isSaving, setIsSaving] = useState(false)
-
-  const [selectedVersion, setSelectedVersion] = useState<number | null>(null)
-  const [previewMode, setPreviewMode] = useState<PreviewMode>('current')
-  const [isLoadingPreview, setIsLoadingPreview] = useState(false)
-
-  const [revertConfirmOpen, setRevertConfirmOpen] = useState(false)
-  const [versionToRevert, setVersionToRevert] = useState<number | null>(null)
-  const [isReverting, setIsReverting] = useState(false)
-
-  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false)
-  const [versionToDelete, setVersionToDelete] = useState<number | null>(null)
-  const [isDeleting, setIsDeleting] = useState(false)
-
-  const [undeployConfirmOpen, setUndeployConfirmOpen] = useState(false)
-
-  const [versionCache, setVersionCache] = useState<Record<number, GraphVersionState>>({})
-
-  const rfInstance = useBuilderStore((state) => state.rfInstance)
-  const currentNodes = useBuilderStore((state) => state.nodes)
-  const currentEdges = useBuilderStore((state) => state.edges)
-
-  const currentState: GraphVersionState = useMemo(() => ({
-    nodes: currentNodes.map((node) => ({
-      id: node.id,
-      type: node.type || 'custom',
-      position: node.position,
-      data: node.data as Record<string, unknown>,
-    })),
-    edges: currentEdges.map((edge) => ({
-      id: edge.id,
-      source: edge.source,
-      target: edge.target,
-    })),
-  }), [currentNodes, currentEdges])
-
-  const cachedSelectedState =
-    selectedVersion !== null ? versionCache[selectedVersion] ?? null : null
-
-  const fetchVersionState = useCallback(
-    async (version: number) => {
-      if (!graphId) return
-      if (versionCache[version]) return
-
-      setIsLoadingPreview(true)
-      try {
-        const response = await graphDeploymentService.getVersionState(graphId, version)
-        if (response.state) {
-          setVersionCache((prev) => ({ ...prev, [version]: response.state }))
-        }
-      } catch (error) {
-        console.error('Failed to fetch version state:', error)
-      } finally {
-        setIsLoadingPreview(false)
-      }
-    },
-    [graphId, versionCache],
-  )
-
-  useEffect(() => {
-    if (selectedVersion !== null) {
-      fetchVersionState(selectedVersion)
-      setPreviewMode('selected')
-    } else {
-      setPreviewMode('current')
-    }
-  }, [selectedVersion, fetchVersionState])
-
-  useEffect(() => {
-    if (open && graphId) {
-      setCurrentPage(1)
-      setSelectedVersion(null)
-      setPreviewMode('current')
-    } else if (!open) {
-      setVersionCache({})
-      setSelectedVersion(null)
-      setPreviewMode('current')
-    }
-  }, [open, graphId])
-
-  const handleSelectVersion = useCallback(
-    (version: number) => {
-      if (selectedVersion === version) {
-        setSelectedVersion(null)
-      } else {
-        setSelectedVersion(version)
-      }
-    },
-    [selectedVersion],
-  )
-
-  const handlePageChange = useCallback(
-    (page: number) => {
-      if (page >= 1 && page <= totalPages) {
-        setCurrentPage(page)
-      }
-    },
-    [totalPages],
-  )
-
-  const handleRevertClick = (version: number) => {
-    setVersionToRevert(version)
-    setRevertConfirmOpen(true)
-  }
-
-  const handleDeleteClick = (version: number) => {
-    setVersionToDelete(version)
-    setDeleteConfirmOpen(true)
-  }
-
-  const handleConfirmDelete = async () => {
-    if (versionToDelete === null) return
-
-    setIsDeleting(true)
-    try {
-      await deleteVersion(graphId, versionToDelete)
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(graphId) })
-
-      toast({
-        title: t('workspace.deleteVersionSuccess'),
-        description: t('workspace.deleteVersionSuccessDescription', { version: versionToDelete }),
-        variant: 'success',
-      })
-      setDeleteConfirmOpen(false)
-      setVersionToDelete(null)
-      if (selectedVersion === versionToDelete) {
-        setSelectedVersion(null)
-        setPreviewMode('current')
-      }
-    } catch (error) {
-      console.error('Failed to delete version:', error)
-      toast({
-        title: t('workspace.deleteVersionFailed'),
-        description: t('workspace.deleteVersionFailedDescription'),
-        variant: 'destructive',
-      })
-    } finally {
-      setIsDeleting(false)
-    }
-  }
-
-  const handleConfirmUndeploy = async () => {
-    try {
-      await undeploy(graphId)
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployment(graphId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(graphId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployed() })
-
-      toast({
-        title: t('workspace.undeploySuccess'),
-        description: t('workspace.undeploySuccessDescription'),
-        variant: 'success',
-      })
-      setUndeployConfirmOpen(false)
-    } catch (error) {
-      console.error('Failed to undeploy:', error)
-      toast({
-        title: t('workspace.undeployFailed'),
-        description: t('workspace.undeployFailedDescription'),
-        variant: 'destructive',
-      })
-    }
-  }
-
-  const handleConfirmRevert = async () => {
-    if (versionToRevert === null) return
-
-    setIsReverting(true)
-    try {
-      await revertToVersion(graphId, versionToRevert)
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployment(graphId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(graphId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployed() })
-
-      const state = await agentService.loadGraphState(graphId)
-
-      useBuilderStore.setState({
-        nodes: state.nodes || [],
-        edges: state.edges || [],
-        past: [],
-        future: [],
-        selectedNodeId: null,
-      })
-
-      if (state.viewport && rfInstance) {
-        rfInstance.setViewport(state.viewport)
-      } else if (rfInstance) {
-        setTimeout(() => {
-          rfInstance?.fitView({ padding: 0.2 })
-        }, 100)
-      }
-
-      toast({
-        title: t('workspace.revertSuccess'),
-        description: t('workspace.revertSuccessDescription', { version: versionToRevert }),
-        variant: 'success',
-      })
-
-      setRevertConfirmOpen(false)
-      setVersionToRevert(null)
-      onOpenChange(false)
-    } catch (error) {
-      console.error('Failed to revert version:', error)
-      toast({
-        title: t('workspace.revertFailed'),
-        description: t('workspace.revertFailedDescription'),
-        variant: 'destructive',
-      })
-    } finally {
-      setIsReverting(false)
-    }
-  }
-
-  const handleStartEdit = (version: GraphDeploymentVersion) => {
-    setEditingVersion(version.version)
-    setEditName(version.name || '')
-  }
-
-  const handleCancelEdit = () => {
-    setEditingVersion(null)
-    setEditName('')
-  }
-
-  const handleSaveName = async () => {
-    if (!editingVersion) return
-    setIsSaving(true)
-    try {
-      await renameVersion(graphId, editingVersion, editName)
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(graphId) })
-    } catch (error) {
-      console.error('Failed to rename version:', error)
-    } finally {
-      setIsSaving(false)
-      setEditingVersion(null)
-      setEditName('')
-    }
-  }
-
-  const formatDate = (dateString: string) => {
-    const date = new Date(dateString)
-    const year = date.getFullYear()
-    const month = String(date.getMonth() + 1).padStart(2, '0')
-    const day = String(date.getDate()).padStart(2, '0')
-    const hours = String(date.getHours()).padStart(2, '0')
-    const minutes = String(date.getMinutes()).padStart(2, '0')
-    return `${year}-${month}-${day} ${hours}:${minutes}`
-  }
-
-  const previewState =
-    previewMode === 'selected' && cachedSelectedState ? cachedSelectedState : currentState
-
-  const selectedVersionInfo = versions.find((v) => v.version === selectedVersion)
-  const showToggle = selectedVersion !== null
-
-  return {
-    t,
-    // Data
-    deploymentStatus,
-    versions,
-    totalVersions,
-    totalPages,
-    isLoadingVersions,
-    // Preview
-    previewMode,
-    setPreviewMode,
-    selectedVersion,
-    selectedVersionInfo,
-    showToggle,
-    isLoadingPreview,
-    previewState,
-    // Version list
-    editingVersion,
-    editName,
-    setEditName,
-    isSaving,
-    isUndeploying,
-    currentPage,
-    // Handlers
-    handleSelectVersion,
-    handlePageChange,
-    handleRevertClick,
-    handleDeleteClick,
-    handleStartEdit,
-    handleCancelEdit,
-    handleSaveName,
-    formatDate,
-    // Confirmation dialogs
-    revertConfirmOpen,
-    setRevertConfirmOpen,
-    versionToRevert,
-    setVersionToRevert,
-    isReverting,
-    handleConfirmRevert,
-    deleteConfirmOpen,
-    setDeleteConfirmOpen,
-    versionToDelete,
-    setVersionToDelete,
-    isDeleting,
-    handleConfirmDelete,
-    undeployConfirmOpen,
-    setUndeployConfirmOpen,
-    handleConfirmUndeploy,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts
deleted file mode 100644
index a3ee3c270..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/__tests__/workspaceChatWsService.test.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-// Mock next-runtime-env so getWsBaseUrl falls through to the ws://localhost:8000 default
-vi.mock('next-runtime-env', () => ({ env: vi.fn(() => undefined) }))
-vi.stubGlobal(
-  'fetch',
-  vi.fn(async () => ({
-    ok: true,
-    json: async () => ({ data: { token: 'test-token' } }),
-  })),
-)
-
-// ---------------------------------------------------------------------------
-// Mock WebSocket
-// ---------------------------------------------------------------------------
-
-class MockWs {
-  static OPEN = 1
-  static CONNECTING = 0
-  static CLOSED = 3
-
-  readyState = MockWs.OPEN
-  sent: string[] = []
-  onopen: (() => void) | null = null
-  onmessage: ((e: { data: string }) => void) | null = null
-  onclose: ((e: { code: number }) => void) | null = null
-  onerror: (() => void) | null = null
-
-  send(data: string) {
-    this.sent.push(data)
-  }
-
-  close() {
-    this.readyState = MockWs.CLOSED
-  }
-
-  /** Simulate the server delivering a frame to this socket */
-  receive(frame: object) {
-    this.onmessage?.({ data: JSON.stringify(frame) })
-  }
-}
-
-let mockWsInstance: MockWs
-
-vi.stubGlobal(
-  'WebSocket',
-  class extends MockWs {
-    constructor(_url: string) {
-      super()
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
-      mockWsInstance = this
-      // Simulate async open so callers can attach handlers first
-      Promise.resolve().then(() => this.onopen?.())
-    }
-  },
-)
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-/** Flush the microtask queue multiple times to drain chained promises */
-async function flushPromises(rounds = 5) {
-  for (let i = 0; i < rounds; i++) {
-    await new Promise<void>((r) => setTimeout(r, 0))
-  }
-}
-
-// The service exports a singleton, so we import it once at module scope.
-// vi.resetModules() in afterEach ensures a clean instance between tests.
-import type { workspaceChatWsService as WorkspaceChatWsServiceType } from '../workspaceChatWsService'
-
-// ---------------------------------------------------------------------------
-// Tests
-// ---------------------------------------------------------------------------
-
-describe('workspaceChatWsService', () => {
-  afterEach(async () => {
-    const { getChatWsClient } = await import('@/lib/ws/chat/chatWsClient')
-    getChatWsClient().disconnect()
-    vi.resetModules()
-  })
-
-  /** Load a fresh singleton (after vi.resetModules) and wait for the WS to open */
-  async function makeConnectedService(): Promise<typeof WorkspaceChatWsServiceType> {
-    // Dynamic import picks up a fresh module evaluation after resetModules
-    const mod = await import('../workspaceChatWsService')
-    const svc = mod.workspaceChatWsService
-
-    // Kick off the connection; MockWs fires onopen in the next microtask tick
-    const connectP = svc.ensureConnected()
-    await flushPromises()
-    await connectP
-    return svc
-  }
-
-  // -------------------------------------------------------------------------
-  // 1. sendChat emits typed chat.start and resolves with { requestId, threadId } on 'done'
-  // -------------------------------------------------------------------------
-  it('sendChat emits chat.start and resolves with requestId and threadId when done frame is received', async () => {
-    const svc = await makeConnectedService()
-
-    const sendP = svc.sendChat({ message: 'hello' })
-    await flushPromises(2)
-
-    expect(mockWsInstance.sent.length).toBeGreaterThanOrEqual(1)
-    const chatFrame = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-    const { request_id } = chatFrame
-    expect(chatFrame).toMatchObject({
-      type: 'chat.start',
-      input: { message: 'hello' },
-      extension: null,
-      metadata: {},
-    })
-
-    // Server delivers thread info then signals completion
-    mockWsInstance.receive({ type: 'content', request_id, thread_id: 'thread-abc', data: { delta: 'hi' } })
-    mockWsInstance.receive({ type: 'done', request_id, thread_id: 'thread-abc' })
-
-    const result = await sendP
-
-    expect(result).toMatchObject({ requestId: request_id, threadId: 'thread-abc' })
-  })
-
-  // -------------------------------------------------------------------------
-  // 2. sendChat resolves with terminal 'error' when error frame is received
-  // -------------------------------------------------------------------------
-  it('sendChat resolves with terminal error when error frame is received', async () => {
-    const svc = await makeConnectedService()
-
-    const sendP = svc.sendChat({ message: 'hello' })
-    await flushPromises(2)
-
-    const { request_id } = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-
-    mockWsInstance.receive({
-      type: 'error',
-      request_id,
-      data: { message: 'Something went terribly wrong' },
-    })
-
-    const result = await sendP
-    expect(result).toMatchObject({ requestId: request_id, terminal: 'error' })
-  })
-
-  // -------------------------------------------------------------------------
-  // 3. sendChat resolves (does NOT reject) when error frame says "Stream stopped"
-  // -------------------------------------------------------------------------
-  it('sendChat resolves when error frame says "Stream stopped"', async () => {
-    const svc = await makeConnectedService()
-
-    const sendP = svc.sendChat({ message: 'hello', threadId: 'thread-xyz' })
-    await flushPromises(2)
-
-    const { request_id } = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-
-    mockWsInstance.receive({
-      type: 'error',
-      request_id,
-      thread_id: 'thread-xyz',
-      data: { message: 'Stream stopped' },
-    })
-
-    const result = await sendP
-
-    expect(result).toMatchObject({ requestId: request_id })
-  })
-
-  // -------------------------------------------------------------------------
-  // 4. Pending promises are rejected with "WebSocket disconnected" on close
-  // -------------------------------------------------------------------------
-  it('pending sendChat promises are rejected with "WebSocket disconnected" when socket closes', async () => {
-    const svc = await makeConnectedService()
-
-    const sendP = svc.sendChat({ message: 'hello' })
-    await flushPromises(2)
-
-    // Simulate the socket closing before any response arrives
-    mockWsInstance.onclose?.({ code: 1006 })
-
-    await expect(sendP).rejects.toThrow('WebSocket disconnected')
-  })
-
-  // -------------------------------------------------------------------------
-  // 5. stopByThreadId bridges to typed chat.stop with the correct request_id
-  // -------------------------------------------------------------------------
-  it('stopByThreadId sends a typed chat.stop frame with the correct request_id', async () => {
-    const svc = await makeConnectedService()
-
-    const sendP = svc.sendChat({ message: 'hello', threadId: 'thread-stop' })
-    await flushPromises(2)
-
-    const { request_id } = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-
-    // Server notifies the client of the thread_id so threadToRequest is populated
-    mockWsInstance.receive({ type: 'content', request_id, thread_id: 'thread-stop', data: { delta: '' } })
-
-    // Client requests stop
-    svc.stopByThreadId('thread-stop')
-
-    const stopFrame = JSON.parse(mockWsInstance.sent[mockWsInstance.sent.length - 1])
-
-    expect(stopFrame).toMatchObject({ type: 'chat.stop', request_id })
-
-    // Resolve the dangling promise cleanly
-    mockWsInstance.receive({ type: 'done', request_id, thread_id: 'thread-stop' })
-    await sendP
-  })
-})
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/agentService.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/agentService.ts
deleted file mode 100644
index 54a5e13a7..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/agentService.ts
+++ /dev/null
@@ -1,432 +0,0 @@
-'use client'
-
-import { Node, Edge } from 'reactflow'
-
-import { apiGet, apiPost, apiPut, apiDelete } from '@/lib/api-client'
-
-import type { StateField } from '../types/graph'
-import { modelService } from './modelService'
-
-// --- Types ---
-
-export interface AgentGraph {
-  id: string
-  name: string
-  description?: string | null
-  color?: string
-  isDeployed?: boolean
-  workspaceId?: string | null
-  parentId?: string | null
-  folderId?: string | null
-  variables?: Record<string, unknown>
-  createdAt: string
-  updatedAt: string
-  nodeCount?: number
-  nodes?: Node[]
-  edges?: Edge[]
-}
-
-export interface ModelOption {
-  id: string
-  name: string // raw model name from API (e.g. "qwen3.5:latest")
-  label: string
-  provider: string // provider_display_name (for display)
-  provider_name: string
-  isAvailable?: boolean
-}
-
-export interface ToolOption {
-  id: string
-  label: string
-  description?: string
-  name?: string
-  toolType?: string
-  category?: string | null
-  tags?: string[]
-  mcpServer?: string | null
-  raw?: unknown
-}
-
-export interface SkillOption {
-  id: string
-  name: string
-  description: string
-  tags: string[]
-}
-
-const isValidUUID = (str: string): boolean => {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-  return uuidRegex.test(str)
-}
-
-const GRAPH_ID_CACHE_KEY = 'current_graph_id'
-const GRAPH_NAME_CACHE_KEY = 'current_graph_name'
-const getCachedGraphId = (): string | null => {
-  try {
-    const id = localStorage.getItem(GRAPH_ID_CACHE_KEY)
-    if (id && !isValidUUID(id)) {
-      return null
-    }
-    return id
-  } catch {
-    return null
-  }
-}
-
-const setCachedGraphId = (graphId: string): void => {
-  try {
-    if (!isValidUUID(graphId)) {
-      console.warn('[agentService] Invalid graphId passed to setCachedGraphId, ignored:', graphId)
-      return
-    }
-    localStorage.setItem(GRAPH_ID_CACHE_KEY, graphId)
-  } catch {
-    // Silent fail
-  }
-}
-
-const clearCachedGraphId = (): void => {
-  try {
-    localStorage.removeItem(GRAPH_ID_CACHE_KEY)
-  } catch {
-    // Silent fail
-  }
-}
-
-const getCachedGraphName = (): string | null => {
-  try {
-    return localStorage.getItem(GRAPH_NAME_CACHE_KEY)
-  } catch {
-    return null
-  }
-}
-
-const setCachedGraphName = (graphName: string): void => {
-  try {
-    localStorage.setItem(GRAPH_NAME_CACHE_KEY, graphName)
-  } catch {
-    // Silent fail
-  }
-}
-
-const clearCachedGraphName = (): void => {
-  try {
-    localStorage.removeItem(GRAPH_NAME_CACHE_KEY)
-  } catch {
-    // Silent fail
-  }
-}
-
-export const agentService = {
-  async getInitialGraph(): Promise<{ nodes: Node[]; edges: Edge[] }> {
-    return { nodes: [], edges: [] }
-  },
-
-  async listGraphs(workspaceId?: string): Promise<AgentGraph[]> {
-    const url = workspaceId ? `graphs?workspaceId=${workspaceId}` : 'graphs'
-    const response = await apiGet<AgentGraph[]>(url)
-    return response || []
-  },
-
-  async saveGraph(params: {
-    name: string
-    nodes: Node[]
-    edges: Edge[]
-    viewport?: { x: number; y: number; zoom: number }
-    description?: string
-    color?: string
-    variables?: { context?: Record<string, unknown> }
-    workspaceId?: string | null
-  }): Promise<{ graphId: string }> {
-    let graphId = getCachedGraphId()
-
-    if (!graphId) {
-      const createResponse = await apiPost<{ id: string }>('graphs', {
-        name: params.name,
-        description: params.description || '',
-        color: params.color || '',
-        variables: params.variables || {},
-        workspaceId: params.workspaceId,
-      })
-      graphId = createResponse.id
-      setCachedGraphId(graphId)
-      setCachedGraphName(params.name)
-    }
-
-    const seenEdges = new Set<string>()
-    const deduplicatedEdges = params.edges.filter((edge) => {
-      const key = `${edge.source}-${edge.target}`
-      if (seenEdges.has(key)) {
-        return false
-      }
-      seenEdges.add(key)
-      return true
-    })
-
-    await apiPost(`graphs/${graphId}/state`, {
-      nodes: params.nodes,
-      edges: deduplicatedEdges,
-      viewport: params.viewport,
-    })
-
-    return { graphId }
-  },
-
-  async saveGraphState(params: {
-    graphId: string
-    nodes: Node[]
-    edges: Edge[]
-    viewport?: { x: number; y: number; zoom: number }
-    variables?: {
-      context?: Record<string, unknown>
-      state_fields?: StateField[]
-      [key: string]: unknown
-    }
-  }): Promise<void> {
-    if (!params.graphId || !isValidUUID(params.graphId)) {
-      console.warn(
-        '[agentService] saveGraphState called with invalid graphId, skip request:',
-        params.graphId,
-      )
-      return
-    }
-
-    const seenEdges = new Set<string>()
-    const deduplicatedEdges = params.edges.filter((edge) => {
-      const key = `${edge.source}-${edge.target}`
-      if (seenEdges.has(key)) {
-        return false
-      }
-      seenEdges.add(key)
-      return true
-    })
-
-    await apiPost(`graphs/${params.graphId}/state`, {
-      nodes: params.nodes,
-      edges: deduplicatedEdges,
-      viewport: params.viewport,
-      variables: params.variables,
-    })
-  },
-
-  async loadGraphState(graphId: string): Promise<{
-    nodes: Node[]
-    edges: Edge[]
-    viewport?: { x: number; y: number; zoom: number }
-    variables?: { context?: Record<string, unknown> }
-  }> {
-    if (!graphId || !isValidUUID(graphId)) {
-      console.warn(
-        '[agentService] loadGraphState called with invalid graphId, return empty state:',
-        graphId,
-      )
-      return { nodes: [], edges: [] }
-    }
-
-    const response = await apiGet<{
-      nodes: Node[]
-      edges: Edge[]
-      viewport?: { x: number; y: number; zoom: number }
-      variables?: { context?: Record<string, unknown> }
-    }>(`graphs/${graphId}/state`)
-    setCachedGraphId(graphId)
-
-    let data = response || { nodes: [], edges: [] }
-
-    if (data.edges && data.edges.length > 0) {
-      const seenEdges = new Set<string>()
-      data.edges = data.edges.filter((edge) => {
-        const key = `${edge.source}-${edge.target}`
-        if (seenEdges.has(key)) {
-          return false
-        }
-        seenEdges.add(key)
-        return true
-      })
-    }
-
-    return data
-  },
-
-  async deleteGraph(id: string): Promise<void> {
-    await apiDelete(`graphs/${id}`)
-  },
-
-  /**
-   * Create a new Graph (creates metadata only, without node state)
-   */
-  async createGraph(params: {
-    name: string
-    description?: string
-    color?: string
-    variables?: Record<string, unknown>
-    workspaceId?: string | null
-  }): Promise<AgentGraph> {
-    clearCachedGraphId()
-    clearCachedGraphName()
-
-    const response = await apiPost<AgentGraph>('graphs', {
-      name: params.name,
-      description: params.description || '',
-      color: params.color || '',
-      variables: params.variables || {},
-      workspaceId: params.workspaceId,
-    })
-
-    return response
-  },
-
-  /**
-   * Update Graph metadata (name, description, color, etc.)
-   */
-  async updateGraph(
-    id: string,
-    params: {
-      name?: string
-      description?: string
-      color?: string
-      folderId?: string | null
-    },
-  ): Promise<void> {
-    await apiPut(`graphs/${id}`, params)
-  },
-
-  /**
-   * Duplicate a Graph
-   * @param id Original Graph ID
-   * @param newName New Graph name (optional, defaults to adding "(copy)" suffix)
-   * @param workspaceId Target workspace ID
-   * @returns New Graph ID
-   */
-  async duplicateGraph(
-    id: string,
-    options?: {
-      newName?: string
-      workspaceId?: string | null
-    },
-  ): Promise<string> {
-    // Load original graph state
-    const state = await this.loadGraphState(id)
-
-    // Get original graph metadata
-    const graphs = await this.listGraphs(options?.workspaceId || undefined)
-    const originalGraph = graphs.find((g) => g.id === id)
-
-    if (!originalGraph) {
-      throw new Error('Graph not found')
-    }
-
-    clearCachedGraphId()
-    clearCachedGraphName()
-
-    // Create new graph
-    const createResponse = await apiPost<{ id: string }>('graphs', {
-      name: options?.newName || `${originalGraph.name} (copy)`,
-      description: originalGraph.description || '',
-      color: originalGraph.color || '',
-      variables: originalGraph.variables || {},
-      workspaceId: options?.workspaceId || originalGraph.workspaceId || null,
-    })
-
-    const newGraphId = createResponse.id
-
-    // Copy state
-    await apiPost(`graphs/${newGraphId}/state`, {
-      nodes: state.nodes,
-      edges: state.edges,
-      viewport: state.viewport,
-    })
-
-    return newGraphId
-  },
-
-  /**
-   * Move Graph to specified folder
-   */
-  async moveToFolder(graphId: string, folderId: string | null): Promise<void> {
-    await apiPut(`graphs/${graphId}`, {
-      folderId: folderId || null,
-    })
-  },
-
-  async getModels(): Promise<ModelOption[]> {
-    try {
-      const models = await modelService.getAvailableModels('chat')
-      return models.map((model) => ({
-        id: `${model.provider_name}:${model.name}`,
-        name: model.name,
-        label: model.display_name || model.name,
-        provider: model.provider_display_name || model.provider_name, // for display
-        provider_name: model.provider_name,
-        isAvailable: model.is_available,
-      }))
-    } catch {
-      return []
-    }
-  },
-
-  async getBuiltinTools(): Promise<ToolOption[]> {
-    try {
-      // apiGet automatically unwraps response.data, directly return tools array
-      const tools = await apiGet<
-        Array<{
-          id: string
-          label: string
-          name: string
-          description?: string
-          tool_type: string
-          category?: string | null
-          tags?: string[]
-          mcp_server?: string | null
-        }>
-      >('tools/builtin')
-      return (tools || []).map((tool) => ({
-        id: tool.id,
-        label: tool.label,
-        description: tool.description,
-        name: tool.name,
-        toolType: tool.tool_type,
-        category: tool.category ?? null,
-        tags: tool.tags ?? [],
-        mcpServer: tool.mcp_server ?? null,
-        raw: tool,
-      }))
-    } catch {
-      return []
-    }
-  },
-
-  /**
-   * Get available skills for the agent
-   * Uses the skills API to fetch all skills the user has access to
-   */
-  async getAvailableSkills(): Promise<SkillOption[]> {
-    try {
-      const skills = await apiGet<
-        Array<{
-          id: string
-          name: string
-          description: string
-          tags?: string[]
-        }>
-      >('skills?include_public=true')
-      return (skills || []).map((skill) => ({
-        id: skill.id,
-        name: skill.name,
-        description: skill.description,
-        tags: skill.tags || [],
-      }))
-    } catch (error) {
-      console.error('Failed to fetch skills from backend:', error)
-      return []
-    }
-  },
-
-  // --- Cache Management ---
-  getCachedGraphId: getCachedGraphId,
-  setCachedGraphId: setCachedGraphId,
-  clearCachedGraphId: clearCachedGraphId,
-  getCachedGraphName: getCachedGraphName,
-  setCachedGraphName: setCachedGraphName,
-  clearCachedGraphName: clearCachedGraphName,
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/commandService.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/commandService.ts
deleted file mode 100644
index 8dcf1209c..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/commandService.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Command Service - Handles resuming interrupted graph execution
- *
- * Uses shared eventProcessor to handle SSE events, ensuring consistency with startExecution.
- */
-
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-import { generateId } from '../stores/execution/utils'
-import { useExecutionStore } from '../stores/executionStore'
-
-import {
-  processEvent,
-  createEventProcessorContext,
-  type EventProcessorStore,
-} from './eventProcessor'
-import { workspaceChatWsService } from './workspaceChatWsService'
-
-export interface Command {
-  update?: Record<string, unknown>
-  goto?: string
-}
-
-/**
- * Resume interrupted graph execution with a Command
- * This function processes the SSE stream and updates the execution store
- */
-export async function resumeWithCommand(
-  threadId: string,
-  command: Command,
-  onEvent?: (evt: ChatStreamEvent) => void,
-): Promise<void> {
-  // Get execution store
-  const store = useExecutionStore.getState()
-  const graphId = store.currentGraphId
-
-  if (!graphId) {
-    throw new Error('No active graph for resume')
-  }
-
-  // Create event processing context
-  const ctx = createEventProcessorContext(graphId, generateId, () => store.steps)
-
-  // Create store adapter conforming to EventProcessorStore interface
-  const storeAdapter: EventProcessorStore = {
-    addStep: store.addStep,
-    updateStep: store.updateStep,
-    appendContent: store.appendContent,
-    addInterrupt: store.addInterrupt,
-    setExecuting: store.setExecuting,
-    updateState: store.updateState,
-    addTraceStep: store.addTraceStep,
-    addRouteDecision: store.addRouteDecision,
-    setThreadId: store.setThreadId,
-    updateGraphState: store.updateGraphState,
-    getContext: store.getContext,
-  }
-
-  try {
-    const result = await workspaceChatWsService.sendResume({
-      threadId,
-      command,
-      onEvent: (data) => {
-        if (onEvent) onEvent(data)
-        const processed = processEvent(data, ctx, storeAdapter)
-        ctx.currentThoughtId = processed.currentThoughtId
-      },
-    })
-    if (result.threadId) {
-      store.setThreadId(graphId, result.threadId)
-    }
-    store.setRequestId(graphId, result.requestId)
-  } catch (e: unknown) {
-    const error = e as { name?: string; message?: string }
-    if (error?.name === 'AbortError') {
-      throw e
-    }
-    store.setExecuting(false)
-    throw new Error(`Resume failed: ${error?.message || String(e)}`)
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/eventAdapter.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/eventAdapter.ts
deleted file mode 100644
index 684089b4b..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/eventAdapter.ts
+++ /dev/null
@@ -1,650 +0,0 @@
-/**
- * Event Adapter - Maps backend ChatStreamEvent to ExecutionStep format
- *
- * This adapter provides a clean separation between backend event format
- * and frontend execution step representation.
- *
- * Uses the standardized SSE envelope structure from backend.
- */
-
-import type {
-  ChatStreamEvent,
-  ContentEventData,
-  ToolStartEventData,
-  ToolEndEventData,
-  NodeStartEventData,
-  NodeEndEventData,
-  ErrorEventData,
-  ModelInputEventData,
-  ModelOutputEventData,
-  InterruptEventData,
-  CommandEventData,
-  RouteDecisionEventData,
-  LoopIterationEventData,
-  ParallelTaskEventData,
-  StateUpdateEventData,
-  CodeAgentThoughtEventData,
-  CodeAgentCodeEventData,
-  CodeAgentObservationEventData,
-  CodeAgentFinalAnswerEventData,
-  CodeAgentPlanningEventData,
-  CodeAgentErrorEventData,
-} from '@/services/chatBackend'
-import type { ExecutionStep } from '@/types'
-
-import type { InterruptState } from '../stores/execution/types'
-
-export interface EventAdapterContext {
-  currentThoughtId: string | null
-  toolStepMap: Map<string, string> // key: "tool_name:run_id" or "tool_name" (for backward compatibility)
-  nodeStepMap: Map<string, string> // key: "node_name:run_id" or "node_name" (for backward compatibility)
-  modelStepMap: Map<string, string> // key: "run_id" - for pairing model_input and model_output
-  genId: (prefix: string) => string
-  getSteps: () => ExecutionStep[]
-}
-
-export type AdapterResult =
-  | { type: 'noop' }
-  | { type: 'stopped' }
-  | { type: 'done' }
-  | { type: 'add_step'; step: ExecutionStep }
-  | { type: 'append_content'; stepId: string; content: string }
-  | { type: 'update_step'; stepId: string; updates: Partial<ExecutionStep>; clearThought?: boolean }
-  | {
-      type: 'interrupt'
-      nodeId: string
-      nodeLabel: string
-      state: InterruptState
-      threadId: string
-    }
-  | { type: 'command'; command: CommandEventData; nodeId: string }
-  | { type: 'route_decision'; decision: RouteDecisionEventData }
-  | { type: 'loop_iteration'; iteration: LoopIterationEventData }
-  | { type: 'parallel_task'; task: ParallelTaskEventData }
-  | { type: 'state_update'; update: StateUpdateEventData }
-
-type TraceFields = Pick<ExecutionStep, 'traceId' | 'observationId' | 'parentObservationId'>
-
-/**
- * Helper: extract trace/observation fields from event envelope
- */
-function extractTraceFields(evt: ChatStreamEvent): TraceFields {
-  return {
-    traceId: evt.trace_id || undefined,
-    observationId: evt.observation_id || undefined,
-    parentObservationId: evt.parent_observation_id || undefined,
-  }
-}
-
-// ============================================================================
-// Event Handlers
-// ============================================================================
-
-function handleErrorEvent(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { node_name, timestamp, data } = evt
-  const errorData = data as ErrorEventData
-  const errorMsg = errorData?.message || 'Unknown error'
-  const errorCode = errorData?.code
-
-  if (errorCode === 'stopped' || errorMsg === 'Stream stopped' || errorMsg.includes('stopped')) {
-    return { type: 'stopped' }
-  }
-
-  return {
-    type: 'add_step',
-    step: {
-      id: ctx.genId('error'),
-      nodeId: node_name || 'system',
-      nodeLabel: 'Error',
-      stepType: 'system_log',
-      title: 'Error',
-      status: 'error',
-      startTime: timestamp || Date.now(),
-      content: errorMsg,
-      ...traceFields,
-    },
-  }
-}
-
-function handleContentEvent(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { node_name, timestamp, data } = evt
-  const contentData = data as ContentEventData
-  const delta = contentData?.delta || ''
-  if (!delta) return { type: 'noop' }
-
-  if (!ctx.currentThoughtId) {
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('thought'),
-        nodeId: node_name || 'agent',
-        nodeLabel: node_name || 'Agent',
-        stepType: 'agent_thought',
-        title: `Reasoning (${node_name || 'Agent'})`,
-        status: 'running',
-        startTime: timestamp || Date.now(),
-        content: delta,
-        ...traceFields,
-      },
-    }
-  }
-
-  return {
-    type: 'append_content',
-    stepId: ctx.currentThoughtId,
-    content: delta,
-  }
-}
-
-function handleToolEvents(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { type, node_name, run_id, timestamp, data } = evt
-
-  if (type === 'tool_start') {
-    const toolData = data as ToolStartEventData
-    const toolName = toolData?.tool_name || 'tool'
-    const toolInput = toolData?.tool_input
-
-    const toolId = ctx.genId('tool')
-    const toolKey = run_id ? `${toolName}:${run_id}` : toolName
-    ctx.toolStepMap.set(toolKey, toolId)
-
-    return {
-      type: 'add_step',
-      step: {
-        id: toolId,
-        nodeId: node_name || 'tool',
-        nodeLabel: toolName,
-        stepType: 'tool_execution',
-        title: toolName,
-        status: 'running',
-        startTime: timestamp || Date.now(),
-        data: { request: toolInput },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'tool_end') {
-    const toolData = data as ToolEndEventData
-    const toolName = toolData?.tool_name || 'tool'
-    const toolOutput = toolData?.tool_output
-
-    const toolKey = run_id ? `${toolName}:${run_id}` : toolName
-    let toolId = ctx.toolStepMap.get(toolKey)
-
-    if (!toolId) {
-      toolId = ctx.toolStepMap.get(toolName)
-      if (toolId) {
-        ctx.toolStepMap.delete(toolName)
-        ctx.toolStepMap.set(toolKey, toolId)
-      }
-    }
-
-    if (!toolId) return { type: 'noop' }
-
-    const existingStep = ctx.getSteps().find((s) => s.id === toolId)
-    ctx.toolStepMap.delete(toolKey)
-
-    return {
-      type: 'update_step',
-      stepId: toolId,
-      updates: {
-        status: (toolData?.status === 'error' ? 'error' : 'success') as 'success' | 'error',
-        endTime: timestamp || Date.now(),
-        duration: toolData?.duration,
-        data: {
-          request: existingStep?.data?.request,
-          response: toolOutput,
-        },
-      },
-    }
-  }
-
-  return { type: 'noop' }
-}
-
-function handleNodeEvents(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { type, node_name, run_id, timestamp, data } = evt
-
-  if (type === 'node_start') {
-    const nodeData = data as NodeStartEventData
-    const nodeId = node_name || nodeData?.node_name || 'unknown'
-    const stepId = ctx.genId('node')
-
-    const nodeKey = run_id ? `${nodeId}:${run_id}` : nodeId
-    ctx.nodeStepMap.set(nodeKey, stepId)
-
-    return {
-      type: 'add_step',
-      step: {
-        id: stepId,
-        nodeId: nodeId,
-        nodeLabel: nodeData?.node_label || node_name || 'Unknown Node',
-        stepType: 'node_lifecycle',
-        title: nodeData?.node_label || node_name || 'Node',
-        status: 'running',
-        startTime: timestamp || Date.now(),
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'node_end') {
-    const nodeData = data as NodeEndEventData
-    const nodeId = node_name || nodeData?.node_name || 'unknown'
-
-    const nodeKey = run_id ? `${nodeId}:${run_id}` : nodeId
-    let stepId = ctx.nodeStepMap.get(nodeKey)
-
-    if (!stepId) {
-      stepId = ctx.nodeStepMap.get(nodeId)
-      if (stepId) {
-        ctx.nodeStepMap.delete(nodeId)
-        ctx.nodeStepMap.set(nodeKey, stepId)
-      }
-    }
-
-    if (stepId) {
-      ctx.nodeStepMap.delete(nodeKey)
-      return {
-        type: 'update_step',
-        stepId: stepId,
-        updates: {
-          status: (nodeData?.status === 'error' ? 'error' : 'success') as 'success' | 'error',
-          endTime: timestamp || Date.now(),
-          duration: nodeData?.duration,
-          data: {
-            // @ts-expect-error
-            payload: nodeData?.payload,
-          },
-        },
-      }
-    }
-
-    const nodeStep = ctx
-      .getSteps()
-      .find(
-        (s) =>
-          s.stepType === 'node_lifecycle' &&
-          (s.nodeId === nodeId || s.nodeId === nodeData?.node_name) &&
-          s.status === 'running',
-      )
-
-    if (nodeStep) {
-      return {
-        type: 'update_step',
-        stepId: nodeStep.id,
-        updates: {
-          status: (nodeData?.status === 'error' ? 'error' : 'success') as 'success' | 'error',
-          endTime: timestamp || Date.now(),
-          duration: nodeData?.duration,
-          data: {
-            ...nodeStep.data,
-            // @ts-expect-error
-            payload: nodeData?.payload,
-          },
-        },
-      }
-    }
-
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('node'),
-        nodeId: node_name || nodeData?.node_name || 'unknown',
-        nodeLabel: nodeData?.node_label || node_name || 'Unknown Node',
-        stepType: 'node_lifecycle',
-        title: nodeData?.node_label || node_name || 'Node',
-        status: (nodeData?.status === 'error' ? 'error' : 'success') as 'success' | 'error',
-        startTime: timestamp || Date.now(),
-        endTime: timestamp || Date.now(),
-        duration: nodeData?.duration,
-        data: {
-          // @ts-expect-error
-          payload: nodeData?.payload,
-        },
-        ...traceFields,
-      },
-    }
-  }
-
-  return { type: 'noop' }
-}
-
-function handleModelEvents(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { type, node_name, run_id, timestamp, data } = evt
-
-  if (type === 'model_input') {
-    const modelData = data as ModelInputEventData
-    const modelName = modelData?.model_name || 'unknown'
-    const modelProvider = modelData?.model_provider || 'unknown'
-    const messages = modelData?.messages || []
-
-    const stepId = ctx.genId('model_io')
-
-    if (run_id) {
-      ctx.modelStepMap.set(run_id, stepId)
-    }
-
-    return {
-      type: 'add_step',
-      step: {
-        id: stepId,
-        nodeId: node_name || 'model',
-        nodeLabel: `${modelProvider}/${modelName}`,
-        stepType: 'model_io',
-        title: `Model I/O (${modelProvider}/${modelName})`,
-        status: 'running',
-        startTime: timestamp || Date.now(),
-        data: {
-          messages: messages,
-          model_name: modelName,
-          model_provider: modelProvider,
-          run_id: run_id,
-        },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'model_output') {
-    const modelData = data as ModelOutputEventData
-    const modelName = modelData?.model_name || 'unknown'
-    const modelProvider = modelData?.model_provider || 'unknown'
-    const output = modelData?.output
-    const usageMetadata = modelData?.usage_metadata
-
-    if (run_id && ctx.modelStepMap.has(run_id)) {
-      const existingStepId = ctx.modelStepMap.get(run_id)!
-      ctx.modelStepMap.delete(run_id)
-
-      return {
-        type: 'update_step',
-        stepId: existingStepId,
-        updates: {
-          status: 'success',
-          endTime: timestamp || Date.now(),
-          data: {
-            output: output,
-            usage_metadata: usageMetadata,
-          },
-          promptTokens: modelData?.prompt_tokens,
-          completionTokens: modelData?.completion_tokens,
-          totalTokens: modelData?.total_tokens,
-          ...traceFields,
-        },
-      }
-    }
-
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('model_output'),
-        nodeId: node_name || 'model',
-        nodeLabel: `${modelProvider}/${modelName}`,
-        stepType: 'model_io',
-        title: `Model Output (${modelProvider}/${modelName})`,
-        status: 'success',
-        startTime: timestamp || Date.now(),
-        data: {
-          output: output,
-          model_name: modelName,
-          model_provider: modelProvider,
-          usage_metadata: usageMetadata,
-          run_id: run_id,
-        },
-        promptTokens: modelData?.prompt_tokens,
-        completionTokens: modelData?.completion_tokens,
-        totalTokens: modelData?.total_tokens,
-        ...traceFields,
-      },
-    }
-  }
-
-  return { type: 'noop' }
-}
-
-function handleCodeAgentEvents(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-  traceFields: TraceFields,
-): AdapterResult {
-  const { type, node_name, timestamp, data } = evt
-
-  if (type === 'code_agent_thought') {
-    const thoughtData = data as CodeAgentThoughtEventData
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_thought'),
-        nodeId: thoughtData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_thought',
-        title: `Thinking (Step ${thoughtData.step})`,
-        status: 'success',
-        startTime: timestamp || Date.now(),
-        content: thoughtData.content,
-        data: { step: thoughtData.step },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'code_agent_code') {
-    const codeData = data as CodeAgentCodeEventData
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_code'),
-        nodeId: codeData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_code',
-        title: `Code (Step ${codeData.step})`,
-        status: 'success',
-        startTime: timestamp || Date.now(),
-        content: codeData.code,
-        data: { step: codeData.step },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'code_agent_observation') {
-    const obsData = data as CodeAgentObservationEventData
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_obs'),
-        nodeId: obsData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_observation',
-        title: `Observation (Step ${obsData.step})`,
-        status: obsData.has_error ? 'error' : 'success',
-        startTime: timestamp || Date.now(),
-        content: obsData.observation,
-        data: { step: obsData.step, has_error: obsData.has_error },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'code_agent_final_answer') {
-    const answerData = data as CodeAgentFinalAnswerEventData
-    const answerStr =
-      typeof answerData.answer === 'string'
-        ? answerData.answer
-        : JSON.stringify(answerData.answer, null, 2)
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_answer'),
-        nodeId: answerData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_final_answer',
-        title: 'Final Answer',
-        status: 'success',
-        startTime: timestamp || Date.now(),
-        content: answerStr,
-        data: { step: answerData.step, answer: answerData.answer },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'code_agent_planning') {
-    const planData = data as CodeAgentPlanningEventData
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_plan'),
-        nodeId: planData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_planning',
-        title: planData.is_update ? 'Plan Update' : 'Execution Plan',
-        status: 'success',
-        startTime: timestamp || Date.now(),
-        content: planData.plan,
-        data: { step: planData.step, is_update: planData.is_update },
-        ...traceFields,
-      },
-    }
-  }
-
-  if (type === 'code_agent_error') {
-    const errorData = data as CodeAgentErrorEventData
-    return {
-      type: 'add_step',
-      step: {
-        id: ctx.genId('ca_error'),
-        nodeId: errorData.node_name || node_name || 'code_agent',
-        nodeLabel: 'CodeAgent',
-        stepType: 'code_agent_error',
-        title: `Error (Step ${errorData.step})`,
-        status: 'error',
-        startTime: timestamp || Date.now(),
-        content: errorData.error,
-        data: { step: errorData.step },
-        ...traceFields,
-      },
-    }
-  }
-
-  return { type: 'noop' }
-}
-
-function handleMiscEvents(
-  evt: ChatStreamEvent,
-  _ctx: EventAdapterContext,
-  _traceFields: TraceFields,
-): AdapterResult {
-  const { type, node_name, data } = evt
-
-  if (type === 'done') return { type: 'done' }
-  if (type === 'status') return { type: 'noop' }
-  if (type === 'thread_id') return { type: 'noop' }
-
-  if (type === 'interrupt') {
-    const interruptData = data as InterruptEventData
-    return {
-      type: 'interrupt',
-      nodeId: interruptData.node_name || node_name || 'unknown',
-      nodeLabel: interruptData.node_label || interruptData.node_name || 'Unknown Node',
-      state: interruptData.state || {},
-      threadId: interruptData.thread_id || evt.thread_id,
-    }
-  }
-
-  if (type === 'command') {
-    return {
-      type: 'command',
-      command: data as CommandEventData,
-      nodeId: node_name || 'unknown',
-    }
-  }
-
-  if (type === 'route_decision') {
-    return {
-      type: 'route_decision',
-      decision: data as RouteDecisionEventData,
-    }
-  }
-
-  if (type === 'loop_iteration') {
-    return {
-      type: 'loop_iteration',
-      iteration: data as LoopIterationEventData,
-    }
-  }
-
-  if (type === 'parallel_task') {
-    return {
-      type: 'parallel_task',
-      task: data as ParallelTaskEventData,
-    }
-  }
-
-  if (type === 'state_update') {
-    return {
-      type: 'state_update',
-      update: data as StateUpdateEventData,
-    }
-  }
-
-  return { type: 'noop' }
-}
-
-// ============================================================================
-// Main Adapter Function
-// ============================================================================
-
-export function mapChatEventToExecutionStep(
-  evt: ChatStreamEvent,
-  ctx: EventAdapterContext,
-): AdapterResult {
-  const traceFields = extractTraceFields(evt)
-
-  switch (evt.type) {
-    case 'error':
-      return handleErrorEvent(evt, ctx, traceFields)
-    case 'content':
-      return handleContentEvent(evt, ctx, traceFields)
-    case 'tool_start':
-    case 'tool_end':
-      return handleToolEvents(evt, ctx, traceFields)
-    case 'node_start':
-    case 'node_end':
-      return handleNodeEvents(evt, ctx, traceFields)
-    case 'model_input':
-    case 'model_output':
-      return handleModelEvents(evt, ctx, traceFields)
-    case 'code_agent_thought':
-    case 'code_agent_code':
-    case 'code_agent_observation':
-    case 'code_agent_final_answer':
-    case 'code_agent_planning':
-    case 'code_agent_error':
-      return handleCodeAgentEvents(evt, ctx, traceFields)
-    default:
-      return handleMiscEvents(evt, ctx, traceFields)
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/eventProcessor.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/eventProcessor.ts
deleted file mode 100644
index 81afc0707..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/eventProcessor.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Event Processor - Unified SSE Event Handler
- *
- * Shared event processing logic for startExecution and resumeWithCommand.
- * Ensures all event types are correctly handled in both execution paths.
- */
-
-import type { ChatStreamEvent } from '@/services/chatBackend'
-import type { ExecutionStep } from '@/types'
-
-// --- Inline types (formerly in components/visualization/types.ts) ---
-
-/** Execution graph state snapshot for Command Mode tracing */
-export interface GraphState {
-  context?: Record<string, any>
-  messages?: any[]
-  current_node?: string
-}
-
-/** Trace step recording a node execution snapshot */
-export interface TraceStep {
-  nodeId: string
-  nodeType: string
-  timestamp: number
-  command: { update: Record<string, any>; goto?: string; reason?: string }
-  stateSnapshot: GraphState
-  routeDecision?: { result: boolean | string; reason: string; goto: string }
-}
-import type { InterruptState } from '../stores/execution/types'
-import { generateId } from '../stores/execution/utils'
-
-import { mapChatEventToExecutionStep, type AdapterResult } from './eventAdapter'
-
-// Re-export generateId for backwards compatibility
-export { generateId }
-
-/**
- * Event processing context
- */
-export interface EventProcessorContext {
-  /** Current thought step ID */
-  currentThoughtId: string | null
-  /** Tool name to step ID mapping */
-  toolStepMap: Map<string, string>
-  /** Node name to step ID mapping */
-  nodeStepMap: Map<string, string>
-  /** Model run_id to step ID mapping, used for pairing model_input and model_output */
-  modelStepMap: Map<string, string>
-  /** Current graphId */
-  graphId: string
-  /** Function to generate unique IDs */
-  genId: (prefix: string) => string
-  /** Function to get current steps */
-  getSteps: () => ExecutionStep[]
-}
-
-/**
- * Store interface - Defines store methods to be called
- */
-export interface EventProcessorStore {
-  addStep: (step: ExecutionStep) => void
-  updateStep: (stepId: string, updates: Partial<ExecutionStep>) => void
-  appendContent: (stepId: string, text: string) => void
-  addInterrupt: (interrupt: {
-    nodeId: string
-    nodeLabel: string
-    state: InterruptState
-    threadId: string
-  }) => void
-  setExecuting: (isExecuting: boolean) => void
-  updateState: (state: Partial<GraphState>) => void
-  addTraceStep: (step: TraceStep) => void
-  addRouteDecision: (
-    nodeId: string,
-    decision: {
-      result: boolean | string
-      reason: string
-      goto: string
-    },
-  ) => void
-  setThreadId: (graphId: string, threadId: string | null) => void
-  updateGraphState: (graphId: string, updates: { isExecuting?: boolean }) => void
-  getContext: (graphId: string) => { state: { currentState: GraphState | null } }
-}
-
-/**
- * Event processing result
- */
-export interface ProcessEventResult {
-  /** Whether processing should stop */
-  shouldStop: boolean
-  /** Stop reason */
-  stopReason?: 'stopped' | 'done' | 'interrupt'
-  /** Updated currentThoughtId */
-  currentThoughtId: string | null
-}
-
-/**
- * Process a single SSE event
- *
- * @param evt - SSE event
- * @param ctx - Processing context
- * @param store - Store instance
- * @returns Processing result
- */
-export function processEvent(
-  evt: ChatStreamEvent,
-  ctx: EventProcessorContext,
-  store: EventProcessorStore,
-): ProcessEventResult {
-  let { currentThoughtId } = ctx
-  const { toolStepMap, nodeStepMap, modelStepMap, genId, getSteps, graphId } = ctx
-
-  // Use eventAdapter to transform event
-  const result = mapChatEventToExecutionStep(evt, {
-    currentThoughtId,
-    toolStepMap,
-    nodeStepMap,
-    modelStepMap,
-    genId,
-    getSteps,
-  })
-
-  // Handle different result types
-  switch (result.type) {
-    case 'stopped':
-      store.setExecuting(false)
-      return { shouldStop: true, stopReason: 'stopped', currentThoughtId }
-
-    case 'add_step':
-      if (result.step) {
-        store.addStep(result.step)
-        if (result.step.stepType === 'agent_thought') {
-          currentThoughtId = result.step.id
-        }
-      }
-      break
-
-    case 'append_content':
-      if (result.stepId && result.content) {
-        store.appendContent(result.stepId, result.content)
-      }
-      break
-
-    case 'update_step':
-      if (result.stepId && result.updates) {
-        store.updateStep(result.stepId, result.updates)
-        if (result.clearThought) {
-          currentThoughtId = null
-        }
-      }
-      break
-
-    case 'done':
-      if (currentThoughtId) {
-        store.updateStep(currentThoughtId, { status: 'success', endTime: Date.now() })
-        currentThoughtId = null
-      }
-      store.setExecuting(false)
-      return { shouldStop: true, stopReason: 'done', currentThoughtId: null }
-
-    case 'interrupt':
-      store.addInterrupt({
-        nodeId: result.nodeId,
-        nodeLabel: result.nodeLabel,
-        state: result.state,
-        threadId: result.threadId,
-      })
-      if (result.threadId) {
-        store.setThreadId(graphId, result.threadId)
-      }
-      store.updateGraphState(graphId, { isExecuting: false })
-      return { shouldStop: true, stopReason: 'interrupt', currentThoughtId }
-
-    case 'command':
-      handleCommandEvent(result, evt, graphId, store)
-      break
-
-    case 'route_decision':
-      handleRouteDecisionEvent(result, store)
-      break
-
-    case 'loop_iteration':
-      handleLoopIterationEvent(result, store)
-      break
-
-    case 'parallel_task':
-      handleParallelTaskEvent(result, graphId, store)
-      break
-
-    case 'state_update':
-      handleStateUpdateEvent(result, store)
-      break
-
-    case 'noop':
-      // No processing needed
-      break
-  }
-
-  return { shouldStop: false, currentThoughtId }
-}
-
-/**
- * Handle command event
- */
-function handleCommandEvent(
-  result: AdapterResult & { type: 'command' },
-  evt: ChatStreamEvent,
-  graphId: string,
-  store: EventProcessorStore,
-): void {
-  if (result.command.update) {
-    store.updateState(result.command.update)
-  }
-  const ctx = store.getContext(graphId)
-  store.addTraceStep({
-    nodeId: result.nodeId,
-    nodeType: 'agent',
-    timestamp: evt.timestamp || Date.now(),
-    command: {
-      update: result.command.update || {},
-      goto: result.command.goto,
-      reason: result.command.reason,
-    },
-    stateSnapshot: ctx.state.currentState || {},
-  })
-}
-
-/**
- * Handle route_decision event (simplified — route nodes removed)
- */
-function handleRouteDecisionEvent(
-  result: AdapterResult & { type: 'route_decision' },
-  store: EventProcessorStore,
-): void {
-  store.updateState({
-    current_node: result.decision.node_id,
-  })
-}
-
-/**
- * Handle loop_iteration event (no-op, loop nodes removed)
- */
-function handleLoopIterationEvent(
-  _result: AdapterResult & { type: 'loop_iteration' },
-  _store: EventProcessorStore,
-): void {
-  // Loop nodes removed — no state to update
-}
-
-/**
- * Handle parallel_task event
- */
-function handleParallelTaskEvent(
-  result: AdapterResult & { type: 'parallel_task' },
-  graphId: string,
-  store: EventProcessorStore,
-): void {
-  const ctx = store.getContext(graphId)
-  const taskStates =
-    ((ctx.state.currentState as Record<string, unknown>)?.task_states as Record<string, unknown>) ||
-    {}
-  taskStates[result.task.task_id] = {
-    status:
-      result.task.status === 'started'
-        ? 'running'
-        : result.task.status === 'completed'
-          ? 'completed'
-          : 'error',
-    result: result.task.result,
-    error_msg: result.task.error_msg,
-  }
-  store.updateState({ task_states: taskStates, parallel_mode: true } as Partial<GraphState>)
-}
-
-/**
- * Handle state_update event
- */
-function handleStateUpdateEvent(
-  result: AdapterResult & { type: 'state_update' },
-  store: EventProcessorStore,
-): void {
-  store.updateState((result.update.state_snapshot || {}) as Partial<GraphState>)
-}
-
-/**
- * Create event processing context
- */
-export function createEventProcessorContext(
-  graphId: string,
-  genId: (prefix: string) => string,
-  getSteps: () => ExecutionStep[],
-): EventProcessorContext {
-  return {
-    currentThoughtId: null,
-    toolStepMap: new Map<string, string>(),
-    nodeStepMap: new Map<string, string>(),
-    modelStepMap: new Map<string, string>(),
-    graphId,
-    genId,
-    getSteps,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/workspaceChatWsService.ts b/frontend/app/workspace/[workspaceId]/[agentId]/services/workspaceChatWsService.ts
deleted file mode 100644
index 29bccea07..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/workspaceChatWsService.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-'use client'
-
-import { getChatWsClient } from '@/lib/ws/chat/chatWsClient'
-
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-class WorkspaceChatWsService {
-  private client = getChatWsClient()
-
-  async ensureConnected(): Promise<void> {
-    await this.client.connect()
-  }
-
-  async sendChat(params: {
-    message: string
-    threadId?: string | null
-    graphId?: string | null
-    metadata?: Record<string, any>
-    onEvent?: (evt: ChatStreamEvent) => void
-  }): Promise<{ requestId: string; threadId?: string; terminal: string }> {
-    const result = await this.client.sendChat({
-      threadId: params.threadId,
-      graphId: params.graphId,
-      input: { message: params.message },
-      extension: null,
-      metadata: params.metadata ?? {},
-      onEvent: params.onEvent,
-    })
-    return { requestId: result.requestId, threadId: result.threadId, terminal: result.terminal }
-  }
-
-  async sendResume(params: {
-    threadId: string
-    command: { update?: Record<string, unknown>; goto?: string }
-    onEvent?: (evt: ChatStreamEvent) => void
-  }): Promise<{ requestId: string; threadId?: string }> {
-    const result = await this.client.sendResume(params)
-    return { requestId: result.requestId, threadId: result.threadId }
-  }
-
-  stopByThreadId(threadId: string): void {
-    this.client.stopByThreadId(threadId)
-  }
-
-  stopByRequestId(requestId: string): void {
-    this.client.stopByRequestId(requestId)
-  }
-}
-
-export const workspaceChatWsService = new WorkspaceChatWsService()
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/__tests__/builderStore.dirty.test.ts b/frontend/app/workspace/[workspaceId]/[agentId]/stores/__tests__/builderStore.dirty.test.ts
deleted file mode 100644
index 8aa708f61..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/__tests__/builderStore.dirty.test.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest'
-import { useBuilderStore } from '../builderStore'
-import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
-
-// SaveManager makes real API calls — mock the whole module
-vi.mock('../../services/agentService', () => ({
-  agentService: {
-    saveGraphState: vi.fn().mockResolvedValue({}),
-    loadGraphState: vi.fn().mockResolvedValue({ nodes: [], edges: [] }),
-    getInitialGraph: vi.fn().mockResolvedValue({ nodes: [], edges: [] }),
-    setCachedGraphId: vi.fn(),
-    setCachedGraphName: vi.fn(),
-    clearCachedGraphId: vi.fn(),
-    clearCachedGraphName: vi.fn(),
-    listGraphs: vi.fn().mockResolvedValue([]),
-    saveGraph: vi.fn().mockResolvedValue({ graphId: 'g1' }),
-  },
-}))
-
-vi.mock('@/stores/sidebar/store', () => ({
-  useSidebarStore: { getState: () => ({ isCollapsed: false, sidebarWidth: 280 }) },
-}))
-
-const SEED_NODE = { id: 'n1', type: 'custom', position: { x: 0, y: 0 }, data: {} } as any
-const SEED_EDGE = { id: 'e1', source: 'n1', target: 'n2' } as any
-
-function resetStore() {
-  const nodes = [SEED_NODE]
-  const edges = [SEED_EDGE]
-  useBuilderStore.setState({
-    nodes,
-    edges,
-    graphId: 'test-graph-id',
-    graphName: 'Test',
-    lastSavedStateHash: computeGraphStateHash(nodes, edges, [], null),
-    graphStateFields: [],
-    fallbackNodeId: null,
-    past: [],
-    future: [],
-    isInitializing: false,
-  })
-}
-
-describe('onNodesChange — dirty state filtering', () => {
-  beforeEach(resetStore)
-
-  it('does NOT set hasPendingChanges for dimensions change', () => {
-    useBuilderStore.getState().onNodesChange([
-      { type: 'dimensions', id: 'n1', dimensions: { width: 100, height: 50 }, resizing: false },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(false)
-  })
-
-  it('does NOT set hasPendingChanges for select change', () => {
-    useBuilderStore.getState().onNodesChange([
-      { type: 'select', id: 'n1', selected: true },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(false)
-  })
-
-  it('DOES set hasPendingChanges for position change', () => {
-    useBuilderStore.getState().onNodesChange([
-      { type: 'position', id: 'n1', position: { x: 10, y: 20 } },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(true)
-  })
-
-  it('DOES set hasPendingChanges for remove change', () => {
-    useBuilderStore.getState().onNodesChange([
-      { type: 'remove', id: 'n1' },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(true)
-  })
-})
-
-describe('onEdgesChange — dirty state filtering', () => {
-  beforeEach(resetStore)
-
-  it('does NOT set hasPendingChanges for select change', () => {
-    useBuilderStore.getState().onEdgesChange([
-      { type: 'select', id: 'e1', selected: true },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(false)
-  })
-
-  it('DOES set hasPendingChanges for remove change', () => {
-    useBuilderStore.getState().onEdgesChange([
-      { type: 'remove', id: 'e1' },
-    ])
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(true)
-  })
-})
-
-describe('hasPendingChanges — derived from hash', () => {
-  it('is false when currentHash equals lastSavedStateHash', () => {
-    const nodes = [{ id: 'n1', type: 'custom', position: { x: 0, y: 0 }, data: {} }] as any
-    const hash = computeGraphStateHash(nodes, [], [], null)
-    useBuilderStore.setState({ nodes, edges: [], graphStateFields: [], fallbackNodeId: null, lastSavedStateHash: hash })
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(false)
-  })
-
-  it('is true when nodes differ from lastSavedStateHash', () => {
-    const nodes = [{ id: 'n1', type: 'custom', position: { x: 0, y: 0 }, data: {} }] as any
-    const hash = computeGraphStateHash([], [], [], null) // hash of empty state
-    useBuilderStore.setState({ nodes, edges: [], graphStateFields: [], fallbackNodeId: null, lastSavedStateHash: hash })
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(true)
-  })
-
-  it('is true when lastSavedStateHash is null (never saved)', () => {
-    useBuilderStore.setState({ nodes: [], edges: [], graphStateFields: [], fallbackNodeId: null, lastSavedStateHash: null })
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(true)
-  })
-
-  it('is false when lastSavedStateHash is null AND nodes/edges are empty (new unsaved graph)', () => {
-    // New empty graph: no graphId, no hash, no content — not dirty
-    useBuilderStore.setState({ nodes: [], edges: [], graphStateFields: [], fallbackNodeId: null, lastSavedStateHash: null, graphId: null })
-    expect(useBuilderStore.getState().hasPendingChanges).toBe(false)
-  })
-})
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/builderStore.ts b/frontend/app/workspace/[workspaceId]/[agentId]/stores/builderStore.ts
deleted file mode 100644
index cbe28ac2c..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/builderStore.ts
+++ /dev/null
@@ -1,865 +0,0 @@
-'use client'
-
-/**
- * Builder Store - Graph/Canvas State Management
- *
- * This store manages only the graph building functionality:
- * - Nodes and edges
- * - History (undo/redo)
- * - Graph persistence (load/save/import/export)
- *
- * Execution state is managed separately in executionStore.ts
- *
- * Save Management:
- * - All save operations are managed by SaveManager (see utils/saveManager.ts)
- * - SaveManager handles: manual saves, auto-saves, and debounced saves
- * - Timer fields (autoSaveTimer, autoSaveDebounceTimer) are kept for backward compatibility
- *   but are actually managed by SaveManager internally
- */
-
-import {
-  Connection,
-  Edge,
-  EdgeChange,
-  Node,
-  NodeChange,
-  addEdge,
-  OnNodesChange,
-  OnEdgesChange,
-  OnConnect,
-  applyNodeChanges,
-  applyEdgeChanges,
-  ReactFlowInstance,
-} from 'reactflow'
-import { create } from 'zustand'
-
-import { i18n } from '@/lib/i18n'
-import { createLogger } from '@/lib/logs/console/logger'
-import { generateUUID } from '@/lib/utils/uuid'
-import { useSidebarStore } from '@/stores/sidebar/store'
-import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
-
-import { agentService } from '../services/agentService'
-import { nodeRegistry } from '../services/nodeRegistry'
-import type { StateField } from '../types/graph'
-import { EdgeData, ValidationError } from '../types/graph'
-import { determineEdgeTypeAndRouteKey, autoWireConnection } from '../utils/connectionUtils'
-import { getEdgeStyleByType, processEdgesForReactFlow } from '../utils/edgeStyles'
-import { exportGraphToJson, parseImportedGraph } from '../utils/graphImportExport'
-import { SaveManager, type GraphState as SaveManagerGraphState } from '../utils/saveManager'
-
-const logger = createLogger('BuilderStore')
-
-/** Typed shape of graph variables stored alongside canvas state. */
-interface BuilderVariables {
-  graph_mode?: string
-  state_fields?: StateField[]
-  code_content?: string
-  fallback_node_id?: string
-  context?: Record<string, { type?: string; description?: string; value?: unknown }>
-  [key: string]: unknown
-}
-
-/**
- * Migrate legacy context variables to state fields.
- * Converts variables.context entries to StateField[] format.
- * Only applies when state_fields is empty but context has entries.
- */
-function migrateLegacyContextToStateFields(variables: BuilderVariables): StateField[] {
-  const stateFields = variables.state_fields || []
-  if (stateFields.length > 0) return stateFields
-
-  const legacyContext = variables.context || {}
-  if (Object.keys(legacyContext).length === 0) return []
-
-  const migrated = Object.entries(legacyContext).map(([key, v]) => ({
-    name: key,
-    type: (v?.type === 'number'
-      ? 'int'
-      : v?.type === 'boolean'
-        ? 'bool'
-        : v?.type || 'string') as StateField['type'],
-    description: v?.description || '',
-    defaultValue: v?.value,
-  }))
-  logger.info('Migrated legacy context variables to state fields:', migrated.length)
-  return migrated
-}
-
-// Track import graph timers to allow cleanup
-let importGraphTimeout1: NodeJS.Timeout | null = null
-let importGraphTimeout2: NodeJS.Timeout | null = null
-
-interface HistoryState {
-  nodes: Node[]
-  edges: Edge[]
-}
-
-interface ExecutionLog {
-  timestamp: number
-  nodeId: string
-  nodeLabel: string
-  message: string
-  status: 'info' | 'success' | 'error'
-}
-
-interface BuilderState {
-  // Canvas State
-  nodes: Node[]
-  edges: Edge[]
-  rfInstance: ReactFlowInstance | null
-  selectedNodeId: string | null
-  selectedEdgeId: string | null
-
-  // History State
-  past: HistoryState[]
-  future: HistoryState[]
-
-  // UI State
-  isSaving: boolean
-  isInitializing: boolean
-
-  // Execution State
-  isExecuting: boolean
-  activeExecutionNodeId: string | null
-  executionLogs: ExecutionLog[]
-
-  // Auto-save State
-  lastAutoSaveTime: number | null
-  deployedAt: string | null
-  workspaceId: string | null
-  graphId: string | null
-  graphName: string | null
-  autoSaveTimer: NodeJS.Timeout | null // Managed by SaveManager, kept for backward compatibility
-  autoSaveDebounceTimer: NodeJS.Timeout | null // Managed by SaveManager, kept for backward compatibility
-  lastSavedStateHash: string | null
-  hasPendingChanges: boolean
-  saveRetryCount: number
-  lastSaveError: string | null
-
-  onNodesChange: OnNodesChange
-  onEdgesChange: OnEdgesChange
-  onConnect: OnConnect
-  setRfInstance: (instance: ReactFlowInstance) => void
-
-  // History Actions
-  setWorkspaceId: (workspaceId: string) => void
-  setGraphId: (graphId: string | null) => void
-  setGraphName: (graphName: string | null) => void
-
-  // Actions
-  initialize: (workspaceId: string, graphId: string, ref: ReactFlowInstance) => Promise<void>
-  undo: () => void
-  redo: () => void
-  takeSnapshot: () => void
-
-  // Node Actions
-  addNode: (
-    type: string,
-    position: { x: number; y: number },
-    label?: string,
-    configOverride?: Record<string, unknown>,
-  ) => void
-  updateNodeConfig: (id: string, config: Record<string, unknown>) => void
-  updateNodeLabel: (id: string, label: string) => void
-  deleteNode: (id: string) => void
-  duplicateNode: (id: string) => void
-  selectNode: (id: string | null) => void
-
-  // Edge Actions
-  updateEdge: (id: string, data: Partial<EdgeData>) => void
-  selectEdge: (id: string | null) => void
-  getOutgoingEdges: (nodeId: string) => Edge[]
-
-  // Graph Persistence
-  loadGraph: (graphId?: string) => Promise<void>
-  saveGraph: (name: string) => Promise<void>
-  autoSave: () => Promise<void>
-  triggerAutoSave: () => void
-  startAutoSave: () => void
-  stopAutoSave: () => void
-  setDeployedAt: (deployedAt: string | null) => void
-  exportGraph: () => void
-  importGraph: (file: File) => Promise<void>
-
-  // Execution Actions
-  addLog: (nodeId: string, message: string, status?: 'info' | 'success' | 'error') => void
-  startExecution: (input: string) => Promise<void>
-  stopExecution: () => void
-
-  // AI Integration
-  applyAIChanges: (changes: { nodes?: Node[]; edges?: Edge[] }) => void
-  getGraphContext: () => {
-    nodes: Node[]
-    edges: { source: string; target: string }[]
-  }
-
-
-  // State Schema Actions
-  graphStateFields: import('../types/graph').StateField[]
-  addStateField: (field: import('../types/graph').StateField) => void
-  updateStateField: (name: string, field: Partial<import('../types/graph').StateField>) => void
-  deleteStateField: (name: string) => void
-  fallbackNodeId: string | null
-  setFallbackNodeId: (nodeId: string | null) => void
-}
-
-export const useBuilderStore = create<BuilderState>((set, get) => {
-  // Create SaveManager instance with access to store state
-  const saveManager = new SaveManager(
-    (): SaveManagerGraphState => ({
-      graphId: get().graphId,
-      graphName: get().graphName,
-      nodes: get().nodes,
-      edges: get().edges,
-      viewport: get().rfInstance?.getViewport(),
-      graphStateFields: get().graphStateFields,
-      fallbackNodeId: get().fallbackNodeId,
-    }),
-    {
-      onSaveSuccess: (hash, savedGraphId) => {
-        const currentGraphId = get().graphId
-        if (savedGraphId && savedGraphId !== currentGraphId) return
-        set({
-          lastSavedStateHash: hash,
-          lastAutoSaveTime: Date.now(),
-          saveRetryCount: 0,
-          lastSaveError: null,
-        })
-      },
-      onSaveError: (error) => {
-        set({ lastSaveError: error })
-      },
-    },
-  )
-
-  return {
-    nodes: [],
-    edges: [],
-    past: [],
-    future: [],
-    rfInstance: null,
-    selectedNodeId: null,
-    selectedEdgeId: null,
-    isSaving: false,
-    isInitializing: true,
-    workspaceId: null,
-    graphId: null,
-    graphName: null,
-    lastAutoSaveTime: null,
-    deployedAt: null,
-    autoSaveTimer: null,
-    autoSaveDebounceTimer: null,
-    lastSavedStateHash: null,
-    hasPendingChanges: false,
-    saveRetryCount: 0,
-    lastSaveError: null,
-    isExecuting: false,
-    activeExecutionNodeId: null,
-    executionLogs: [],
-    graphStateFields: [],
-    fallbackNodeId: null,
-    setFallbackNodeId: (nodeId) => {
-      set({ fallbackNodeId: nodeId })
-      get().triggerAutoSave()
-    },
-
-    // Actions
-    initialize: async (workspaceId, graphId, rfInstance) => {
-      set({
-        isInitializing: true,
-        workspaceId,
-        graphId,
-        rfInstance,
-        nodes: [],
-        edges: [],
-        graphStateFields: [],
-      })
-
-      try {
-        const [graphState, graphs] = await Promise.all([
-          agentService.loadGraphState(graphId),
-          agentService.listGraphs(workspaceId),
-        ])
-
-        const graphMeta = graphs.find((g) => g.id === graphId)
-
-        // Parse state fields and fallback_node_id from variables
-        const variables = (graphState.variables || {}) as BuilderVariables
-        const stateFields = migrateLegacyContextToStateFields(variables)
-        const fallbackNodeId = variables.fallback_node_id ?? null
-
-        set({
-          nodes: graphState.nodes || [],
-          edges: graphState.edges || [],
-          graphName: graphMeta?.name || 'Untitled Graph',
-          deployedAt: graphMeta?.isDeployed ? new Date().toISOString() : null,
-          graphStateFields: stateFields,
-          fallbackNodeId: fallbackNodeId || null,
-          lastSavedStateHash: computeGraphStateHash(
-            graphState.nodes || [],
-            graphState.edges || [],
-            stateFields,
-            fallbackNodeId,
-          ),
-          isInitializing: false,
-        })
-
-        // Initialize history
-        get().takeSnapshot()
-
-        // Center view if viewport exists, otherwise fit view
-        if (graphState.viewport) {
-          rfInstance.setViewport(graphState.viewport)
-        } else {
-          setTimeout(() => rfInstance.fitView({ padding: 0.2 }), 100)
-        }
-      } catch (error) {
-        console.error('Failed to initialize graph:', error)
-        set({ isInitializing: false })
-      }
-    },
-
-    addStateField: (field) => {
-      set((state) => ({
-        graphStateFields: [...state.graphStateFields, field],
-      }))
-      get().triggerAutoSave()
-    },
-
-    updateStateField: (name, updates) => {
-      set((state) => ({
-        graphStateFields: state.graphStateFields.map((f) =>
-          f.name === name ? { ...f, ...updates } : f,
-        ),
-      }))
-      get().triggerAutoSave()
-    },
-
-    deleteStateField: (name) => {
-      set((state) => ({
-        graphStateFields: state.graphStateFields.filter((f) => f.name !== name),
-      }))
-      get().triggerAutoSave()
-    },
-
-    addLog: (nodeId, message, status: 'info' | 'success' | 'error' = 'info') => {
-      const node = get().nodes.find((n) => n.id === nodeId)
-      const newLog: ExecutionLog = {
-        timestamp: Date.now(),
-        nodeId,
-        nodeLabel: (node?.data as { label?: string })?.label || 'System',
-        message,
-        status,
-      }
-      set((state) => ({ executionLogs: [...state.executionLogs, newLog] }))
-    },
-
-    startExecution: async (input: string) => {
-      const { nodes, edges } = get()
-      if (nodes.length === 0) return
-
-      set({ isExecuting: true, executionLogs: [], activeExecutionNodeId: null })
-      get().addLog(
-        'system',
-        i18n
-          .t('execution.agentStarted', {
-            defaultValue: 'Agent started, input: {{input}}',
-            input,
-          })
-          .replace('{{input}}', input),
-        'info',
-      )
-
-      let currentNode: Node | null = nodes[0]
-      const visited = new Set()
-
-      while (currentNode && get().isExecuting) {
-        set({ activeExecutionNodeId: currentNode.id })
-        get().addLog(currentNode.id, i18n.t('workspace.processingLogic'), 'info')
-
-        await new Promise((r) => setTimeout(r, 2000))
-
-        get().addLog(currentNode.id, i18n.t('workspace.stepCompleted'), 'success')
-        visited.add(currentNode.id)
-
-        const outEdge = edges.find((e) => e.source === currentNode!.id)
-        if (outEdge && !visited.has(outEdge.target)) {
-          currentNode = nodes.find((n) => n.id === outEdge.target) || null
-          if (currentNode) {
-            get().addLog(
-              'system',
-              i18n.t('workspace.transitioningTo', {
-                label: (currentNode.data as { label?: string })?.label,
-              }),
-              'info',
-            )
-          }
-        } else {
-          currentNode = null
-        }
-      }
-
-      if (get().isExecuting) {
-        get().addLog(
-          'system',
-          i18n.t('execution.agentCompleted', { defaultValue: 'Agent completed successfully.' }),
-          'success',
-        )
-        set({ isExecuting: false, activeExecutionNodeId: null })
-      }
-    },
-
-    stopExecution: () => {
-      set({ isExecuting: false, activeExecutionNodeId: null })
-      get().addLog('system', i18n.t('workspace.executionStopped'), 'error')
-    },
-
-    // ========== History Actions ==========
-
-    takeSnapshot: () => {
-      const { nodes, edges, past } = get()
-      const newPast = [...past, { nodes: [...nodes], edges: [...edges] }].slice(-50)
-      set({ past: newPast, future: [] })
-    },
-
-    undo: () => {
-      const { past, future, nodes, edges } = get()
-      if (past.length === 0) return
-      const previous = past[past.length - 1]
-      set({
-        past: past.slice(0, past.length - 1),
-        future: [{ nodes, edges }, ...future],
-        nodes: previous.nodes,
-        edges: previous.edges,
-      })
-      get().triggerAutoSave()
-    },
-
-    redo: () => {
-      const { past, future, nodes, edges } = get()
-      if (future.length === 0) return
-      const next = future[0]
-      set({
-        past: [...past, { nodes, edges }],
-        future: future.slice(1),
-        nodes: next.nodes,
-        edges: next.edges,
-      })
-      get().triggerAutoSave()
-    },
-
-    // ========== ReactFlow Handlers ==========
-
-    onNodesChange: (changes: NodeChange[]) => {
-      if (changes.some((c) => c.type === 'remove')) get().takeSnapshot()
-      set({ nodes: applyNodeChanges(changes, get().nodes) })
-      const isContentChange = changes.some(
-        (c) => c.type !== 'select' && c.type !== 'dimensions',
-      )
-      if (isContentChange) get().triggerAutoSave()
-    },
-
-    onEdgesChange: (changes: EdgeChange[]) => {
-      if (changes.some((c) => c.type === 'remove')) get().takeSnapshot()
-      set({ edges: applyEdgeChanges(changes, get().edges) })
-      const isContentChange = changes.some((c) => c.type !== 'select')
-      if (isContentChange) get().triggerAutoSave()
-    },
-
-    onConnect: (connection: Connection) => {
-      try {
-        if (!connection.source || !connection.target) return
-
-        const { edges, nodes } = get()
-        const exists = edges.some(
-          (e) => e.source === connection.source && e.target === connection.target,
-        )
-        if (exists) return
-
-        if (connection.source === connection.target) return
-
-        const sourceNode = nodes.find((n) => n.id === connection.source)
-        const targetNode = nodes.find((n) => n.id === connection.target)
-        if (!sourceNode || !targetNode) return
-
-        // Determine edge type and route_key using extracted utility
-        const { edgeType, routeKey } = determineEdgeTypeAndRouteKey(
-          connection.source,
-          connection.target,
-          nodes,
-          edges,
-        )
-
-        const edgeData: EdgeData = {
-          edge_type: edgeType,
-          route_key: routeKey,
-        }
-
-        const { style: edgeStyle } = getEdgeStyleByType(edgeType)
-
-        get().takeSnapshot()
-        set({
-          edges: addEdge(
-            {
-              ...connection,
-              data: edgeData,
-              type: 'default',
-              animated: true,
-              style: edgeStyle,
-            },
-            get().edges,
-          ),
-        })
-
-        get().triggerAutoSave()
-      } catch (error) {
-        console.error('Failed to create connection:', error)
-      }
-    },
-
-    setRfInstance: (instance) => set({ rfInstance: instance }),
-    setWorkspaceId: (workspaceId) => set({ workspaceId }),
-    setGraphId: (graphId) => {
-      set({ graphId })
-    },
-    setGraphName: (graphName) => set({ graphName }),
-
-    // ========== Node Actions ==========
-
-    addNode: (type, position, label, configOverride) => {
-      get().takeSnapshot()
-      const def = nodeRegistry.get(type)
-      const defaultConfig = { ...def?.defaultConfig }
-      // If configuration override is provided, merge into default configuration
-      if (configOverride) {
-        Object.assign(defaultConfig, configOverride)
-      }
-      const newNode: Node = {
-        id: generateUUID(),
-        type: 'custom',
-        position,
-        data: {
-          label: label || def?.label || 'New Node',
-          type: type,
-          config: defaultConfig,
-        },
-      }
-      set({ nodes: [...get().nodes, newNode], selectedNodeId: newNode.id })
-      get().triggerAutoSave()
-    },
-
-    updateNodeConfig: (id, config) => {
-      const node = get().nodes.find((n) => n.id === id)
-      const nodeType = (node?.data as { type?: string })?.type || ''
-
-      set({
-        nodes: get().nodes.map((n) => {
-          if (n.id === id) {
-            const nodeData = n.data as { config?: Record<string, unknown> }
-            return {
-              ...n,
-              data: { ...n.data, config: { ...nodeData.config, ...config } },
-            }
-          }
-          return n
-        }),
-      })
-
-
-      get().triggerAutoSave()
-    },
-
-    updateNodeLabel: (id, label) => {
-      set({
-        nodes: get().nodes.map((node) => {
-          if (node.id === id) {
-            return { ...node, data: { ...node.data, label } }
-          }
-          return node
-        }),
-      })
-      get().triggerAutoSave()
-    },
-
-    deleteNode: (id) => {
-      get().takeSnapshot()
-      const { nodes, edges } = get()
-      const newNodes = nodes.filter((n) => n.id !== id)
-      const newEdges = edges.filter((e) => e.source !== id && e.target !== id)
-      set({
-        nodes: newNodes,
-        edges: newEdges,
-        selectedNodeId: null,
-      })
-      get().triggerAutoSave()
-    },
-
-    duplicateNode: (id: string) => {
-      get().takeSnapshot()
-      const nodeToDuplicate = get().nodes.find((n) => n.id === id)
-      if (!nodeToDuplicate) return
-
-      const sidebarState = useSidebarStore.getState()
-      const isSidebarCollapsed = sidebarState.isCollapsed
-      const sidebarWidth = sidebarState.sidebarWidth || 280
-      const offsetX = 200
-      const offsetY = 50
-      let newX = nodeToDuplicate.position.x + offsetX
-      const newY = nodeToDuplicate.position.y + offsetY
-      const sidebarRightBoundary = isSidebarCollapsed ? 422 : sidebarWidth
-
-      if (newX < sidebarRightBoundary + 50) {
-        newX = sidebarRightBoundary + 50
-      }
-
-      const newNode: Node = {
-        ...nodeToDuplicate,
-        id: generateUUID(),
-        position: { x: newX, y: newY },
-        selected: false,
-      }
-      set({ nodes: [...get().nodes, newNode], selectedNodeId: newNode.id })
-      get().triggerAutoSave()
-    },
-
-    selectNode: (id) => set({ selectedNodeId: id, selectedEdgeId: null }),
-
-    // Edge Actions
-    updateEdge: (id, data) => {
-      set((state) => ({
-        edges: state.edges.map((e) => {
-          if (e.id !== id) return e
-
-          const updatedData = { ...(e.data || {}), ...data } as EdgeData
-          const edgeType = updatedData.edge_type
-
-          // Update edge type and style based on edge_type
-          const { type: edgeTypeForReactFlow, style: edgeStyle } = getEdgeStyleByType(
-            edgeType,
-            e.style,
-          )
-
-          return {
-            ...e,
-            type: edgeTypeForReactFlow,
-            data: updatedData,
-            style: edgeStyle,
-          }
-        }),
-      }))
-      get().triggerAutoSave()
-    },
-    selectEdge: (id) => set({ selectedEdgeId: id, selectedNodeId: null }),
-
-    getOutgoingEdges: (nodeId) => {
-      return get().edges.filter((e) => e.source === nodeId)
-    },
-
-
-    loadGraph: async (graphId?: string) => {
-      set({ isInitializing: true })
-      try {
-        if (graphId) {
-          const state = await agentService.loadGraphState(graphId)
-          let { nodes, edges } = state
-          const { variables } = state
-
-          // Process edges to ensure correct type and style based on edge_type
-          const processedEdges = processEdgesForReactFlow(edges)
-
-          // Load state fields and fallback_node_id from variables
-          const loadedStateFields = migrateLegacyContextToStateFields(
-            (variables as BuilderVariables) || {},
-          )
-          const fallbackNodeId = (variables as BuilderVariables)?.fallback_node_id ?? null
-
-          set({
-            nodes,
-            edges: processedEdges,
-            graphStateFields: loadedStateFields,
-            fallbackNodeId: fallbackNodeId || null,
-            past: [],
-            future: [],
-            isInitializing: false,
-          })
-        } else {
-          let { nodes, edges } = await agentService.getInitialGraph()
-
-          // Process edges to ensure correct type and style based on edge_type
-          const processedEdges = processEdgesForReactFlow(edges)
-
-          set({ nodes, edges: processedEdges, past: [], future: [], isInitializing: false })
-        }
-      } catch {
-        set({ nodes: [], edges: [], past: [], future: [], isInitializing: false })
-      }
-    },
-
-    saveGraph: async (name: string) => {
-      const { nodes, edges, rfInstance, workspaceId } = get()
-      if (!name) return
-      set({ isSaving: true })
-      try {
-        const viewport = rfInstance?.getViewport() || { x: 0, y: 0, zoom: 1 }
-        const variables = {}
-        const { graphId } = await agentService.saveGraph({
-          name,
-          nodes,
-          edges,
-          viewport,
-          workspaceId,
-          variables,
-        })
-        // Save state using SaveManager
-        await saveManager.save('manual')
-        const currentStateHash = computeGraphStateHash(nodes, edges, get().graphStateFields, get().fallbackNodeId)
-        set({
-          graphId,
-          graphName: name,
-          lastAutoSaveTime: Date.now(),
-          lastSavedStateHash: currentStateHash,
-          saveRetryCount: 0,
-          lastSaveError: null,
-        })
-      } finally {
-        set({ isSaving: false })
-      }
-    },
-
-    autoSave: async () => {
-      await saveManager.save('auto')
-    },
-
-    triggerAutoSave: () => {
-      const { graphId } = get()
-
-      if (!graphId) return
-
-      saveManager.debouncedSave()
-    },
-
-    startAutoSave: () => {
-      saveManager.save('auto')
-    },
-
-    stopAutoSave: () => {
-      saveManager.stopAll()
-      // Clear timer references in state for backward compatibility
-      set({
-        autoSaveTimer: null,
-        autoSaveDebounceTimer: null,
-      })
-    },
-
-    setDeployedAt: (deployedAt: string | null) => {
-      set({ deployedAt })
-    },
-
-    exportGraph: () => {
-      const { nodes, edges, rfInstance } = get()
-      exportGraphToJson(nodes, edges, rfInstance)
-    },
-
-    importGraph: async (file: File) => {
-      try {
-        const { nodes, edges, viewport } = await parseImportedGraph(file)
-
-        get().takeSnapshot()
-
-        // Import doesn't set graphId/graphName, so don't trigger auto-save
-        // User needs to explicitly save the imported graph first
-        set({
-          nodes,
-          edges,
-          past: [],
-          future: [],
-          selectedNodeId: null,
-          lastSavedStateHash: null,
-          saveRetryCount: 0,
-          lastSaveError: null,
-        })
-
-        // Clear any existing import timers
-        if (importGraphTimeout1) {
-          clearTimeout(importGraphTimeout1)
-          importGraphTimeout1 = null
-        }
-        if (importGraphTimeout2) {
-          clearTimeout(importGraphTimeout2)
-          importGraphTimeout2 = null
-        }
-
-        importGraphTimeout1 = setTimeout(() => {
-          const { rfInstance } = get()
-          if (viewport && rfInstance) {
-            rfInstance.setViewport(viewport)
-            importGraphTimeout1 = null
-          } else if (rfInstance) {
-            importGraphTimeout2 = setTimeout(() => {
-              rfInstance?.fitView({ padding: 0.2 })
-              importGraphTimeout2 = null
-            }, 100)
-            importGraphTimeout1 = null
-          } else {
-            importGraphTimeout1 = null
-          }
-        }, 100)
-      } catch (error) {
-        throw error
-      }
-    },
-
-    applyAIChanges: ({ nodes, edges }) => {
-      get().takeSnapshot()
-      set((state) => ({
-        nodes: nodes !== undefined ? nodes : state.nodes,
-        edges: edges !== undefined ? edges : state.edges,
-      }))
-
-      // Optimistic update only. Graph state is persisted by the backend after
-      // Copilot generation; no frontend save here to avoid dual-write races.
-    },
-
-    getGraphContext: () => {
-      const { nodes, edges } = get()
-      return {
-        nodes: nodes,
-        edges: edges.map((e) => ({
-          source: e.source,
-          target: e.target,
-        })),
-      }
-    },
-  }
-})
-
-// Subscribe to relevant fields and recompute hasPendingChanges reactively.
-// This ensures useBuilderStore() hooks in components always see the correct value.
-useBuilderStore.subscribe((state, prevState) => {
-  if (
-    state.nodes === prevState.nodes &&
-    state.edges === prevState.edges &&
-    state.graphStateFields === prevState.graphStateFields &&
-    state.fallbackNodeId === prevState.fallbackNodeId &&
-    state.lastSavedStateHash === prevState.lastSavedStateHash &&
-    state.graphId === prevState.graphId
-  ) return
-
-  const { graphId, nodes, edges, graphStateFields, fallbackNodeId, lastSavedStateHash } = state
-  let hasPendingChanges: boolean
-  if (!graphId && nodes.length === 0 && edges.length === 0) {
-    hasPendingChanges = false
-  } else if (lastSavedStateHash === null) {
-    hasPendingChanges = graphId !== null
-  } else {
-    const currentHash = computeGraphStateHash(nodes, edges, graphStateFields, fallbackNodeId)
-    hasPendingChanges = currentHash !== lastSavedStateHash
-  }
-  if (state.hasPendingChanges !== hasPendingChanges) {
-    // Safe: hasPendingChanges is not in the watched fields above, so this
-    // setState call won't re-trigger the early-return check, preventing
-    // infinite recursion.
-    useBuilderStore.setState({ hasPendingChanges })
-  }
-})
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/executionStore.ts b/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/executionStore.ts
deleted file mode 100644
index 1efd7fc79..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/executionStore.ts
+++ /dev/null
@@ -1,544 +0,0 @@
-'use client'
-
-/**
- * Execution Store
- *
- * Zustand Store for managing Graph execution state
- *
- * Responsibilities:
- * - Multi-Graph state isolation
- * - LRU cache management
- * - Execution flow control
- */
-
-import { create } from 'zustand'
-
-import type { ChatStreamEvent } from '@/services/chatBackend'
-import type { ExecutionStep, ExecutionTreeNode } from '@/types'
-
-import { buildExecutionTree } from '../../lib/tree-building'
-import { agentService } from '../../services/agentService'
-import type { GraphState, TraceStep } from '../../services/eventProcessor'
-import {
-  processEvent,
-  createEventProcessorContext,
-  generateId as genId,
-  type EventProcessorStore,
-} from '../../services/eventProcessor'
-
-import {
-  createEmptyGraphState,
-  createExecutionContext,
-  getExecutionManager,
-} from './ExecutionManager'
-import type { ExecutionStore, ExecutionContext, GraphExecutionState, InterruptInfo } from './types'
-import { generateId } from './utils'
-import { workspaceChatWsService } from '../../services/workspaceChatWsService'
-
-// ============ Batch Update Buffer ============
-// Used to merge high-frequency appendContent calls, reducing state update frequency
-
-const pendingContentUpdates = new Map<string, string>()
-let contentUpdateScheduled = false
-
-// ============ Helper Functions ============
-
-function getOrCreateContext(
-  contexts: Map<string, ExecutionContext>,
-  graphId: string | null,
-): ExecutionContext {
-  if (!graphId) return createExecutionContext('')
-  let context = contexts.get(graphId)
-  if (!context) {
-    context = createExecutionContext(graphId)
-  }
-  return context
-}
-
-function syncComputedProperties(state: GraphExecutionState) {
-  return {
-    steps: state.steps,
-    isExecuting: state.isExecuting,
-    showPanel: state.showPanel,
-    activeNodeId: state.activeNodeId,
-    pendingInterrupts: state.pendingInterrupts,
-    currentState: state.currentState,
-    executionTrace: state.executionTrace,
-    routeDecisions: state.routeDecisions,
-    treeRoots: state.treeRoots,
-    treeNodeMap: state.treeNodeMap,
-  }
-}
-
-/**
- * Rebuild tree structure from steps and merge into state updates.
- */
-function rebuildTree(steps: ExecutionStep[]): {
-  treeRoots: ExecutionTreeNode[]
-  treeNodeMap: Map<string, ExecutionTreeNode>
-} {
-  const { roots, nodeMap } = buildExecutionTree(steps)
-  return { treeRoots: roots, treeNodeMap: nodeMap }
-}
-
-// ============ Store ============
-
-export const useExecutionStore = create<ExecutionStore>((set, get) => {
-  const manager = getExecutionManager()
-
-  const getCurrentState = (): GraphExecutionState => {
-    const { contexts, currentGraphId } = get()
-    return getOrCreateContext(contexts, currentGraphId).state
-  }
-
-  const updateCurrentState = (updates: Partial<GraphExecutionState>) => {
-    const { contexts, currentGraphId } = get()
-    if (!currentGraphId) return
-
-    const context = getOrCreateContext(contexts, currentGraphId)
-    const newState = { ...context.state, ...updates }
-    const newContext = { ...context, state: newState }
-
-    const newContexts = new Map(contexts)
-    newContexts.set(currentGraphId, newContext)
-
-    set({
-      contexts: newContexts,
-      ...syncComputedProperties(newState),
-    })
-  }
-
-  return {
-    // ============ State ============
-    contexts: new Map<string, ExecutionContext>(),
-    currentGraphId: null,
-    steps: [],
-    isExecuting: false,
-    showPanel: false,
-    activeNodeId: null,
-    pendingInterrupts: new Map<string, InterruptInfo>(),
-    currentState: null,
-    executionTrace: [],
-    routeDecisions: [],
-    treeRoots: [],
-    treeNodeMap: new Map(),
-
-    // ============ Graph Switching ============
-
-    setCurrentGraphId: (graphId: string | null) => {
-      const { contexts, clearGraphState } = get()
-
-      if (graphId) {
-        manager.recordAccess(graphId)
-        const toEvict = manager.getGraphsToEvict(contexts)
-        toEvict.forEach((id) => clearGraphState(id))
-      }
-
-      const context = getOrCreateContext(contexts, graphId)
-
-      if (graphId && !contexts.has(graphId)) {
-        const newContexts = new Map(contexts)
-        newContexts.set(graphId, context)
-        set({
-          contexts: newContexts,
-          currentGraphId: graphId,
-          ...syncComputedProperties(context.state),
-        })
-      } else {
-        set({
-          currentGraphId: graphId,
-          ...syncComputedProperties(context.state),
-        })
-      }
-    },
-
-    // ============ State Updates ============
-
-    updateGraphState: (graphId: string, updates: Partial<GraphExecutionState>) => {
-      const { contexts, currentGraphId } = get()
-      const context = getOrCreateContext(contexts, graphId)
-      const newState = { ...context.state, ...updates }
-      const newContext = { ...context, state: newState }
-
-      const newContexts = new Map(contexts)
-      newContexts.set(graphId, newContext)
-
-      if (graphId === currentGraphId) {
-        set({ contexts: newContexts, ...syncComputedProperties(newState) })
-      } else {
-        set({ contexts: newContexts })
-      }
-    },
-
-    // ============ Step Management ============
-
-    addStep: (step: ExecutionStep) => {
-      const state = getCurrentState()
-      if (state.steps.some((s) => s.id === step.id)) return
-      const newSteps = [...state.steps, step]
-      updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
-    },
-
-    updateStep: (stepId: string, updates: Partial<ExecutionStep>) => {
-      const state = getCurrentState()
-      const idx = state.steps.findIndex((s) => s.id === stepId)
-      if (idx === -1) return
-
-      const step = state.steps[idx]
-      const hasChanges = Object.keys(updates).some(
-        (k) => step[k as keyof ExecutionStep] !== updates[k as keyof ExecutionStep],
-      )
-      if (!hasChanges) return
-
-      const newSteps = [...state.steps]
-      // Deep merge data field instead of overwriting
-      const mergedData = updates.data ? { ...(step.data || {}), ...updates.data } : step.data
-      newSteps[idx] = { ...step, ...updates, data: mergedData }
-      updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
-    },
-
-    appendContent: (stepId: string, text: string) => {
-      if (!text) return
-
-      // Accumulate to buffer instead of immediate update
-      const existing = pendingContentUpdates.get(stepId) || ''
-      pendingContentUpdates.set(stepId, existing + text)
-
-      // Schedule batch update (execute once per microtask cycle)
-      if (!contentUpdateScheduled) {
-        contentUpdateScheduled = true
-        queueMicrotask(() => {
-          contentUpdateScheduled = false
-          const updates = new Map(pendingContentUpdates)
-          pendingContentUpdates.clear()
-
-          const state = getCurrentState()
-          const newSteps = [...state.steps]
-          let hasChanges = false
-
-          updates.forEach((content, id) => {
-            const idx = newSteps.findIndex((s) => s.id === id)
-            if (idx !== -1) {
-              newSteps[idx] = {
-                ...newSteps[idx],
-                content: (newSteps[idx].content || '') + content,
-              }
-              hasChanges = true
-            }
-          })
-
-          if (hasChanges) {
-            updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
-          }
-        })
-      }
-    },
-
-    // ============ Panel ============
-
-    togglePanel: (show?: boolean) => {
-      const state = getCurrentState()
-      updateCurrentState({ showPanel: show ?? !state.showPanel })
-    },
-
-    // ============ Interrupt Management ============
-
-    addInterrupt: (interrupt: InterruptInfo) => {
-      const state = getCurrentState()
-      const newInterrupts = new Map(state.pendingInterrupts)
-      newInterrupts.set(interrupt.nodeId, interrupt)
-
-      const nodeStep = state.steps.find(
-        (s) => s.nodeId === interrupt.nodeId && s.status === 'running',
-      )
-
-      if (nodeStep) {
-        const updatedSteps = state.steps.map((s) =>
-          s.id === nodeStep.id ? { ...s, status: 'waiting' as const } : s,
-        )
-        updateCurrentState({ pendingInterrupts: newInterrupts, steps: updatedSteps })
-      } else {
-        updateCurrentState({ pendingInterrupts: newInterrupts })
-      }
-    },
-
-    removeInterrupt: (nodeId: string) => {
-      const state = getCurrentState()
-      const newInterrupts = new Map(state.pendingInterrupts)
-      newInterrupts.delete(nodeId)
-      updateCurrentState({ pendingInterrupts: newInterrupts })
-    },
-
-    clearInterrupts: () => {
-      updateCurrentState({ pendingInterrupts: new Map() })
-    },
-
-    getInterrupt: (nodeId: string) => getCurrentState().pendingInterrupts.get(nodeId),
-
-    // ============ Execution Control ============
-
-    clear: () => {
-      updateCurrentState({
-        steps: [],
-        currentState: null,
-        executionTrace: [],
-        routeDecisions: [],
-        treeRoots: [],
-        treeNodeMap: new Map(),
-      })
-    },
-
-    clearGraphState: (graphId: string) => {
-      const { contexts, currentGraphId } = get()
-
-      const context = contexts.get(graphId)
-      if (context?.abortController) {
-        context.abortController.abort()
-      }
-
-      manager.removeFromAccess(graphId)
-
-      const newContexts = new Map(contexts)
-      newContexts.delete(graphId)
-
-      if (graphId === currentGraphId) {
-        set({ contexts: newContexts, ...syncComputedProperties(createEmptyGraphState()) })
-      } else {
-        set({ contexts: newContexts })
-      }
-    },
-
-    getRunningGraphIds: () => {
-      const { contexts } = get()
-      const running: string[] = []
-      contexts.forEach((ctx, id) => {
-        if (ctx.state.isExecuting) running.push(id)
-      })
-      return running
-    },
-
-    setExecuting: (isExecuting: boolean) => {
-      const state = getCurrentState()
-      updateCurrentState({
-        isExecuting,
-        activeNodeId: isExecuting ? state.activeNodeId : null,
-      })
-    },
-
-    // ============ Execution Context ============
-
-    getContext: (graphId: string) => {
-      const { contexts } = get()
-      return getOrCreateContext(contexts, graphId)
-    },
-
-    setAbortController: (graphId: string, controller: AbortController | null) => {
-      const { contexts } = get()
-      const context = getOrCreateContext(contexts, graphId)
-      const newContexts = new Map(contexts)
-      newContexts.set(graphId, { ...context, abortController: controller })
-      set({ contexts: newContexts })
-    },
-
-    setThreadId: (graphId: string, threadId: string | null) => {
-      const { contexts } = get()
-      const context = getOrCreateContext(contexts, graphId)
-      const newContexts = new Map(contexts)
-      newContexts.set(graphId, { ...context, threadId })
-      set({ contexts: newContexts })
-    },
-
-    setRequestId: (graphId: string, requestId: string | null) => {
-      const { contexts } = get()
-      const context = getOrCreateContext(contexts, graphId)
-      const newContexts = new Map(contexts)
-      newContexts.set(graphId, { ...context, requestId })
-      set({ contexts: newContexts })
-    },
-
-    // ============ Command Mode ============
-
-    updateState: (stateUpdate: Partial<GraphState>) => {
-      const state = getCurrentState()
-      updateCurrentState({
-        currentState: state.currentState
-          ? { ...state.currentState, ...stateUpdate }
-          : (stateUpdate as GraphState),
-      })
-    },
-
-    addTraceStep: (step: TraceStep) => {
-      const state = getCurrentState()
-      updateCurrentState({ executionTrace: [...state.executionTrace, step] })
-    },
-
-    addRouteDecision: (nodeId, decision) => {
-      const state = getCurrentState()
-      updateCurrentState({
-        routeDecisions: [
-          ...state.routeDecisions,
-          { nodeId, decision, timestamp: Date.now() },
-        ],
-      })
-    },
-
-    // ============ Execution Methods ============
-
-    startExecution: async (input: string) => {
-      const store = get()
-      if (!input.trim()) return
-
-      const graphId = store.currentGraphId || agentService.getCachedGraphId()
-      if (!graphId) {
-        console.error('No graph_id available for execution')
-        // Surface error in the execution panel so the user sees feedback
-        store.togglePanel(true)
-        store.addStep({
-          id: generateId('error'),
-          nodeId: 'system',
-          nodeLabel: 'Error',
-          stepType: 'system_log',
-          title: 'Execution Error',
-          status: 'error',
-          startTime: Date.now(),
-          content: 'No graph available for execution. Please save your graph first.',
-        })
-        return
-      }
-
-      // Cancel previous execution
-      const existingContext = store.getContext(graphId)
-      if (existingContext.abortController) {
-        existingContext.abortController.abort()
-      }
-
-      const abortController = new AbortController()
-      store.setAbortController(graphId, abortController)
-      store.setRequestId(graphId, null)
-      store.setThreadId(graphId, null)
-
-      store.clearInterrupts()
-      store.updateGraphState(graphId, {
-        steps: [],
-        isExecuting: true,
-        activeNodeId: null,
-        pendingInterrupts: new Map(),
-      })
-      store.togglePanel(true)
-
-      const workflowId = generateId('workflow')
-      store.addStep({
-        id: workflowId,
-        nodeId: 'system',
-        nodeLabel: 'Workflow',
-        stepType: 'node_lifecycle',
-        title: 'Workflow Execution',
-        status: 'running',
-        startTime: Date.now(),
-        data: { input },
-      })
-
-      // Create event processing context
-      const ctx = createEventProcessorContext(graphId, genId, () => get().steps)
-
-      // Create store adapter conforming to EventProcessorStore interface
-      const storeAdapter: EventProcessorStore = {
-        addStep: store.addStep,
-        updateStep: store.updateStep,
-        appendContent: store.appendContent,
-        addInterrupt: store.addInterrupt,
-        setExecuting: store.setExecuting,
-        updateState: store.updateState,
-        addTraceStep: store.addTraceStep,
-        addRouteDecision: store.addRouteDecision,
-        setThreadId: store.setThreadId,
-        updateGraphState: store.updateGraphState,
-        getContext: store.getContext,
-      }
-
-      let wasStopped = false
-
-      try {
-        const result = await workspaceChatWsService.sendChat({
-          message: input,
-          threadId: null,
-          graphId,
-          metadata: {},
-          onEvent: (evt: ChatStreamEvent) => {
-            const s = get()
-
-            // Use shared event processor
-            const eventResult = processEvent(evt, ctx, storeAdapter)
-
-            // Update currentThoughtId in context
-            ctx.currentThoughtId = eventResult.currentThoughtId
-
-            // Special handling for stopped event to update workflow step
-            if (eventResult.shouldStop && eventResult.stopReason === 'stopped') {
-              wasStopped = true
-              s.updateStep(workflowId, { status: 'error', endTime: Date.now() })
-            }
-          },
-        })
-
-        if (result.threadId) store.setThreadId(graphId, result.threadId)
-        store.setRequestId(graphId, result.requestId)
-
-        // Only mark success when not stopped/errored
-        if (!wasStopped && result.terminal !== 'error') {
-          const graphContext = store.getContext(graphId)
-          const workflowStep = graphContext.state.steps.find((s) => s.id === workflowId)
-          store.updateStep(workflowId, {
-            status: 'success',
-            endTime: Date.now(),
-            duration: Date.now() - (workflowStep?.startTime || Date.now()),
-          })
-        }
-      } catch (e: unknown) {
-        const error = e as { name?: string; message?: string }
-        store.updateStep(workflowId, { status: 'error', endTime: Date.now() })
-        if (error?.name !== 'AbortError') {
-          store.addStep({
-            id: generateId('error'),
-            nodeId: 'system',
-            nodeLabel: 'Error',
-            stepType: 'system_log',
-            title: 'Execution Error',
-            status: 'error',
-            startTime: Date.now(),
-            content: String(error?.message || e),
-          })
-        }
-      } finally {
-        store.updateGraphState(graphId, { isExecuting: false })
-        store.setAbortController(graphId, null)
-        store.setRequestId(graphId, null)
-      }
-    },
-
-    stopExecution: async () => {
-      const { currentGraphId, getContext, setAbortController, setThreadId, updateGraphState } =
-        get()
-      if (!currentGraphId) return
-
-      const context = getContext(currentGraphId)
-
-      if (context.threadId) {
-        try {
-          workspaceChatWsService.stopByThreadId(context.threadId)
-        } catch (error) {
-          console.error('Failed to stop execution:', error)
-        }
-        setThreadId(currentGraphId, null)
-      }
-
-      if (context.abortController) {
-        context.abortController.abort()
-        setAbortController(currentGraphId, null)
-      }
-
-      get().setRequestId(currentGraphId, null)
-      updateGraphState(currentGraphId, { isExecuting: false, activeNodeId: null })
-    },
-  }
-})
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/executionStore.ts b/frontend/app/workspace/[workspaceId]/[agentId]/stores/executionStore.ts
deleted file mode 100644
index 6d25a3b65..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/executionStore.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Execution Store - compatibility layer
- *
- * Re-exports from the new modular structure.
- * Maintains backward compatibility so existing code needs no changes.
- */
-
-export { useExecutionStore } from './execution/executionStore'
-export type { InterruptInfo } from './execution/types'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/__tests__/saveManager.test.ts b/frontend/app/workspace/[workspaceId]/[agentId]/utils/__tests__/saveManager.test.ts
deleted file mode 100644
index 17068d421..000000000
--- a/frontend/app/workspace/[workspaceId]/[agentId]/utils/__tests__/saveManager.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { SaveManager } from '../saveManager'
-
-const mockSaveGraphState = vi.fn().mockResolvedValue({})
-
-vi.mock('../../services/agentService', () => ({
-  agentService: { saveGraphState: (...args: any[]) => mockSaveGraphState(...args) },
-}))
-
-const baseState = () => ({
-  graphId: 'graph-1',
-  graphName: 'Test',
-  nodes: [],
-  edges: [],
-  viewport: { x: 0, y: 0, zoom: 1 },
-  graphStateFields: [],
-  fallbackNodeId: null,
-})
-
-describe('SaveManager (simplified)', () => {
-  let onSaveSuccess: ReturnType<typeof vi.fn>
-  let onSaveError: ReturnType<typeof vi.fn>
-  let getState: ReturnType<typeof vi.fn>
-  let manager: SaveManager
-
-  beforeEach(() => {
-    mockSaveGraphState.mockClear()
-    onSaveSuccess = vi.fn()
-    onSaveError = vi.fn()
-    getState = vi.fn().mockReturnValue(baseState())
-    manager = new SaveManager(getState, { onSaveSuccess, onSaveError })
-  })
-
-  it('calls agentService.saveGraphState with correct payload', async () => {
-    await manager.save('manual')
-    expect(mockSaveGraphState).toHaveBeenCalledOnce()
-    const call = mockSaveGraphState.mock.calls[0][0]
-    expect(call.graphId).toBe('graph-1')
-    expect(call.nodes).toEqual([])
-  })
-
-  it('calls onSaveSuccess with the saved graphId', async () => {
-    await manager.save('manual')
-    expect(onSaveSuccess).toHaveBeenCalledWith(expect.any(String), 'graph-1')
-  })
-
-  it('does NOT save when graphId is null', async () => {
-    getState.mockReturnValue({ ...baseState(), graphId: null })
-    await manager.save('manual')
-    expect(mockSaveGraphState).not.toHaveBeenCalled()
-  })
-
-  it('calls onSaveError when save throws', async () => {
-    mockSaveGraphState.mockRejectedValueOnce(new Error('network error'))
-    await manager.save('manual')
-    expect(onSaveError).toHaveBeenCalledWith('network error')
-  })
-
-  it('does NOT have a setLastSavedHash method', () => {
-    expect((manager as any).setLastSavedHash).toBeUndefined()
-  })
-
-  it('does NOT have a lastSavedHash field', () => {
-    expect((manager as any).lastSavedHash).toBeUndefined()
-  })
-})
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-context-menu.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-context-menu.tsx
deleted file mode 100644
index 1de5bced6..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-context-menu.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-'use client'
-
-import {
-  Copy,
-  Pencil,
-  Trash2,
-} from 'lucide-react'
-
-import { useTranslation } from '@/lib/i18n'
-
-import { SidebarContextMenu, type MenuItemConfig } from '../sidebar-context-menu'
-
-interface AgentContextMenuProps {
-  menuPosition: { x: number; y: number }
-  onClose: () => void
-  onRename?: () => void
-  onDuplicate?: () => void
-  onDelete?: () => void
-}
-
-export function AgentContextMenu({
-  menuPosition,
-  onClose,
-  onRename,
-  onDuplicate,
-  onDelete,
-}: AgentContextMenuProps) {
-  const { t } = useTranslation()
-
-  const items: MenuItemConfig[] = []
-  if (onRename) items.push({ label: t('workspace.rename'), icon: <Pencil className="h-3 w-3" />, onClick: onRename })
-  if (onDuplicate) items.push({ label: t('workspace.duplicate'), icon: <Copy className="h-3 w-3" />, onClick: onDuplicate })
-  if (onDelete) items.push({ label: t('workspace.delete'), icon: <Trash2 className="h-3 w-3" />, onClick: onDelete, variant: 'destructive', separator: true })
-
-  return (
-    <SidebarContextMenu
-      items={items}
-      onClose={onClose}
-      position={menuPosition}
-    />
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-item.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-item.tsx
deleted file mode 100644
index 1ac3dda50..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-item.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-'use client'
-
-import {
-  Bot,
-  GripVertical,
-  MoreHorizontal,
-} from 'lucide-react'
-import Link from 'next/link'
-import { useParams } from 'next/navigation'
-import React, { useCallback, useState } from 'react'
-
-import type { AgentMetadata } from '@/app/workspace/[workspaceId]/components/sidebar/sidebar'
-import { InlineRenameInput } from '@/components/ui/inline-rename-input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { cn } from '@/lib/utils'
-
-import { useInlineRename } from '../inline-rename-input'
-import { AgentContextMenu } from './agent-context-menu'
-
-/**
- * Agent item component with drag support and context menu
- */
-interface AgentItemProps {
-  agent: AgentMetadata
-  active: boolean
-  indented?: boolean
-  indentLevel?: number
-  onDragStart?: (agentId: string) => void
-  onDragEnd?: () => void
-  onRename?: (id: string, newName: string) => void
-  onDelete?: (id: string) => void
-  onDuplicate?: (id: string) => void
-  canEdit?: boolean
-}
-
-const AgentItem = React.memo(function AgentItem({
-  agent,
-  active,
-  indented = false,
-  indentLevel = 0,
-  onDragStart,
-  onDragEnd,
-  onRename,
-  onDelete,
-  onDuplicate,
-  canEdit: _canEdit = true,
-}: AgentItemProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-  const [isDragging, setIsDragging] = useState(false)
-  const [showMenu, setShowMenu] = useState(false)
-  const [menuPosition, setMenuPosition] = useState({ x: 0, y: 0 })
-
-  const handleRename = useCallback((newName: string) => {
-    onRename?.(agent.id, newName)
-  }, [agent.id, onRename])
-
-  const { isEditing, editName, setEditName, startEditing, handleSave: handleSaveRename, handleCancel: handleCancelRename } = useInlineRename(agent.name, handleRename)
-
-  const handleDragStart = (e: React.DragEvent) => {
-    if (isEditing) {
-      e.preventDefault()
-      return
-    }
-    e.dataTransfer.setData('agentId', agent.id)
-    e.dataTransfer.effectAllowed = 'move'
-    setIsDragging(true)
-    onDragStart?.(agent.id)
-  }
-
-  const handleDragEnd = () => {
-    setIsDragging(false)
-    onDragEnd?.()
-  }
-
-  const handleContextMenu = useCallback((e: React.MouseEvent) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setMenuPosition({ x: e.clientX, y: e.clientY })
-    setShowMenu(true)
-  }, [])
-
-  const handleStartRename = useCallback(() => {
-    setShowMenu(false)
-    startEditing()
-  }, [startEditing])
-
-  const handleDelete = useCallback(() => {
-    setShowMenu(false)
-    onDelete?.(agent.id)
-  }, [agent.id, onDelete])
-
-  const handleDuplicate = useCallback(() => {
-    setShowMenu(false)
-    onDuplicate?.(agent.id)
-  }, [agent.id, onDuplicate])
-
-  const indentPadding = indented ? (indentLevel > 0 ? indentLevel * 12 : 16) : 0
-
-  return (
-    <>
-      <div
-        draggable={!isEditing}
-        onDragStart={handleDragStart}
-        onDragEnd={handleDragEnd}
-        onContextMenu={handleContextMenu}
-        className={cn(
-          'group flex items-center rounded-md transition-colors duration-100',
-          isDragging && 'opacity-50',
-          active
-            ? 'bg-[var(--surface-muted)] text-[var(--text-primary)]'
-            : 'text-[var(--text-secondary)] hover:bg-[var(--surface-5)]',
-        )}
-        style={{ marginLeft: `${indentPadding}px` }}
-      >
-        <div className="flex cursor-grab items-center px-[4px] py-1.5 opacity-0 transition-opacity group-hover:opacity-100">
-          <GripVertical className="h-3 w-3 text-[var(--text-tertiary)]" />
-        </div>
-
-        {isEditing ? (
-          <div className="flex flex-1 items-center gap-1.5 py-[3px] pr-[6px]">
-            <Bot className="ml-[2px] h-3.5 w-3.5 flex-shrink-0 text-[var(--brand-500)]" />
-            <InlineRenameInput
-              value={editName}
-              onChange={setEditName}
-              onSave={handleSaveRename}
-              onCancel={handleCancelRename}
-              placeholder="Enter name..."
-            />
-          </div>
-        ) : (
-          <TooltipProvider delayDuration={400}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Link
-                  href={`/workspace/${workspaceId}/${agent.id}`}
-                  className="flex min-w-0 flex-1 items-center py-[5px] pr-[6px]"
-                  onClick={(e) => isDragging && e.preventDefault()}
-                  onDoubleClick={(e) => {
-                    e.preventDefault()
-                    handleStartRename()
-                  }}
-                >
-                  <Bot className="mr-[6px] h-3.5 w-3.5 flex-shrink-0 text-[var(--brand-500)]" />
-                  <span className="truncate text-sm font-medium">{agent.name}</span>
-                  {agent.graphMode === 'code' && (
-                    <span className="ml-1.5 flex-shrink-0 rounded bg-primary/10 px-1 py-0.5 text-2xs font-semibold uppercase leading-none text-primary">
-                      Code
-                    </span>
-                  )}
-                </Link>
-              </TooltipTrigger>
-              <TooltipContent
-                side="bottom"
-                className="max-w-[280px] break-words border border-[var(--border)] bg-[var(--surface-1)] text-[var(--text-primary)] shadow-lg"
-              >
-                {agent.name}
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        )}
-
-        {/* Menu Button */}
-        {!isEditing && (
-          <button
-            type="button"
-            className="mr-[4px] rounded-sm p-[4px] opacity-0 transition-opacity hover:bg-[var(--surface-muted)] group-hover:opacity-100"
-            onClick={(e) => {
-              e.stopPropagation()
-              e.preventDefault()
-              setMenuPosition({ x: e.clientX, y: e.clientY })
-              setShowMenu(!showMenu)
-            }}
-          >
-            <MoreHorizontal className="h-3 w-3 text-[var(--text-tertiary)]" />
-          </button>
-        )}
-      </div>
-
-      {/* Context Menu */}
-      {showMenu && (
-        <AgentContextMenu
-          menuPosition={menuPosition}
-          onClose={() => setShowMenu(false)}
-          onRename={onRename ? handleStartRename : undefined}
-          onDuplicate={onDuplicate ? handleDuplicate : undefined}
-          onDelete={onDelete ? handleDelete : undefined}
-        />
-      )}
-    </>
-  )
-})
-
-AgentItem.displayName = 'AgentItem'
-
-export { AgentItem }
-export type { AgentItemProps }
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list-context.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list-context.tsx
deleted file mode 100644
index 24f523fc8..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list-context.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-'use client'
-
-import { createContext, useContext } from 'react'
-
-import type {
-  Folder as FolderType,
-  AgentMetadata,
-} from '@/app/workspace/[workspaceId]/components/sidebar/sidebar'
-
-interface AgentListContextValue {
-  // Data accessors
-  getAgentsInFolder: (folderId: string) => AgentMetadata[]
-  getSubfolders: (parentId: string) => FolderType[]
-  allFolders: FolderType[]
-  activeAgentId?: string
-  maxDepth: number
-
-  // Folder actions
-  onToggleFolder: (folderId: string) => void
-  onRenameFolder: (folderId: string, newName: string) => void
-  onDeleteFolder: (folderId: string) => void
-  onCreateSubfolderFor: (parentId: string) => void
-  onDuplicateFolder: (folderId: string) => void
-  onMoveAgentToFolder: (agentId: string, folderId: string) => void
-
-  // Agent actions
-  onRenameAgent?: (id: string, newName: string) => void
-  onDeleteAgent?: (id: string) => void
-  onDuplicateAgent?: (id: string) => void
-
-  // Drag
-  onDragAgentStart?: (agentId: string) => void
-  onDragAgentEnd?: () => void
-  isDragActive: boolean
-
-  // Permissions
-  canEdit: boolean
-}
-
-const AgentListContext = createContext<AgentListContextValue | null>(null)
-
-export function AgentListProvider({
-  children,
-  value,
-}: {
-  children: React.ReactNode
-  value: AgentListContextValue
-}) {
-  return <AgentListContext.Provider value={value}>{children}</AgentListContext.Provider>
-}
-
-export function useAgentListContext() {
-  const ctx = useContext(AgentListContext)
-  if (!ctx) throw new Error('useAgentListContext must be used within AgentListProvider')
-  return ctx
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list.tsx
deleted file mode 100644
index 68b952b2f..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/agent-list.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-'use client'
-
-import { useParams, usePathname } from 'next/navigation'
-import { useCallback, useState, useMemo } from 'react'
-
-import type {
-  Folder as FolderType,
-  AgentMetadata,
-} from '@/app/workspace/[workspaceId]/components/sidebar/sidebar'
-import { Skeleton } from '@/components/ui/skeleton'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { useDropZone } from '../../hooks/use-drop-zone'
-import { AgentItem } from './agent-item'
-import { AgentListProvider } from './agent-list-context'
-import { FolderItem } from './folder-item'
-
-/**
- * Root drop zone for removing from folders
- */
-interface RootDropZoneProps {
-  children: React.ReactNode
-  isDragActive: boolean
-  onDropAgent?: (agentId: string) => void
-}
-
-function RootDropZone({ children, isDragActive, onDropAgent }: RootDropZoneProps) {
-  const { t } = useTranslation()
-  const { isDragOver, handleDragOver, handleDragLeave, handleDrop } = useDropZone(onDropAgent)
-
-  if (!isDragActive) {
-    return <>{children}</>
-  }
-
-  return (
-    <div
-      className={cn('rounded-md p-[4px] transition-all', isDragOver && 'bg-[var(--surface-5)]')}
-      onDragOver={handleDragOver}
-      onDragLeave={handleDragLeave}
-      onDrop={handleDrop}
-    >
-      {children}
-      {isDragOver && (
-        <div className="rounded-md border border-dashed border-[var(--border)] py-2 text-center text-sm font-medium text-[var(--text-tertiary)]">
-          {t('workspace.dropHereToRemoveFromFolder')}
-        </div>
-      )}
-    </div>
-  )
-}
-
-const DEFAULT_MAX_FOLDER_DEPTH = 2
-
-interface AgentListProps {
-  regularAgents: AgentMetadata[]
-  folders?: FolderType[]
-  isLoading?: boolean
-  searchQuery?: string
-  onToggleFolder?: (folderId: string) => void
-  onRenameFolder?: (folderId: string, newName: string) => void
-  onDeleteFolder?: (folderId: string) => void
-  onMoveAgentToFolder?: (agentId: string, folderId: string | null) => void
-  onCreateSubfolder?: (parentId: string) => void
-  onDuplicateFolder?: (folderId: string) => void
-  maxFolderDepth?: number
-  onRenameAgent?: (id: string, newName: string) => void
-  onDeleteAgent?: (id: string) => void
-  onDuplicateAgent?: (id: string) => void
-  canEdit?: boolean
-}
-
-/**
- * AgentList component with folders and drag-drop support
- */
-export function AgentList({
-  regularAgents,
-  folders = [],
-  isLoading = false,
-  searchQuery = '',
-  onToggleFolder,
-  onRenameFolder,
-  onDeleteFolder,
-  onMoveAgentToFolder,
-  onCreateSubfolder,
-  onDuplicateFolder,
-  maxFolderDepth = DEFAULT_MAX_FOLDER_DEPTH,
-  onRenameAgent,
-  onDeleteAgent,
-  onDuplicateAgent,
-  canEdit = true,
-}: AgentListProps) {
-  const { t } = useTranslation()
-  const pathname = usePathname()
-  const params = useParams()
-  const agentId = params.agentId as string | undefined
-  const [isDragActive, setIsDragActive] = useState(false)
-
-  const isAgentActive = useCallback((id: string) => pathname?.includes(`/${id}`), [pathname])
-
-  const filteredAgents = useMemo(() => {
-    if (!searchQuery.trim()) return regularAgents
-    const query = searchQuery.toLowerCase().trim()
-    return regularAgents.filter((agent) => agent.name.toLowerCase().includes(query))
-  }, [regularAgents, searchQuery])
-
-  const filteredFolders = useMemo(() => {
-    if (!searchQuery.trim()) return folders
-    const query = searchQuery.toLowerCase().trim()
-    return folders.filter((folder) => {
-      if (folder.name.toLowerCase().includes(query)) return true
-      const agentsInFolder = filteredAgents.filter((a) => a.folderId === folder.id)
-      return agentsInFolder.length > 0
-    })
-  }, [folders, searchQuery, filteredAgents])
-
-  const getAgentsInFolder = useCallback(
-    (folderId: string) => filteredAgents.filter((a) => a.folderId === folderId),
-    [filteredAgents],
-  )
-
-  const getSubfolders = useCallback(
-    (parentId: string) => filteredFolders.filter((f) => f.parentId === parentId),
-    [filteredFolders],
-  )
-
-  const rootFolders = filteredFolders.filter((f) => !f.parentId)
-  const rootAgents = filteredAgents.filter((a) => !a.folderId)
-
-  const handleDragStart = useCallback(() => setIsDragActive(true), [])
-  const handleDragEnd = useCallback(() => setIsDragActive(false), [])
-
-  const agentListContextValue = useMemo(
-    () => ({
-      getAgentsInFolder,
-      getSubfolders,
-      allFolders: folders,
-      activeAgentId: agentId,
-      maxDepth: maxFolderDepth,
-      onToggleFolder: (id: string) => onToggleFolder?.(id),
-      onRenameFolder: (id: string, name: string) => onRenameFolder?.(id, name),
-      onDeleteFolder: (id: string) => onDeleteFolder?.(id),
-      onCreateSubfolderFor: (id: string) => onCreateSubfolder?.(id),
-      onDuplicateFolder: (id: string) => onDuplicateFolder?.(id),
-      onMoveAgentToFolder: (aId: string, fId: string) => onMoveAgentToFolder?.(aId, fId),
-      onRenameAgent,
-      onDeleteAgent,
-      onDuplicateAgent,
-      onDragAgentStart: handleDragStart,
-      onDragAgentEnd: handleDragEnd,
-      isDragActive,
-      canEdit,
-    }),
-    [
-      getAgentsInFolder,
-      getSubfolders,
-      folders,
-      agentId,
-      maxFolderDepth,
-      onToggleFolder,
-      onRenameFolder,
-      onDeleteFolder,
-      onCreateSubfolder,
-      onDuplicateFolder,
-      onMoveAgentToFolder,
-      onRenameAgent,
-      onDeleteAgent,
-      onDuplicateAgent,
-      handleDragStart,
-      handleDragEnd,
-      isDragActive,
-      canEdit,
-    ],
-  )
-
-  if (isLoading) {
-    return (
-      <div className="space-y-[4px]">
-        {Array.from({ length: 4 }).map((_, i) => (
-          <div key={`skeleton-${i}`} className="flex items-center gap-1.5 rounded-md px-1.5 py-[5px]">
-            <Skeleton className="h-3 w-3 rounded-xs" />
-            <Skeleton className="h-3.5 w-[80px]" />
-          </div>
-        ))}
-      </div>
-    )
-  }
-
-  const hasNoContent = rootFolders.length === 0 && regularAgents.length === 0
-
-  if (hasNoContent) {
-    return (
-      <div className="px-2 py-3 text-center text-base font-medium text-[var(--text-tertiary)]">
-        {t('workspace.noAgentsYet')}
-      </div>
-    )
-  }
-
-  return (
-    <div className="space-y-[4px]">
-      <AgentListProvider value={agentListContextValue}>
-        {rootFolders.map((folder) => (
-          <FolderItem
-            key={folder.id}
-            folder={folder}
-            agents={getAgentsInFolder(folder.id)}
-            subfolders={getSubfolders(folder.id)}
-            depth={0}
-            onToggle={() => onToggleFolder?.(folder.id)}
-            onRename={(newName) => onRenameFolder?.(folder.id, newName)}
-            onDelete={() => onDeleteFolder?.(folder.id)}
-            onCreateSubfolder={() => onCreateSubfolder?.(folder.id)}
-            onDuplicate={() => onDuplicateFolder?.(folder.id)}
-            onDropAgent={(aId) => onMoveAgentToFolder?.(aId, folder.id)}
-          />
-        ))}
-      </AgentListProvider>
-
-      {rootAgents.length > 0 && (
-        <RootDropZone
-          isDragActive={isDragActive && rootFolders.length > 0}
-          onDropAgent={(aId) => onMoveAgentToFolder?.(aId, null)}
-        >
-          <div className="space-y-[2px]">
-            {rootFolders.length > 0 && (
-              <div className="px-2 py-1 text-sm font-medium text-[var(--text-tertiary)]">
-                {t('workspace.ungrouped')}
-              </div>
-            )}
-            {rootAgents.map((agent) => (
-              <AgentItem
-                key={agent.id}
-                agent={agent}
-                active={isAgentActive(agent.id)}
-                onDragStart={handleDragStart}
-                onDragEnd={handleDragEnd}
-                onRename={onRenameAgent}
-                onDelete={onDeleteAgent}
-                onDuplicate={onDuplicateAgent}
-                canEdit={canEdit}
-              />
-            ))}
-          </div>
-        </RootDropZone>
-      )}
-
-      {rootAgents.length === 0 && rootFolders.length > 0 && isDragActive && (
-        <RootDropZone isDragActive={true} onDropAgent={(aId) => onMoveAgentToFolder?.(aId, null)}>
-          <div className="rounded-md border border-dashed border-[var(--border)] py-3 text-center text-sm font-medium text-[var(--text-tertiary)]">
-            {t('workspace.dropHereToRemoveFromFolder')}
-          </div>
-        </RootDropZone>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/folder-item.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/folder-item.tsx
deleted file mode 100644
index 27e6fb7e5..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/agent-list/folder-item.tsx
+++ /dev/null
@@ -1,219 +0,0 @@
-'use client'
-
-import {
-  ChevronRight,
-  ChevronDown,
-  Copy,
-  Folder,
-  FolderOpen,
-  FolderPlus,
-  MoreHorizontal,
-  Pencil,
-  Trash2,
-} from 'lucide-react'
-import { useState } from 'react'
-
-import type {
-  Folder as FolderType,
-  AgentMetadata,
-} from '@/app/workspace/[workspaceId]/components/sidebar/sidebar'
-import { InlineRenameInput } from '@/components/ui/inline-rename-input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { useInlineRename } from '../inline-rename-input'
-import { useDropZone } from '../../hooks/use-drop-zone'
-import { SidebarContextMenu } from '../sidebar-context-menu'
-import { AgentItem } from './agent-item'
-import { useAgentListContext } from './agent-list-context'
-
-export interface FolderItemProps {
-  folder: FolderType
-  agents: AgentMetadata[]
-  subfolders: FolderType[]
-  depth?: number
-  onToggle: () => void
-  onRename: (newName: string) => void
-  onDelete: () => void
-  onCreateSubfolder?: () => void
-  onDuplicate?: () => void
-  onDropAgent?: (agentId: string) => void
-}
-
-export function FolderItem({
-  folder,
-  agents,
-  subfolders,
-  depth = 0,
-  onToggle,
-  onRename,
-  onDelete,
-  onCreateSubfolder,
-  onDuplicate,
-  onDropAgent,
-}: FolderItemProps) {
-  const {
-    activeAgentId,
-    maxDepth,
-    isDragActive,
-    canEdit,
-    getAgentsInFolder,
-    getSubfolders,
-    onToggleFolder,
-    onRenameFolder,
-    onDeleteFolder,
-    onCreateSubfolderFor,
-    onDuplicateFolder,
-    onMoveAgentToFolder,
-    onRenameAgent,
-    onDeleteAgent,
-    onDuplicateAgent,
-    onDragAgentStart,
-    onDragAgentEnd,
-  } = useAgentListContext()
-  const { t } = useTranslation()
-  const canCreateSubfolder = depth < maxDepth - 1
-  const [showMenu, setShowMenu] = useState(false)
-
-  const { isEditing, editName, setEditName, startEditing, handleSave: handleSaveRename, handleCancel: handleCancelRename } = useInlineRename(folder.name, onRename)
-  const { isDragOver, handleDragOver, handleDragLeave, handleDrop } = useDropZone(onDropAgent)
-
-  const indentPadding = depth * 12
-
-  return (
-    <div className="space-y-[2px]">
-      {/* Folder Header */}
-      <div
-        className={cn(
-          'group flex items-center rounded-md py-[5px] pr-[6px] text-[var(--text-secondary)] transition-all',
-          isDragOver
-            ? 'bg-[var(--brand-500)] ring-2 ring-[var(--brand-500)]'
-            : 'hover:bg-[var(--surface-5)]',
-          isDragActive && !isDragOver && 'ring-dashed ring-1 ring-[var(--border)]',
-        )}
-        style={{ paddingLeft: `${8 + indentPadding}px` }}
-        onDragOver={handleDragOver}
-        onDragLeave={handleDragLeave}
-        onDrop={handleDrop}
-      >
-        <button type="button" className="flex flex-1 items-center gap-1.5" onClick={onToggle}>
-          {folder.isExpanded ? (
-            <ChevronDown className="h-3 w-3 flex-shrink-0 transition-all duration-100" />
-          ) : (
-            <ChevronRight className="h-3 w-3 flex-shrink-0 transition-all duration-100" />
-          )}
-          {folder.isExpanded ? (
-            <FolderOpen className="h-3.5 w-3.5 flex-shrink-0 text-[var(--text-tertiary)]" />
-          ) : (
-            <Folder className="h-3.5 w-3.5 flex-shrink-0 text-[var(--text-tertiary)]" />
-          )}
-          {isEditing ? (
-            <InlineRenameInput
-              value={editName}
-              onChange={setEditName}
-              onSave={handleSaveRename}
-              onCancel={handleCancelRename}
-              size="sm"
-            />
-          ) : (
-            <TooltipProvider delayDuration={400}>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <span className="truncate text-base font-medium">{folder.name}</span>
-                </TooltipTrigger>
-                <TooltipContent
-                  side="bottom"
-                  className="max-w-[280px] break-words border border-[var(--border)] bg-[var(--surface-1)] text-[var(--text-primary)] shadow-lg"
-                >
-                  {folder.name}
-                </TooltipContent>
-              </Tooltip>
-            </TooltipProvider>
-          )}
-        </button>
-
-        {/* Menu */}
-        <div className="relative">
-          <button
-            type="button"
-            className="rounded-sm p-0.5 opacity-0 transition-opacity group-hover:opacity-100"
-            onClick={(e) => {
-              e.stopPropagation()
-              setShowMenu(!showMenu)
-            }}
-          >
-            <MoreHorizontal className="h-3.5 w-3.5" />
-          </button>
-
-          {showMenu && (
-            <SidebarContextMenu
-              items={[
-                ...(canCreateSubfolder
-                  ? [{ label: t('workspace.newSubfolder'), icon: <FolderPlus className="h-3 w-3" />, onClick: () => onCreateSubfolder?.() }]
-                  : []),
-                { label: t('workspace.duplicate'), icon: <Copy className="h-3 w-3" />, onClick: () => onDuplicate?.() },
-                { label: t('workspace.rename'), icon: <Pencil className="h-3 w-3" />, onClick: () => startEditing(), separator: true },
-                { label: t('workspace.delete'), icon: <Trash2 className="h-3 w-3" />, onClick: onDelete, variant: 'destructive' as const },
-              ]}
-              onClose={() => setShowMenu(false)}
-              className="right-0 top-[24px] min-w-[140px]"
-            />
-          )}
-        </div>
-      </div>
-
-      {/* Folder Contents (expanded) */}
-      {folder.isExpanded && (
-        <div className="space-y-[2px]">
-          {depth < maxDepth - 1 &&
-            subfolders.map((subfolder) => (
-              <FolderItem
-                key={subfolder.id}
-                folder={subfolder}
-                agents={getAgentsInFolder(subfolder.id)}
-                subfolders={getSubfolders(subfolder.id)}
-                depth={depth + 1}
-                onToggle={() => onToggleFolder(subfolder.id)}
-                onRename={(newName) => onRenameFolder(subfolder.id, newName)}
-                onDelete={() => onDeleteFolder(subfolder.id)}
-                onCreateSubfolder={() => onCreateSubfolderFor(subfolder.id)}
-                onDuplicate={() => onDuplicateFolder(subfolder.id)}
-                onDropAgent={(aId) => onMoveAgentToFolder(aId, subfolder.id)}
-              />
-            ))}
-
-          {agents.map((agent) => (
-            <AgentItem
-              key={agent.id}
-              agent={agent}
-              active={agent.id === activeAgentId}
-              indented
-              indentLevel={depth + 1}
-              onDragStart={onDragAgentStart}
-              onDragEnd={onDragAgentEnd}
-              onRename={onRenameAgent}
-              onDelete={onDeleteAgent}
-              onDuplicate={onDuplicateAgent}
-              canEdit={canEdit}
-            />
-          ))}
-
-          {agents.length === 0 && subfolders.length === 0 && (
-            <div
-              className={cn(
-                'rounded-md py-2 text-sm font-normal',
-                isDragOver
-                  ? 'bg-[var(--brand-500)] text-[var(--text-secondary)]'
-                  : 'text-[var(--text-subtle)] opacity-60',
-              )}
-              style={{ marginLeft: `${24 + indentPadding}px` }}
-            >
-              {isDragOver ? t('workspace.dropHereToAdd') : t('workspace.dropWorkflowsHere')}
-            </div>
-          )}
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-agent-dialog.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-agent-dialog.tsx
deleted file mode 100644
index 20b316418..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-agent-dialog.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-'use client'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-interface CreateAgentDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  newAgentName: string
-  setNewAgentName: (name: string) => void
-  createAgentMode: 'code' | 'canvas'
-  setCreateAgentMode: (mode: 'code' | 'canvas') => void
-  onConfirm: () => void
-}
-
-export function CreateAgentDialog({
-  open,
-  onOpenChange,
-  newAgentName,
-  setNewAgentName,
-  createAgentMode,
-  setCreateAgentMode,
-  onConfirm,
-}: CreateAgentDialogProps) {
-  const { t } = useTranslation()
-
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>{t('workspace.createAgent', { defaultValue: 'Create New Agent' })}</AlertDialogTitle>
-          <AlertDialogDescription>
-            {t('workspace.createAgentDescription', { defaultValue: 'Choose a mode and name for your agent.' })}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-
-        <div className="space-y-4 py-2">
-          {/* Mode Selection */}
-          <div className="grid grid-cols-2 gap-3">
-            <button
-              type="button"
-              onClick={() => setCreateAgentMode('canvas')}
-              className={cn(
-                'flex flex-col items-start gap-1 rounded-lg border p-3 text-left transition-all',
-                createAgentMode === 'canvas'
-                  ? 'border-primary bg-primary/5 ring-1 ring-primary'
-                  : 'border-[var(--border)] hover:border-primary/30'
-              )}
-            >
-              <span className="text-sm font-medium">Canvas</span>
-              <span className="text-sm leading-tight text-[var(--text-muted)]">
-                Drag-and-drop DeepAgents builder
-              </span>
-            </button>
-            <button
-              type="button"
-              onClick={() => setCreateAgentMode('code')}
-              className={cn(
-                'flex flex-col items-start gap-1 rounded-lg border p-3 text-left transition-all',
-                createAgentMode === 'code'
-                  ? 'border-primary bg-primary/5 ring-1 ring-primary'
-                  : 'border-[var(--border)] hover:border-primary/30'
-              )}
-            >
-              <span className="text-sm font-medium">Code</span>
-              <span className="text-sm leading-tight text-[var(--text-muted)]">
-                Python code to define graph structure
-              </span>
-            </button>
-          </div>
-
-          {/* Name Input */}
-          <div className="space-y-1.5">
-            <label className="text-xs font-medium text-[var(--text-secondary)]">
-              {t('workspace.agentName', { defaultValue: 'Agent Name' })}
-            </label>
-            <input
-              value={newAgentName}
-              onChange={(e) => setNewAgentName(e.target.value)}
-              onKeyDown={(e) => e.key === 'Enter' && onConfirm()}
-              className="h-9 w-full rounded-md border border-[var(--border)] bg-[var(--surface-1)] px-3 text-sm outline-none focus:border-primary focus:ring-1 focus:ring-primary"
-              autoFocus
-            />
-          </div>
-        </div>
-
-        <AlertDialogFooter>
-          <AlertDialogCancel>{t('workspace.cancel')}</AlertDialogCancel>
-          <AlertDialogAction
-            onClick={onConfirm}
-            disabled={!newAgentName.trim()}
-          >
-            {t('workspace.create', { defaultValue: 'Create' })}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-folder-dialog.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-folder-dialog.tsx
deleted file mode 100644
index c9ec8e95f..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/create-folder-dialog.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-'use client'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { useTranslation } from '@/lib/i18n'
-
-interface DeleteAgentDialogProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  agentToDelete: { id: string; name: string } | null
-  onConfirm: () => void
-  onCancel: () => void
-}
-
-export function DeleteAgentDialog({
-  open,
-  onOpenChange,
-  agentToDelete,
-  onConfirm,
-  onCancel,
-}: DeleteAgentDialogProps) {
-  const { t } = useTranslation()
-
-  return (
-    <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogContent variant="destructive">
-        <AlertDialogHeader>
-          <AlertDialogTitle>{t('workspace.deleteAgentConfirmTitle')}</AlertDialogTitle>
-          <AlertDialogDescription>
-            {agentToDelete ? (
-              <>
-                {t('workspace.deleteAgentConfirmMessagePrefix')}{' '}
-                <span className="font-semibold text-[var(--status-error)]">{agentToDelete.name}</span>{' '}
-                {t('workspace.deleteAgentConfirmMessageSuffix')}
-              </>
-            ) : (
-              t('workspace.deleteAgentConfirmMessageDefault')
-            )}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel onClick={onCancel}>
-            {t('workspace.cancel')}
-          </AlertDialogCancel>
-          <AlertDialogAction
-            onClick={onConfirm}
-            className="bg-[var(--status-error)] text-white hover:bg-[var(--status-error-hover)]"
-          >
-            {t('workspace.delete')}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/index.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/components/index.ts
deleted file mode 100644
index ea4cec2c3..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { AgentList } from './agent-list/agent-list'
-export { WorkspaceHeader } from './workspace-header/workspace-header'
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/inline-rename-input.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/inline-rename-input.tsx
deleted file mode 100644
index 0dac86e44..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/inline-rename-input.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { Check, X } from 'lucide-react'
-
-interface InlineRenameInputProps {
-  initialName: string
-  onSave: (newName: string) => void
-  onCancel: () => void
-  className?: string
-  inputClassName?: string
-}
-
-export function useInlineRename(initialName: string, onRename?: (newName: string) => void) {
-  const [isEditing, setIsEditing] = useState(false)
-  const [editName, setEditName] = useState(initialName)
-  const inputRef = useRef<HTMLInputElement>(null)
-
-  useEffect(() => {
-    if (isEditing && inputRef.current) {
-      inputRef.current.focus()
-      inputRef.current.select()
-    }
-  }, [isEditing])
-
-  // Sync editName when initialName changes while not editing
-  useEffect(() => {
-    if (!isEditing) setEditName(initialName)
-  }, [initialName, isEditing])
-
-  const startEditing = useCallback(() => {
-    setEditName(initialName)
-    setIsEditing(true)
-  }, [initialName])
-
-  const handleSave = useCallback(() => {
-    const trimmed = editName.trim()
-    if (trimmed && trimmed !== initialName && onRename) {
-      onRename(trimmed)
-    }
-    setIsEditing(false)
-  }, [editName, initialName, onRename])
-
-  const handleCancel = useCallback(() => {
-    setEditName(initialName)
-    setIsEditing(false)
-  }, [initialName])
-
-  const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
-    if (e.key === 'Enter') { e.preventDefault(); handleSave() }
-    if (e.key === 'Escape') { e.preventDefault(); handleCancel() }
-  }, [handleSave, handleCancel])
-
-  return { isEditing, editName, setEditName, inputRef, startEditing, handleSave, handleCancel, handleKeyDown }
-}
-
-export function InlineRenameInput({ initialName, onSave, onCancel, className, inputClassName }: InlineRenameInputProps) {
-  const { editName, setEditName, inputRef, handleSave, handleCancel, handleKeyDown } = useInlineRename(
-    initialName,
-    onSave,
-  )
-
-  // Override cancel to also call parent onCancel
-  const cancel = useCallback(() => {
-    handleCancel()
-    onCancel()
-  }, [handleCancel, onCancel])
-
-  return (
-    <div className={className || 'flex items-center gap-0.5'}>
-      <input
-        ref={inputRef}
-        value={editName}
-        onChange={(e) => setEditName(e.target.value)}
-        onBlur={handleSave}
-        onKeyDown={handleKeyDown}
-        className={inputClassName || 'h-6 flex-1 rounded-sm border border-[var(--border)] bg-[var(--surface-elevated)] px-1.5 text-sm outline-none focus:border-primary'}
-        autoFocus
-      />
-      <button type="button" onMouseDown={(e) => { e.preventDefault(); handleSave() }} className="rounded-xs p-0.5 text-[var(--status-success)] hover:bg-[var(--surface-3)]">
-        <Check className="h-3 w-3" />
-      </button>
-      <button type="button" onMouseDown={(e) => { e.preventDefault(); cancel() }} className="rounded-xs p-0.5 text-[var(--text-muted)] hover:bg-[var(--surface-3)]">
-        <X className="h-3 w-3" />
-      </button>
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/sidebar-context-menu.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/sidebar-context-menu.tsx
deleted file mode 100644
index 6dc23bbbd..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/sidebar-context-menu.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-'use client'
-
-import React from 'react'
-import { createPortal } from 'react-dom'
-import { cn } from '@/lib/utils'
-
-export interface MenuItemConfig {
-  label: string
-  icon?: React.ReactNode
-  onClick: () => void
-  variant?: 'default' | 'destructive'
-  separator?: boolean // show separator BEFORE this item
-}
-
-interface SidebarContextMenuProps {
-  items: MenuItemConfig[]
-  onClose: () => void
-  position?: { x: number; y: number } // for fixed positioning (right-click)
-  className?: string // for absolute positioning (button-triggered)
-}
-
-export function SidebarContextMenu({ items, onClose, position, className }: SidebarContextMenuProps) {
-  const menu = (
-    <>
-      <div className="fixed inset-0 z-popover" onClick={onClose} />
-      <div
-        data-workspace-menu
-        className={cn(
-          'z-top min-w-[120px] rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-1 shadow-lg',
-          position ? 'fixed' : 'absolute',
-          className,
-        )}
-        style={position ? { left: `${position.x}px`, top: `${position.y}px` } : undefined}
-      >
-        {items.map((item, i) => (
-          <React.Fragment key={i}>
-            {item.separator && <div className="my-1 h-px bg-[var(--border)]" />}
-            <button
-              type="button"
-              className={cn(
-                'flex w-full items-center gap-1.5 rounded-md px-1.5 py-[5px] text-sm font-medium transition-colors hover:bg-[var(--surface-5)]',
-                item.variant === 'destructive'
-                  ? 'text-[var(--status-error)]'
-                  : 'text-[var(--text-secondary)]',
-              )}
-              onClick={() => { item.onClick(); onClose() }}
-            >
-              {item.icon}
-              {item.label}
-            </button>
-          </React.Fragment>
-        ))}
-      </div>
-    </>
-  )
-
-  // Portal to body so z-index is not trapped by parent stacking contexts
-  if (position) return createPortal(menu, document.body)
-  return menu
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/index.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/index.ts
deleted file mode 100644
index aea1c9b50..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { WorkspaceHeader } from './workspace-header'
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/use-workspace-rename.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/use-workspace-rename.ts
deleted file mode 100644
index 7f3582a0c..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/use-workspace-rename.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { useState, useCallback } from 'react'
-
-interface Workspace {
-  id: string
-  name: string
-  ownerId?: string
-  role?: string
-  type?: string
-}
-
-export function useWorkspaceRename(
-  activeWorkspace: { id?: string; name: string; type?: string } | null | undefined,
-  workspaceId: string,
-  workspaces: Workspace[],
-  onRenameWorkspace?: (workspaceId: string, newName: string) => void,
-  onDeleteWorkspace?: (workspaceId: string) => void,
-  onDuplicateWorkspace?: (workspaceId: string) => void,
-) {
-  const [isRenaming, setIsRenaming] = useState(false)
-  const [editingWorkspaceId, setEditingWorkspaceId] = useState<string | null>(null)
-  const [editName, setEditName] = useState('')
-  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false)
-  const [workspaceToDelete, setWorkspaceToDelete] = useState<{ id: string; name: string } | null>(null)
-
-  const handleStartHeaderRename = useCallback(() => {
-    if (activeWorkspace?.type === 'personal') return
-    setIsRenaming(true)
-    setEditName(activeWorkspace?.name || '')
-  }, [activeWorkspace?.name, activeWorkspace?.type])
-
-  const handleSaveHeaderRename = useCallback(() => {
-    if (activeWorkspace?.type === 'personal') {
-      setIsRenaming(false)
-      setEditName('')
-      return
-    }
-    const trimmedName = editName.trim()
-    const currentName = activeWorkspace?.name || ''
-    const isDifferent = trimmedName !== currentName
-    setIsRenaming(false)
-    setEditName('')
-    if (!trimmedName || !isDifferent || !onRenameWorkspace) return
-    onRenameWorkspace(workspaceId, trimmedName)
-  }, [editName, activeWorkspace?.name, activeWorkspace?.type, workspaceId, onRenameWorkspace])
-
-  const handleCancelHeaderRename = useCallback(() => {
-    setIsRenaming(false)
-    setEditName('')
-  }, [])
-
-  const handleStartWorkspaceRename = useCallback((workspace: Workspace) => {
-    if (workspace.type === 'personal') return
-    setEditingWorkspaceId(workspace.id)
-    setEditName(workspace.name)
-  }, [])
-
-  const handleSaveWorkspaceRename = useCallback(
-    (wsId: string) => {
-      const workspace = workspaces.find((w) => w.id === wsId)
-      if (workspace?.type === 'personal') {
-        setEditingWorkspaceId(null)
-        setEditName('')
-        return
-      }
-      const trimmedName = editName.trim()
-      const currentName = workspace?.name || ''
-      const isDifferent = trimmedName !== currentName
-      setEditingWorkspaceId(null)
-      setEditName('')
-      if (!trimmedName || !isDifferent || !onRenameWorkspace) return
-      onRenameWorkspace(wsId, trimmedName)
-    },
-    [editName, onRenameWorkspace, workspaces],
-  )
-
-  const handleCancelWorkspaceRename = useCallback(() => {
-    setEditingWorkspaceId(null)
-    setEditName('')
-  }, [])
-
-  const handleDeleteWorkspace = useCallback(
-    (wsId: string) => {
-      const workspace = workspaces.find((w) => w.id === wsId)
-      if (workspace?.type === 'personal') return
-      if (workspace) {
-        setWorkspaceToDelete({ id: wsId, name: workspace.name })
-        setDeleteConfirmOpen(true)
-      }
-    },
-    [workspaces],
-  )
-
-  const handleConfirmDelete = useCallback(() => {
-    if (!workspaceToDelete || !onDeleteWorkspace) {
-      setDeleteConfirmOpen(false)
-      setWorkspaceToDelete(null)
-      return
-    }
-    try {
-      onDeleteWorkspace(workspaceToDelete.id)
-      setDeleteConfirmOpen(false)
-      setWorkspaceToDelete(null)
-    } catch {
-      setDeleteConfirmOpen(false)
-      setWorkspaceToDelete(null)
-    }
-  }, [workspaceToDelete, onDeleteWorkspace])
-
-  const handleDuplicateWorkspace = useCallback(
-    (wsId: string) => {
-      const workspace = workspaces.find((w) => w.id === wsId)
-      if (workspace?.type === 'personal') return
-      if (!onDuplicateWorkspace) return
-      onDuplicateWorkspace(wsId)
-    },
-    [onDuplicateWorkspace, workspaces],
-  )
-
-  const handleStartWorkspaceRenameWithClose = useCallback(
-    (workspace: Workspace) => handleStartWorkspaceRename(workspace),
-    [handleStartWorkspaceRename],
-  )
-
-  const handleRenameKeyDown = useCallback(
-    (e: React.KeyboardEvent, wsId: string, isHeader = false) => {
-      if (e.key === 'Enter') {
-        e.preventDefault()
-        e.stopPropagation()
-        if (isHeader) handleSaveHeaderRename()
-        else handleSaveWorkspaceRename(wsId)
-      } else if (e.key === 'Escape') {
-        e.preventDefault()
-        e.stopPropagation()
-        if (isHeader) handleCancelHeaderRename()
-        else handleCancelWorkspaceRename()
-      }
-    },
-    [handleSaveHeaderRename, handleCancelHeaderRename, handleSaveWorkspaceRename, handleCancelWorkspaceRename],
-  )
-
-  return {
-    isRenaming,
-    editingWorkspaceId,
-    setEditingWorkspaceId,
-    editName,
-    setEditName,
-    deleteConfirmOpen,
-    setDeleteConfirmOpen,
-    workspaceToDelete,
-    setWorkspaceToDelete,
-    handleStartHeaderRename,
-    handleSaveHeaderRename,
-    handleCancelHeaderRename,
-    handleSaveWorkspaceRename,
-    handleCancelWorkspaceRename,
-    handleDeleteWorkspace,
-    handleConfirmDelete,
-    handleDuplicateWorkspace,
-    handleStartWorkspaceRenameWithClose,
-    handleRenameKeyDown,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dialogs.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dialogs.tsx
deleted file mode 100644
index b3de6d090..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dialogs.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-'use client'
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from '@/components/ui/alert-dialog'
-import { useTranslation } from '@/lib/i18n'
-
-interface WorkspaceDialogsProps {
-  deleteConfirmOpen: boolean
-  setDeleteConfirmOpen: (open: boolean) => void
-  workspaceToDelete: { id: string; name: string } | null
-  setWorkspaceToDelete: (workspace: { id: string; name: string } | null) => void
-  onConfirmDelete: () => void
-}
-
-export function WorkspaceDialogs({
-  deleteConfirmOpen,
-  setDeleteConfirmOpen,
-  workspaceToDelete,
-  setWorkspaceToDelete,
-  onConfirmDelete,
-}: WorkspaceDialogsProps) {
-  const { t } = useTranslation()
-
-  return (
-    <AlertDialog open={deleteConfirmOpen} onOpenChange={setDeleteConfirmOpen}>
-      <AlertDialogContent variant="destructive">
-        <AlertDialogHeader>
-          <AlertDialogTitle>{t('workspace.deleteConfirmTitle')}</AlertDialogTitle>
-          <AlertDialogDescription>
-            {workspaceToDelete ? (
-              <>
-                {t('workspace.deleteConfirmMessagePrefix')}{' '}
-                <span className="font-semibold text-[var(--status-error)]">{workspaceToDelete.name}</span>
-                {t('workspace.deleteConfirmMessageSuffix')}
-              </>
-            ) : (
-              t('workspace.deleteConfirmMessageDefault')
-            )}
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogCancel
-            onClick={() => {
-              setDeleteConfirmOpen(false)
-              setWorkspaceToDelete(null)
-            }}
-          >
-            {t('workspace.cancel')}
-          </AlertDialogCancel>
-          <AlertDialogAction
-            onClick={onConfirmDelete}
-            className="bg-[var(--status-error)] text-white hover:bg-[var(--status-error-hover)]"
-          >
-            {t('workspace.delete')}
-          </AlertDialogAction>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dropdown.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dropdown.tsx
deleted file mode 100644
index 7bb158336..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-dropdown.tsx
+++ /dev/null
@@ -1,335 +0,0 @@
-'use client'
-
-import {
-  Check,
-  Copy,
-  MoreHorizontal,
-  Pencil,
-  Plus,
-  Search,
-  Trash2,
-  Users,
-  X,
-} from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import { useState, useCallback, useMemo, useRef, useEffect } from 'react'
-
-import { InlineRenameInput } from '@/components/ui/inline-rename-input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { SidebarContextMenu, type MenuItemConfig } from '../sidebar-context-menu'
-
-interface Workspace {
-  id: string
-  name: string
-  ownerId?: string
-  role?: string
-  type?: string
-}
-
-interface WorkspaceDropdownProps {
-  workspaceId: string
-  workspaces: Workspace[]
-  isWorkspacesLoading: boolean
-  isCreatingWorkspace: boolean
-  onWorkspaceSwitch?: (workspace: Workspace) => void
-  onCreateWorkspace?: () => Promise<void>
-  onClose: () => void
-  getWorkspaceDisplayName: (workspace: Workspace) => string
-  onStartRenameWithClose: (workspace: Workspace) => void
-  onDeleteWorkspace: (wsId: string) => void
-  onDuplicateWorkspace: (wsId: string) => void
-  editingWorkspaceId: string | null
-  editName: string
-  setEditName: (name: string) => void
-  onSaveWorkspaceRename: (wsId: string) => void
-  onCancelWorkspaceRename: () => void
-  onRenameKeyDown: (e: React.KeyboardEvent, wsId: string, isHeader?: boolean) => void
-}
-
-export function WorkspaceDropdown({
-  workspaceId,
-  workspaces,
-  isWorkspacesLoading,
-  isCreatingWorkspace,
-  onWorkspaceSwitch,
-  onCreateWorkspace,
-  onClose,
-  getWorkspaceDisplayName,
-  onStartRenameWithClose,
-  onDeleteWorkspace,
-  onDuplicateWorkspace,
-  editingWorkspaceId,
-  editName,
-  setEditName,
-  onSaveWorkspaceRename,
-  onCancelWorkspaceRename,
-  onRenameKeyDown,
-}: WorkspaceDropdownProps) {
-  const { t } = useTranslation()
-  const router = useRouter()
-  const [searchQuery, setSearchQuery] = useState('')
-  const [showWorkspaceMenu, setShowWorkspaceMenu] = useState<string | null>(null)
-  const [menuPosition, setMenuPosition] = useState<{ x: number; y: number } | null>(null)
-  const searchInputRef = useRef<HTMLInputElement>(null)
-  const menuButtonRefs = useRef<Record<string, HTMLButtonElement | null>>({})
-
-  useEffect(() => {
-    if (searchInputRef.current) {
-      setTimeout(() => searchInputRef.current?.focus(), 100)
-    }
-  }, [])
-
-  const filteredWorkspaces = useMemo(() => {
-    if (!searchQuery.trim()) return workspaces
-    const query = searchQuery.toLowerCase()
-    return workspaces.filter((ws) => ws.name.toLowerCase().includes(query))
-  }, [workspaces, searchQuery])
-
-  useEffect(() => {
-    if (showWorkspaceMenu) {
-      const handleClickOutside = (e: MouseEvent) => {
-        const target = e.target as HTMLElement
-        if (
-          !target.closest('[data-workspace-menu]') &&
-          !target.closest('[data-workspace-menu-button]')
-        ) {
-          setShowWorkspaceMenu(null)
-          setMenuPosition(null)
-        }
-      }
-
-      document.addEventListener('mousedown', handleClickOutside)
-      return () => {
-        document.removeEventListener('mousedown', handleClickOutside)
-      }
-    }
-  }, [showWorkspaceMenu])
-
-  const handleCloseDropdown = useCallback(() => {
-    onClose()
-    setSearchQuery('')
-  }, [onClose])
-
-  return (
-    <>
-      <div className="fixed inset-0 z-40" onClick={handleCloseDropdown} />
-      <div className="absolute left-0 right-0 top-[calc(100%+4px)] z-50 rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-[4px] shadow-lg">
-        <div className="flex items-center justify-between px-2 py-1">
-          <span className="text-sm font-medium text-[var(--text-tertiary)]">
-            {t('workspace.workspaces')}
-          </span>
-          <TooltipProvider delayDuration={100}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  className="rounded-sm p-0.5 transition-colors hover:bg-[var(--surface-5)]"
-                  onClick={async () => {
-                    if (onCreateWorkspace) {
-                      await onCreateWorkspace()
-                    }
-                  }}
-                  disabled={isCreatingWorkspace}
-                >
-                  <Plus className="h-3.5 w-3.5 text-[var(--text-secondary)]" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent
-                side="bottom"
-                sideOffset={4}
-                className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg"
-              >
-                {t('workspace.createWorkspace')}
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        </div>
-
-        <div className="mx-[4px] mb-[8px] mt-[4px]">
-          <div className="flex items-center gap-1.5 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-2 py-[5px]">
-            <Search className="h-3 w-3 flex-shrink-0 text-[var(--text-tertiary)]" />
-            <input
-              ref={searchInputRef}
-              type="text"
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              placeholder={t('workspace.searchWorkspaces')}
-              className="flex-1 bg-transparent text-sm font-medium text-[var(--text-primary)] outline-none placeholder:text-[var(--text-tertiary)]"
-            />
-            {searchQuery && (
-              <button
-                type="button"
-                className="rounded-xs p-px transition-colors hover:bg-[var(--surface-5)]"
-                onClick={() => setSearchQuery('')}
-                aria-label={t('workspace.clearSearch', { defaultValue: 'Clear search' })}
-              >
-                <X className="h-[10px] w-[10px] text-[var(--text-tertiary)]" />
-              </button>
-            )}
-          </div>
-        </div>
-
-        <div className="max-h-[240px] overflow-y-auto">
-          {isWorkspacesLoading ? (
-            <div className="px-2 py-1.5 text-sm text-[var(--text-tertiary)]">
-              {t('workspace.loadingAgents')}
-            </div>
-          ) : filteredWorkspaces.length === 0 ? (
-            <div className="px-2 py-1.5 text-sm text-[var(--text-tertiary)]">
-              {searchQuery ? t('workspace.noWorkspacesFound') : t('workspace.noWorkspaces')}
-            </div>
-          ) : (
-            filteredWorkspaces.map((workspace) => (
-              <div
-                key={workspace.id}
-                className={cn(
-                  'group relative grid grid-cols-[1fr_auto_auto] items-center gap-1 rounded-md transition-colors',
-                  workspace.id === workspaceId
-                    ? 'bg-[var(--surface-muted)]'
-                    : 'hover:bg-[var(--surface-5)]',
-                )}
-              >
-                {editingWorkspaceId === workspace.id ? (
-                  <div className="flex flex-1 items-center gap-1 px-2 py-1.5">
-                    <InlineRenameInput
-                      value={editName}
-                      onChange={(v) => setEditName(v)}
-                      onSave={() => onSaveWorkspaceRename(workspace.id)}
-                      onCancel={onCancelWorkspaceRename}
-                      size="sm"
-                    />
-                  </div>
-                ) : (
-                  <>
-                    <TooltipProvider delayDuration={400}>
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            type="button"
-                            className={cn(
-                              'flex min-w-0 items-center px-2 py-1.5 text-left text-sm font-medium',
-                              workspace.id === workspaceId
-                                ? 'text-[var(--text-primary)]'
-                                : 'text-[var(--text-secondary)]',
-                            )}
-                            onClick={() => {
-                              if (onWorkspaceSwitch) {
-                                onWorkspaceSwitch(workspace)
-                              }
-                              handleCloseDropdown()
-                            }}
-                          >
-                            <span className="truncate">
-                              {getWorkspaceDisplayName(workspace)}
-                            </span>
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent
-                          side="right"
-                          sideOffset={8}
-                          className="max-w-[280px] break-words rounded-lg border border-[var(--border)] bg-[var(--surface-1)] px-2.5 py-1.5 text-sm font-medium text-[var(--text-primary)] shadow-lg"
-                        >
-                          {getWorkspaceDisplayName(workspace)}
-                        </TooltipContent>
-                      </Tooltip>
-                    </TooltipProvider>
-
-                    <div className="flex w-[44px] shrink-0 justify-center">
-                      {workspace.type === 'personal' ? (
-                        <span className="w-[36px] rounded-sm bg-[var(--brand-100)] px-[4px] py-[1px] text-center text-xs font-medium text-[var(--brand-600)]">
-                          {t('workspace.personal')}
-                        </span>
-                      ) : workspace.type === 'team' ? (
-                        <span className="w-[36px] rounded-sm bg-[var(--brand-100)] px-[4px] py-[1px] text-center text-xs font-medium text-[var(--brand-600)] dark:bg-[var(--brand-100)] dark:text-[var(--brand-400)]">
-                          {t('workspace.team')}
-                        </span>
-                      ) : null}
-                    </div>
-
-                    <div className="mr-[4px] flex w-5 justify-end">
-                      {workspace.type !== 'personal' && (
-                        <button
-                          ref={(el) => {
-                            menuButtonRefs.current[workspace.id] = el
-                          }}
-                          data-workspace-menu-button
-                          type="button"
-                          className="rounded-sm p-[4px] opacity-0 transition-opacity hover:bg-[var(--surface-muted)] group-hover:opacity-100"
-                          aria-label={t('workspace.moreOptions', { defaultValue: 'More options' })}
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            const button = menuButtonRefs.current[workspace.id]
-                            if (button) {
-                              const rect = button.getBoundingClientRect()
-                              setMenuPosition({
-                                x: rect.right - 120,
-                                y: rect.bottom + 4,
-                              })
-                            }
-                            setShowWorkspaceMenu(
-                              showWorkspaceMenu === workspace.id ? null : workspace.id,
-                            )
-                          }}
-                        >
-                          <MoreHorizontal className="h-3 w-3 text-[var(--text-tertiary)]" />
-                        </button>
-                      )}
-                    </div>
-                  </>
-                )}
-              </div>
-            ))
-          )}
-        </div>
-      </div>
-
-      {showWorkspaceMenu && menuPosition && (() => {
-        const workspace = workspaces.find((w) => w.id === showWorkspaceMenu)
-        if (!workspace || workspace.type === 'personal') return null
-
-        const closeMenu = () => {
-          setShowWorkspaceMenu(null)
-          setMenuPosition(null)
-        }
-
-        const items: MenuItemConfig[] = []
-        if (workspace.role === 'owner' || workspace.role === 'admin') {
-          items.push({
-            label: t('workspace.membersManagement'),
-            icon: <Users className="h-3 w-3" />,
-            onClick: () => router.push(`/workspace/${workspace.id}/settings/members`),
-          })
-        }
-        items.push({
-          label: t('workspace.rename'),
-          icon: <Pencil className="h-3 w-3" />,
-          onClick: () => onStartRenameWithClose(workspace),
-          separator: items.length > 0,
-        })
-        items.push({
-          label: t('workspace.duplicate'),
-          icon: <Copy className="h-3 w-3" />,
-          onClick: () => onDuplicateWorkspace(workspace.id),
-        })
-        items.push({
-          label: t('workspace.delete'),
-          icon: <Trash2 className="h-3 w-3" />,
-          onClick: () => onDeleteWorkspace(workspace.id),
-          variant: 'destructive',
-          separator: true,
-        })
-
-        return (
-          <SidebarContextMenu
-            items={items}
-            onClose={closeMenu}
-            position={menuPosition}
-          />
-        )
-      })()}
-    </>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-header.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-header.tsx
deleted file mode 100644
index 6b06b66f5..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/components/workspace-header/workspace-header.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-'use client'
-
-import { ChevronDown, PanelLeft, Pencil } from 'lucide-react'
-import { useState, useCallback } from 'react'
-
-import { InlineRenameInput } from '@/components/ui/inline-rename-input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-
-import { useInlineRename } from '../inline-rename-input'
-import { useWorkspaceRename } from './use-workspace-rename'
-import { WorkspaceDialogs } from './workspace-dialogs'
-import { WorkspaceDropdown } from './workspace-dropdown'
-
-interface Workspace {
-  id: string
-  name: string
-  ownerId?: string
-  role?: string
-  type?: string
-}
-
-interface WorkspaceHeaderProps {
-  activeWorkspace?: { id?: string; name: string; type?: string } | null
-  workspaceId: string
-  workspaces?: Workspace[]
-  isWorkspacesLoading?: boolean
-  isCreatingWorkspace?: boolean
-  onWorkspaceSwitch?: (workspace: Workspace) => void
-  onCreateWorkspace?: () => Promise<void>
-  onToggleCollapse?: () => void
-  isCollapsed?: boolean
-  onRenameWorkspace?: (workspaceId: string, newName: string) => void
-  onDeleteWorkspace?: (workspaceId: string) => void
-  onDuplicateWorkspace?: (workspaceId: string) => void
-  showCollapseButton?: boolean
-}
-
-export function WorkspaceHeader({
-  activeWorkspace,
-  workspaceId,
-  workspaces = [],
-  isWorkspacesLoading = false,
-  isCreatingWorkspace = false,
-  onWorkspaceSwitch,
-  onCreateWorkspace,
-  onToggleCollapse,
-  isCollapsed = false,
-  onRenameWorkspace,
-  onDeleteWorkspace,
-  onDuplicateWorkspace,
-  showCollapseButton = true,
-}: WorkspaceHeaderProps) {
-  const { t } = useTranslation()
-  const [isDropdownOpen, setIsDropdownOpen] = useState(false)
-
-  const handleHeaderRename = useCallback((newName: string) => {
-    if (activeWorkspace?.type === 'personal') return
-    onRenameWorkspace?.(workspaceId, newName)
-  }, [activeWorkspace?.type, workspaceId, onRenameWorkspace])
-
-  const {
-    isEditing: isRenaming, editName, setEditName,
-    startEditing: handleStartHeaderRename, handleSave: handleSaveHeaderRename,
-    handleCancel: handleCancelHeaderRename,
-  } = useInlineRename(activeWorkspace?.name || '', handleHeaderRename)
-
-  const {
-    editingWorkspaceId, setEditingWorkspaceId,
-    editName: dropdownEditName, setEditName: setDropdownEditName,
-    deleteConfirmOpen, setDeleteConfirmOpen,
-    workspaceToDelete, setWorkspaceToDelete,
-    handleSaveWorkspaceRename, handleCancelWorkspaceRename,
-    handleDeleteWorkspace, handleConfirmDelete, handleDuplicateWorkspace,
-    handleStartWorkspaceRenameWithClose, handleRenameKeyDown,
-  } = useWorkspaceRename(activeWorkspace, workspaceId, workspaces, onRenameWorkspace, onDeleteWorkspace, onDuplicateWorkspace)
-
-  const getWorkspaceDisplayName = useCallback(
-    (workspace: Workspace | { id?: string; name: string; type?: string }): string => {
-      if (workspace.type === 'personal' && (workspace.name === '个人空间' || workspace.name === 'Personal Space')) {
-        return t('workspace.personalSpace')
-      }
-      return workspace.name
-    },
-    [t],
-  )
-
-  return (
-    <div className="relative flex min-w-0 items-center justify-between gap-1.5">
-      <div className="flex min-w-0 flex-1 items-center gap-1.5">
-        {isRenaming ? (
-          <InlineRenameInput
-            value={editName}
-            onChange={setEditName}
-            onSave={handleSaveHeaderRename}
-            onCancel={handleCancelHeaderRename}
-            size="sm"
-          />
-        ) : (
-          <div className="group flex min-w-0 flex-1 items-center gap-1">
-            <div className="flex min-w-0 items-center gap-1">
-              <TooltipProvider delayDuration={100}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <h2 className="flex-1 truncate text-base font-medium text-[var(--text-primary)]">
-                      {activeWorkspace ? getWorkspaceDisplayName(activeWorkspace) : t('workspace.workspace')}
-                    </h2>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-                    {activeWorkspace ? getWorkspaceDisplayName(activeWorkspace) : t('workspace.workspace')}
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
-              {activeWorkspace?.type === 'personal' ? (
-                <span className="w-[32px] shrink-0 rounded-sm bg-[var(--brand-100)] px-[3px] py-[1px] text-center text-xs font-medium text-[var(--brand-600)]">
-                  {t('workspace.personal')}
-                </span>
-              ) : activeWorkspace?.type === 'team' ? (
-                <span className="w-[32px] shrink-0 rounded-sm bg-[var(--brand-100)] px-[3px] py-[1px] text-center text-xs font-medium text-[var(--brand-600)] dark:bg-[var(--brand-100)] dark:text-[var(--brand-400)]">
-                  {t('workspace.team')}
-                </span>
-              ) : null}
-            </div>
-            {onRenameWorkspace && activeWorkspace?.type !== 'personal' && (
-              <TooltipProvider delayDuration={100}>
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <button
-                      type="button"
-                      className="rounded-sm p-0.5 opacity-0 transition-opacity hover:bg-[var(--surface-5)] group-hover:opacity-100"
-                      onClick={handleStartHeaderRename}
-                    >
-                      <Pencil className="h-3 w-3 text-[var(--text-tertiary)]" />
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-                    {t('workspace.renameWorkspace')}
-                  </TooltipContent>
-                </Tooltip>
-              </TooltipProvider>
-            )}
-          </div>
-        )}
-      </div>
-
-      <div className="flex items-center gap-1.5">
-        <TooltipProvider delayDuration={100}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <button
-                type="button"
-                className="flex items-center justify-center rounded-sm p-[4px] transition-colors hover:bg-[var(--surface-5)]"
-                onClick={() => setIsDropdownOpen(!isDropdownOpen)}
-              >
-                <ChevronDown className={cn('h-[11px] w-[11px] text-[var(--text-secondary)] transition-transform duration-100', isDropdownOpen && 'rotate-180')} />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-              {t('workspace.switchWorkspace')}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-
-        {showCollapseButton && (
-          <TooltipProvider delayDuration={100}>
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  type="button"
-                  className="flex items-center justify-center rounded-sm p-[4px] transition-colors hover:bg-[var(--surface-5)]"
-                  onClick={onToggleCollapse}
-                >
-                  <PanelLeft className="h-3.5 w-3.5 text-[var(--text-secondary)]" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-                {isCollapsed ? t('workspace.expandSidebar') : t('workspace.collapseSidebar')}
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        )}
-      </div>
-
-      {isDropdownOpen && (
-        <WorkspaceDropdown
-          workspaceId={workspaceId}
-          workspaces={workspaces}
-          isWorkspacesLoading={isWorkspacesLoading}
-          isCreatingWorkspace={isCreatingWorkspace}
-          onWorkspaceSwitch={onWorkspaceSwitch}
-          onCreateWorkspace={onCreateWorkspace}
-          onClose={() => { setIsDropdownOpen(false); setEditingWorkspaceId(null) }}
-          getWorkspaceDisplayName={getWorkspaceDisplayName}
-          onStartRenameWithClose={handleStartWorkspaceRenameWithClose}
-          onDeleteWorkspace={handleDeleteWorkspace}
-          onDuplicateWorkspace={handleDuplicateWorkspace}
-          editingWorkspaceId={editingWorkspaceId}
-          editName={dropdownEditName}
-          setEditName={setDropdownEditName}
-          onSaveWorkspaceRename={handleSaveWorkspaceRename}
-          onCancelWorkspaceRename={handleCancelWorkspaceRename}
-          onRenameKeyDown={handleRenameKeyDown}
-        />
-      )}
-
-      <WorkspaceDialogs
-        deleteConfirmOpen={deleteConfirmOpen}
-        setDeleteConfirmOpen={setDeleteConfirmOpen}
-        workspaceToDelete={workspaceToDelete}
-        setWorkspaceToDelete={setWorkspaceToDelete}
-        onConfirmDelete={handleConfirmDelete}
-      />
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-agent-mutations.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-agent-mutations.ts
deleted file mode 100644
index 5638d3f53..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-agent-mutations.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { useCallback } from 'react'
-
-import {
-  agentService,
-  type AgentGraph,
-} from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { useBuilderStore } from '@/app/workspace/[workspaceId]/[agentId]/stores/builderStore'
-import { CODE_STARTER_TEMPLATE } from '@/app/workspace/[workspaceId]/[agentId]/utils/codeTemplate'
-import { useToast } from '@/hooks/use-toast'
-import { graphKeys } from '@/hooks/queries/graphs'
-import { useTranslation } from '@/lib/i18n'
-import { createLogger } from '@/lib/logs/console/logger'
-import { isPermissionError } from '@/lib/utils/is-permission-error'
-
-const logger = createLogger('Sidebar')
-
-export function useAgentMutations(workspaceId: string) {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-  const queryClient = useQueryClient()
-
-  const createAgentMutation = useMutation({
-    mutationFn: async (data: { name: string; description?: string; color?: string; mode?: 'canvas' | 'code' }) => {
-      // Create Graph
-      const graph = await agentService.createGraph({
-        name: data.name,
-        description: data.description,
-        color: data.color,
-        workspaceId: workspaceId || null,
-      })
-
-      if (graph?.id) {
-        if (data.mode === 'code') {
-          // Code mode: save with starter template and graph_mode flag
-          await agentService.saveGraphState({
-            graphId: graph.id,
-            nodes: [],
-            edges: [],
-            viewport: { x: 0, y: 0, zoom: 1 },
-            variables: {
-              graph_mode: 'code',
-              code_content: CODE_STARTER_TEMPLATE,
-            },
-          })
-        } else {
-          await agentService.saveGraphState({
-            graphId: graph.id,
-            nodes: [],
-            edges: [],
-            viewport: { x: 0, y: 0, zoom: 1 },
-          })
-        }
-      }
-      return graph
-    },
-    onSuccess: (graph: AgentGraph) => {
-      queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-      toast({
-        title: t('workspace.agentCreateSuccess'),
-        variant: 'success',
-      })
-      return graph
-    },
-    onError: (error: unknown) => {
-      let errorMessage = t('workspace.cannotCreateAgent')
-      if (error instanceof Error) {
-        if (isPermissionError(error)) {
-          errorMessage = t('workspace.cannotCreateAgent')
-        } else {
-          errorMessage = error.message || errorMessage
-        }
-      }
-      toast({
-        title: t('workspace.agentCreateFailed'),
-        description: errorMessage,
-        variant: 'destructive',
-      })
-    },
-  })
-
-  const updateAgentMutation = useMutation({
-    mutationFn: async (data: {
-      id: string
-      name?: string
-      description?: string
-      color?: string
-    }) => {
-      await agentService.updateGraph(data.id, {
-        name: data.name,
-        description: data.description,
-        color: data.color,
-      })
-    },
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-      // If renaming the currently editing graph, update graphName in store
-      const { graphId, setGraphName } = useBuilderStore.getState()
-      if (variables.name && graphId === variables.id) {
-        setGraphName(variables.name)
-        // Also update localStorage for compatibility
-        agentService.setCachedGraphName(variables.name)
-      }
-      toast({
-        title: t('workspace.agentUpdateSuccess'),
-        variant: 'success',
-      })
-    },
-    onError: (error: unknown) => {
-      let errorMessage = t('workspace.agentUpdateFailed')
-      if (error instanceof Error) {
-        errorMessage = error.message || errorMessage
-      }
-      toast({
-        title: t('workspace.agentUpdateFailed'),
-        description: errorMessage,
-        variant: 'destructive',
-      })
-    },
-  })
-
-  const deleteAgentMutation = useMutation({
-    mutationFn: async (id: string) => {
-      await agentService.deleteGraph(id)
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-      toast({
-        title: t('workspace.agentDeleteSuccess'),
-        variant: 'success',
-      })
-    },
-    onError: (error: unknown) => {
-      let errorMessage = t('workspace.cannotDeleteAgent')
-      if (error instanceof Error) {
-        if (isPermissionError(error)) {
-          errorMessage = t('workspace.cannotDeleteAgent')
-        } else {
-          errorMessage = error.message || errorMessage
-        }
-      }
-      toast({
-        title: t('workspace.agentDeleteFailed'),
-        description: errorMessage,
-        variant: 'destructive',
-      })
-    },
-  })
-
-  const duplicateAgentMutation = useMutation({
-    mutationFn: async (id: string) => {
-      await agentService.duplicateGraph(id, { workspaceId: workspaceId || null })
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-      toast({
-        title: t('workspace.agentDuplicateSuccess'),
-        variant: 'success',
-      })
-    },
-    onError: (error: unknown) => {
-      let errorMessage = t('workspace.agentDuplicateFailed')
-      if (error instanceof Error) {
-        if (isPermissionError(error)) {
-          errorMessage = t('workspace.cannotCreateAgent')
-        } else {
-          errorMessage = error.message || errorMessage
-        }
-      }
-      toast({
-        title: t('workspace.agentDuplicateFailed'),
-        description: errorMessage,
-        variant: 'destructive',
-      })
-    },
-  })
-
-  const handleMoveAgentToFolder = useCallback(
-    async (agentId: string, folderId: string | null) => {
-      try {
-        await agentService.moveToFolder(agentId, folderId)
-        queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-      } catch (error) {
-        logger.error('Failed to move agent to folder', { error, agentId, folderId })
-      }
-    },
-    [workspaceId, queryClient],
-  )
-
-  return {
-    createAgentMutation,
-    updateAgentMutation,
-    deleteAgentMutation,
-    duplicateAgentMutation,
-    handleMoveAgentToFolder,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-drop-zone.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-drop-zone.ts
deleted file mode 100644
index efd40b03b..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-drop-zone.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-'use client'
-
-import { useCallback, useState } from 'react'
-
-export function useDropZone(onDrop?: (agentId: string) => void) {
-  const [isDragOver, setIsDragOver] = useState(false)
-
-  const handleDragOver = useCallback((e: React.DragEvent) => {
-    e.preventDefault()
-    e.dataTransfer.dropEffect = 'move'
-    setIsDragOver(true)
-  }, [])
-
-  const handleDragLeave = useCallback(() => {
-    setIsDragOver(false)
-  }, [])
-
-  const handleDrop = useCallback((e: React.DragEvent) => {
-    e.preventDefault()
-    setIsDragOver(false)
-    const agentId = e.dataTransfer.getData('agentId')
-    if (agentId) {
-      onDrop?.(agentId)
-    }
-  }, [onDrop])
-
-  return { isDragOver, handleDragOver, handleDragLeave, handleDrop }
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-folder-handlers.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-folder-handlers.ts
deleted file mode 100644
index a74d75ac1..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-folder-handlers.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { useCallback } from 'react'
-
-import { useToast } from '@/hooks/use-toast'
-import {
-  useCreateFolder,
-  useUpdateFolder,
-  useDeleteFolderMutation as useDeleteFolder,
-  useDuplicateFolderMutation as useDuplicateFolder,
-} from '@/hooks/queries/folders'
-import { useTranslation } from '@/lib/i18n'
-import { isPermissionError } from '@/lib/utils/is-permission-error'
-import { useFolderStore, type WorkflowFolder } from '@/stores/folders/store'
-
-export function useFolderHandlers(
-  workspaceId: string,
-  canEdit: boolean,
-) {
-  const { t } = useTranslation()
-  const { toast } = useToast()
-
-  const folderStoreData = useFolderStore((state) => state.folders)
-  const canCreateSubfolderCheck = useFolderStore((state) => state.canCreateSubfolder)
-
-  const createFolderMutation = useCreateFolder()
-  const updateFolderMutation = useUpdateFolder()
-  const deleteFolderMutation = useDeleteFolder()
-  const duplicateFolderMutation = useDuplicateFolder()
-
-  const handleCreateFolder = useCallback(
-    async (parentId?: string | null) => {
-      if (!canEdit) {
-        toast({
-          title: t('workspace.noPermission'),
-          description: t('workspace.cannotCreateFolder'),
-          variant: 'destructive',
-        })
-        return
-      }
-      if (parentId && !canCreateSubfolderCheck(parentId)) {
-        return
-      }
-
-      const defaultFolderName = t('workspace.defaultFolderName')
-      createFolderMutation.mutate({
-        workspaceId,
-        name: defaultFolderName,
-        parentId: parentId || undefined,
-      })
-    },
-    [workspaceId, createFolderMutation, canCreateSubfolderCheck, t, canEdit, toast],
-  )
-
-  const handleRenameFolder = useCallback(
-    (folderId: string, newName: string) => {
-      updateFolderMutation.mutate({
-        workspaceId,
-        id: folderId,
-        updates: { name: newName },
-      })
-    },
-    [workspaceId, updateFolderMutation],
-  )
-
-  const handleDeleteFolder = useCallback(
-    (folderId: string) => {
-      if (!canEdit) {
-        toast({
-          title: t('workspace.noPermission'),
-          description: t('workspace.cannotDeleteFolder'),
-          variant: 'destructive',
-        })
-        return
-      }
-      deleteFolderMutation.mutate(
-        { workspaceId, id: folderId },
-        {
-          onError: (error: unknown) => {
-            let errorMessage = t('workspace.cannotDeleteFolder')
-            if (error instanceof Error) {
-              if (isPermissionError(error)) {
-                errorMessage = t('workspace.cannotDeleteFolder')
-              } else {
-                errorMessage = error.message || errorMessage
-              }
-            }
-            toast({
-              title: t('workspace.noPermission'),
-              description: errorMessage,
-              variant: 'destructive',
-            })
-          },
-        },
-      )
-    },
-    [workspaceId, deleteFolderMutation, canEdit, toast, t],
-  )
-
-  const handleDuplicateFolder = useCallback(
-    (folderId: string, foldersData?: WorkflowFolder[]) => {
-      if (!canEdit) {
-        toast({
-          title: t('workspace.noPermission'),
-          description: t('workspace.cannotCreateFolder'),
-          variant: 'destructive',
-        })
-        return
-      }
-      const folder = folderStoreData[folderId] || foldersData?.find((f: WorkflowFolder) => f.id === folderId)
-      if (!folder) {
-        return
-      }
-
-      duplicateFolderMutation.mutate(
-        {
-          workspaceId,
-          id: folderId,
-          name: `${folder.name} (Copy)`,
-          parentId: folder.parentId,
-          color: folder.color,
-        },
-        {
-          onError: (error: unknown) => {
-            let errorMessage = t('workspace.cannotCreateFolder')
-            if (error instanceof Error) {
-              if (isPermissionError(error)) {
-                errorMessage = t('workspace.cannotCreateFolder')
-              } else {
-                errorMessage = error.message || errorMessage
-              }
-            }
-            toast({
-              title: t('workspace.noPermission'),
-              description: errorMessage,
-              variant: 'destructive',
-            })
-          },
-        },
-      )
-    },
-    [workspaceId, duplicateFolderMutation, folderStoreData, canEdit, toast, t],
-  )
-
-  return {
-    createFolderMutation,
-    handleCreateFolder,
-    handleRenameFolder,
-    handleDeleteFolder,
-    handleDuplicateFolder,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-workspace-handlers.ts b/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-workspace-handlers.ts
deleted file mode 100644
index 40b3685b0..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/hooks/use-workspace-handlers.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { useCallback } from 'react'
-
-import {
-  useCreateWorkspace,
-  useUpdateWorkspace,
-  useDeleteWorkspace,
-  useDuplicateWorkspace,
-} from '@/hooks/queries/workspaces'
-import { useTranslation } from '@/lib/i18n'
-
-export function useWorkspaceHandlers(router: { push: (url: string) => void }) {
-  const { t } = useTranslation()
-
-  const createWorkspaceMutation = useCreateWorkspace()
-  const updateWorkspaceMutation = useUpdateWorkspace()
-  const deleteWorkspaceMutation = useDeleteWorkspace()
-  const duplicateWorkspaceMutation = useDuplicateWorkspace()
-
-  const handleWorkspaceSwitch = useCallback(
-    (workspace: { id: string; name: string }) => {
-      router.push(`/workspace/${workspace.id}`)
-    },
-    [router],
-  )
-
-  const handleCreateWorkspace = useCallback(async () => {
-    createWorkspaceMutation.mutate({ name: t('workspace.newWorkspace') })
-  }, [createWorkspaceMutation, t])
-
-  const handleRenameWorkspace = useCallback(
-    (id: string, name: string) => {
-      if (!updateWorkspaceMutation) {
-        return
-      }
-      updateWorkspaceMutation.mutate({ id, updates: { name } })
-    },
-    [updateWorkspaceMutation],
-  )
-
-  const handleDeleteWorkspace = useCallback(
-    (id: string) => {
-      if (!deleteWorkspaceMutation) {
-        return
-      }
-      deleteWorkspaceMutation.mutate(id)
-    },
-    [deleteWorkspaceMutation],
-  )
-
-  const handleDuplicateWorkspace = useCallback(
-    (id: string) => {
-      if (!duplicateWorkspaceMutation) {
-        return
-      }
-      duplicateWorkspaceMutation.mutate({ id })
-    },
-    [duplicateWorkspaceMutation],
-  )
-
-  return {
-    createWorkspaceMutation,
-    handleWorkspaceSwitch,
-    handleCreateWorkspace,
-    handleRenameWorkspace,
-    handleDeleteWorkspace,
-    handleDuplicateWorkspace,
-  }
-}
diff --git a/frontend/app/workspace/[workspaceId]/components/sidebar/sidebar.tsx b/frontend/app/workspace/[workspaceId]/components/sidebar/sidebar.tsx
deleted file mode 100644
index 175b1de0e..000000000
--- a/frontend/app/workspace/[workspaceId]/components/sidebar/sidebar.tsx
+++ /dev/null
@@ -1,387 +0,0 @@
-'use client'
-
-import { FolderPlus, Plus } from 'lucide-react'
-import { useParams, useRouter } from 'next/navigation'
-import { useCallback, useRef, useState, useEffect, useMemo } from 'react'
-
-import type { AgentGraph } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import {
-  AgentList,
-  WorkspaceHeader,
-} from '@/app/workspace/[workspaceId]/components/sidebar/components'
-import { CreateAgentDialog } from '@/app/workspace/[workspaceId]/components/sidebar/components/create-agent-dialog'
-import { DeleteAgentDialog } from '@/app/workspace/[workspaceId]/components/sidebar/components/create-folder-dialog'
-import { useAgentMutations } from '@/app/workspace/[workspaceId]/components/sidebar/hooks/use-agent-mutations'
-import { useFolderHandlers } from '@/app/workspace/[workspaceId]/components/sidebar/hooks/use-folder-handlers'
-import { useWorkspaceHandlers } from '@/app/workspace/[workspaceId]/components/sidebar/hooks/use-workspace-handlers'
-import { SearchInput } from '@/components/ui/search-input'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useToast } from '@/hooks/use-toast'
-import { useFolders } from '@/hooks/queries/folders'
-import { useGraphs } from '@/hooks/queries/graphs'
-import { useWorkspaces } from '@/hooks/queries/workspaces'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
-import { useTranslation } from '@/lib/i18n'
-import { cn } from '@/lib/utils'
-import { useFolderStore, MAX_FOLDER_DEPTH, type WorkflowFolder } from '@/stores/folders/store'
-import { MIN_SIDEBAR_WIDTH, useSidebarStore } from '@/stores/sidebar/store'
-
-/**
- * Folder interface for component props (simplified from store)
- */
-export interface Folder {
-  id: string
-  name: string
-  isExpanded: boolean
-  createdAt: Date
-  parentId?: string | null
-}
-
-/**
- * Mock agent metadata type
- */
-export interface AgentMetadata {
-  id: string
-  name: string
-  color?: string
-  folderId?: string | null
-  graphMode?: string | null
-}
-
-function toFolder(wf: WorkflowFolder, expandedFolders: Set<string>): Folder {
-  return {
-    id: wf.id,
-    name: wf.name,
-    isExpanded: expandedFolders.has(wf.id),
-    createdAt: wf.createdAt,
-    parentId: wf.parentId,
-  }
-}
-
-function graphToAgentMetadata(graph: AgentGraph): AgentMetadata {
-  const variables = graph.variables as { graph_mode?: string } | undefined
-  return {
-    id: graph.id,
-    name: graph.name,
-    color: graph.color || undefined,
-    folderId: graph.folderId || null,
-    graphMode: variables?.graph_mode || null,
-  }
-}
-
-/**
- * Sidebar component with resizable width that persists across page refreshes
- */
-export function Sidebar() {
-  const { t } = useTranslation()
-  const params = useParams()
-  const router = useRouter()
-  const workspaceId = params.workspaceId as string
-  const agentId = params.agentId as string | undefined
-  const { toast } = useToast()
-
-  const sidebarRef = useRef<HTMLElement>(null)
-  const scrollContainerRef = useRef<HTMLDivElement>(null)
-
-  const { permissions, loading: permissionsLoading } = useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
-
-  const [deleteAgentConfirmOpen, setDeleteAgentConfirmOpen] = useState(false)
-  const [agentToDelete, setAgentToDelete] = useState<{ id: string; name: string } | null>(null)
-  const [searchQuery, setSearchQuery] = useState('')
-  const [showCreateDialog, setShowCreateDialog] = useState(false)
-  const [newAgentName, setNewAgentName] = useState('')
-  const [createAgentMode, setCreateAgentMode] = useState<'code' | 'canvas'>('canvas')
-  const isCollapsed = useSidebarStore((state) => state.isCollapsed)
-  const setIsCollapsed = useSidebarStore((state) => state.setIsCollapsed)
-  const sidebarWidth = useSidebarStore((state) => state.sidebarWidth)
-  const setSidebarWidth = useSidebarStore((state) => state.setSidebarWidth)
-  const isAppSidebarCollapsed = useSidebarStore((state) => state.isAppSidebarCollapsed)
-
-  const folderStoreData = useFolderStore((state) => state.folders)
-  const expandedFolders = useFolderStore((state) => state.expandedFolders)
-  const toggleExpanded = useFolderStore((state) => state.toggleExpanded)
-
-  const { data: foldersData, isLoading: isFoldersLoading } = useFolders(workspaceId)
-  const { data: workspacesData, isLoading: isWorkspacesLoading } = useWorkspaces()
-  const { data: graphsData, isLoading: isAgentsLoading } = useGraphs(workspaceId)
-
-  const agents: AgentMetadata[] = useMemo(() => graphsData?.map(graphToAgentMetadata) || [], [graphsData])
-
-  const {
-    createAgentMutation, updateAgentMutation, deleteAgentMutation,
-    duplicateAgentMutation, handleMoveAgentToFolder,
-  } = useAgentMutations(workspaceId)
-
-  const {
-    createFolderMutation, handleCreateFolder, handleRenameFolder,
-    handleDeleteFolder, handleDuplicateFolder: handleDuplicateFolderBase,
-  } = useFolderHandlers(workspaceId, userPermissions.canEdit)
-
-  const handleDuplicateFolder = useCallback(
-    (folderId: string) => handleDuplicateFolderBase(folderId, foldersData),
-    [handleDuplicateFolderBase, foldersData],
-  )
-
-  const {
-    createWorkspaceMutation, handleWorkspaceSwitch, handleCreateWorkspace,
-    handleRenameWorkspace, handleDeleteWorkspace, handleDuplicateWorkspace,
-  } = useWorkspaceHandlers(router)
-
-  const folders: Folder[] = Object.values(folderStoreData)
-    .filter((f) => f.workspaceId === workspaceId)
-    .map((f) => toFolder(f, expandedFolders))
-
-  const activeWorkspace = workspacesData?.find((w) => w.id === workspaceId) || workspacesData?.[0]
-  const isOnAgentPage = !!agentId
-
-  const generateRandomColor = useCallback(() => {
-    const colors = [
-      '#3972F6', '#10B981', '#F59E0B', '#EF4444', '#8B5CF6', '#EC4899',
-      '#06B6D4', '#84CC16', '#F97316', '#6366F1', '#14B8A6', '#A855F7',
-    ]
-    return colors[Math.floor(Math.random() * colors.length)]
-  }, [])
-
-  const handleCreateAgent = useCallback(() => {
-    if (!userPermissions.canEdit) {
-      toast({ title: t('workspace.noPermission'), description: t('workspace.cannotCreateAgent'), variant: 'destructive' })
-      return
-    }
-    setNewAgentName(t('workspace.defaultAgentName'))
-    setCreateAgentMode('canvas')
-    setShowCreateDialog(true)
-  }, [userPermissions.canEdit, toast, t])
-
-  const handleConfirmCreateAgent = useCallback(() => {
-    if (!newAgentName.trim()) return
-    setShowCreateDialog(false)
-    createAgentMutation.mutate(
-      { name: newAgentName.trim(), description: '', color: generateRandomColor(), mode: createAgentMode },
-      { onSuccess: (graph: AgentGraph) => { if (graph?.id) router.push(`/workspace/${workspaceId}/${graph.id}`) } },
-    )
-  }, [newAgentName, createAgentMode, createAgentMutation, generateRandomColor, router, workspaceId])
-
-  const handleToggleFolder = useCallback((folderId: string) => toggleExpanded(folderId), [toggleExpanded])
-
-  useEffect(() => {
-    if (searchQuery.trim() && folders.length > 0 && agents.length > 0) {
-      const query = searchQuery.toLowerCase().trim()
-      folders.forEach((folder) => {
-        const agentsInFolder = agents.filter((a) => a.folderId === folder.id)
-        const hasMatchingAgents = agentsInFolder.some((agent) => agent.name.toLowerCase().includes(query))
-        const folderNameMatches = folder.name.toLowerCase().includes(query)
-        if ((hasMatchingAgents || folderNameMatches) && !expandedFolders.has(folder.id)) {
-          toggleExpanded(folder.id)
-        }
-      })
-    }
-  }, [searchQuery, folders, agents, expandedFolders, toggleExpanded])
-
-  const handleRenameAgent = useCallback(
-    (agentId: string, newName: string) => updateAgentMutation.mutate({ id: agentId, name: newName }),
-    [updateAgentMutation],
-  )
-
-  const handleDeleteAgent = useCallback(
-    (agentId: string) => {
-      if (!userPermissions.canEdit) {
-        toast({ title: t('workspace.noPermission'), description: t('workspace.cannotDeleteAgent'), variant: 'destructive' })
-        return
-      }
-      const agent = agents.find((a) => a.id === agentId)
-      if (!agent) return
-      setAgentToDelete({ id: agentId, name: agent.name })
-      setDeleteAgentConfirmOpen(true)
-    },
-    [agents, userPermissions.canEdit, toast, t],
-  )
-
-  const handleConfirmDeleteAgent = useCallback(() => {
-    if (!agentToDelete) return
-    deleteAgentMutation.mutate(agentToDelete.id)
-    setDeleteAgentConfirmOpen(false)
-    setAgentToDelete(null)
-  }, [agentToDelete, deleteAgentMutation])
-
-  const handleDuplicateAgent = useCallback(
-    (agentId: string) => {
-      if (!userPermissions.canEdit) {
-        toast({ title: t('workspace.noPermission'), description: t('workspace.cannotCreateAgent'), variant: 'destructive' })
-        return
-      }
-      duplicateAgentMutation.mutate(agentId)
-    },
-    [duplicateAgentMutation, userPermissions.canEdit, toast, t],
-  )
-
-  const handleToggleCollapse = useCallback(() => setIsCollapsed(!isCollapsed), [isCollapsed, setIsCollapsed])
-
-  const handleMouseDown = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault()
-      const startX = e.clientX
-      const startWidth = sidebarWidth
-      const handleMouseMove = (e: MouseEvent) => {
-        const delta = e.clientX - startX
-        const newWidth = Math.max(MIN_SIDEBAR_WIDTH, startWidth + delta)
-        setSidebarWidth(Math.min(newWidth, window.innerWidth * 0.3))
-      }
-      const handleMouseUp = () => {
-        document.removeEventListener('mousemove', handleMouseMove)
-        document.removeEventListener('mouseup', handleMouseUp)
-      }
-      document.addEventListener('mousemove', handleMouseMove)
-      document.addEventListener('mouseup', handleMouseUp)
-    },
-    [sidebarWidth, setSidebarWidth],
-  )
-
-  const workspaceHeaderProps = {
-    activeWorkspace,
-    workspaceId,
-    workspaces: workspacesData || [],
-    isWorkspacesLoading,
-    isCreatingWorkspace: createWorkspaceMutation.isPending,
-    onWorkspaceSwitch: handleWorkspaceSwitch,
-    onCreateWorkspace: handleCreateWorkspace,
-    onToggleCollapse: handleToggleCollapse,
-    isCollapsed,
-    showCollapseButton: true as const,
-    onRenameWorkspace: handleRenameWorkspace,
-    onDeleteWorkspace: handleDeleteWorkspace,
-    onDuplicateWorkspace: handleDuplicateWorkspace,
-  }
-
-  if (isCollapsed) {
-    return (
-      <div
-        className="fixed top-[14px] z-10 max-w-[232px] rounded-lg border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 transition-all duration-300"
-        style={{ left: isAppSidebarCollapsed ? 'calc(var(--sidebar-width-collapsed) + 14px)' : 'calc(var(--sidebar-width) + 14px)' }}
-      >
-        <WorkspaceHeader {...workspaceHeaderProps} />
-      </div>
-    )
-  }
-
-  return (
-    <>
-      <aside
-        ref={sidebarRef}
-        className={cn(
-          'sidebar-container fixed inset-y-0 overflow-hidden bg-[var(--surface-2)] transition-all duration-300',
-          isCollapsed ? 'pointer-events-none z-0' : 'z-10',
-        )}
-        style={{
-          left: isCollapsed ? '-1000px' : isAppSidebarCollapsed ? 'var(--sidebar-width-collapsed)' : 'var(--sidebar-width)',
-          width: isCollapsed ? '0px' : `${sidebarWidth}px`,
-          opacity: isCollapsed ? 0 : 1,
-          visibility: isCollapsed ? 'hidden' : 'visible',
-          transition: 'left 0.3s ease, width 0.3s ease, opacity 0.3s ease',
-        }}
-        aria-label="Workspace sidebar"
-      >
-        <div className="flex h-full flex-col border-r border-[var(--border)] pt-[14px]">
-          <div className="flex-shrink-0 px-2.5">
-            <WorkspaceHeader {...workspaceHeaderProps} />
-          </div>
-
-          <div className="mx-[5px] mt-[10px]">
-            <SearchInput value={searchQuery} onValueChange={setSearchQuery} placeholder={t('workspace.searchAgents')} />
-          </div>
-
-          <div className="relative mt-[14px] flex flex-1 flex-col overflow-hidden">
-            <div className="flex flex-shrink-0 items-center justify-between px-2.5">
-              <span className="text-sm font-medium text-[var(--text-tertiary)]">{t('workspace.agents')}</span>
-              <div className="flex items-center gap-2">
-                <TooltipProvider delayDuration={100}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        className={`rounded-sm p-0.5 transition-colors ${createFolderMutation.isPending || !userPermissions.canEdit ? 'cursor-not-allowed opacity-50' : 'hover:bg-[var(--surface-5)]'}`}
-                        onClick={() => handleCreateFolder()}
-                        disabled={createFolderMutation.isPending}
-                      >
-                        <FolderPlus className="h-3.5 w-3.5 text-[var(--text-secondary)]" />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-                      {t('workspace.createFolder')}
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-                <TooltipProvider delayDuration={100}>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <button
-                        type="button"
-                        className={`rounded-sm border border-[var(--border)] p-0.5 transition-colors ${createAgentMutation.isPending || !userPermissions.canEdit ? 'cursor-not-allowed opacity-50' : 'hover:bg-[var(--surface-5)]'}`}
-                        onClick={handleCreateAgent}
-                        disabled={createAgentMutation.isPending}
-                      >
-                        <Plus className="h-3.5 w-3.5 text-[var(--text-secondary)]" />
-                      </button>
-                    </TooltipTrigger>
-                    <TooltipContent side="bottom" sideOffset={4} className="rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 text-sm font-medium text-[var(--text-primary)] shadow-lg">
-                      {t('workspace.createAgent')}
-                    </TooltipContent>
-                  </Tooltip>
-                </TooltipProvider>
-              </div>
-            </div>
-
-            <div ref={scrollContainerRef} className="mt-[8px] flex-1 overflow-y-auto overflow-x-hidden px-[5px]">
-              <AgentList
-                regularAgents={agents}
-                folders={folders}
-                isLoading={isFoldersLoading || isAgentsLoading}
-                searchQuery={searchQuery}
-                onToggleFolder={handleToggleFolder}
-                onRenameFolder={handleRenameFolder}
-                onDeleteFolder={handleDeleteFolder}
-                onMoveAgentToFolder={handleMoveAgentToFolder}
-                onCreateSubfolder={handleCreateFolder}
-                onDuplicateFolder={handleDuplicateFolder}
-                maxFolderDepth={MAX_FOLDER_DEPTH}
-                onRenameAgent={handleRenameAgent}
-                onDeleteAgent={handleDeleteAgent}
-                onDuplicateAgent={handleDuplicateAgent}
-              />
-            </div>
-          </div>
-        </div>
-      </aside>
-
-      {isOnAgentPage && (
-        <div
-          className="fixed bottom-0 top-0 z-20 w-[8px] cursor-ew-resize"
-          style={{ left: `calc(${isAppSidebarCollapsed ? 'var(--sidebar-width-collapsed)' : 'var(--sidebar-width)'} + ${sidebarWidth - 4}px)` }}
-          onMouseDown={handleMouseDown}
-          role="separator"
-          aria-orientation="vertical"
-          aria-label="Resize sidebar"
-        />
-      )}
-
-      <DeleteAgentDialog
-        open={deleteAgentConfirmOpen}
-        onOpenChange={setDeleteAgentConfirmOpen}
-        agentToDelete={agentToDelete}
-        onConfirm={handleConfirmDeleteAgent}
-        onCancel={() => { setDeleteAgentConfirmOpen(false); setAgentToDelete(null) }}
-      />
-
-      <CreateAgentDialog
-        open={showCreateDialog}
-        onOpenChange={setShowCreateDialog}
-        newAgentName={newAgentName}
-        setNewAgentName={setNewAgentName}
-        createAgentMode={createAgentMode}
-        setCreateAgentMode={setCreateAgentMode}
-        onConfirm={handleConfirmCreateAgent}
-      />
-    </>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/layout.tsx b/frontend/app/workspace/[workspaceId]/layout.tsx
deleted file mode 100644
index 2c4943755..000000000
--- a/frontend/app/workspace/[workspaceId]/layout.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-'use client'
-
-import { useSidebarStore } from '@/stores/sidebar/store'
-
-import { Sidebar } from './components/sidebar/sidebar'
-import { GlobalCommandsProvider } from './providers/global-commands-provider'
-import { WorkspacePermissionsProvider } from './providers/workspace-permissions-provider'
-
-/**
- * Workspace Detail Layout
- *
- * Provides workspace-level functionality:
- * - GlobalCommandsProvider: workspace global commands (keyboard shortcuts)
- * - Sidebar: workspace navigation and agent management
- *
- * Layout structure:
- * - AppSidebar (fixed 140px) is rendered in AppShell
- * - Workspace Sidebar is fixed at left-[140px] position (adjustable width)
- * - Main content area occupies remaining space, left margin adapts to Workspace Sidebar state
- *
- * Note:
- * - SocketProvider and Tooltip.Provider are provided in parent layout
- * - AppSidebar (global navigation) is rendered in root layout's AppShell, fixed width
- * - Workspace Sidebar uses fixed positioning, fixed to the right of AppSidebar
- */
-export default function WorkspaceLayout({ children }: { children: React.ReactNode }) {
-  const workspaceSidebarWidth = useSidebarStore((state) => state.sidebarWidth)
-  const isWorkspaceSidebarCollapsed = useSidebarStore((state) => state.isCollapsed)
-
-  // Calculate workspace sidebar width for content margin
-  // Only account for workspace sidebar, not AppSidebar (handled by AppShell)
-  const contentMarginLeft = isWorkspaceSidebarCollapsed ? 0 : workspaceSidebarWidth
-
-  return (
-    <WorkspacePermissionsProvider>
-      <GlobalCommandsProvider>
-        <Sidebar />
-        <div
-          className="h-full flex-1 overflow-hidden transition-all duration-300"
-          style={{ marginLeft: `${contentMarginLeft}px` }}
-        >
-          {children}
-        </div>
-      </GlobalCommandsProvider>
-    </WorkspacePermissionsProvider>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/page.tsx b/frontend/app/workspace/[workspaceId]/page.tsx
deleted file mode 100644
index 423e72e4d..000000000
--- a/frontend/app/workspace/[workspaceId]/page.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-'use client'
-
-import { useQueryClient } from '@tanstack/react-query'
-import { Loader2 } from 'lucide-react'
-import { useParams, useRouter } from 'next/navigation'
-import { useEffect, useState } from 'react'
-
-import { useGraphs, graphKeys } from '@/hooks/queries/graphs'
-import { useTranslation } from '@/lib/i18n'
-import { createLogger } from '@/lib/logs/console/logger'
-
-import { agentService } from './[agentId]/services/agentService'
-
-const logger = createLogger('WorkspaceDetailPage')
-
-/**
- * Workspace Details Page - Redirect to first agent/graph
- *
- * Route structure:
- * - Current page: /workspace/[workspaceId]
- * - Redirects to: /workspace/[workspaceId]/[agentId]
- */
-export default function WorkspaceDetailPage() {
-  const { t } = useTranslation()
-  const router = useRouter()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-  const queryClient = useQueryClient()
-  const [hasAttemptedRedirect, setHasAttemptedRedirect] = useState(false)
-  const [isCreating, setIsCreating] = useState(false)
-
-  // Use React Query hook to get graph list (shared cache)
-  const { data: graphs = [], isLoading } = useGraphs(workspaceId)
-
-  useEffect(() => {
-    if (hasAttemptedRedirect || isLoading) {
-      return
-    }
-
-    if (graphs.length > 0 && graphs[0].id) {
-      const firstGraph = graphs[0]
-      logger.info('Redirecting to first graph', { workspaceId, graphId: firstGraph.id })
-      setHasAttemptedRedirect(true)
-      router.replace(`/workspace/${workspaceId}/${firstGraph.id}`)
-    } else {
-      // Workspace is empty, automatically create default graph
-      const createDefaultGraph = async () => {
-        if (isCreating) return
-        setIsCreating(true)
-        try {
-          logger.info('Workspace is empty, creating default graph', { workspaceId })
-
-          // Use agentService to create new graph
-          const graphName = t('workspace.defaultGraphName')
-          const graph = await agentService.createGraph({
-            name: graphName,
-            description: t('workspace.defaultGraphDescription'),
-            color: '',
-            workspaceId: workspaceId,
-          })
-
-          const graphId = graph.id
-          logger.info('Graph created', { graphId })
-
-          // Save graph state (empty graph)
-          await agentService.saveGraphState({
-            graphId,
-            nodes: [],
-            edges: [],
-            viewport: { x: 0, y: 0, zoom: 1 },
-          })
-
-          logger.info('Default graph created and saved', { graphId })
-
-          // Refresh sidebar graph list (invalidate React Query cache)
-          await queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-
-          // Redirect to newly created graph
-          setHasAttemptedRedirect(true)
-          router.replace(`/workspace/${workspaceId}/${graphId}`)
-        } catch (error) {
-          logger.error('Failed to create default graph', { error })
-          setHasAttemptedRedirect(true)
-        } finally {
-          setIsCreating(false)
-        }
-      }
-
-      createDefaultGraph()
-    }
-  }, [graphs, workspaceId, router, hasAttemptedRedirect, isLoading, isCreating, t, queryClient])
-
-  // Show loading state
-  if (isLoading || isCreating) {
-    return (
-      <div className="flex h-full items-center justify-center">
-        <div className="text-center">
-          <Loader2 className="mx-auto h-8 w-8 animate-spin text-muted-foreground" />
-          <p className="mt-4 text-sm text-muted-foreground">
-            {isCreating ? t('workspace.creatingDefaultGraph') : t('workspace.loadingAgents')}
-          </p>
-        </div>
-      </div>
-    )
-  }
-
-  // Show loading while redirecting
-  return (
-    <div className="flex h-full items-center justify-center">
-      <div className="text-center">
-        <Loader2 className="mx-auto h-8 w-8 animate-spin text-muted-foreground" />
-        <p className="mt-4 text-sm text-muted-foreground">{t('workspace.redirecting')}</p>
-      </div>
-    </div>
-  )
-}
diff --git a/frontend/app/workspace/[workspaceId]/providers/global-commands-provider.tsx b/frontend/app/workspace/[workspaceId]/providers/global-commands-provider.tsx
deleted file mode 100644
index 4ce5a8c2e..000000000
--- a/frontend/app/workspace/[workspaceId]/providers/global-commands-provider.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-'use client'
-
-import { useRouter } from 'next/navigation'
-import {
-  createContext,
-  type ReactNode,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-} from 'react'
-
-import { createLogger } from '@/lib/logs/console/logger'
-import { generateUUID } from '@/lib/utils/uuid'
-
-const logger = createLogger('GlobalCommands')
-
-/**
- * Detects if the current platform is macOS.
- *
- * @returns True if running on macOS, false otherwise
- */
-function isMacPlatform(): boolean {
-  if (typeof window === 'undefined') return false
-  return (
-    /Mac|iPhone|iPod|iPad/i.test(navigator.platform) ||
-    /Mac|iPhone|iPod|iPad/i.test(navigator.userAgent)
-  )
-}
-
-/**
- * Represents a parsed keyboard shortcut.
- *
- * We support the following modifiers:
- * - Mod: maps to Meta on macOS, Ctrl on other platforms
- * - Ctrl, Meta, Shift, Alt
- *
- * Examples:
- * - "Mod+A"
- * - "Mod+Shift+T"
- * - "Meta+K"
- */
-export interface ParsedShortcut {
-  key: string
-  mod?: boolean
-  ctrl?: boolean
-  meta?: boolean
-  shift?: boolean
-  alt?: boolean
-}
-
-/**
- * Declarative command registration.
- */
-export interface GlobalCommand {
-  /** Unique id for the command. If omitted, one is generated. */
-  id?: string
-  /** Shortcut string in the form "Mod+Shift+T", "Mod+A", "Meta+K", etc. */
-  shortcut: string
-  /**
-   * Whether to allow the command to run inside editable elements like inputs,
-   * textareas or contenteditable. Defaults to true to ensure browser defaults
-   * are overridden when desired.
-   */
-  allowInEditable?: boolean
-  /**
-   * Handler invoked when the shortcut is matched. Use this to trigger actions
-   * like navigation or dispatching application events.
-   */
-  handler: (event: KeyboardEvent) => void
-}
-
-interface RegistryCommand extends GlobalCommand {
-  id: string
-  parsed: ParsedShortcut
-}
-
-interface GlobalCommandsContextValue {
-  register: (commands: GlobalCommand[]) => () => void
-}
-
-const GlobalCommandsContext = createContext<GlobalCommandsContextValue | null>(null)
-
-/**
- * Parses a human-readable shortcut into a structured representation.
- */
-function parseShortcut(shortcut: string): ParsedShortcut {
-  const parts = shortcut.split('+').map((p) => p.trim())
-  const modifiers = new Set(parts.slice(0, -1).map((p) => p.toLowerCase()))
-  const last = parts[parts.length - 1]
-
-  return {
-    key: last.length === 1 ? last.toLowerCase() : last, // keep non-letter keys verbatim
-    mod: modifiers.has('mod'),
-    ctrl: modifiers.has('ctrl'),
-    meta: modifiers.has('meta') || modifiers.has('cmd') || modifiers.has('command'),
-    shift: modifiers.has('shift'),
-    alt: modifiers.has('alt') || modifiers.has('option'),
-  }
-}
-
-/**
- * Checks if a KeyboardEvent matches a parsed shortcut, honoring platform-specific
- * interpretation of "Mod" (Meta on macOS, Ctrl elsewhere).
- */
-function matchesShortcut(e: KeyboardEvent, parsed: ParsedShortcut): boolean {
-  const isMac = isMacPlatform()
-  const expectedCtrl = parsed.ctrl || (parsed.mod ? !isMac : false)
-  const expectedMeta = parsed.meta || (parsed.mod ? isMac : false)
-
-  // Normalize key for comparison: for letters compare lowercase
-  const eventKey = e.key.length === 1 ? e.key.toLowerCase() : e.key
-
-  return (
-    eventKey === parsed.key &&
-    !!e.ctrlKey === !!expectedCtrl &&
-    !!e.metaKey === !!expectedMeta &&
-    !!e.shiftKey === !!parsed.shift &&
-    !!e.altKey === !!parsed.alt
-  )
-}
-
-/**
- * Provider that captures global keyboard shortcuts and routes them to
- * registered commands. Commands can be registered from any descendant component.
- */
-export function GlobalCommandsProvider({ children }: { children: ReactNode }) {
-  const registryRef = useRef<Map<string, RegistryCommand>>(new Map())
-  const isMac = useMemo(() => isMacPlatform(), [])
-  const router = useRouter()
-
-  const register = useCallback((commands: GlobalCommand[]) => {
-    const createdIds: string[] = []
-    for (const cmd of commands) {
-      const id = cmd.id ?? generateUUID()
-      const parsed = parseShortcut(cmd.shortcut)
-      registryRef.current.set(id, {
-        ...cmd,
-        id,
-        parsed,
-        allowInEditable: cmd.allowInEditable ?? true,
-      })
-      createdIds.push(id)
-      logger.info('Registered global command', { id, shortcut: cmd.shortcut })
-    }
-
-    return () => {
-      for (const id of createdIds) {
-        registryRef.current.delete(id)
-        logger.info('Unregistered global command', { id })
-      }
-    }
-  }, [])
-
-  useEffect(() => {
-    const onKeyDown = (e: KeyboardEvent) => {
-      if (e.isComposing) return
-
-      // Evaluate matches in registration order (latest registration wins naturally
-      // due to replacement on same id). Break on first match.
-      for (const [, cmd] of registryRef.current) {
-        if (!cmd.allowInEditable) {
-          const ae = document.activeElement
-          const isEditable =
-            ae instanceof HTMLInputElement ||
-            ae instanceof HTMLTextAreaElement ||
-            ae?.hasAttribute('contenteditable')
-          if (isEditable) continue
-        }
-
-        if (matchesShortcut(e, cmd.parsed)) {
-          // Always override default browser behavior for matched commands.
-          e.preventDefault()
-          e.stopPropagation()
-          logger.info('Executing global command', {
-            id: cmd.id,
-            shortcut: cmd.shortcut,
-            key: e.key,
-            isMac,
-            path: typeof window !== 'undefined' ? window.location.pathname : undefined,
-          })
-          try {
-            cmd.handler(e)
-          } catch (err) {
-            logger.error('Global command handler threw', { id: cmd.id, err })
-          }
-          return
-        }
-      }
-    }
-
-    window.addEventListener('keydown', onKeyDown, { capture: true })
-    return () => window.removeEventListener('keydown', onKeyDown, { capture: true })
-  }, [isMac, router])
-
-  const value = useMemo<GlobalCommandsContextValue>(() => ({ register }), [register])
-
-  return <GlobalCommandsContext.Provider value={value}>{children}</GlobalCommandsContext.Provider>
-}
-
-/**
- * Registers a set of global commands for the lifetime of the component.
- *
- * Returns nothing; cleanup is automatic on unmount.
- */
-export function useRegisterGlobalCommands(commands: GlobalCommand[] | (() => GlobalCommand[])) {
-  const ctx = useContext(GlobalCommandsContext)
-  if (!ctx) {
-    throw new Error('useRegisterGlobalCommands must be used within GlobalCommandsProvider')
-  }
-
-  useEffect(() => {
-    const list = typeof commands === 'function' ? commands() : commands
-    const unregister = ctx.register(list)
-    return unregister
-    // We intentionally want to register once for the given commands
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-}
diff --git a/frontend/app/workspace/layout.tsx b/frontend/app/workspace/layout.tsx
deleted file mode 100644
index 06d8440fb..000000000
--- a/frontend/app/workspace/layout.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client'
-
-import { TooltipProvider } from '@/components/ui/tooltip'
-
-interface WorkspaceRootLayoutProps {
-  children: React.ReactNode
-}
-export default function WorkspaceRootLayout({ children }: WorkspaceRootLayoutProps) {
-  return (
-    <TooltipProvider delayDuration={600} skipDelayDuration={0}>
-      {children}
-    </TooltipProvider>
-  )
-}
diff --git a/frontend/app/workspace/page.tsx b/frontend/app/workspace/page.tsx
deleted file mode 100644
index 2fff1b3ee..000000000
--- a/frontend/app/workspace/page.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-'use client'
-
-import { Loader2 } from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import { useEffect } from 'react'
-
-import { useWorkspaces } from '@/hooks/queries/workspaces'
-import { useSession } from '@/lib/auth/auth-client'
-import { createLogger } from '@/lib/logs/console/logger'
-
-const logger = createLogger('WorkspacePage')
-
-/**
- * Workspace Index Page
- *
- * Features:
- * 1. Get user's workspace list
- * 2. If no workspace exists, automatically create default workspace
- * 3. Redirect to first workspace
- *
- * Note: Authentication is handled by AuthGuard, no need to check again here
- */
-export default function WorkspacePage() {
-  const router = useRouter()
-  const { data: session, isPending: isSessionPending } = useSession()
-
-  // Use React Query hook to get workspace list (shared cache)
-  const { data: workspaces = [], isLoading: isWorkspacesLoading } = useWorkspaces()
-
-  useEffect(() => {
-    // Wait for both session and workspaces to finish loading
-    if (isSessionPending || isWorkspacesLoading) {
-      return
-    }
-
-    // Ensure redirect happens on the correct path
-    if (typeof window !== 'undefined' && window.location.pathname === '/workspace') {
-      if (workspaces.length === 0) {
-        logger.error(
-          'No workspaces found for user, personal space should have been created on login',
-        )
-        router.replace('/')
-        return
-      }
-
-      // Redirect to first workspace (usually personal space)
-      const firstWorkspace = workspaces[0]
-      logger.info(`Redirecting to first workspace: ${firstWorkspace.id}`)
-      router.replace(`/workspace/${firstWorkspace.id}`)
-    }
-  }, [session, isSessionPending, isWorkspacesLoading, workspaces, router])
-
-  if (isSessionPending || isWorkspacesLoading) {
-    return (
-      <div className="flex h-screen w-full items-center justify-center">
-        <div className="flex flex-col items-center justify-center text-center align-middle">
-          <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
-        </div>
-      </div>
-    )
-  }
-
-  return null
-}
diff --git a/frontend/bun.lock b/frontend/bun.lock
index c5556a9d5..f0d6fd1ed 100644
--- a/frontend/bun.lock
+++ b/frontend/bun.lock
@@ -5,10 +5,6 @@
     "": {
       "name": "joysafeter-frontend",
       "dependencies": {
-        "@azure/communication-email": "^1.1.0",
-        "@better-auth/sso": "^1.4.7",
-        "@better-auth/stripe": "^1.4.7",
-        "@cerebras/cerebras_cloud_sdk": "^1.59.0",
         "@codemirror/lang-python": "^6.1.6",
         "@codemirror/lint": "^6.8.4",
         "@codemirror/view": "^6.36.5",
@@ -16,7 +12,6 @@
         "@dnd-kit/sortable": "^8.0.0",
         "@dnd-kit/utilities": "^3.2.2",
         "@hookform/resolvers": "^4.1.3",
-        "@mistralai/mistralai": "^1.10.0",
         "@radix-ui/react-alert-dialog": "^1.1.15",
         "@radix-ui/react-avatar": "^1.1.11",
         "@radix-ui/react-checkbox": "^1.3.3",
@@ -40,25 +35,21 @@
         "@radix-ui/react-tooltip": "^1.2.8",
         "@t3-oss/env-nextjs": "^0.13.8",
         "@tanstack/react-query": "^5.90.12",
+        "@tanstack/react-table": "^8.21.3",
         "@tanstack/react-virtual": "^3.11.1",
         "@types/dompurify": "^3.0.5",
         "@types/markdown-it": "^14.1.2",
         "@types/prismjs": "^1.26.6",
-        "@types/react-window": "^2.0.0",
         "@uiw/codemirror-theme-vscode": "^4.23.7",
         "@uiw/react-codemirror": "^4.23.7",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "cmdk": "^1.1.1",
-        "cohere-ai": "^7.20.0",
         "critters": "^0.0.25",
-        "croner": "^9.1.0",
-        "cronstrue": "^3.9.0",
         "crypto-js": "^4.2.0",
         "date-fns": "4.1.0",
         "dompurify": "^3.3.1",
         "framer-motion": "^12.5.0",
-        "groq-sdk": "^0.37.0",
         "i18next": "^25.7.3",
         "i18next-browser-languagedetector": "^8.2.0",
         "input-otp": "^1.4.2",
@@ -70,20 +61,15 @@
         "next-themes": "^0.4.6",
         "prismjs": "^1.30.0",
         "react": "19.2.1",
-        "react-colorful": "^5.6.1",
         "react-dom": "19.2.1",
         "react-hook-form": "^7.54.2",
         "react-i18next": "^16.5.0",
         "react-markdown": "^10.1.0",
         "react-resizable-panels": "^3.0.6",
-        "react-simple-code-editor": "^0.14.1",
         "react-syntax-highlighter": "^16.1.0",
-        "react-window": "^2.2.3",
         "reactflow": "^11.11.4",
         "recharts": "^3.8.1",
         "remark-gfm": "^4.0.1",
-        "resend": "^6.6.0",
-        "serializer": "^0.0.3",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "zod": "^3.24.2",
@@ -122,94 +108,6 @@
 
     "@asamuzakjp/css-color": ["@asamuzakjp/css-color@3.2.0", "", { "dependencies": { "@csstools/css-calc": "^2.1.3", "@csstools/css-color-parser": "^3.0.9", "@csstools/css-parser-algorithms": "^3.0.4", "@csstools/css-tokenizer": "^3.0.3", "lru-cache": "^10.4.3" } }, "sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw=="],
 
-    "@authenio/xml-encryption": ["@authenio/xml-encryption@2.0.2", "https://registry.npmmirror.com/@authenio/xml-encryption/-/xml-encryption-2.0.2.tgz", { "dependencies": { "@xmldom/xmldom": "^0.8.6", "escape-html": "^1.0.3", "xpath": "0.0.32" } }, "sha512-cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg=="],
-
-    "@aws-crypto/sha256-browser": ["@aws-crypto/sha256-browser@5.2.0", "https://registry.npmmirror.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", { "dependencies": { "@aws-crypto/sha256-js": "^5.2.0", "@aws-crypto/supports-web-crypto": "^5.2.0", "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", "@aws-sdk/util-locate-window": "^3.0.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.6.2" } }, "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw=="],
-
-    "@aws-crypto/sha256-js": ["@aws-crypto/sha256-js@5.2.0", "https://registry.npmmirror.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", { "dependencies": { "@aws-crypto/util": "^5.2.0", "@aws-sdk/types": "^3.222.0", "tslib": "^2.6.2" } }, "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA=="],
-
-    "@aws-crypto/supports-web-crypto": ["@aws-crypto/supports-web-crypto@5.2.0", "https://registry.npmmirror.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg=="],
-
-    "@aws-crypto/util": ["@aws-crypto/util@5.2.0", "https://registry.npmmirror.com/@aws-crypto/util/-/util-5.2.0.tgz", { "dependencies": { "@aws-sdk/types": "^3.222.0", "@smithy/util-utf8": "^2.0.0", "tslib": "^2.6.2" } }, "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ=="],
-
-    "@aws-sdk/client-cognito-identity": ["@aws-sdk/client-cognito-identity@3.948.0", "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.948.0.tgz", { "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/credential-provider-node": "3.948.0", "@aws-sdk/middleware-host-header": "3.936.0", "@aws-sdk/middleware-logger": "3.936.0", "@aws-sdk/middleware-recursion-detection": "3.948.0", "@aws-sdk/middleware-user-agent": "3.947.0", "@aws-sdk/region-config-resolver": "3.936.0", "@aws-sdk/types": "3.936.0", "@aws-sdk/util-endpoints": "3.936.0", "@aws-sdk/util-user-agent-browser": "3.936.0", "@aws-sdk/util-user-agent-node": "3.947.0", "@smithy/config-resolver": "^4.4.3", "@smithy/core": "^3.18.7", "@smithy/fetch-http-handler": "^5.3.6", "@smithy/hash-node": "^4.2.5", "@smithy/invalid-dependency": "^4.2.5", "@smithy/middleware-content-length": "^4.2.5", "@smithy/middleware-endpoint": "^4.3.14", "@smithy/middleware-retry": "^4.4.14", "@smithy/middleware-serde": "^4.2.6", "@smithy/middleware-stack": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/node-http-handler": "^4.4.5", "@smithy/protocol-http": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-base64": "^4.3.0", "@smithy/util-body-length-browser": "^4.2.0", "@smithy/util-body-length-node": "^4.2.1", "@smithy/util-defaults-mode-browser": "^4.3.13", "@smithy/util-defaults-mode-node": "^4.2.16", "@smithy/util-endpoints": "^3.2.5", "@smithy/util-middleware": "^4.2.5", "@smithy/util-retry": "^4.2.5", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-xuf0zODa1zxiCDEcAW0nOsbkXHK9QnK6KFsCatSdcIsg1zIaGCui0Cg3HCm/gjoEgv+4KkEpYmzdcT5piedzxA=="],
-
-    "@aws-sdk/client-sagemaker": ["@aws-sdk/client-sagemaker@3.948.0", "https://registry.npmmirror.com/@aws-sdk/client-sagemaker/-/client-sagemaker-3.948.0.tgz", { "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/credential-provider-node": "3.948.0", "@aws-sdk/middleware-host-header": "3.936.0", "@aws-sdk/middleware-logger": "3.936.0", "@aws-sdk/middleware-recursion-detection": "3.948.0", "@aws-sdk/middleware-user-agent": "3.947.0", "@aws-sdk/region-config-resolver": "3.936.0", "@aws-sdk/types": "3.936.0", "@aws-sdk/util-endpoints": "3.936.0", "@aws-sdk/util-user-agent-browser": "3.936.0", "@aws-sdk/util-user-agent-node": "3.947.0", "@smithy/config-resolver": "^4.4.3", "@smithy/core": "^3.18.7", "@smithy/fetch-http-handler": "^5.3.6", "@smithy/hash-node": "^4.2.5", "@smithy/invalid-dependency": "^4.2.5", "@smithy/middleware-content-length": "^4.2.5", "@smithy/middleware-endpoint": "^4.3.14", "@smithy/middleware-retry": "^4.4.14", "@smithy/middleware-serde": "^4.2.6", "@smithy/middleware-stack": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/node-http-handler": "^4.4.5", "@smithy/protocol-http": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-base64": "^4.3.0", "@smithy/util-body-length-browser": "^4.2.0", "@smithy/util-body-length-node": "^4.2.1", "@smithy/util-defaults-mode-browser": "^4.3.13", "@smithy/util-defaults-mode-node": "^4.2.16", "@smithy/util-endpoints": "^3.2.5", "@smithy/util-middleware": "^4.2.5", "@smithy/util-retry": "^4.2.5", "@smithy/util-utf8": "^4.2.0", "@smithy/util-waiter": "^4.2.5", "tslib": "^2.6.2" } }, "sha512-YG7Dh21Xn16HC2U5DtN4KFA/mcNX289rT1nMmCrAOEf/buIZXVMXk0H990POWDtVnIuPqZ2K95Z96d0VveCZKA=="],
-
-    "@aws-sdk/client-sso": ["@aws-sdk/client-sso@3.948.0", "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.948.0.tgz", { "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/middleware-host-header": "3.936.0", "@aws-sdk/middleware-logger": "3.936.0", "@aws-sdk/middleware-recursion-detection": "3.948.0", "@aws-sdk/middleware-user-agent": "3.947.0", "@aws-sdk/region-config-resolver": "3.936.0", "@aws-sdk/types": "3.936.0", "@aws-sdk/util-endpoints": "3.936.0", "@aws-sdk/util-user-agent-browser": "3.936.0", "@aws-sdk/util-user-agent-node": "3.947.0", "@smithy/config-resolver": "^4.4.3", "@smithy/core": "^3.18.7", "@smithy/fetch-http-handler": "^5.3.6", "@smithy/hash-node": "^4.2.5", "@smithy/invalid-dependency": "^4.2.5", "@smithy/middleware-content-length": "^4.2.5", "@smithy/middleware-endpoint": "^4.3.14", "@smithy/middleware-retry": "^4.4.14", "@smithy/middleware-serde": "^4.2.6", "@smithy/middleware-stack": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/node-http-handler": "^4.4.5", "@smithy/protocol-http": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-base64": "^4.3.0", "@smithy/util-body-length-browser": "^4.2.0", "@smithy/util-body-length-node": "^4.2.1", "@smithy/util-defaults-mode-browser": "^4.3.13", "@smithy/util-defaults-mode-node": "^4.2.16", "@smithy/util-endpoints": "^3.2.5", "@smithy/util-middleware": "^4.2.5", "@smithy/util-retry": "^4.2.5", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-iWjchXy8bIAVBUsKnbfKYXRwhLgRg3EqCQ5FTr3JbR+QR75rZm4ZOYXlvHGztVTmtAZ+PQVA1Y4zO7v7N87C0A=="],
-
-    "@aws-sdk/core": ["@aws-sdk/core@3.947.0", "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.947.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@aws-sdk/xml-builder": "3.930.0", "@smithy/core": "^3.18.7", "@smithy/node-config-provider": "^4.3.5", "@smithy/property-provider": "^4.2.5", "@smithy/protocol-http": "^5.3.5", "@smithy/signature-v4": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/util-base64": "^4.3.0", "@smithy/util-middleware": "^4.2.5", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-Khq4zHhuAkvCFuFbgcy3GrZTzfSX7ZIjIcW1zRDxXRLZKRtuhnZdonqTUfaWi5K42/4OmxkYNpsO7X7trQOeHw=="],
-
-    "@aws-sdk/credential-provider-cognito-identity": ["@aws-sdk/credential-provider-cognito-identity@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.948.0.tgz", { "dependencies": { "@aws-sdk/client-cognito-identity": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-qWzS4aJj09sHJ4ZPLP3UCgV2HJsqFRNtseoDlvmns8uKq4ShaqMoqJrN6A9QTZT7lEBjPFsfVV4Z7Eh6a0g3+g=="],
-
-    "@aws-sdk/credential-provider-env": ["@aws-sdk/credential-provider-env@3.947.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.947.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-VR2V6dRELmzwAsCpK4GqxUi6UW5WNhAXS9F9AzWi5jvijwJo3nH92YNJUP4quMpgFZxJHEWyXLWgPjh9u0zYOA=="],
-
-    "@aws-sdk/credential-provider-http": ["@aws-sdk/credential-provider-http@3.947.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.947.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/types": "3.936.0", "@smithy/fetch-http-handler": "^5.3.6", "@smithy/node-http-handler": "^4.4.5", "@smithy/property-provider": "^4.2.5", "@smithy/protocol-http": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/util-stream": "^4.5.6", "tslib": "^2.6.2" } }, "sha512-inF09lh9SlHj63Vmr5d+LmwPXZc2IbK8lAruhOr3KLsZAIHEgHgGPXWDC2ukTEMzg0pkexQ6FOhXXad6klK4RA=="],
-
-    "@aws-sdk/credential-provider-ini": ["@aws-sdk/credential-provider-ini@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.948.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/credential-provider-env": "3.947.0", "@aws-sdk/credential-provider-http": "3.947.0", "@aws-sdk/credential-provider-login": "3.948.0", "@aws-sdk/credential-provider-process": "3.947.0", "@aws-sdk/credential-provider-sso": "3.948.0", "@aws-sdk/credential-provider-web-identity": "3.948.0", "@aws-sdk/nested-clients": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/credential-provider-imds": "^4.2.5", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-Cl//Qh88e8HBL7yYkJNpF5eq76IO6rq8GsatKcfVBm7RFVxCqYEPSSBtkHdbtNwQdRQqAMXc6E/lEB/CZUDxnA=="],
-
-    "@aws-sdk/credential-provider-login": ["@aws-sdk/credential-provider-login@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.948.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/nested-clients": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/protocol-http": "^5.3.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-gcKO2b6eeTuZGp3Vvgr/9OxajMrD3W+FZ2FCyJox363ZgMoYJsyNid1vuZrEuAGkx0jvveLXfwiVS0UXyPkgtw=="],
-
-    "@aws-sdk/credential-provider-node": ["@aws-sdk/credential-provider-node@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.948.0.tgz", { "dependencies": { "@aws-sdk/credential-provider-env": "3.947.0", "@aws-sdk/credential-provider-http": "3.947.0", "@aws-sdk/credential-provider-ini": "3.948.0", "@aws-sdk/credential-provider-process": "3.947.0", "@aws-sdk/credential-provider-sso": "3.948.0", "@aws-sdk/credential-provider-web-identity": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/credential-provider-imds": "^4.2.5", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-ep5vRLnrRdcsP17Ef31sNN4g8Nqk/4JBydcUJuFRbGuyQtrZZrVT81UeH2xhz6d0BK6ejafDB9+ZpBjXuWT5/Q=="],
-
-    "@aws-sdk/credential-provider-process": ["@aws-sdk/credential-provider-process@3.947.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.947.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-WpanFbHe08SP1hAJNeDdBDVz9SGgMu/gc0XJ9u3uNpW99nKZjDpvPRAdW7WLA4K6essMjxWkguIGNOpij6Do2Q=="],
-
-    "@aws-sdk/credential-provider-sso": ["@aws-sdk/credential-provider-sso@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.948.0.tgz", { "dependencies": { "@aws-sdk/client-sso": "3.948.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/token-providers": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-gqLhX1L+zb/ZDnnYbILQqJ46j735StfWV5PbDjxRzBKS7GzsiYoaf6MyHseEopmWrez5zl5l6aWzig7UpzSeQQ=="],
-
-    "@aws-sdk/credential-provider-web-identity": ["@aws-sdk/credential-provider-web-identity@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.948.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/nested-clients": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-MvYQlXVoJyfF3/SmnNzOVEtANRAiJIObEUYYyjTqKZTmcRIVVky0tPuG26XnB8LmTYgtESwJIZJj/Eyyc9WURQ=="],
-
-    "@aws-sdk/credential-providers": ["@aws-sdk/credential-providers@3.948.0", "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.948.0.tgz", { "dependencies": { "@aws-sdk/client-cognito-identity": "3.948.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/credential-provider-cognito-identity": "3.948.0", "@aws-sdk/credential-provider-env": "3.947.0", "@aws-sdk/credential-provider-http": "3.947.0", "@aws-sdk/credential-provider-ini": "3.948.0", "@aws-sdk/credential-provider-login": "3.948.0", "@aws-sdk/credential-provider-node": "3.948.0", "@aws-sdk/credential-provider-process": "3.947.0", "@aws-sdk/credential-provider-sso": "3.948.0", "@aws-sdk/credential-provider-web-identity": "3.948.0", "@aws-sdk/nested-clients": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/config-resolver": "^4.4.3", "@smithy/core": "^3.18.7", "@smithy/credential-provider-imds": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/property-provider": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-puFIZzSxByrTS7Ffn+zIjxlyfI0ELjjwvISVUTAZPmH5Jl95S39+A+8MOOALtFQcxLO7UEIiJFJIIkNENK+60w=="],
-
-    "@aws-sdk/middleware-host-header": ["@aws-sdk/middleware-host-header@3.936.0", "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.936.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-tAaObaAnsP1XnLGndfkGWFuzrJYuk9W0b/nLvol66t8FZExIAf/WdkT2NNAWOYxljVs++oHnyHBCxIlaHrzSiw=="],
-
-    "@aws-sdk/middleware-logger": ["@aws-sdk/middleware-logger@3.936.0", "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.936.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-aPSJ12d3a3Ea5nyEnLbijCaaYJT2QjQ9iW+zGh5QcZYXmOGWbKVyPSxmVOboZQG+c1M8t6d2O7tqrwzIq8L8qw=="],
-
-    "@aws-sdk/middleware-recursion-detection": ["@aws-sdk/middleware-recursion-detection@3.948.0", "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.948.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@aws/lambda-invoke-store": "^0.2.2", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-Qa8Zj+EAqA0VlAVvxpRnpBpIWJI9KUwaioY1vkeNVwXPlNaz9y9zCKVM9iU9OZ5HXpoUg6TnhATAHXHAE8+QsQ=="],
-
-    "@aws-sdk/middleware-user-agent": ["@aws-sdk/middleware-user-agent@3.947.0", "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.947.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/types": "3.936.0", "@aws-sdk/util-endpoints": "3.936.0", "@smithy/core": "^3.18.7", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-7rpKV8YNgCP2R4F9RjWZFcD2R+SO/0R4VHIbY9iZJdH2MzzJ8ZG7h8dZ2m8QkQd1fjx4wrFJGGPJUTYXPV3baA=="],
-
-    "@aws-sdk/nested-clients": ["@aws-sdk/nested-clients@3.948.0", "https://registry.npmmirror.com/@aws-sdk/nested-clients/-/nested-clients-3.948.0.tgz", { "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", "@aws-sdk/core": "3.947.0", "@aws-sdk/middleware-host-header": "3.936.0", "@aws-sdk/middleware-logger": "3.936.0", "@aws-sdk/middleware-recursion-detection": "3.948.0", "@aws-sdk/middleware-user-agent": "3.947.0", "@aws-sdk/region-config-resolver": "3.936.0", "@aws-sdk/types": "3.936.0", "@aws-sdk/util-endpoints": "3.936.0", "@aws-sdk/util-user-agent-browser": "3.936.0", "@aws-sdk/util-user-agent-node": "3.947.0", "@smithy/config-resolver": "^4.4.3", "@smithy/core": "^3.18.7", "@smithy/fetch-http-handler": "^5.3.6", "@smithy/hash-node": "^4.2.5", "@smithy/invalid-dependency": "^4.2.5", "@smithy/middleware-content-length": "^4.2.5", "@smithy/middleware-endpoint": "^4.3.14", "@smithy/middleware-retry": "^4.4.14", "@smithy/middleware-serde": "^4.2.6", "@smithy/middleware-stack": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/node-http-handler": "^4.4.5", "@smithy/protocol-http": "^5.3.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-base64": "^4.3.0", "@smithy/util-body-length-browser": "^4.2.0", "@smithy/util-body-length-node": "^4.2.1", "@smithy/util-defaults-mode-browser": "^4.3.13", "@smithy/util-defaults-mode-node": "^4.2.16", "@smithy/util-endpoints": "^3.2.5", "@smithy/util-middleware": "^4.2.5", "@smithy/util-retry": "^4.2.5", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-zcbJfBsB6h254o3NuoEkf0+UY1GpE9ioiQdENWv7odo69s8iaGBEQ4BDpsIMqcuiiUXw1uKIVNxCB1gUGYz8lw=="],
-
-    "@aws-sdk/region-config-resolver": ["@aws-sdk/region-config-resolver@3.936.0", "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.936.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@smithy/config-resolver": "^4.4.3", "@smithy/node-config-provider": "^4.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-wOKhzzWsshXGduxO4pqSiNyL9oUtk4BEvjWm9aaq6Hmfdoydq6v6t0rAGHWPjFwy9z2haovGRi3C8IxdMB4muw=="],
-
-    "@aws-sdk/token-providers": ["@aws-sdk/token-providers@3.948.0", "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.948.0.tgz", { "dependencies": { "@aws-sdk/core": "3.947.0", "@aws-sdk/nested-clients": "3.948.0", "@aws-sdk/types": "3.936.0", "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-V487/kM4Teq5dcr1t5K6eoUKuqlGr9FRWL3MIMukMERJXHZvio6kox60FZ/YtciRHRI75u14YUqm2Dzddcu3+A=="],
-
-    "@aws-sdk/types": ["@aws-sdk/types@3.936.0", "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.936.0.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-uz0/VlMd2pP5MepdrHizd+T+OKfyK4r3OA9JI+L/lPKg0YFQosdJNCKisr6o70E3dh8iMpFYxF1UN/4uZsyARg=="],
-
-    "@aws-sdk/util-endpoints": ["@aws-sdk/util-endpoints@3.936.0", "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.936.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-endpoints": "^3.2.5", "tslib": "^2.6.2" } }, "sha512-0Zx3Ntdpu+z9Wlm7JKUBOzS9EunwKAb4KdGUQQxDqh5Lc3ta5uBoub+FgmVuzwnmBu9U1Os8UuwVTH0Lgu+P5w=="],
-
-    "@aws-sdk/util-locate-window": ["@aws-sdk/util-locate-window@3.893.0", "https://registry.npmmirror.com/@aws-sdk/util-locate-window/-/util-locate-window-3.893.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg=="],
-
-    "@aws-sdk/util-user-agent-browser": ["@aws-sdk/util-user-agent-browser@3.936.0", "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.936.0.tgz", { "dependencies": { "@aws-sdk/types": "3.936.0", "@smithy/types": "^4.9.0", "bowser": "^2.11.0", "tslib": "^2.6.2" } }, "sha512-eZ/XF6NxMtu+iCma58GRNRxSq4lHo6zHQLOZRIeL/ghqYJirqHdenMOwrzPettj60KWlv827RVebP9oNVrwZbw=="],
-
-    "@aws-sdk/util-user-agent-node": ["@aws-sdk/util-user-agent-node@3.947.0", "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.947.0.tgz", { "dependencies": { "@aws-sdk/middleware-user-agent": "3.947.0", "@aws-sdk/types": "3.936.0", "@smithy/node-config-provider": "^4.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" }, "peerDependencies": { "aws-crt": ">=1.0.0" }, "optionalPeers": ["aws-crt"] }, "sha512-+vhHoDrdbb+zerV4noQk1DHaUMNzWFWPpPYjVTwW2186k5BEJIecAMChYkghRrBVJ3KPWP1+JnZwOd72F3d4rQ=="],
-
-    "@aws-sdk/xml-builder": ["@aws-sdk/xml-builder@3.930.0", "https://registry.npmmirror.com/@aws-sdk/xml-builder/-/xml-builder-3.930.0.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "fast-xml-parser": "5.2.5", "tslib": "^2.6.2" } }, "sha512-YIfkD17GocxdmlUVc3ia52QhcWuRIUJonbF8A2CYfcWNV3HzvAqpcPeC0bYUhkK+8e8YO1ARnLKZQE0TlwzorA=="],
-
-    "@aws/lambda-invoke-store": ["@aws/lambda-invoke-store@0.2.2", "https://registry.npmmirror.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz", {}, "sha512-C0NBLsIqzDIae8HFw9YIrIBsbc0xTiOtt7fAukGPnqQ/+zZNaq+4jhuccltK0QuWHBnNm/a6kLIRA6GFiM10eg=="],
-
-    "@azure-rest/core-client": ["@azure-rest/core-client@2.5.1", "https://registry.npmmirror.com/@azure-rest/core-client/-/core-client-2.5.1.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", "@azure/core-rest-pipeline": "^1.22.0", "@azure/core-tracing": "^1.3.0", "@typespec/ts-http-runtime": "^0.3.0", "tslib": "^2.6.2" } }, "sha512-EHaOXW0RYDKS5CFffnixdyRPak5ytiCtU7uXDcP/uiY+A6jFRwNGzzJBiznkCzvi5EYpY+YWinieqHb0oY916A=="],
-
-    "@azure/abort-controller": ["@azure/abort-controller@2.1.2", "https://registry.npmmirror.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA=="],
-
-    "@azure/communication-common": ["@azure/communication-common@2.4.0", "https://registry.npmmirror.com/@azure/communication-common/-/communication-common-2.4.0.tgz", { "dependencies": { "@azure-rest/core-client": "^2.3.3", "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.9.0", "@azure/core-rest-pipeline": "^1.17.0", "@azure/core-tracing": "^1.2.0", "@azure/core-util": "^1.11.0", "events": "^3.3.0", "jwt-decode": "^4.0.0", "tslib": "^2.8.1" } }, "sha512-wwn4AoOgTgoA9OZkO34SKBpQg7/kfcABnzbaYEbc+9bCkBtwwjgMEk6xM+XLEE/uuODZ8q8jidUoNcZHQyP5AQ=="],
-
-    "@azure/communication-email": ["@azure/communication-email@1.1.0", "https://registry.npmmirror.com/@azure/communication-email/-/communication-email-1.1.0.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/communication-common": "^2.3.1", "@azure/core-auth": "^1.9.0", "@azure/core-client": "^1.9.2", "@azure/core-lro": "^2.7.2", "@azure/core-rest-pipeline": "^1.18.0", "@azure/core-util": "^1.11.0", "@azure/logger": "^1.1.4", "tslib": "^2.8.1" } }, "sha512-n9ATpXyxb4MIhEp/Vtv5BU8GdUZH0vYpm/1pKXVu9AeiQ78MG3OIaiQQ2PmQfA0XPdTx5/g+tUxkwVuD6U4u4w=="],
-
-    "@azure/core-auth": ["@azure/core-auth@1.10.1", "https://registry.npmmirror.com/@azure/core-auth/-/core-auth-1.10.1.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-util": "^1.13.0", "tslib": "^2.6.2" } }, "sha512-ykRMW8PjVAn+RS6ww5cmK9U2CyH9p4Q88YJwvUslfuMmN98w/2rdGRLPqJYObapBCdzBVeDgYWdJnFPFb7qzpg=="],
-
-    "@azure/core-client": ["@azure/core-client@1.10.1", "https://registry.npmmirror.com/@azure/core-client/-/core-client-1.10.1.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", "@azure/core-rest-pipeline": "^1.22.0", "@azure/core-tracing": "^1.3.0", "@azure/core-util": "^1.13.0", "@azure/logger": "^1.3.0", "tslib": "^2.6.2" } }, "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w=="],
-
-    "@azure/core-lro": ["@azure/core-lro@2.7.2", "https://registry.npmmirror.com/@azure/core-lro/-/core-lro-2.7.2.tgz", { "dependencies": { "@azure/abort-controller": "^2.0.0", "@azure/core-util": "^1.2.0", "@azure/logger": "^1.0.0", "tslib": "^2.6.2" } }, "sha512-0YIpccoX8m/k00O7mDDMdJpbr6mf1yWo2dfmxt5A8XVZVVMz2SSKaEbMCeJRvgQ0IaSlqhjT47p4hVIRRy90xw=="],
-
-    "@azure/core-rest-pipeline": ["@azure/core-rest-pipeline@1.22.2", "https://registry.npmmirror.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.10.0", "@azure/core-tracing": "^1.3.0", "@azure/core-util": "^1.13.0", "@azure/logger": "^1.3.0", "@typespec/ts-http-runtime": "^0.3.0", "tslib": "^2.6.2" } }, "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg=="],
-
-    "@azure/core-tracing": ["@azure/core-tracing@1.3.1", "https://registry.npmmirror.com/@azure/core-tracing/-/core-tracing-1.3.1.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-9MWKevR7Hz8kNzzPLfX4EAtGM2b8mr50HPDBvio96bURP/9C+HjdH3sBlLSNNrvRAr5/k/svoH457gB5IKpmwQ=="],
-
-    "@azure/core-util": ["@azure/core-util@1.13.1", "https://registry.npmmirror.com/@azure/core-util/-/core-util-1.13.1.tgz", { "dependencies": { "@azure/abort-controller": "^2.1.2", "@typespec/ts-http-runtime": "^0.3.0", "tslib": "^2.6.2" } }, "sha512-XPArKLzsvl0Hf0CaGyKHUyVgF7oDnhKoP85Xv6M4StF/1AhfORhZudHtOyf2s+FcbuQ9dPRAjB8J2KvRRMUK2A=="],
-
-    "@azure/logger": ["@azure/logger@1.3.0", "https://registry.npmmirror.com/@azure/logger/-/logger-1.3.0.tgz", { "dependencies": { "@typespec/ts-http-runtime": "^0.3.0", "tslib": "^2.6.2" } }, "sha512-fCqPIfOcLE+CGqGPd66c8bZpwAji98tZ4JI9i/mlTNTlsIWslCfpg48s/ypyLxZTump5sypjrKn2/kY7q8oAbA=="],
-
     "@babel/code-frame": ["@babel/code-frame@7.27.1", "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.27.1.tgz", { "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg=="],
 
     "@babel/compat-data": ["@babel/compat-data@7.28.5", "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.28.5.tgz", {}, "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA=="],
@@ -250,20 +148,6 @@
 
     "@babel/types": ["@babel/types@7.28.5", "https://registry.npmmirror.com/@babel/types/-/types-7.28.5.tgz", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA=="],
 
-    "@better-auth/core": ["@better-auth/core@1.4.7", "https://registry.npmmirror.com/@better-auth/core/-/core-1.4.7.tgz", { "dependencies": { "@standard-schema/spec": "^1.0.0", "zod": "^4.1.12" }, "peerDependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "better-call": "1.1.5", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1" } }, "sha512-rNfj8aNFwPwAMYo+ahoWDsqKrV7svD3jhHSC6+A77xxKodbgV0UgH+RO21GMaZ0PPAibEl851nw5e3bsNslW/w=="],
-
-    "@better-auth/sso": ["@better-auth/sso@1.4.7", "https://registry.npmmirror.com/@better-auth/sso/-/sso-1.4.7.tgz", { "dependencies": { "@better-fetch/fetch": "1.1.21", "fast-xml-parser": "^5.2.5", "jose": "^6.1.0", "samlify": "^2.10.1", "zod": "^4.1.12" }, "peerDependencies": { "better-auth": "1.4.7" } }, "sha512-AFhrGcUE/VqRjPzJFgwdstQtVML+noWHzZJ3cC+153FqV0c1EeWUbCXI1yt3nnGVSePgYeLNEunkSsPV6euXdg=="],
-
-    "@better-auth/stripe": ["@better-auth/stripe@1.4.7", "https://registry.npmmirror.com/@better-auth/stripe/-/stripe-1.4.7.tgz", { "dependencies": { "defu": "^6.1.4", "zod": "^4.1.12" }, "peerDependencies": { "@better-auth/core": "1.4.7", "better-auth": "1.4.7", "stripe": "^18 || ^19 || ^20" } }, "sha512-Ekvxj0HxOJ93Cma9JTos5vdJipJ20lE6sx9McYEvggvamJWR8RkbaRWN88M+HZ9074o67W9YcQMa1m15QAUezw=="],
-
-    "@better-auth/telemetry": ["@better-auth/telemetry@1.4.7", "https://registry.npmmirror.com/@better-auth/telemetry/-/telemetry-1.4.7.tgz", { "dependencies": { "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21" }, "peerDependencies": { "@better-auth/core": "1.4.7" } }, "sha512-k07C/FWnX6m+IxLruNkCweIxuaIwVTB2X40EqwamRVhYNBAhOYZFGLHH+PtQyM+Yf1Z4+8H6MugLOXSreXNAjQ=="],
-
-    "@better-auth/utils": ["@better-auth/utils@0.3.0", "https://registry.npmmirror.com/@better-auth/utils/-/utils-0.3.0.tgz", {}, "sha512-W+Adw6ZA6mgvnSnhOki270rwJ42t4XzSK6YWGF//BbVXL6SwCLWfyzBc1lN2m/4RM28KubdBKQ4X5VMoLRNPQw=="],
-
-    "@better-fetch/fetch": ["@better-fetch/fetch@1.1.21", "https://registry.npmmirror.com/@better-fetch/fetch/-/fetch-1.1.21.tgz", {}, "sha512-/ImESw0sskqlVR94jB+5+Pxjf+xBwDZF/N5+y2/q4EqD7IARUTSpPfIo8uf39SYpCxyOCtbyYpUrZ3F/k0zT4A=="],
-
-    "@cerebras/cerebras_cloud_sdk": ["@cerebras/cerebras_cloud_sdk@1.59.0", "https://registry.npmmirror.com/@cerebras/cerebras_cloud_sdk/-/cerebras_cloud_sdk-1.59.0.tgz", { "dependencies": { "@types/node": "^18.11.18", "@types/node-fetch": "^2.6.4", "abort-controller": "^3.0.0", "agentkeepalive": "^4.2.1", "form-data-encoder": "1.7.2", "formdata-node": "^4.3.2", "node-fetch": "^2.6.7" } }, "sha512-bDx86IgIb+FzbLQVUtVnjsEv7e+TDPwQkulycLNImsb9ecyIJPfpURSIyxV4pdoHZ9zMVaQy59hBqJ0zLqNK8Q=="],
-
     "@codemirror/autocomplete": ["@codemirror/autocomplete@6.20.1", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/common": "^1.0.0" } }, "sha512-1cvg3Vz1dSSToCNlJfRA2WSI4ht3K+WplO0UMOgmUYPivCyy2oueZY6Lx7M9wThm7SDUBViRmuT+OG/i8+ON9A=="],
 
     "@codemirror/commands": ["@codemirror/commands@6.10.3", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.6.0", "@codemirror/view": "^6.27.0", "@lezer/common": "^1.1.0" } }, "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q=="],
@@ -464,8 +348,6 @@
 
     "@marijn/find-cluster-break": ["@marijn/find-cluster-break@1.0.2", "", {}, "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g=="],
 
-    "@mistralai/mistralai": ["@mistralai/mistralai@1.10.0", "https://registry.npmmirror.com/@mistralai/mistralai/-/mistralai-1.10.0.tgz", { "dependencies": { "zod": "^3.20.0", "zod-to-json-schema": "^3.24.1" } }, "sha512-tdIgWs4Le8vpvPiUEWne6tK0qbVc+jMenujnvTqOjogrJUsCSQhus0tHTU1avDDh5//Rq2dFgP9mWRAdIEoBqg=="],
-
     "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@0.2.12", "https://registry.npmmirror.com/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", { "dependencies": { "@emnapi/core": "^1.4.3", "@emnapi/runtime": "^1.4.3", "@tybys/wasm-util": "^0.10.0" } }, "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ=="],
 
     "@next/env": ["@next/env@16.0.7", "https://registry.npmmirror.com/@next/env/-/env-16.0.7.tgz", {}, "sha512-gpaNgUh5nftFKRkRQGnVi5dpcYSKGcZZkQffZ172OrG/XkrnS7UBTQ648YY+8ME92cC4IojpI2LqTC8sTDhAaw=="],
@@ -490,10 +372,6 @@
 
     "@next/swc-win32-x64-msvc": ["@next/swc-win32-x64-msvc@16.0.7", "https://registry.npmmirror.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.7.tgz", { "os": "win32", "cpu": "x64" }, "sha512-gniPjy55zp5Eg0896qSrf3yB1dw4F/3s8VK1ephdsZZ129j2n6e1WqCbE2YgcKhW9hPB9TVZENugquWJD5x0ug=="],
 
-    "@noble/ciphers": ["@noble/ciphers@2.1.1", "https://registry.npmmirror.com/@noble/ciphers/-/ciphers-2.1.1.tgz", {}, "sha512-bysYuiVfhxNJuldNXlFEitTVdNnYUc+XNJZd7Qm2a5j1vZHgY+fazadNFWFaMK/2vye0JVlxV3gHmC0WDfAOQw=="],
-
-    "@noble/hashes": ["@noble/hashes@2.0.1", "https://registry.npmmirror.com/@noble/hashes/-/hashes-2.0.1.tgz", {}, "sha512-XlOlEbQcE9fmuXxrVTXCTlG2nlRXa9Rj3rr5Ue/+tX+nmkgbX720YHh0VR3hBF9xDvwnb8D2shVGOwNx+ulArw=="],
-
     "@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
 
     "@nodelib/fs.stat": ["@nodelib/fs.stat@2.0.5", "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", {}, "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="],
@@ -662,90 +540,6 @@
 
     "@rtsao/scc": ["@rtsao/scc@1.1.0", "https://registry.npmmirror.com/@rtsao/scc/-/scc-1.1.0.tgz", {}, "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="],
 
-    "@smithy/abort-controller": ["@smithy/abort-controller@4.2.5", "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-j7HwVkBw68YW8UmFRcjZOmssE77Rvk0GWAIN1oFBhsaovQmZWYCIcGa9/pwRB0ExI8Sk9MWNALTjftjHZea7VA=="],
-
-    "@smithy/config-resolver": ["@smithy/config-resolver@4.4.3", "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-4.4.3.tgz", { "dependencies": { "@smithy/node-config-provider": "^4.3.5", "@smithy/types": "^4.9.0", "@smithy/util-config-provider": "^4.2.0", "@smithy/util-endpoints": "^3.2.5", "@smithy/util-middleware": "^4.2.5", "tslib": "^2.6.2" } }, "sha512-ezHLe1tKLUxDJo2LHtDuEDyWXolw8WGOR92qb4bQdWq/zKenO5BvctZGrVJBK08zjezSk7bmbKFOXIVyChvDLw=="],
-
-    "@smithy/core": ["@smithy/core@3.18.7", "https://registry.npmmirror.com/@smithy/core/-/core-3.18.7.tgz", { "dependencies": { "@smithy/middleware-serde": "^4.2.6", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "@smithy/util-base64": "^4.3.0", "@smithy/util-body-length-browser": "^4.2.0", "@smithy/util-middleware": "^4.2.5", "@smithy/util-stream": "^4.5.6", "@smithy/util-utf8": "^4.2.0", "@smithy/uuid": "^1.1.0", "tslib": "^2.6.2" } }, "sha512-axG9MvKhMWOhFbvf5y2DuyTxQueO0dkedY9QC3mAfndLosRI/9LJv8WaL0mw7ubNhsO4IuXX9/9dYGPFvHrqlw=="],
-
-    "@smithy/credential-provider-imds": ["@smithy/credential-provider-imds@4.2.5", "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.5.tgz", { "dependencies": { "@smithy/node-config-provider": "^4.3.5", "@smithy/property-provider": "^4.2.5", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "tslib": "^2.6.2" } }, "sha512-BZwotjoZWn9+36nimwm/OLIcVe+KYRwzMjfhd4QT7QxPm9WY0HiOV8t/Wlh+HVUif0SBVV7ksq8//hPaBC/okQ=="],
-
-    "@smithy/fetch-http-handler": ["@smithy/fetch-http-handler@5.3.6", "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.6.tgz", { "dependencies": { "@smithy/protocol-http": "^5.3.5", "@smithy/querystring-builder": "^4.2.5", "@smithy/types": "^4.9.0", "@smithy/util-base64": "^4.3.0", "tslib": "^2.6.2" } }, "sha512-3+RG3EA6BBJ/ofZUeTFJA7mHfSYrZtQIrDP9dI8Lf7X6Jbos2jptuLrAAteDiFVrmbEmLSuRG/bUKzfAXk7dhg=="],
-
-    "@smithy/hash-node": ["@smithy/hash-node@4.2.5", "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "@smithy/util-buffer-from": "^4.2.0", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-DpYX914YOfA3UDT9CN1BM787PcHfWRBB43fFGCYrZFUH0Jv+5t8yYl+Pd5PW4+QzoGEDvn5d5QIO4j2HyYZQSA=="],
-
-    "@smithy/invalid-dependency": ["@smithy/invalid-dependency@4.2.5", "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-2L2erASEro1WC5nV+plwIMxrTXpvpfzl4e+Nre6vBVRR2HKeGGcvpJyyL3/PpiSg+cJG2KpTmZmq934Olb6e5A=="],
-
-    "@smithy/is-array-buffer": ["@smithy/is-array-buffer@4.2.0", "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ=="],
-
-    "@smithy/middleware-content-length": ["@smithy/middleware-content-length@4.2.5", "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.5.tgz", { "dependencies": { "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-Y/RabVa5vbl5FuHYV2vUCwvh/dqzrEY/K2yWPSqvhFUwIY0atLqO4TienjBXakoy4zrKAMCZwg+YEqmH7jaN7A=="],
-
-    "@smithy/middleware-endpoint": ["@smithy/middleware-endpoint@4.3.14", "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.14.tgz", { "dependencies": { "@smithy/core": "^3.18.7", "@smithy/middleware-serde": "^4.2.6", "@smithy/node-config-provider": "^4.3.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "@smithy/url-parser": "^4.2.5", "@smithy/util-middleware": "^4.2.5", "tslib": "^2.6.2" } }, "sha512-v0q4uTKgBM8dsqGjqsabZQyH85nFaTnFcgpWU1uydKFsdyyMzfvOkNum9G7VK+dOP01vUnoZxIeRiJ6uD0kjIg=="],
-
-    "@smithy/middleware-retry": ["@smithy/middleware-retry@4.4.14", "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-4.4.14.tgz", { "dependencies": { "@smithy/node-config-provider": "^4.3.5", "@smithy/protocol-http": "^5.3.5", "@smithy/service-error-classification": "^4.2.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "@smithy/util-middleware": "^4.2.5", "@smithy/util-retry": "^4.2.5", "@smithy/uuid": "^1.1.0", "tslib": "^2.6.2" } }, "sha512-Z2DG8Ej7FyWG1UA+7HceINtSLzswUgs2np3sZX0YBBxCt+CXG4QUxv88ZDS3+2/1ldW7LqtSY1UO/6VQ1pND8Q=="],
-
-    "@smithy/middleware-serde": ["@smithy/middleware-serde@4.2.6", "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-4.2.6.tgz", { "dependencies": { "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-VkLoE/z7e2g8pirwisLz8XJWedUSY8my/qrp81VmAdyrhi94T+riBfwP+AOEEFR9rFTSonC/5D2eWNmFabHyGQ=="],
-
-    "@smithy/middleware-stack": ["@smithy/middleware-stack@4.2.5", "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-bYrutc+neOyWxtZdbB2USbQttZN0mXaOyYLIsaTbJhFsfpXyGWUxJpEuO1rJ8IIJm2qH4+xJT0mxUSsEDTYwdQ=="],
-
-    "@smithy/node-config-provider": ["@smithy/node-config-provider@4.3.5", "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-4.3.5.tgz", { "dependencies": { "@smithy/property-provider": "^4.2.5", "@smithy/shared-ini-file-loader": "^4.4.0", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-UTurh1C4qkVCtqggI36DGbLB2Kv8UlcFdMXDcWMbqVY2uRg0XmT9Pb4Vj6oSQ34eizO1fvR0RnFV4Axw4IrrAg=="],
-
-    "@smithy/node-http-handler": ["@smithy/node-http-handler@4.4.5", "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-4.4.5.tgz", { "dependencies": { "@smithy/abort-controller": "^4.2.5", "@smithy/protocol-http": "^5.3.5", "@smithy/querystring-builder": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-CMnzM9R2WqlqXQGtIlsHMEZfXKJVTIrqCNoSd/QpAyp+Dw0a1Vps13l6ma1fH8g7zSPNsA59B/kWgeylFuA/lw=="],
-
-    "@smithy/property-provider": ["@smithy/property-provider@4.2.5", "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-8iLN1XSE1rl4MuxvQ+5OSk/Zb5El7NJZ1td6Tn+8dQQHIjp59Lwl6bd0+nzw6SKm2wSSriH2v/I9LPzUic7EOg=="],
-
-    "@smithy/protocol-http": ["@smithy/protocol-http@5.3.5", "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-5.3.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-RlaL+sA0LNMp03bf7XPbFmT5gN+w3besXSWMkA8rcmxLSVfiEXElQi4O2IWwPfxzcHkxqrwBFMbngB8yx/RvaQ=="],
-
-    "@smithy/querystring-builder": ["@smithy/querystring-builder@4.2.5", "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "@smithy/util-uri-escape": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-y98otMI1saoajeik2kLfGyRp11e5U/iJYH/wLCh3aTV/XutbGT9nziKGkgCaMD1ghK7p6htHMm6b6scl9JRUWg=="],
-
-    "@smithy/querystring-parser": ["@smithy/querystring-parser@4.2.5", "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-031WCTdPYgiQRYNPXznHXof2YM0GwL6SeaSyTH/P72M1Vz73TvCNH2Nq8Iu2IEPq9QP2yx0/nrw5YmSeAi/AjQ=="],
-
-    "@smithy/service-error-classification": ["@smithy/service-error-classification@4.2.5", "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0" } }, "sha512-8fEvK+WPE3wUAcDvqDQG1Vk3ANLR8Px979te96m84CbKAjBVf25rPYSzb4xU4hlTyho7VhOGnh5i62D/JVF0JQ=="],
-
-    "@smithy/shared-ini-file-loader": ["@smithy/shared-ini-file-loader@4.4.0", "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.0.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-5WmZ5+kJgJDjwXXIzr1vDTG+RhF9wzSODQBfkrQ2VVkYALKGvZX1lgVSxEkgicSAFnFhPj5rudJV0zoinqS0bA=="],
-
-    "@smithy/signature-v4": ["@smithy/signature-v4@5.3.5", "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-5.3.5.tgz", { "dependencies": { "@smithy/is-array-buffer": "^4.2.0", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "@smithy/util-hex-encoding": "^4.2.0", "@smithy/util-middleware": "^4.2.5", "@smithy/util-uri-escape": "^4.2.0", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w=="],
-
-    "@smithy/smithy-client": ["@smithy/smithy-client@4.9.10", "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-4.9.10.tgz", { "dependencies": { "@smithy/core": "^3.18.7", "@smithy/middleware-endpoint": "^4.3.14", "@smithy/middleware-stack": "^4.2.5", "@smithy/protocol-http": "^5.3.5", "@smithy/types": "^4.9.0", "@smithy/util-stream": "^4.5.6", "tslib": "^2.6.2" } }, "sha512-Jaoz4Jw1QYHc1EFww/E6gVtNjhoDU+gwRKqXP6C3LKYqqH2UQhP8tMP3+t/ePrhaze7fhLE8vS2q6vVxBANFTQ=="],
-
-    "@smithy/types": ["@smithy/types@4.9.0", "https://registry.npmmirror.com/@smithy/types/-/types-4.9.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-MvUbdnXDTwykR8cB1WZvNNwqoWVaTRA0RLlLmf/cIFNMM2cKWz01X4Ly6SMC4Kks30r8tT3Cty0jmeWfiuyHTA=="],
-
-    "@smithy/url-parser": ["@smithy/url-parser@4.2.5", "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-4.2.5.tgz", { "dependencies": { "@smithy/querystring-parser": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-VaxMGsilqFnK1CeBX+LXnSuaMx4sTL/6znSZh2829txWieazdVxr54HmiyTsIbpOTLcf5nYpq9lpzmwRdxj6rQ=="],
-
-    "@smithy/util-base64": ["@smithy/util-base64@4.3.0", "https://registry.npmmirror.com/@smithy/util-base64/-/util-base64-4.3.0.tgz", { "dependencies": { "@smithy/util-buffer-from": "^4.2.0", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ=="],
-
-    "@smithy/util-body-length-browser": ["@smithy/util-body-length-browser@4.2.0", "https://registry.npmmirror.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg=="],
-
-    "@smithy/util-body-length-node": ["@smithy/util-body-length-node@4.2.1", "https://registry.npmmirror.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA=="],
-
-    "@smithy/util-buffer-from": ["@smithy/util-buffer-from@4.2.0", "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz", { "dependencies": { "@smithy/is-array-buffer": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew=="],
-
-    "@smithy/util-config-provider": ["@smithy/util-config-provider@4.2.0", "https://registry.npmmirror.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q=="],
-
-    "@smithy/util-defaults-mode-browser": ["@smithy/util-defaults-mode-browser@4.3.13", "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.13.tgz", { "dependencies": { "@smithy/property-provider": "^4.2.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-hlVLdAGrVfyNei+pKIgqDTxfu/ZI2NSyqj4IDxKd5bIsIqwR/dSlkxlPaYxFiIaDVrBy0he8orsFy+Cz119XvA=="],
-
-    "@smithy/util-defaults-mode-node": ["@smithy/util-defaults-mode-node@4.2.16", "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.16.tgz", { "dependencies": { "@smithy/config-resolver": "^4.4.3", "@smithy/credential-provider-imds": "^4.2.5", "@smithy/node-config-provider": "^4.3.5", "@smithy/property-provider": "^4.2.5", "@smithy/smithy-client": "^4.9.10", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-F1t22IUiJLHrxW9W1CQ6B9PN+skZ9cqSuzB18Eh06HrJPbjsyZ7ZHecAKw80DQtyGTRcVfeukKaCRYebFwclbg=="],
-
-    "@smithy/util-endpoints": ["@smithy/util-endpoints@3.2.5", "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-3.2.5.tgz", { "dependencies": { "@smithy/node-config-provider": "^4.3.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-3O63AAWu2cSNQZp+ayl9I3NapW1p1rR5mlVHcF6hAB1dPZUQFfRPYtplWX/3xrzWthPGj5FqB12taJJCfH6s8A=="],
-
-    "@smithy/util-hex-encoding": ["@smithy/util-hex-encoding@4.2.0", "https://registry.npmmirror.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw=="],
-
-    "@smithy/util-middleware": ["@smithy/util-middleware@4.2.5", "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-4.2.5.tgz", { "dependencies": { "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-6Y3+rvBF7+PZOc40ybeZMcGln6xJGVeY60E7jy9Mv5iKpMJpHgRE6dKy9ScsVxvfAYuEX4Q9a65DQX90KaQ3bA=="],
-
-    "@smithy/util-retry": ["@smithy/util-retry@4.2.5", "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-4.2.5.tgz", { "dependencies": { "@smithy/service-error-classification": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-GBj3+EZBbN4NAqJ/7pAhsXdfzdlznOh8PydUijy6FpNIMnHPSMO2/rP4HKu+UFeikJxShERk528oy7GT79YiJg=="],
-
-    "@smithy/util-stream": ["@smithy/util-stream@4.5.6", "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-4.5.6.tgz", { "dependencies": { "@smithy/fetch-http-handler": "^5.3.6", "@smithy/node-http-handler": "^4.4.5", "@smithy/types": "^4.9.0", "@smithy/util-base64": "^4.3.0", "@smithy/util-buffer-from": "^4.2.0", "@smithy/util-hex-encoding": "^4.2.0", "@smithy/util-utf8": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-qWw/UM59TiaFrPevefOZ8CNBKbYEP6wBAIlLqxn3VAIo9rgnTNc4ASbVrqDmhuwI87usnjhdQrxodzAGFFzbRQ=="],
-
-    "@smithy/util-uri-escape": ["@smithy/util-uri-escape@4.2.0", "https://registry.npmmirror.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA=="],
-
-    "@smithy/util-utf8": ["@smithy/util-utf8@4.2.0", "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz", { "dependencies": { "@smithy/util-buffer-from": "^4.2.0", "tslib": "^2.6.2" } }, "sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw=="],
-
-    "@smithy/util-waiter": ["@smithy/util-waiter@4.2.5", "https://registry.npmmirror.com/@smithy/util-waiter/-/util-waiter-4.2.5.tgz", { "dependencies": { "@smithy/abort-controller": "^4.2.5", "@smithy/types": "^4.9.0", "tslib": "^2.6.2" } }, "sha512-Dbun99A3InifQdIrsXZ+QLcC0PGBPAdrl4cj1mTgJvyc9N2zf7QSxg8TBkzsCmGJdE3TLbO9ycwpY0EkWahQ/g=="],
-
-    "@smithy/uuid": ["@smithy/uuid@1.1.0", "https://registry.npmmirror.com/@smithy/uuid/-/uuid-1.1.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw=="],
-
-    "@stablelib/base64": ["@stablelib/base64@1.0.1", "https://registry.npmmirror.com/@stablelib/base64/-/base64-1.0.1.tgz", {}, "sha512-1bnPQqSxSuc3Ii6MhBysoWCg58j97aUjuCSZrGSmDxNqtytIi0k8utUenAwTZN4V5mXXYGsVUI9zeBqy+jBOSQ=="],
-
     "@standard-schema/spec": ["@standard-schema/spec@1.0.0", "https://registry.npmmirror.com/@standard-schema/spec/-/spec-1.0.0.tgz", {}, "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA=="],
 
     "@standard-schema/utils": ["@standard-schema/utils@0.3.0", "https://registry.npmmirror.com/@standard-schema/utils/-/utils-0.3.0.tgz", {}, "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g=="],
@@ -764,8 +558,12 @@
 
     "@tanstack/react-query": ["@tanstack/react-query@5.90.12", "https://registry.npmmirror.com/@tanstack/react-query/-/react-query-5.90.12.tgz", { "dependencies": { "@tanstack/query-core": "5.90.12" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-graRZspg7EoEaw0a8faiUASCyJrqjKPdqJ9EwuDRUF9mEYJ1YPczI9H+/agJ0mOJkPCJDk0lsz5QTrLZ/jQ2rg=="],
 
+    "@tanstack/react-table": ["@tanstack/react-table@8.21.3", "", { "dependencies": { "@tanstack/table-core": "8.21.3" }, "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8" } }, "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww=="],
+
     "@tanstack/react-virtual": ["@tanstack/react-virtual@3.13.13", "", { "dependencies": { "@tanstack/virtual-core": "3.13.13" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-4o6oPMDvQv+9gMi8rE6gWmsOjtUZUYIJHv7EB+GblyYdi8U6OqLl8rhHWIUZSL1dUU2dPwTdTgybCKf9EjIrQg=="],
 
+    "@tanstack/table-core": ["@tanstack/table-core@8.21.3", "", {}, "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="],
+
     "@tanstack/virtual-core": ["@tanstack/virtual-core@3.13.13", "", {}, "sha512-uQFoSdKKf5S8k51W5t7b2qpfkyIbdHMzAn+AMQvHPxKUPeo1SsGaA4JRISQT87jm28b7z8OEqPcg1IOZagQHcA=="],
 
     "@testing-library/dom": ["@testing-library/dom@10.4.1", "", { "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", "aria-query": "5.3.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "picocolors": "1.1.1", "pretty-format": "^27.0.2" } }, "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg=="],
@@ -884,8 +682,6 @@
 
     "@types/node": ["@types/node@24.2.1", "https://registry.npmmirror.com/@types/node/-/node-24.2.1.tgz", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ=="],
 
-    "@types/node-fetch": ["@types/node-fetch@2.6.13", "https://registry.npmmirror.com/@types/node-fetch/-/node-fetch-2.6.13.tgz", { "dependencies": { "@types/node": "*", "form-data": "^4.0.4" } }, "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw=="],
-
     "@types/prismjs": ["@types/prismjs@1.26.6", "", {}, "sha512-vqlvI7qlMvcCBbVe0AKAb4f97//Hy0EBTaiW8AalRnG/xAN5zOiWWyrNqNXeq8+KAuvRewjCVY1+IPxk4RdNYw=="],
 
     "@types/react": ["@types/react@19.2.7", "https://registry.npmmirror.com/@types/react/-/react-19.2.7.tgz", { "dependencies": { "csstype": "^3.2.2" } }, "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg=="],
@@ -894,8 +690,6 @@
 
     "@types/react-syntax-highlighter": ["@types/react-syntax-highlighter@15.5.13", "https://registry.npmmirror.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.13.tgz", { "dependencies": { "@types/react": "*" } }, "sha512-uLGJ87j6Sz8UaBAooU0T6lWJ0dBmjZgN1PZTrj05TNql2/XpC6+4HhMT5syIdFUUt+FASfCeLLv4kBygNU+8qA=="],
 
-    "@types/react-window": ["@types/react-window@2.0.0", "https://registry.npmmirror.com/@types/react-window/-/react-window-2.0.0.tgz", { "dependencies": { "react-window": "*" } }, "sha512-E8hMDtImEpMk1SjswSvqoSmYvk7GEtyVaTa/GJV++FdDNuMVVEzpAClyJ0nqeKYBrMkGiyH6M1+rPLM0Nu1exQ=="],
-
     "@types/trusted-types": ["@types/trusted-types@2.0.7", "https://registry.npmmirror.com/@types/trusted-types/-/trusted-types-2.0.7.tgz", {}, "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw=="],
 
     "@types/unist": ["@types/unist@3.0.3", "https://registry.npmmirror.com/@types/unist/-/unist-3.0.3.tgz", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="],
@@ -922,8 +716,6 @@
 
     "@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.49.0", "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.49.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.49.0", "eslint-visitor-keys": "^4.2.1" } }, "sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA=="],
 
-    "@typespec/ts-http-runtime": ["@typespec/ts-http-runtime@0.3.2", "https://registry.npmmirror.com/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.2.tgz", { "dependencies": { "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", "tslib": "^2.6.2" } }, "sha512-IlqQ/Gv22xUC1r/WQm4StLkYQmaaTsXAhUVsNE0+xiyf0yRFiH5++q78U3bw6bLKDCTmh0uqKB9eG9+Bt75Dkg=="],
-
     "@uiw/codemirror-extensions-basic-setup": ["@uiw/codemirror-extensions-basic-setup@4.25.9", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" } }, "sha512-QFAqr+pu6lDmNpAlecODcF49TlsrZ0bj15zPzfhiqSDl+Um3EsDLFLppixC7kFLn+rdDM2LTvVjn5CPvefpRgw=="],
 
     "@uiw/codemirror-theme-vscode": ["@uiw/codemirror-theme-vscode@4.25.9", "", { "dependencies": { "@uiw/codemirror-themes": "4.25.9" } }, "sha512-9KTnScHTSk97yGnyNYvDm6QZuBCdbO1OzMQ5bHtoBSPSVtH0LjY3bS6CXsBagb22v8OLPx/XwrBYOjKFp409CQ=="],
@@ -988,20 +780,12 @@
 
     "@vitest/utils": ["@vitest/utils@3.2.4", "https://registry.npmmirror.com/@vitest/utils/-/utils-3.2.4.tgz", { "dependencies": { "@vitest/pretty-format": "3.2.4", "loupe": "^3.1.4", "tinyrainbow": "^2.0.0" } }, "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA=="],
 
-    "@xmldom/is-dom-node": ["@xmldom/is-dom-node@1.0.1", "https://registry.npmmirror.com/@xmldom/is-dom-node/-/is-dom-node-1.0.1.tgz", {}, "sha512-CJDxIgE5I0FH+ttq/Fxy6nRpxP70+e2O048EPe85J2use3XKdatVM7dDVvFNjQudd9B49NPoZ+8PG49zj4Er8Q=="],
-
-    "@xmldom/xmldom": ["@xmldom/xmldom@0.8.11", "https://registry.npmmirror.com/@xmldom/xmldom/-/xmldom-0.8.11.tgz", {}, "sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw=="],
-
-    "abort-controller": ["abort-controller@3.0.0", "https://registry.npmmirror.com/abort-controller/-/abort-controller-3.0.0.tgz", { "dependencies": { "event-target-shim": "^5.0.0" } }, "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="],
-
     "acorn": ["acorn@8.15.0", "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz", { "bin": { "acorn": "bin/acorn" } }, "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg=="],
 
     "acorn-jsx": ["acorn-jsx@5.3.2", "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
 
     "agent-base": ["agent-base@7.1.4", "https://registry.npmmirror.com/agent-base/-/agent-base-7.1.4.tgz", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
 
-    "agentkeepalive": ["agentkeepalive@4.6.0", "https://registry.npmmirror.com/agentkeepalive/-/agentkeepalive-4.6.0.tgz", { "dependencies": { "humanize-ms": "^1.2.1" } }, "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ=="],
-
     "ajv": ["ajv@6.12.6", "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="],
 
     "ansi-regex": ["ansi-regex@5.0.1", "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
@@ -1036,8 +820,6 @@
 
     "arraybuffer.prototype.slice": ["arraybuffer.prototype.slice@1.0.4", "https://registry.npmmirror.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", { "dependencies": { "array-buffer-byte-length": "^1.0.1", "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-abstract": "^1.23.5", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "is-array-buffer": "^3.0.4" } }, "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ=="],
 
-    "asn1": ["asn1@0.2.6", "https://registry.npmmirror.com/asn1/-/asn1-0.2.6.tgz", { "dependencies": { "safer-buffer": "~2.1.0" } }, "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="],
-
     "assertion-error": ["assertion-error@2.0.1", "https://registry.npmmirror.com/assertion-error/-/assertion-error-2.0.1.tgz", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="],
 
     "ast-types-flow": ["ast-types-flow@0.0.8", "https://registry.npmmirror.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz", {}, "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ=="],
@@ -1058,28 +840,18 @@
 
     "balanced-match": ["balanced-match@1.0.2", "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
 
-    "base64-js": ["base64-js@1.5.1", "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="],
-
     "baseline-browser-mapping": ["baseline-browser-mapping@2.9.5", "https://registry.npmmirror.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.5.tgz", { "bin": { "baseline-browser-mapping": "dist/cli.js" } }, "sha512-D5vIoztZOq1XM54LUdttJVc96ggEsIfju2JBvht06pSzpckp3C7HReun67Bghzrtdsq9XdMGbSSB3v3GhMNmAA=="],
 
-    "better-auth": ["better-auth@1.4.7", "https://registry.npmmirror.com/better-auth/-/better-auth-1.4.7.tgz", { "dependencies": { "@better-auth/core": "1.4.7", "@better-auth/telemetry": "1.4.7", "@better-auth/utils": "0.3.0", "@better-fetch/fetch": "1.1.21", "@noble/ciphers": "^2.0.0", "@noble/hashes": "^2.0.0", "better-call": "1.1.5", "defu": "^6.1.4", "jose": "^6.1.0", "kysely": "^0.28.5", "nanostores": "^1.0.1", "zod": "^4.1.12" }, "peerDependencies": { "@lynx-js/react": "*", "@prisma/client": "^5.22.0", "@sveltejs/kit": "^2.0.0", "@tanstack/react-start": "^1.0.0", "better-sqlite3": "^12.4.1", "drizzle-kit": "^0.31.4", "drizzle-orm": "^0.41.0", "mongodb": "^6.18.0", "mysql2": "^3.14.4", "next": "^14.0.0 || ^15.0.0 || ^16.0.0", "pg": "^8.16.3", "prisma": "^5.22.0", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0", "solid-js": "^1.0.0", "svelte": "^4.0.0 || ^5.0.0", "vitest": "^4.0.15", "vue": "^3.0.0" }, "optionalPeers": ["@lynx-js/react", "@prisma/client", "@sveltejs/kit", "@tanstack/react-start", "better-sqlite3", "drizzle-kit", "drizzle-orm", "mongodb", "mysql2", "next", "pg", "prisma", "react", "react-dom", "solid-js", "svelte", "vitest", "vue"] }, "sha512-kVmDQxzqGwP4FFMOYpS5I7oAaoFW3hwooUAAtcbb2DrOYv5EUvRUDJbTMaPoMTj7URjNDQ6vG9gcCS1Q+0aVBw=="],
-
-    "better-call": ["better-call@1.1.5", "https://registry.npmmirror.com/better-call/-/better-call-1.1.5.tgz", { "dependencies": { "@better-auth/utils": "^0.3.0", "@better-fetch/fetch": "^1.1.4", "rou3": "^0.7.10", "set-cookie-parser": "^2.7.1" }, "peerDependencies": { "zod": "^4.0.0" }, "optionalPeers": ["zod"] }, "sha512-nQJ3S87v6wApbDwbZ++FrQiSiVxWvZdjaO+2v6lZJAG2WWggkB2CziUDjPciz3eAt9TqfRursIQMZIcpkBnvlw=="],
-
     "binary-extensions": ["binary-extensions@2.3.0", "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz", {}, "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="],
 
     "boolbase": ["boolbase@1.0.0", "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
 
-    "bowser": ["bowser@2.13.1", "https://registry.npmmirror.com/bowser/-/bowser-2.13.1.tgz", {}, "sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw=="],
-
     "brace-expansion": ["brace-expansion@1.1.12", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.12.tgz", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg=="],
 
     "braces": ["braces@3.0.3", "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
 
     "browserslist": ["browserslist@4.28.1", "https://registry.npmmirror.com/browserslist/-/browserslist-4.28.1.tgz", { "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", "electron-to-chromium": "^1.5.263", "node-releases": "^2.0.27", "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" } }, "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA=="],
 
-    "buffer": ["buffer@6.0.3", "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" } }, "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="],
-
     "busboy": ["busboy@1.6.0", "https://registry.npmmirror.com/busboy/-/busboy-1.6.0.tgz", { "dependencies": { "streamsearch": "^1.1.0" } }, "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="],
 
     "cac": ["cac@6.7.14", "https://registry.npmmirror.com/cac/-/cac-6.7.14.tgz", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="],
@@ -1092,8 +864,6 @@
 
     "callsites": ["callsites@3.1.0", "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
 
-    "camelcase": ["camelcase@6.3.0", "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz", {}, "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="],
-
     "camelcase-css": ["camelcase-css@2.0.1", "https://registry.npmmirror.com/camelcase-css/-/camelcase-css-2.0.1.tgz", {}, "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="],
 
     "caniuse-lite": ["caniuse-lite@1.0.30001760", "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001760.tgz", {}, "sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw=="],
@@ -1128,8 +898,6 @@
 
     "codemirror": ["codemirror@6.0.2", "", { "dependencies": { "@codemirror/autocomplete": "^6.0.0", "@codemirror/commands": "^6.0.0", "@codemirror/language": "^6.0.0", "@codemirror/lint": "^6.0.0", "@codemirror/search": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.0.0" } }, "sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw=="],
 
-    "cohere-ai": ["cohere-ai@7.20.0", "https://registry.npmmirror.com/cohere-ai/-/cohere-ai-7.20.0.tgz", { "dependencies": { "@aws-crypto/sha256-js": "^5.2.0", "@aws-sdk/client-sagemaker": "^3.583.0", "@aws-sdk/credential-providers": "^3.583.0", "@smithy/protocol-http": "^5.1.2", "@smithy/signature-v4": "^5.1.2", "convict": "^6.2.4", "form-data": "^4.0.4", "form-data-encoder": "^4.1.0", "formdata-node": "^6.0.3", "readable-stream": "^4.7.0" } }, "sha512-h/3h3pcLXRUmkzp/W+/FWViEMcAFtSZ8YayCTFQXpib112uNSj3feApOtJg7v9lreWR1t7gznhE6N9KNCX5FOA=="],
-
     "color-convert": ["color-convert@2.0.1", "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],
 
     "color-name": ["color-name@1.1.4", "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
@@ -1144,16 +912,10 @@
 
     "convert-source-map": ["convert-source-map@2.0.0", "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz", {}, "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="],
 
-    "convict": ["convict@6.2.4", "https://registry.npmmirror.com/convict/-/convict-6.2.4.tgz", { "dependencies": { "lodash.clonedeep": "^4.5.0", "yargs-parser": "^20.2.7" } }, "sha512-qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ=="],
-
     "crelt": ["crelt@1.0.6", "", {}, "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="],
 
     "critters": ["critters@0.0.25", "https://registry.npmmirror.com/critters/-/critters-0.0.25.tgz", { "dependencies": { "chalk": "^4.1.0", "css-select": "^5.1.0", "dom-serializer": "^2.0.0", "domhandler": "^5.0.2", "htmlparser2": "^8.0.2", "postcss": "^8.4.23", "postcss-media-query-parser": "^0.2.3" } }, "sha512-ROF/tjJyyRdM8/6W0VqoN5Ql05xAGnkf5b7f3sTEl1bI5jTQQf8O918RD/V9tEb9pRY/TKcvJekDbJtniHyPtQ=="],
 
-    "croner": ["croner@9.1.0", "https://registry.npmmirror.com/croner/-/croner-9.1.0.tgz", {}, "sha512-p9nwwR4qyT5W996vBZhdvBCnMhicY5ytZkR4D1Xj0wuTDEiMnjwR57Q3RXYY/s0EpX6Ay3vgIcfaR+ewGHsi+g=="],
-
-    "cronstrue": ["cronstrue@3.9.0", "https://registry.npmmirror.com/cronstrue/-/cronstrue-3.9.0.tgz", { "bin": { "cronstrue": "bin/cli.js" } }, "sha512-T3S35zmD0Ai2B4ko6+mEM+k9C6tipe2nB9RLiGT6QL2Wn0Vsn2cCZAC8Oeuf4CaE00GZWVdpYitbpWCNlIWqdA=="],
-
     "cross-spawn": ["cross-spawn@7.0.6", "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
 
     "crypto-js": ["crypto-js@4.2.0", "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz", {}, "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="],
@@ -1230,8 +992,6 @@
 
     "define-properties": ["define-properties@1.2.1", "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz", { "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" } }, "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="],
 
-    "defu": ["defu@6.1.4", "https://registry.npmmirror.com/defu/-/defu-6.1.4.tgz", {}, "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="],
-
     "delayed-stream": ["delayed-stream@1.0.0", "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="],
 
     "dequal": ["dequal@2.0.3", "https://registry.npmmirror.com/dequal/-/dequal-2.0.3.tgz", {}, "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="],
@@ -1288,14 +1048,10 @@
 
     "es-toolkit": ["es-toolkit@1.45.1", "", {}, "sha512-/jhoOj/Fx+A+IIyDNOvO3TItGmlMKhtX8ISAHKE90c4b/k1tqaqEZ+uUqfpU8DMnW5cgNJv606zS55jGvza0Xw=="],
 
-    "es6-promise": ["es6-promise@4.2.8", "https://registry.npmmirror.com/es6-promise/-/es6-promise-4.2.8.tgz", {}, "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="],
-
     "esbuild": ["esbuild@0.25.12", "https://registry.npmmirror.com/esbuild/-/esbuild-0.25.12.tgz", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="],
 
     "escalade": ["escalade@3.2.0", "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],
 
-    "escape-html": ["escape-html@1.0.3", "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="],
-
     "escape-string-regexp": ["escape-string-regexp@4.0.0", "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
 
     "eslint": ["eslint@9.39.1", "https://registry.npmmirror.com/eslint/-/eslint-9.39.1.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.1", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.39.1", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g=="],
@@ -1334,12 +1090,8 @@
 
     "esutils": ["esutils@2.0.3", "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="],
 
-    "event-target-shim": ["event-target-shim@5.0.1", "https://registry.npmmirror.com/event-target-shim/-/event-target-shim-5.0.1.tgz", {}, "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="],
-
     "eventemitter3": ["eventemitter3@5.0.4", "", {}, "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw=="],
 
-    "events": ["events@3.3.0", "https://registry.npmmirror.com/events/-/events-3.3.0.tgz", {}, "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="],
-
     "expect-type": ["expect-type@1.3.0", "https://registry.npmmirror.com/expect-type/-/expect-type-1.3.0.tgz", {}, "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA=="],
 
     "extend": ["extend@3.0.2", "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz", {}, "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="],
@@ -1352,10 +1104,6 @@
 
     "fast-levenshtein": ["fast-levenshtein@2.0.6", "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", {}, "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="],
 
-    "fast-sha256": ["fast-sha256@1.3.0", "https://registry.npmmirror.com/fast-sha256/-/fast-sha256-1.3.0.tgz", {}, "sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ=="],
-
-    "fast-xml-parser": ["fast-xml-parser@5.2.5", "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz", { "dependencies": { "strnum": "^2.1.0" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ=="],
-
     "fastq": ["fastq@1.19.1", "https://registry.npmmirror.com/fastq/-/fastq-1.19.1.tgz", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="],
 
     "fault": ["fault@1.0.4", "https://registry.npmmirror.com/fault/-/fault-1.0.4.tgz", { "dependencies": { "format": "^0.2.0" } }, "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="],
@@ -1376,12 +1124,8 @@
 
     "form-data": ["form-data@4.0.5", "https://registry.npmmirror.com/form-data/-/form-data-4.0.5.tgz", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w=="],
 
-    "form-data-encoder": ["form-data-encoder@1.7.2", "https://registry.npmmirror.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz", {}, "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="],
-
     "format": ["format@0.2.2", "https://registry.npmmirror.com/format/-/format-0.2.2.tgz", {}, "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="],
 
-    "formdata-node": ["formdata-node@4.4.1", "https://registry.npmmirror.com/formdata-node/-/formdata-node-4.4.1.tgz", { "dependencies": { "node-domexception": "1.0.0", "web-streams-polyfill": "4.0.0-beta.3" } }, "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ=="],
-
     "fraction.js": ["fraction.js@4.3.7", "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz", {}, "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="],
 
     "framer-motion": ["framer-motion@12.23.25", "https://registry.npmmirror.com/framer-motion/-/framer-motion-12.23.25.tgz", { "dependencies": { "motion-dom": "^12.23.23", "motion-utils": "^12.23.6", "tslib": "^2.4.0" }, "peerDependencies": { "@emotion/is-prop-valid": "*", "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" }, "optionalPeers": ["@emotion/is-prop-valid", "react", "react-dom"] }, "sha512-gUHGl2e4VG66jOcH0JHhuJQr6ZNwrET9g31ZG0xdXzT0CznP7fHX4P8Bcvuc4MiUB90ysNnWX2ukHRIggkl6hQ=="],
@@ -1420,8 +1164,6 @@
 
     "graceful-fs": ["graceful-fs@4.2.11", "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
 
-    "groq-sdk": ["groq-sdk@0.37.0", "https://registry.npmmirror.com/groq-sdk/-/groq-sdk-0.37.0.tgz", { "dependencies": { "@types/node": "^18.11.18", "@types/node-fetch": "^2.6.4", "abort-controller": "^3.0.0", "agentkeepalive": "^4.2.1", "form-data-encoder": "1.7.2", "formdata-node": "^4.3.2", "node-fetch": "^2.6.7" } }, "sha512-lT72pcT8b/X5XrzdKf+rWVzUGW1OQSKESmL8fFN5cTbsf02gq6oFam4SVeNtzELt9cYE2Pt3pdGgSImuTbHFDg=="],
-
     "has-bigints": ["has-bigints@1.1.0", "https://registry.npmmirror.com/has-bigints/-/has-bigints-1.1.0.tgz", {}, "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg=="],
 
     "has-flag": ["has-flag@4.0.0", "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
@@ -1464,16 +1206,12 @@
 
     "https-proxy-agent": ["https-proxy-agent@7.0.6", "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
 
-    "humanize-ms": ["humanize-ms@1.2.1", "https://registry.npmmirror.com/humanize-ms/-/humanize-ms-1.2.1.tgz", { "dependencies": { "ms": "^2.0.0" } }, "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="],
-
     "i18next": ["i18next@25.7.3", "https://registry.npmmirror.com/i18next/-/i18next-25.7.3.tgz", { "dependencies": { "@babel/runtime": "^7.28.4" }, "peerDependencies": { "typescript": "^5" }, "optionalPeers": ["typescript"] }, "sha512-2XaT+HpYGuc2uTExq9TVRhLsso+Dxym6PWaKpn36wfBmTI779OQ7iP/XaZHzrnGyzU4SHpFrTYLKfVyBfAhVNA=="],
 
     "i18next-browser-languagedetector": ["i18next-browser-languagedetector@8.2.0", "https://registry.npmmirror.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-8.2.0.tgz", { "dependencies": { "@babel/runtime": "^7.23.2" } }, "sha512-P+3zEKLnOF0qmiesW383vsLdtQVyKtCNA9cjSoKCppTKPQVfKd2W8hbVo5ZhNJKDqeM7BOcvNoKJOjpHh4Js9g=="],
 
     "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
 
-    "ieee754": ["ieee754@1.2.1", "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],
-
     "ignore": ["ignore@5.3.2", "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
 
     "immer": ["immer@10.2.0", "", {}, "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw=="],
@@ -1566,8 +1304,6 @@
 
     "jiti": ["jiti@1.21.7", "https://registry.npmmirror.com/jiti/-/jiti-1.21.7.tgz", { "bin": { "jiti": "bin/jiti.js" } }, "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A=="],
 
-    "jose": ["jose@6.1.3", "https://registry.npmmirror.com/jose/-/jose-6.1.3.tgz", {}, "sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ=="],
-
     "js-tokens": ["js-tokens@4.0.0", "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="],
 
     "js-yaml": ["js-yaml@4.1.1", "https://registry.npmmirror.com/js-yaml/-/js-yaml-4.1.1.tgz", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA=="],
@@ -1586,12 +1322,8 @@
 
     "jsx-ast-utils": ["jsx-ast-utils@3.3.5", "https://registry.npmmirror.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", { "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", "object.assign": "^4.1.4", "object.values": "^1.1.6" } }, "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ=="],
 
-    "jwt-decode": ["jwt-decode@4.0.0", "https://registry.npmmirror.com/jwt-decode/-/jwt-decode-4.0.0.tgz", {}, "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA=="],
-
     "keyv": ["keyv@4.5.4", "https://registry.npmmirror.com/keyv/-/keyv-4.5.4.tgz", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="],
 
-    "kysely": ["kysely@0.28.9", "https://registry.npmmirror.com/kysely/-/kysely-0.28.9.tgz", {}, "sha512-3BeXMoiOhpOwu62CiVpO6lxfq4eS6KMYfQdMsN/2kUCRNuF2YiEr7u0HLHaQU+O4Xu8YXE3bHVkwaQ85i72EuA=="],
-
     "language-subtag-registry": ["language-subtag-registry@0.3.23", "https://registry.npmmirror.com/language-subtag-registry/-/language-subtag-registry-0.3.23.tgz", {}, "sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ=="],
 
     "language-tags": ["language-tags@1.0.9", "https://registry.npmmirror.com/language-tags/-/language-tags-1.0.9.tgz", { "dependencies": { "language-subtag-registry": "^0.3.20" } }, "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA=="],
@@ -1608,8 +1340,6 @@
 
     "lodash": ["lodash@4.17.21", "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", {}, "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="],
 
-    "lodash.clonedeep": ["lodash.clonedeep@4.5.0", "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", {}, "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="],
-
     "lodash.merge": ["lodash.merge@4.6.2", "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz", {}, "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="],
 
     "longest-streak": ["longest-streak@3.1.0", "https://registry.npmmirror.com/longest-streak/-/longest-streak-3.1.0.tgz", {}, "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g=="],
@@ -1746,8 +1476,6 @@
 
     "nanoid": ["nanoid@3.3.11", "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="],
 
-    "nanostores": ["nanostores@1.1.0", "https://registry.npmmirror.com/nanostores/-/nanostores-1.1.0.tgz", {}, "sha512-yJBmDJr18xy47dbNVlHcgdPrulSn1nhSE6Ns9vTG+Nx9VPT6iV1MD6aQFp/t52zpf82FhLLTXAXr30NuCnxvwA=="],
-
     "napi-postinstall": ["napi-postinstall@0.3.4", "https://registry.npmmirror.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz", { "bin": { "napi-postinstall": "lib/cli.js" } }, "sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ=="],
 
     "natural-compare": ["natural-compare@1.4.0", "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="],
@@ -1758,16 +1486,8 @@
 
     "next-themes": ["next-themes@0.4.6", "https://registry.npmmirror.com/next-themes/-/next-themes-0.4.6.tgz", { "peerDependencies": { "react": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc", "react-dom": "^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc" } }, "sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA=="],
 
-    "node-domexception": ["node-domexception@1.0.0", "https://registry.npmmirror.com/node-domexception/-/node-domexception-1.0.0.tgz", {}, "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="],
-
-    "node-fetch": ["node-fetch@2.7.0", "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.7.0.tgz", { "dependencies": { "whatwg-url": "^5.0.0" }, "peerDependencies": { "encoding": "^0.1.0" }, "optionalPeers": ["encoding"] }, "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="],
-
-    "node-forge": ["node-forge@1.3.3", "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.3.tgz", {}, "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg=="],
-
     "node-releases": ["node-releases@2.0.27", "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.27.tgz", {}, "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA=="],
 
-    "node-rsa": ["node-rsa@1.1.1", "https://registry.npmmirror.com/node-rsa/-/node-rsa-1.1.1.tgz", { "dependencies": { "asn1": "^0.2.4" } }, "sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="],
-
     "normalize-path": ["normalize-path@3.0.0", "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", {}, "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="],
 
     "normalize-range": ["normalize-range@0.1.2", "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz", {}, "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="],
@@ -1802,8 +1522,6 @@
 
     "p-locate": ["p-locate@5.0.0", "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
 
-    "pako": ["pako@1.0.11", "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz", {}, "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="],
-
     "parent-module": ["parent-module@1.0.1", "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz", { "dependencies": { "callsites": "^3.0.0" } }, "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="],
 
     "parse-entities": ["parse-entities@4.0.2", "https://registry.npmmirror.com/parse-entities/-/parse-entities-4.0.2.tgz", { "dependencies": { "@types/unist": "^2.0.0", "character-entities-legacy": "^3.0.0", "character-reference-invalid": "^2.0.0", "decode-named-character-reference": "^1.0.0", "is-alphanumerical": "^2.0.0", "is-decimal": "^2.0.0", "is-hexadecimal": "^2.0.0" } }, "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw=="],
@@ -1856,8 +1574,6 @@
 
     "prismjs": ["prismjs@1.30.0", "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz", {}, "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw=="],
 
-    "process": ["process@0.11.10", "https://registry.npmmirror.com/process/-/process-0.11.10.tgz", {}, "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="],
-
     "prop-types": ["prop-types@15.8.1", "https://registry.npmmirror.com/prop-types/-/prop-types-15.8.1.tgz", { "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.13.1" } }, "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="],
 
     "property-information": ["property-information@7.1.0", "https://registry.npmmirror.com/property-information/-/property-information-7.1.0.tgz", {}, "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ=="],
@@ -1866,16 +1582,10 @@
 
     "punycode.js": ["punycode.js@2.3.1", "https://registry.npmmirror.com/punycode.js/-/punycode.js-2.3.1.tgz", {}, "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA=="],
 
-    "qs": ["qs@6.14.0", "https://registry.npmmirror.com/qs/-/qs-6.14.0.tgz", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w=="],
-
-    "querystringify": ["querystringify@2.2.0", "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz", {}, "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="],
-
     "queue-microtask": ["queue-microtask@1.2.3", "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="],
 
     "react": ["react@19.2.1", "https://registry.npmmirror.com/react/-/react-19.2.1.tgz", {}, "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw=="],
 
-    "react-colorful": ["react-colorful@5.6.1", "https://registry.npmmirror.com/react-colorful/-/react-colorful-5.6.1.tgz", { "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw=="],
-
     "react-dom": ["react-dom@19.2.1", "https://registry.npmmirror.com/react-dom/-/react-dom-19.2.1.tgz", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.1" } }, "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg=="],
 
     "react-hook-form": ["react-hook-form@7.68.0", "https://registry.npmmirror.com/react-hook-form/-/react-hook-form-7.68.0.tgz", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-oNN3fjrZ/Xo40SWlHf1yCjlMK417JxoSJVUXQjGdvdRCU07NTFei1i1f8ApUAts+IVh14e4EdakeLEA+BEAs/Q=="],
@@ -1896,20 +1606,14 @@
 
     "react-resizable-panels": ["react-resizable-panels@3.0.6", "https://registry.npmmirror.com/react-resizable-panels/-/react-resizable-panels-3.0.6.tgz", { "peerDependencies": { "react": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-b3qKHQ3MLqOgSS+FRYKapNkJZf5EQzuf6+RLiq1/IlTHw99YrZ2NJZLk4hQIzTnnIkRg2LUqyVinu6YWWpUYew=="],
 
-    "react-simple-code-editor": ["react-simple-code-editor@0.14.1", "https://registry.npmmirror.com/react-simple-code-editor/-/react-simple-code-editor-0.14.1.tgz", { "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-BR5DtNRy+AswWJECyA17qhUDvrrCZ6zXOCfkQY5zSmb96BVUbpVAv03WpcjcwtCwiLbIANx3gebHOcXYn1EHow=="],
-
     "react-style-singleton": ["react-style-singleton@2.2.3", "https://registry.npmmirror.com/react-style-singleton/-/react-style-singleton-2.2.3.tgz", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="],
 
     "react-syntax-highlighter": ["react-syntax-highlighter@16.1.0", "https://registry.npmmirror.com/react-syntax-highlighter/-/react-syntax-highlighter-16.1.0.tgz", { "dependencies": { "@babel/runtime": "^7.28.4", "highlight.js": "^10.4.1", "highlightjs-vue": "^1.0.0", "lowlight": "^1.17.0", "prismjs": "^1.30.0", "refractor": "^5.0.0" }, "peerDependencies": { "react": ">= 0.14.0" } }, "sha512-E40/hBiP5rCNwkeBN1vRP+xow1X0pndinO+z3h7HLsHyjztbyjfzNWNKuAsJj+7DLam9iT4AaaOZnueCU+Nplg=="],
 
-    "react-window": ["react-window@2.2.3", "https://registry.npmmirror.com/react-window/-/react-window-2.2.3.tgz", { "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-gTRqQYC8ojbiXyd9duYFiSn2TJw0ROXCgYjenOvNKITWzK0m0eCvkUsEUM08xvydkMh7ncp+LE0uS3DeNGZxnQ=="],
-
     "reactflow": ["reactflow@11.11.4", "https://registry.npmmirror.com/reactflow/-/reactflow-11.11.4.tgz", { "dependencies": { "@reactflow/background": "11.3.14", "@reactflow/controls": "11.2.14", "@reactflow/core": "11.11.4", "@reactflow/minimap": "11.7.14", "@reactflow/node-resizer": "2.2.14", "@reactflow/node-toolbar": "1.3.14" }, "peerDependencies": { "react": ">=17", "react-dom": ">=17" } }, "sha512-70FOtJkUWH3BAOsN+LU9lCrKoKbtOPnz2uq0CV2PLdNSwxTXOhCbsZr50GmZ+Rtw3jx8Uv7/vBFtCGixLfd4Og=="],
 
     "read-cache": ["read-cache@1.0.0", "https://registry.npmmirror.com/read-cache/-/read-cache-1.0.0.tgz", { "dependencies": { "pify": "^2.3.0" } }, "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="],
 
-    "readable-stream": ["readable-stream@4.7.0", "https://registry.npmmirror.com/readable-stream/-/readable-stream-4.7.0.tgz", { "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", "process": "^0.11.10", "string_decoder": "^1.3.0" } }, "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg=="],
-
     "readdirp": ["readdirp@3.6.0", "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", { "dependencies": { "picomatch": "^2.2.1" } }, "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="],
 
     "recharts": ["recharts@3.8.1", "", { "dependencies": { "@reduxjs/toolkit": "^1.9.0 || 2.x.x", "clsx": "^2.1.1", "decimal.js-light": "^2.5.1", "es-toolkit": "^1.39.3", "eventemitter3": "^5.0.1", "immer": "^10.1.1", "react-redux": "8.x.x || 9.x.x", "reselect": "5.1.1", "tiny-invariant": "^1.3.3", "use-sync-external-store": "^1.2.2", "victory-vendor": "^37.0.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg=="],
@@ -1934,12 +1638,8 @@
 
     "remark-stringify": ["remark-stringify@11.0.0", "https://registry.npmmirror.com/remark-stringify/-/remark-stringify-11.0.0.tgz", { "dependencies": { "@types/mdast": "^4.0.0", "mdast-util-to-markdown": "^2.0.0", "unified": "^11.0.0" } }, "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="],
 
-    "requires-port": ["requires-port@1.0.0", "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz", {}, "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="],
-
     "reselect": ["reselect@5.1.1", "", {}, "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="],
 
-    "resend": ["resend@6.6.0", "https://registry.npmmirror.com/resend/-/resend-6.6.0.tgz", { "dependencies": { "svix": "1.76.1" }, "peerDependencies": { "@react-email/render": "*" }, "optionalPeers": ["@react-email/render"] }, "sha512-d1WoOqSxj5x76JtQMrieNAG1kZkh4NU4f+Je1yq4++JsDpLddhEwnJlNfvkCzvUuZy9ZquWmMMAm2mENd2JvRw=="],
-
     "resolve": ["resolve@1.22.11", "https://registry.npmmirror.com/resolve/-/resolve-1.22.11.tgz", { "dependencies": { "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" } }, "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ=="],
 
     "resolve-from": ["resolve-from@4.0.0", "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="],
@@ -1950,34 +1650,24 @@
 
     "rollup": ["rollup@4.53.3", "https://registry.npmmirror.com/rollup/-/rollup-4.53.3.tgz", { "dependencies": { "@types/estree": "1.0.8" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.53.3", "@rollup/rollup-android-arm64": "4.53.3", "@rollup/rollup-darwin-arm64": "4.53.3", "@rollup/rollup-darwin-x64": "4.53.3", "@rollup/rollup-freebsd-arm64": "4.53.3", "@rollup/rollup-freebsd-x64": "4.53.3", "@rollup/rollup-linux-arm-gnueabihf": "4.53.3", "@rollup/rollup-linux-arm-musleabihf": "4.53.3", "@rollup/rollup-linux-arm64-gnu": "4.53.3", "@rollup/rollup-linux-arm64-musl": "4.53.3", "@rollup/rollup-linux-loong64-gnu": "4.53.3", "@rollup/rollup-linux-ppc64-gnu": "4.53.3", "@rollup/rollup-linux-riscv64-gnu": "4.53.3", "@rollup/rollup-linux-riscv64-musl": "4.53.3", "@rollup/rollup-linux-s390x-gnu": "4.53.3", "@rollup/rollup-linux-x64-gnu": "4.53.3", "@rollup/rollup-linux-x64-musl": "4.53.3", "@rollup/rollup-openharmony-arm64": "4.53.3", "@rollup/rollup-win32-arm64-msvc": "4.53.3", "@rollup/rollup-win32-ia32-msvc": "4.53.3", "@rollup/rollup-win32-x64-gnu": "4.53.3", "@rollup/rollup-win32-x64-msvc": "4.53.3", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA=="],
 
-    "rou3": ["rou3@0.7.11", "https://registry.npmmirror.com/rou3/-/rou3-0.7.11.tgz", {}, "sha512-ELguG3ENDw5NKNmWHO3OGEjcgdxkCNvnMR22gKHEgRXuwiriap5RIYdummOaOiqUNcC5yU5txGCHWNm7KlHuAA=="],
-
     "rrweb-cssom": ["rrweb-cssom@0.7.1", "", {}, "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg=="],
 
     "run-parallel": ["run-parallel@1.2.0", "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="],
 
     "safe-array-concat": ["safe-array-concat@1.1.3", "https://registry.npmmirror.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz", { "dependencies": { "call-bind": "^1.0.8", "call-bound": "^1.0.2", "get-intrinsic": "^1.2.6", "has-symbols": "^1.1.0", "isarray": "^2.0.5" } }, "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q=="],
 
-    "safe-buffer": ["safe-buffer@5.2.1", "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="],
-
     "safe-push-apply": ["safe-push-apply@1.0.0", "https://registry.npmmirror.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz", { "dependencies": { "es-errors": "^1.3.0", "isarray": "^2.0.5" } }, "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA=="],
 
     "safe-regex-test": ["safe-regex-test@1.1.0", "https://registry.npmmirror.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-regex": "^1.2.1" } }, "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw=="],
 
     "safer-buffer": ["safer-buffer@2.1.2", "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
 
-    "samlify": ["samlify@2.10.2", "https://registry.npmmirror.com/samlify/-/samlify-2.10.2.tgz", { "dependencies": { "@authenio/xml-encryption": "^2.0.2", "@xmldom/xmldom": "^0.8.6", "camelcase": "^6.2.0", "node-forge": "^1.3.0", "node-rsa": "^1.1.1", "pako": "^1.0.10", "uuid": "^8.3.2", "xml": "^1.0.1", "xml-crypto": "^6.1.2", "xml-escape": "^1.1.0", "xpath": "^0.0.32" } }, "sha512-y5s1cHwclqwP8h7K2Wj9SfP1q+1S9+jrs5OAegYTLAiuFi7nDvuKqbiXLmUTvYPMpzHcX94wTY2+D604jgTKvA=="],
-
     "saxes": ["saxes@6.0.0", "", { "dependencies": { "xmlchars": "^2.2.0" } }, "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="],
 
     "scheduler": ["scheduler@0.27.0", "https://registry.npmmirror.com/scheduler/-/scheduler-0.27.0.tgz", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
 
     "semver": ["semver@6.3.1", "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
 
-    "serializer": ["serializer@0.0.3", "https://registry.npmmirror.com/serializer/-/serializer-0.0.3.tgz", {}, "sha512-sMuj6DIDqONG+U5PE+l6p+2+3D+X7X8T3FVJXzBQMfRctTCklfVO0qH9SIGfX9F/ZPr8c5NFdGhAUw+2mAIZQg=="],
-
-    "set-cookie-parser": ["set-cookie-parser@2.7.2", "https://registry.npmmirror.com/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz", {}, "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw=="],
-
     "set-function-length": ["set-function-length@1.2.2", "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2" } }, "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg=="],
 
     "set-function-name": ["set-function-name@2.0.2", "https://registry.npmmirror.com/set-function-name/-/set-function-name-2.0.2.tgz", { "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", "has-property-descriptors": "^1.0.2" } }, "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ=="],
@@ -2026,8 +1716,6 @@
 
     "string.prototype.trimstart": ["string.prototype.trimstart@1.0.8", "https://registry.npmmirror.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", { "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" } }, "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg=="],
 
-    "string_decoder": ["string_decoder@1.3.0", "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz", { "dependencies": { "safe-buffer": "~5.2.0" } }, "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="],
-
     "stringify-entities": ["stringify-entities@4.0.4", "https://registry.npmmirror.com/stringify-entities/-/stringify-entities-4.0.4.tgz", { "dependencies": { "character-entities-html4": "^2.0.0", "character-entities-legacy": "^3.0.0" } }, "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg=="],
 
     "strip-bom": ["strip-bom@3.0.0", "https://registry.npmmirror.com/strip-bom/-/strip-bom-3.0.0.tgz", {}, "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="],
@@ -2038,10 +1726,6 @@
 
     "strip-literal": ["strip-literal@3.1.0", "https://registry.npmmirror.com/strip-literal/-/strip-literal-3.1.0.tgz", { "dependencies": { "js-tokens": "^9.0.1" } }, "sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg=="],
 
-    "stripe": ["stripe@20.0.0", "https://registry.npmmirror.com/stripe/-/stripe-20.0.0.tgz", { "dependencies": { "qs": "^6.11.0" }, "peerDependencies": { "@types/node": ">=16" }, "optionalPeers": ["@types/node"] }, "sha512-EaZeWpbJOCcDytdjKSwdrL5BxzbDGNueiCfHjHXlPdBQvLqoxl6AAivC35SPzTmVXJb5duXQlXFGS45H0+e6Gg=="],
-
-    "strnum": ["strnum@2.1.2", "https://registry.npmmirror.com/strnum/-/strnum-2.1.2.tgz", {}, "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ=="],
-
     "style-mod": ["style-mod@4.1.3", "", {}, "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ=="],
 
     "style-to-js": ["style-to-js@1.1.21", "https://registry.npmmirror.com/style-to-js/-/style-to-js-1.1.21.tgz", { "dependencies": { "style-to-object": "1.0.14" } }, "sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ=="],
@@ -2056,8 +1740,6 @@
 
     "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="],
 
-    "svix": ["svix@1.76.1", "https://registry.npmmirror.com/svix/-/svix-1.76.1.tgz", { "dependencies": { "@stablelib/base64": "^1.0.0", "@types/node": "^22.7.5", "es6-promise": "^4.2.8", "fast-sha256": "^1.3.0", "url-parse": "^1.5.10", "uuid": "^10.0.0" } }, "sha512-CRuDWBTgYfDnBLRaZdKp9VuoPcNUq9An14c/k+4YJ15Qc5Grvf66vp0jvTltd4t7OIRj+8lM1DAgvSgvf7hdLw=="],
-
     "symbol-tree": ["symbol-tree@3.2.4", "", {}, "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="],
 
     "tailwind-merge": ["tailwind-merge@2.6.0", "https://registry.npmmirror.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz", {}, "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA=="],
@@ -2146,8 +1828,6 @@
 
     "uri-js": ["uri-js@4.4.1", "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
 
-    "url-parse": ["url-parse@1.5.10", "https://registry.npmmirror.com/url-parse/-/url-parse-1.5.10.tgz", { "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" } }, "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="],
-
     "use-callback-ref": ["use-callback-ref@1.3.3", "https://registry.npmmirror.com/use-callback-ref/-/use-callback-ref-1.3.3.tgz", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg=="],
 
     "use-sidecar": ["use-sidecar@1.1.3", "https://registry.npmmirror.com/use-sidecar/-/use-sidecar-1.1.3.tgz", { "dependencies": { "detect-node-es": "^1.1.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ=="],
@@ -2156,8 +1836,6 @@
 
     "util-deprecate": ["util-deprecate@1.0.2", "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],
 
-    "uuid": ["uuid@8.3.2", "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="],
-
     "vfile": ["vfile@6.0.3", "https://registry.npmmirror.com/vfile/-/vfile-6.0.3.tgz", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="],
 
     "vfile-message": ["vfile-message@4.0.3", "https://registry.npmmirror.com/vfile-message/-/vfile-message-4.0.3.tgz", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw=="],
@@ -2178,8 +1856,6 @@
 
     "w3c-xmlserializer": ["w3c-xmlserializer@5.0.0", "", { "dependencies": { "xml-name-validator": "^5.0.0" } }, "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA=="],
 
-    "web-streams-polyfill": ["web-streams-polyfill@4.0.0-beta.3", "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz", {}, "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug=="],
-
     "webidl-conversions": ["webidl-conversions@7.0.0", "", {}, "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="],
 
     "whatwg-encoding": ["whatwg-encoding@3.1.1", "", { "dependencies": { "iconv-lite": "0.6.3" } }, "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ=="],
@@ -2204,28 +1880,16 @@
 
     "ws": ["ws@8.18.3", "https://registry.npmmirror.com/ws/-/ws-8.18.3.tgz", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg=="],
 
-    "xml": ["xml@1.0.1", "https://registry.npmmirror.com/xml/-/xml-1.0.1.tgz", {}, "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw=="],
-
-    "xml-crypto": ["xml-crypto@6.1.2", "https://registry.npmmirror.com/xml-crypto/-/xml-crypto-6.1.2.tgz", { "dependencies": { "@xmldom/is-dom-node": "^1.0.1", "@xmldom/xmldom": "^0.8.10", "xpath": "^0.0.33" } }, "sha512-leBOVQdVi8FvPJrMYoum7Ici9qyxfE4kVi+AkpUoYCSXaQF4IlBm1cneTK9oAxR61LpYxTx7lNcsnBIeRpGW2w=="],
-
-    "xml-escape": ["xml-escape@1.1.0", "https://registry.npmmirror.com/xml-escape/-/xml-escape-1.1.0.tgz", {}, "sha512-B/T4sDK8Z6aUh/qNr7mjKAwwncIljFuUP+DO/D5hloYFj+90O88z8Wf7oSucZTHxBAsC1/CTP4rtx/x1Uf72Mg=="],
-
     "xml-name-validator": ["xml-name-validator@5.0.0", "", {}, "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg=="],
 
     "xmlchars": ["xmlchars@2.2.0", "", {}, "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="],
 
-    "xpath": ["xpath@0.0.32", "https://registry.npmmirror.com/xpath/-/xpath-0.0.32.tgz", {}, "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="],
-
     "yallist": ["yallist@3.1.1", "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],
 
-    "yargs-parser": ["yargs-parser@20.2.9", "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz", {}, "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="],
-
     "yocto-queue": ["yocto-queue@0.1.0", "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "zod": ["zod@3.25.76", "https://registry.npmmirror.com/zod/-/zod-3.25.76.tgz", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
 
-    "zod-to-json-schema": ["zod-to-json-schema@3.25.0", "https://registry.npmmirror.com/zod-to-json-schema/-/zod-to-json-schema-3.25.0.tgz", { "peerDependencies": { "zod": "^3.25 || ^4" } }, "sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ=="],
-
     "zod-validation-error": ["zod-validation-error@4.0.2", "https://registry.npmmirror.com/zod-validation-error/-/zod-validation-error-4.0.2.tgz", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ=="],
 
     "zustand": ["zustand@4.5.7", "https://registry.npmmirror.com/zustand/-/zustand-4.5.7.tgz", { "dependencies": { "use-sync-external-store": "^1.2.2" }, "peerDependencies": { "@types/react": ">=16.8", "immer": ">=9.0.6", "react": ">=16.8" }, "optionalPeers": ["@types/react", "immer", "react"] }, "sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw=="],
@@ -2234,18 +1898,6 @@
 
     "@asamuzakjp/css-color/lru-cache": ["lru-cache@10.4.3", "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.4.3.tgz", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
 
-    "@aws-crypto/sha256-browser/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="],
-
-    "@aws-crypto/util/@smithy/util-utf8": ["@smithy/util-utf8@2.3.0", "https://registry.npmmirror.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", { "dependencies": { "@smithy/util-buffer-from": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A=="],
-
-    "@better-auth/core/zod": ["zod@4.1.13", "https://registry.npmmirror.com/zod/-/zod-4.1.13.tgz", {}, "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig=="],
-
-    "@better-auth/sso/zod": ["zod@4.1.13", "https://registry.npmmirror.com/zod/-/zod-4.1.13.tgz", {}, "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig=="],
-
-    "@better-auth/stripe/zod": ["zod@4.1.13", "https://registry.npmmirror.com/zod/-/zod-4.1.13.tgz", {}, "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig=="],
-
-    "@cerebras/cerebras_cloud_sdk/@types/node": ["@types/node@18.19.130", "https://registry.npmmirror.com/@types/node/-/node-18.19.130.tgz", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg=="],
-
     "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],
 
     "@next/eslint-plugin-next/fast-glob": ["fast-glob@3.3.1", "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.1.tgz", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.4" } }, "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="],
@@ -2292,16 +1944,10 @@
 
     "anymatch/picomatch": ["picomatch@2.3.1", "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
 
-    "better-auth/zod": ["zod@4.1.13", "https://registry.npmmirror.com/zod/-/zod-4.1.13.tgz", {}, "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig=="],
-
     "chokidar/glob-parent": ["glob-parent@5.1.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
     "cmdk/@radix-ui/react-primitive": ["@radix-ui/react-primitive@2.1.4", "https://registry.npmmirror.com/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", { "dependencies": { "@radix-ui/react-slot": "1.2.4" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg=="],
 
-    "cohere-ai/form-data-encoder": ["form-data-encoder@4.1.0", "https://registry.npmmirror.com/form-data-encoder/-/form-data-encoder-4.1.0.tgz", {}, "sha512-G6NsmEW15s0Uw9XnCg+33H3ViYRyiM0hMrMhhqQOR8NFc5GhYrI+6I3u7OTw7b91J2g8rtvMBZJDbcGb2YUniw=="],
-
-    "cohere-ai/formdata-node": ["formdata-node@6.0.3", "https://registry.npmmirror.com/formdata-node/-/formdata-node-6.0.3.tgz", {}, "sha512-8e1++BCiTzUno9v5IZ2J6bv4RU+3UKDmqWUQD0MIMVCd9AdhWkO1gw57oo1mNEX1dMq2EGI+FbWz4B92pscSQg=="],
-
     "cssstyle/rrweb-cssom": ["rrweb-cssom@0.8.0", "", {}, "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw=="],
 
     "eslint-config-next/globals": ["globals@16.4.0", "https://registry.npmmirror.com/globals/-/globals-16.4.0.tgz", {}, "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw=="],
@@ -2316,8 +1962,6 @@
 
     "fast-glob/glob-parent": ["glob-parent@5.1.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
-    "groq-sdk/@types/node": ["@types/node@18.19.130", "https://registry.npmmirror.com/@types/node/-/node-18.19.130.tgz", { "dependencies": { "undici-types": "~5.26.4" } }, "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg=="],
-
     "is-bun-module/semver": ["semver@7.7.3", "https://registry.npmmirror.com/semver/-/semver-7.7.3.tgz", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="],
 
     "mdast-util-find-and-replace/escape-string-regexp": ["escape-string-regexp@5.0.0", "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", {}, "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw=="],
@@ -2330,8 +1974,6 @@
 
     "next-runtime-env/react": ["react@18.3.1", "https://registry.npmmirror.com/react/-/react-18.3.1.tgz", { "dependencies": { "loose-envify": "^1.1.0" } }, "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ=="],
 
-    "node-fetch/whatwg-url": ["whatwg-url@5.0.0", "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz", { "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" } }, "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="],
-
     "parse-entities/@types/unist": ["@types/unist@2.0.11", "https://registry.npmmirror.com/@types/unist/-/unist-2.0.11.tgz", {}, "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA=="],
 
     "parse5/entities": ["entities@6.0.1", "", {}, "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g=="],
@@ -2350,22 +1992,10 @@
 
     "strip-literal/js-tokens": ["js-tokens@9.0.1", "https://registry.npmmirror.com/js-tokens/-/js-tokens-9.0.1.tgz", {}, "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ=="],
 
-    "svix/@types/node": ["@types/node@22.19.3", "https://registry.npmmirror.com/@types/node/-/node-22.19.3.tgz", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA=="],
-
-    "svix/uuid": ["uuid@10.0.0", "https://registry.npmmirror.com/uuid/-/uuid-10.0.0.tgz", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ=="],
-
     "tailwindcss/postcss-selector-parser": ["postcss-selector-parser@6.1.2", "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg=="],
 
     "tsconfig-paths/json5": ["json5@1.0.2", "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz", { "dependencies": { "minimist": "^1.2.0" }, "bin": { "json5": "lib/cli.js" } }, "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="],
 
-    "xml-crypto/xpath": ["xpath@0.0.33", "https://registry.npmmirror.com/xpath/-/xpath-0.0.33.tgz", {}, "sha512-NNXnzrkDrAzalLhIUc01jO2mOzXGXh1JwPgkihcLLzw98c0WgYDmmjSh1Kl3wzaxSVWMuA+fe0WTWOBDWCBmNA=="],
-
-    "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="],
-
-    "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from": ["@smithy/util-buffer-from@2.2.0", "https://registry.npmmirror.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", { "dependencies": { "@smithy/is-array-buffer": "^2.2.0", "tslib": "^2.6.2" } }, "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA=="],
-
-    "@cerebras/cerebras_cloud_sdk/@types/node/undici-types": ["undici-types@5.26.5", "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="],
-
     "@next/eslint-plugin-next/fast-glob/glob-parent": ["glob-parent@5.1.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
 
     "@radix-ui/react-avatar/@radix-ui/react-primitive/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.4", "https://registry.npmmirror.com/@radix-ui/react-slot/-/react-slot-1.2.4.tgz", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA=="],
@@ -2380,8 +2010,6 @@
 
     "cmdk/@radix-ui/react-primitive/@radix-ui/react-slot": ["@radix-ui/react-slot@1.2.4", "https://registry.npmmirror.com/@radix-ui/react-slot/-/react-slot-1.2.4.tgz", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA=="],
 
-    "groq-sdk/@types/node/undici-types": ["undici-types@5.26.5", "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz", {}, "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="],
-
     "next-runtime-env/next/@next/env": ["@next/env@14.2.35", "https://registry.npmmirror.com/@next/env/-/env-14.2.35.tgz", {}, "sha512-DuhvCtj4t9Gwrx80dmz2F4t/zKQ4ktN8WrMwOuVzkJfBilwAwGr6v16M5eI8yCuZ63H9TTuEU09Iu2HqkzFPVQ=="],
 
     "next-runtime-env/next/@next/swc-darwin-arm64": ["@next/swc-darwin-arm64@14.2.33", "https://registry.npmmirror.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.33.tgz", { "os": "darwin", "cpu": "arm64" }, "sha512-HqYnb6pxlsshoSTubdXKu15g3iivcbsMXg4bYpjL2iS/V6aQot+iyF4BUc2qA/J/n55YtvE4PHMKWBKGCF/+wA=="],
@@ -2405,15 +2033,5 @@
     "next-runtime-env/next/postcss": ["postcss@8.4.31", "https://registry.npmmirror.com/postcss/-/postcss-8.4.31.tgz", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="],
 
     "next-runtime-env/next/styled-jsx": ["styled-jsx@5.1.1", "https://registry.npmmirror.com/styled-jsx/-/styled-jsx-5.1.1.tgz", { "dependencies": { "client-only": "0.0.1" }, "peerDependencies": { "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0" } }, "sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw=="],
-
-    "node-fetch/whatwg-url/tr46": ["tr46@0.0.3", "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz", {}, "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="],
-
-    "node-fetch/whatwg-url/webidl-conversions": ["webidl-conversions@3.0.1", "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz", {}, "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="],
-
-    "svix/@types/node/undici-types": ["undici-types@6.21.0", "https://registry.npmmirror.com/undici-types/-/undici-types-6.21.0.tgz", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
-
-    "@aws-crypto/sha256-browser/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="],
-
-    "@aws-crypto/util/@smithy/util-utf8/@smithy/util-buffer-from/@smithy/is-array-buffer": ["@smithy/is-array-buffer@2.2.0", "https://registry.npmmirror.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", { "dependencies": { "tslib": "^2.6.2" } }, "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA=="],
   }
 }
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/ApiAccessDialog.tsx b/frontend/components/agents/agent-build/agent-api-access-dialog.tsx
similarity index 82%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/ApiAccessDialog.tsx
rename to frontend/components/agents/agent-build/agent-api-access-dialog.tsx
index f18c8dbd7..656ca8c6e 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/ApiAccessDialog.tsx
+++ b/frontend/components/agents/agent-build/agent-api-access-dialog.tsx
@@ -20,45 +20,56 @@ import {
 } from '@/components/ui/select'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useToast } from '@/hooks/use-toast'
-import { TokenList } from '@/components/tokens/TokenList'
 import { TokenCreatedDialog } from '@/components/settings/token-created-dialog'
+import { TokenList } from '@/components/tokens/TokenList'
 import {
   useCreateToken,
   usePlatformTokens,
   type PlatformTokenCreateResponse,
 } from '@/hooks/queries/platformTokens'
-import { useCopyToClipboard } from '@/app/chat/shared/hooks/useCopyToClipboard'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+import { useToast } from '@/hooks/use-toast'
 import { API_BASE } from '@/lib/api-client'
 import { useTranslation } from '@/lib/i18n'
+import type { TokenListParams } from '@/services/platformTokenService'
 
-interface ApiAccessDialogProps {
+interface AgentApiAccessDialogProps {
   open: boolean
   onOpenChange: (open: boolean) => void
   agentId: string
   workspaceId: string
+  endpointKind?: 'graph'
+  tokenResourceType?: NonNullable<TokenListParams['resourceType']>
+  executeScope?: string
+  readScope?: string
 }
 
-export function ApiAccessDialog({
+export function AgentApiAccessDialog({
   open,
   onOpenChange,
   agentId,
   workspaceId,
-}: ApiAccessDialogProps) {
+  endpointKind = 'graph',
+  tokenResourceType = 'graph',
+  executeScope = 'graphs:execute',
+  readScope = 'graphs:read',
+}: AgentApiAccessDialogProps) {
   const { t } = useTranslation()
   const { toast } = useToast()
   const { copied, handleCopy } = useCopyToClipboard()
 
-  // Token creation state
   const [showCreateForm, setShowCreateForm] = useState(false)
   const [tokenName, setTokenName] = useState('')
-  const [tokenScope, setTokenScope] = useState('graphs:execute')
+  const [tokenScope, setTokenScope] = useState(executeScope)
   const [createdToken, setCreatedToken] = useState<PlatformTokenCreateResponse | null>(null)
 
-  const { data: tokens = [] } = usePlatformTokens({ resourceType: 'graph', resourceId: workspaceId })
+  const { data: tokens = [] } = usePlatformTokens({
+    resourceType: tokenResourceType,
+    resourceId: workspaceId,
+  })
   const createMutation = useCreateToken()
 
-  const apiUrl = `${API_BASE}/openapi/graph/${agentId}`
+  const apiUrl = `${API_BASE}/openapi/${endpointKind}/${agentId}`
 
   const curlExample = `curl -X POST "${apiUrl}/run" \\
   -H "Authorization: Bearer YOUR_API_KEY" \\
@@ -71,7 +82,7 @@ export function ApiAccessDialog({
       const result = await createMutation.mutateAsync({
         name: tokenName.trim(),
         scopes: [tokenScope],
-        resource_type: 'graph',
+        resource_type: tokenResourceType,
         resource_id: workspaceId,
       })
       setCreatedToken(result)
@@ -79,16 +90,17 @@ export function ApiAccessDialog({
       setTokenName('')
       setShowCreateForm(false)
     } catch (error: unknown) {
-      toast({ title: error instanceof Error ? error.message : String(error), variant: 'destructive' })
+      toast({
+        title: error instanceof Error ? error.message : String(error),
+        variant: 'destructive',
+      })
     }
   }
 
   const tokenHeader = (
     <div>
       <div className="mb-4">
-        <h3 className="text-sm font-medium text-[var(--text-primary)]">
-          {t('workspace.apiKeys')}
-        </h3>
+        <h3 className="text-sm font-medium text-[var(--text-primary)]">{t('workspace.apiKeys')}</h3>
         <p className="mt-1 text-xs text-[var(--text-tertiary)]">
           {t('workspace.apiKeysDescription')}
         </p>
@@ -104,7 +116,9 @@ export function ApiAccessDialog({
         {t('settings.tokens.create')}
       </Button>
       {tokens.length >= 50 && (
-        <p className="mt-1 text-xs text-[var(--status-warning)]">{t('settings.tokens.limitReached')}</p>
+        <p className="mt-1 text-xs text-[var(--status-warning)]">
+          {t('settings.tokens.limitReached')}
+        </p>
       )}
       {showCreateForm && (
         <div className="mt-3 flex items-end gap-2 rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-4">
@@ -112,7 +126,7 @@ export function ApiAccessDialog({
             <Label className="text-xs">{t('settings.tokens.name')}</Label>
             <Input
               value={tokenName}
-              onChange={(e) => setTokenName(e.target.value)}
+              onChange={(event) => setTokenName(event.target.value)}
               placeholder={t('settings.tokens.namePlaceholder')}
               className="mt-1"
             />
@@ -124,12 +138,8 @@ export function ApiAccessDialog({
                 <SelectValue />
               </SelectTrigger>
               <SelectContent>
-                <SelectItem value="graphs:execute">
-                  {t('settings.tokens.scopeRead')}
-                </SelectItem>
-                <SelectItem value="graphs:read">
-                  {t('settings.tokens.scopeRead')}
-                </SelectItem>
+                <SelectItem value={executeScope}>{t('settings.tokens.scopeRead')}</SelectItem>
+                <SelectItem value={readScope}>{t('settings.tokens.scopeRead')}</SelectItem>
               </SelectContent>
             </Select>
           </div>
@@ -150,12 +160,8 @@ export function ApiAccessDialog({
               <Terminal className="h-4 w-4 text-[var(--brand-600)]" />
             </div>
             <div>
-              <DialogTitle className="text-xl">
-                {t('workspace.apiAccess')}
-              </DialogTitle>
-              <DialogDescription>
-                {t('workspace.apiAccessDescription')}
-              </DialogDescription>
+              <DialogTitle className="text-xl">{t('workspace.apiAccess')}</DialogTitle>
+              <DialogDescription>{t('workspace.apiAccessDescription')}</DialogDescription>
             </div>
           </div>
         </DialogHeader>
@@ -174,9 +180,10 @@ export function ApiAccessDialog({
             </TabsList>
 
             <TabsContent value="integration" className="space-y-6">
-              {/* Endpoint Information */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('workspace.baseUrl')}</h3>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('workspace.baseUrl')}
+                </h3>
                 <div className="flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-2.5">
                   <div className="flex flex-col gap-1 overflow-hidden">
                     <span className="text-xs font-semibold uppercase tracking-wider text-[var(--text-tertiary)]">
@@ -205,17 +212,16 @@ export function ApiAccessDialog({
                           )}
                         </Button>
                       </TooltipTrigger>
-                      <TooltipContent>
-                        {t('workspace.copy')}
-                      </TooltipContent>
+                      <TooltipContent>{t('workspace.copy')}</TooltipContent>
                     </Tooltip>
                   </TooltipProvider>
                 </div>
               </div>
 
-              {/* Authentication */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('workspace.authentication')}</h3>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('workspace.authentication')}
+                </h3>
                 <p className="text-sm text-[var(--text-tertiary)]">
                   {t('workspace.authenticationDescription', { header: '' })}
                   <code className="rounded bg-[var(--surface-3)] px-1 py-0.5 text-[var(--text-primary)]">
@@ -229,12 +235,15 @@ export function ApiAccessDialog({
                 </div>
               </div>
 
-              {/* Example Request */}
               <div className="space-y-3">
-                <h3 className="text-sm font-semibold text-[var(--text-primary)]">{t('workspace.exampleRequest')}</h3>
+                <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+                  {t('workspace.exampleRequest')}
+                </h3>
                 <div className="relative overflow-hidden rounded-lg border border-[var(--border)]">
                   <div className="flex items-center justify-between border-b border-[var(--border)] bg-[var(--surface-3)] px-4 py-2">
-                    <span className="text-mono text-xs font-semibold text-[var(--text-secondary)]">cURL</span>
+                    <span className="text-mono text-xs font-semibold text-[var(--text-secondary)]">
+                      cURL
+                    </span>
                     <TooltipProvider delayDuration={300}>
                       <Tooltip>
                         <TooltipTrigger asChild>
@@ -251,9 +260,7 @@ export function ApiAccessDialog({
                             )}
                           </Button>
                         </TooltipTrigger>
-                        <TooltipContent>
-                          {t('workspace.copyCode')}
-                        </TooltipContent>
+                        <TooltipContent>{t('workspace.copyCode')}</TooltipContent>
                       </Tooltip>
                     </TooltipProvider>
                   </div>
@@ -263,7 +270,6 @@ export function ApiAccessDialog({
                 </div>
               </div>
 
-              {/* Documentation Link */}
               <div className="pt-2">
                 <a
                   href="https://github.com/jd-opensource/JoySafeter/blob/main/docs/api/openapi.md"
@@ -292,7 +298,11 @@ export function ApiAccessDialog({
 
             <TabsContent value="keys" className="space-y-4">
               <div className="rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] p-4 shadow-sm">
-                <TokenList resourceType="graph" resourceId={workspaceId} header={tokenHeader} />
+                <TokenList
+                  resourceType={tokenResourceType}
+                  resourceId={workspaceId}
+                  header={tokenHeader}
+                />
               </div>
             </TabsContent>
           </Tabs>
@@ -301,7 +311,7 @@ export function ApiAccessDialog({
 
       <TokenCreatedDialog
         open={!!createdToken}
-        onOpenChange={(open) => !open && setCreatedToken(null)}
+        onOpenChange={(nextOpen) => !nextOpen && setCreatedToken(null)}
         tokenData={createdToken}
       />
     </Dialog>
diff --git a/frontend/components/agents/agent-build/agent-build-shell.tsx b/frontend/components/agents/agent-build/agent-build-shell.tsx
new file mode 100644
index 000000000..a3a835d02
--- /dev/null
+++ b/frontend/components/agents/agent-build/agent-build-shell.tsx
@@ -0,0 +1,69 @@
+'use client'
+
+import { useCallback, useEffect, useState } from 'react'
+import { useRouter, useSearchParams } from 'next/navigation'
+
+import { useTranslation } from '@/lib/i18n'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import type { Agent, AgentVersion } from '@/types/agent'
+
+import {
+  BUILD_STAGES,
+  isBuildStageId,
+  resolveDefaultStage,
+  type BuildStageId,
+} from './agent-build-types'
+import { BuildStepper } from './build-stepper'
+import { useBuilderSurface } from './builder-surface-context'
+import { StageRenderer } from './stage-renderer'
+
+interface AgentBuildShellProps {
+  agent: Agent
+  version: AgentVersion | null
+}
+
+export function AgentBuildShell({ agent, version }: AgentBuildShellProps) {
+  const router = useRouter()
+  const searchParams = useSearchParams()
+  const surface = useBuilderSurface()
+  const { workspaceId } = useCurrentWorkspace()
+  const activeStageId = (() => {
+    const urlStage = searchParams.get('stage')
+    if (urlStage && isBuildStageId(urlStage)) return urlStage
+    return resolveDefaultStage(agent, version)
+  })()
+
+  useEffect(() => {
+    const urlStage = searchParams.get('stage')
+    if (!urlStage) {
+      const defaultStage = resolveDefaultStage(agent, version)
+      const params = new URLSearchParams(searchParams.toString())
+      params.set('stage', defaultStage)
+      router.replace(`/agents/${agent.id}?${params.toString()}`, { scroll: false })
+    }
+  }, [agent.id, router, searchParams, version])
+
+  const navigateToStage = useCallback(
+    (stageId: BuildStageId) => {
+      const params = new URLSearchParams(searchParams.toString())
+      params.set('stage', stageId)
+      router.replace(`/agents/${agent.id}?${params.toString()}`, { scroll: false })
+    },
+    [agent.id, router, searchParams],
+  )
+
+  const stageProps = {
+    agent,
+    version,
+    workspaceId,
+    navigateToStage,
+  }
+
+  return (
+    <div className="flex h-full flex-col">
+      <main className="min-h-0 flex-1 overflow-hidden">
+        <StageRenderer stageId={activeStageId} surface={surface} stageProps={stageProps} />
+      </main>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-build/agent-build-types.ts b/frontend/components/agents/agent-build/agent-build-types.ts
new file mode 100644
index 000000000..e5b6054f6
--- /dev/null
+++ b/frontend/components/agents/agent-build/agent-build-types.ts
@@ -0,0 +1,81 @@
+import { Beaker, BriefcaseBusiness, FileText, Hammer, Rocket, type LucideIcon } from 'lucide-react'
+import type { Agent, AgentVersion } from '@/types/agent'
+
+export type BuildStageId = 'brief' | 'build' | 'test-lab' | 'release' | 'usage'
+
+export interface StageProps {
+  agent: Agent
+  version: AgentVersion | null
+  workspaceId: string
+  navigateToStage: (stageId: BuildStageId) => void
+}
+
+export interface BuilderSurface {
+  BriefStage: React.ComponentType<StageProps>
+  BuildStage: React.ComponentType<StageProps>
+  TestLabStage: React.ComponentType<StageProps>
+}
+
+export interface BuildStageConfig {
+  id: BuildStageId
+  labelKey: string
+  descriptionKey: string
+  icon: LucideIcon
+}
+
+export const BUILD_STAGES: readonly BuildStageConfig[] = [
+  {
+    id: 'brief',
+    labelKey: 'agents.build.stages.brief',
+    descriptionKey: 'agents.build.stageDescriptions.brief',
+    icon: FileText,
+  },
+  {
+    id: 'build',
+    labelKey: 'agents.build.stages.build',
+    descriptionKey: 'agents.build.stageDescriptions.build',
+    icon: Hammer,
+  },
+  {
+    id: 'test-lab',
+    labelKey: 'agents.build.stages.testLab',
+    descriptionKey: 'agents.build.stageDescriptions.testLab',
+    icon: Beaker,
+  },
+  {
+    id: 'release',
+    labelKey: 'agents.build.stages.release',
+    descriptionKey: 'agents.build.stageDescriptions.release',
+    icon: Rocket,
+  },
+  {
+    id: 'usage',
+    labelKey: 'agents.build.stages.usage',
+    descriptionKey: 'agents.build.stageDescriptions.usage',
+    icon: BriefcaseBusiness,
+  },
+] as const
+
+const BUILD_STAGE_IDS = new Set<BuildStageId>(BUILD_STAGES.map((s) => s.id))
+
+export function isBuildStageId(value: string | null | undefined): value is BuildStageId {
+  return Boolean(value && BUILD_STAGE_IDS.has(value as BuildStageId))
+}
+
+export function hasVersionContent(version: AgentVersion): boolean {
+  const payload = version.definition_payload
+  if (!payload) return false
+  const nodes = payload.nodes as unknown[] | undefined
+  if (Array.isArray(nodes) && nodes.length > 0) return true
+  const code = payload.code_content as string | undefined
+  if (code && code.trim().length > 0) return true
+  const prompt = payload.prompt as string | undefined
+  if (prompt && prompt.trim().length > 0) return true
+  return false
+}
+
+export function resolveDefaultStage(agent: Agent, version: AgentVersion | null): BuildStageId {
+  if (agent.active_release_id) return 'usage'
+  if (!version) return 'brief'
+  return hasVersionContent(version) ? 'build' : 'brief'
+}
diff --git a/frontend/components/agents/agent-build/agent-release-stage.tsx b/frontend/components/agents/agent-build/agent-release-stage.tsx
new file mode 100644
index 000000000..7bac01e7e
--- /dev/null
+++ b/frontend/components/agents/agent-build/agent-release-stage.tsx
@@ -0,0 +1,400 @@
+'use client'
+
+import { useMemo, useState } from 'react'
+import {
+  Archive,
+  CheckCircle2,
+  ChevronDown,
+  ChevronRight,
+  Loader2,
+  MoreHorizontal,
+  Rocket,
+  Undo2,
+  XCircle,
+} from 'lucide-react'
+
+import { ReleaseStatusBadge } from '@/components/agents/release-status-badge'
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import {
+  usePublishAgent,
+  useReleaseHistory,
+  useRetireRelease,
+  useRollbackAgent,
+  useUnpublishAgent,
+} from '@/hooks/queries/agentPublish'
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+import type { AgentRelease } from '@/types/agent-release'
+import { canRetire, canRollback } from '@/types/agent-release'
+
+import { hasVersionContent } from './agent-build-types'
+import type { StageProps } from './agent-build-types'
+
+function formatDate(iso: string | null): string {
+  if (!iso) return '-'
+  return new Date(iso).toLocaleDateString(undefined, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })
+}
+
+function UnpublishedHero({
+  onPublish,
+  canPublish,
+  isPending,
+  t,
+}: {
+  onPublish: () => void
+  canPublish: boolean
+  isPending: boolean
+  t: (key: string, opts?: Record<string, string>) => string
+}) {
+  return (
+    <div className="flex flex-col items-center justify-center gap-6 py-20 text-center">
+      <div className="flex h-16 w-16 items-center justify-center rounded-2xl bg-[var(--accent-muted)]">
+        <Rocket className="h-8 w-8 text-[var(--accent)]" />
+      </div>
+      <div className="space-y-2">
+        <h2 className="text-2xl font-semibold text-[var(--text-primary)]">
+          {t('agents.build.release.title', { defaultValue: 'Publish your Agent' })}
+        </h2>
+        <p className="mx-auto max-w-md text-sm text-[var(--text-secondary)]">
+          {t('agents.build.release.subtitle', {
+            defaultValue: 'Publish to enable chat, tasks, and API access',
+          })}
+        </p>
+      </div>
+      <Button size="lg" onClick={onPublish} disabled={!canPublish || isPending}>
+        {isPending ? (
+          <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+        ) : (
+          <Rocket className="mr-2 h-4 w-4" />
+        )}
+        {t('agents.build.release.publish', { defaultValue: 'Publish' })}
+      </Button>
+    </div>
+  )
+}
+
+function PublishedCard({
+  activeRelease,
+  onPublishNew,
+  onUnpublish,
+  canPublish,
+  canAdmin,
+  isPublishing,
+  isUnpublishing,
+  t,
+}: {
+  activeRelease: AgentRelease | undefined
+  onPublishNew: () => void
+  onUnpublish: () => void
+  canPublish: boolean
+  canAdmin: boolean
+  isPublishing: boolean
+  isUnpublishing: boolean
+  t: (key: string, opts?: Record<string, string>) => string
+}) {
+  return (
+    <Card className="border-green-500/40 bg-green-50/50 p-5 dark:bg-green-950/20">
+      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+        <div className="flex items-center gap-3">
+          <CheckCircle2 className="h-5 w-5 text-green-600 dark:text-green-400" />
+          <div>
+            <p className="text-sm font-semibold text-[var(--text-primary)]">
+              {t('agents.build.release.currentActive', { defaultValue: 'Currently published' })}
+            </p>
+            {activeRelease && (
+              <p className="text-xs text-[var(--text-muted)]">
+                {`${t('agents.build.release.releaseVersion', { defaultValue: 'Version {{version}}', version: String(activeRelease.release_number) })} · ${t('agents.build.release.publishedAt', { defaultValue: 'Published' })} ${formatDate(activeRelease.published_at)}`}
+              </p>
+            )}
+          </div>
+        </div>
+        <div className="flex items-center gap-2">
+          {canAdmin && (
+            <Button variant="outline" onClick={onUnpublish} disabled={isUnpublishing}>
+              {isUnpublishing ? (
+                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+              ) : (
+                <XCircle className="mr-2 h-4 w-4" />
+              )}
+              {t('agents.build.release.unpublish', { defaultValue: 'Unpublish' })}
+            </Button>
+          )}
+          <Button onClick={onPublishNew} disabled={!canPublish || isPublishing}>
+            {isPublishing ? (
+              <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+            ) : (
+              <Rocket className="mr-2 h-4 w-4" />
+            )}
+            {t('agents.build.release.publishNew', { defaultValue: 'Publish new version' })}
+          </Button>
+        </div>
+      </div>
+    </Card>
+  )
+}
+
+function ReleaseRow({
+  release,
+  isAdmin,
+  onRollback,
+  isRollingBack,
+  onRetire,
+  isRetiring,
+  t,
+}: {
+  release: AgentRelease
+  isAdmin: boolean
+  onRollback: (releaseId: string) => void
+  isRollingBack: boolean
+  onRetire: (releaseId: string) => void
+  isRetiring: boolean
+  t: (key: string, opts?: Record<string, string>) => string
+}) {
+  const isActive = release.status === 'active'
+
+  return (
+    <div
+      className={`flex flex-col gap-3 rounded-xl border p-3 md:flex-row md:items-center md:justify-between ${
+        isActive
+          ? 'border-green-500/40 bg-green-50/30 dark:bg-green-950/10'
+          : 'border-[var(--border)] bg-[var(--surface-2)]'
+      }`}
+    >
+      <div className="flex flex-wrap items-center gap-2">
+        <span className="text-sm font-semibold text-[var(--text-primary)]">
+          {t('agents.build.release.releaseVersion', {
+            defaultValue: 'Version {{version}}',
+            version: String(release.release_number),
+          })}
+        </span>
+        <span className="text-xs text-[var(--text-muted)]">
+          {`· ${t('agents.build.release.publishedAt', { defaultValue: 'Published' })} ${formatDate(release.published_at)}`}
+        </span>
+        <ReleaseStatusBadge status={release.status} />
+      </div>
+
+      <div className="flex items-center gap-2">
+        {!isActive && canRollback(release.status) && isAdmin && (
+          <Button
+            size="sm"
+            variant="outline"
+            onClick={() => onRollback(release.id)}
+            disabled={isRollingBack}
+          >
+            {isRollingBack ? (
+              <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />
+            ) : (
+              <Undo2 className="mr-1.5 h-3.5 w-3.5" />
+            )}
+            {t('agents.build.release.rollback', { defaultValue: 'Roll back to this version' })}
+          </Button>
+        )}
+
+        {isAdmin && canRetire(release.status) && (
+          <DropdownMenu>
+            <DropdownMenuTrigger asChild>
+              <Button size="sm" variant="ghost" className="h-8 w-8 p-0">
+                <MoreHorizontal className="h-4 w-4" />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <DropdownMenuItem
+                onClick={() => onRetire(release.id)}
+                disabled={isRetiring}
+                className="text-destructive"
+              >
+                {isRetiring ? (
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                ) : (
+                  <Archive className="mr-2 h-4 w-4" />
+                )}
+                {t('agents.build.release.retireRelease', { defaultValue: 'Retire' })}
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        )}
+      </div>
+    </div>
+  )
+}
+
+export function AgentReleaseStage({ agent, version, workspaceId }: StageProps) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const { canAdmin } = useUserPermissionsContext()
+
+  const canPublishDraft = version ? hasVersionContent(version) : false
+  const canPublishFlag = canAdmin && canPublishDraft
+
+  const isPublished = Boolean(agent.active_release_id)
+
+  const publishAgent = usePublishAgent()
+  const rollbackAgent = useRollbackAgent()
+  const retireRelease = useRetireRelease()
+  const unpublishAgent = useUnpublishAgent()
+  const { data: releases = [], isLoading: isLoadingHistory } = useReleaseHistory(
+    agent.id,
+    workspaceId,
+    { enabled: isPublished },
+  )
+
+  const [historyOpen, setHistoryOpen] = useState(false)
+  const [showArchived, setShowArchived] = useState(false)
+  const [pendingRollbackId, setPendingRollbackId] = useState<string | null>(null)
+  const [pendingRetireId, setPendingRetireId] = useState<string | null>(null)
+
+  const activeRelease = useMemo(() => releases.find((r) => r.status === 'active'), [releases])
+  const { visibleReleases, archivedCount } = useMemo(() => {
+    const archived = releases.filter((r) => r.status === 'retired')
+    return {
+      visibleReleases: showArchived ? releases : releases.filter((r) => r.status !== 'retired'),
+      archivedCount: archived.length,
+    }
+  }, [releases, showArchived])
+
+  const handlePublish = () => {
+    publishAgent.mutate(
+      { agentId: agent.id, workspaceId },
+      {
+        onSuccess: () => {
+          toast({
+            title: t('agents.build.release.publish', { defaultValue: 'Publish' }),
+            description: t('agents.build.release.publishSuccess', {
+              defaultValue: 'Agent published successfully',
+            }),
+            variant: 'success',
+          })
+        },
+        onError: (error) => {
+          toast({
+            title: t('agents.build.release.publishFailed', {
+              defaultValue: 'Publish failed',
+            }),
+            description: error instanceof Error ? error.message : String(error),
+            variant: 'destructive',
+          })
+        },
+      },
+    )
+  }
+
+  const handleUnpublish = () => {
+    unpublishAgent.mutate({ agentId: agent.id, workspaceId })
+  }
+
+  return (
+    <div className="h-full overflow-y-auto bg-[var(--surface-1)] p-6">
+      <div className="mx-auto max-w-3xl space-y-5">
+        {!isPublished && (
+          <UnpublishedHero
+            onPublish={handlePublish}
+            canPublish={canPublishFlag}
+            isPending={publishAgent.isPending}
+            t={t}
+          />
+        )}
+
+        {isPublished && (
+          <PublishedCard
+            activeRelease={activeRelease}
+            onPublishNew={handlePublish}
+            onUnpublish={handleUnpublish}
+            canPublish={canPublishFlag}
+            canAdmin={canAdmin}
+            isPublishing={publishAgent.isPending}
+            isUnpublishing={unpublishAgent.isPending}
+            t={t}
+          />
+        )}
+
+        {releases.length > 0 && (
+          <div>
+            <button
+              type="button"
+              className="flex w-full items-center gap-2 py-2 text-sm font-semibold text-[var(--text-primary)] hover:text-[var(--text-secondary)]"
+              onClick={() => setHistoryOpen((prev) => !prev)}
+            >
+              {historyOpen ? (
+                <ChevronDown className="h-4 w-4" />
+              ) : (
+                <ChevronRight className="h-4 w-4" />
+              )}
+              {t('agents.build.release.history', { defaultValue: 'Version history' })}
+              <Badge variant="outline" className="ml-1 text-xs">
+                {releases.length}
+              </Badge>
+            </button>
+
+            {historyOpen && (
+              <div className="mt-2 space-y-2">
+                {isLoadingHistory ? (
+                  <div className="flex items-center gap-2 py-4 text-sm text-[var(--text-muted)]">
+                    <Loader2 className="h-4 w-4 animate-spin" />
+                    {t('common.loading', { defaultValue: 'Loading...' })}
+                  </div>
+                ) : (
+                  <>
+                    {visibleReleases.map((release) => (
+                      <ReleaseRow
+                        key={release.id}
+                        release={release}
+                        isAdmin={canAdmin}
+                        onRollback={(releaseId) => {
+                          setPendingRollbackId(releaseId)
+                          rollbackAgent.mutate(
+                            { agentId: agent.id, releaseId, workspaceId },
+                            { onSettled: () => setPendingRollbackId(null) },
+                          )
+                        }}
+                        isRollingBack={pendingRollbackId === release.id}
+                        onRetire={(releaseId) => {
+                          setPendingRetireId(releaseId)
+                          retireRelease.mutate(
+                            { agentId: agent.id, releaseId, workspaceId },
+                            { onSettled: () => setPendingRetireId(null) },
+                          )
+                        }}
+                        isRetiring={pendingRetireId === release.id}
+                        t={t}
+                      />
+                    ))}
+
+                    {archivedCount > 0 && (
+                      <button
+                        type="button"
+                        className="mt-1 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+                        onClick={() => setShowArchived((prev) => !prev)}
+                      >
+                        {showArchived
+                          ? t('agents.build.release.hideArchived', {
+                              defaultValue: 'Hide archived',
+                            })
+                          : t('agents.build.release.showArchived', {
+                              defaultValue: `Show ${archivedCount} archived`,
+                              num: String(archivedCount),
+                            })}
+                      </button>
+                    )}
+                  </>
+                )}
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-build/agent-usage-stage.tsx b/frontend/components/agents/agent-build/agent-usage-stage.tsx
new file mode 100644
index 000000000..1adf86594
--- /dev/null
+++ b/frontend/components/agents/agent-build/agent-usage-stage.tsx
@@ -0,0 +1,95 @@
+'use client'
+
+import { MessageSquare, Plug, Terminal } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { useTranslation } from '@/lib/i18n'
+import type { StageProps } from './agent-build-types'
+import { AgentApiAccessDialog } from './agent-api-access-dialog'
+
+export function AgentUsageStage({ agent, workspaceId }: StageProps) {
+  const { t } = useTranslation()
+  const [apiAccessOpen, setApiAccessOpen] = useState(false)
+  const hasActiveRelease = Boolean(agent.active_release_id)
+
+  return (
+    <div className="h-full overflow-y-auto bg-[var(--surface-1)] p-6">
+      <div className="mx-auto max-w-5xl space-y-5">
+        <div className="rounded-2xl border border-[var(--border)] bg-[var(--surface-2)] p-5">
+          <p className="text-xs font-bold uppercase tracking-[0.2em] text-[var(--text-muted)]">
+            {t('agents.build.usage.kicker', { defaultValue: 'Business usage' })}
+          </p>
+          <h2 className="mt-1 text-2xl font-semibold text-[var(--text-primary)]">
+            {t('agents.build.usage.title', {
+              defaultValue: 'Use this Agent in business scenarios',
+            })}
+          </h2>
+          <p className="mt-2 max-w-2xl text-sm text-[var(--text-secondary)]">
+            {hasActiveRelease
+              ? t('agents.build.usage.subtitleReady', {
+                  defaultValue:
+                    'The active release can now be connected to chat, tasks, API calls, and business workflows.',
+                })
+              : t('agents.build.usage.subtitleNoRelease', {
+                  defaultValue:
+                    'Publish and activate a release before connecting this Agent to business usage.',
+                })}
+          </p>
+        </div>
+
+        <div className="grid gap-4 md:grid-cols-3">
+          <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+            <MessageSquare className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <h3 className="mt-3 text-sm font-semibold text-[var(--text-primary)]">
+              {t('agents.build.usage.chat', { defaultValue: 'Chat' })}
+            </h3>
+            <p className="mt-2 text-sm text-[var(--text-muted)]">
+              {t('agents.build.usage.chatDesc', {
+                defaultValue: 'Start conversations against the active release.',
+              })}
+            </p>
+          </Card>
+          <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+            <Plug className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <h3 className="mt-3 text-sm font-semibold text-[var(--text-primary)]">
+              {t('agents.build.usage.tasks', { defaultValue: 'Tasks and workflows' })}
+            </h3>
+            <p className="mt-2 text-sm text-[var(--text-muted)]">
+              {t('agents.build.usage.tasksDesc', {
+                defaultValue: 'Attach this Agent to task execution and operational flows.',
+              })}
+            </p>
+          </Card>
+          <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+            <Terminal className="h-5 w-5 text-[var(--skill-brand-600)]" />
+            <h3 className="mt-3 text-sm font-semibold text-[var(--text-primary)]">
+              {t('workspace.apiAccess', { defaultValue: 'API Access' })}
+            </h3>
+            <p className="mt-2 text-sm text-[var(--text-muted)]">
+              {t('workspace.apiAccessDescription', {
+                defaultValue: 'Generate tokens and call this Agent from external systems.',
+              })}
+            </p>
+            <Button
+              className="mt-4"
+              variant="outline"
+              onClick={() => setApiAccessOpen(true)}
+              disabled={!hasActiveRelease}
+            >
+              {t('workspace.accessApi', { defaultValue: 'Access API' })}
+            </Button>
+          </Card>
+        </div>
+      </div>
+
+      <AgentApiAccessDialog
+        open={apiAccessOpen}
+        onOpenChange={setApiAccessOpen}
+        agentId={agent.id}
+        workspaceId={workspaceId}
+      />
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-build/build-stepper.tsx b/frontend/components/agents/agent-build/build-stepper.tsx
new file mode 100644
index 000000000..c3504d2d8
--- /dev/null
+++ b/frontend/components/agents/agent-build/build-stepper.tsx
@@ -0,0 +1,57 @@
+'use client'
+
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+
+import type { BuildStageConfig, BuildStageId } from './agent-build-types'
+
+interface BuildStepperProps {
+  stages: readonly BuildStageConfig[]
+  activeStage: BuildStageId
+  onNavigate: (stageId: BuildStageId) => void
+}
+
+export function BuildStepper({ stages, activeStage, onNavigate }: BuildStepperProps) {
+  const { t } = useTranslation()
+
+  return (
+    <nav aria-label="Build stages" className="flex items-center gap-1">
+      {stages.map((stage, index) => {
+        const Icon = stage.icon
+        const isActive = stage.id === activeStage
+        const isLast = index === stages.length - 1
+
+        return (
+          <div key={stage.id} className="flex items-center">
+            <button
+              type="button"
+              aria-current={isActive ? 'step' : undefined}
+              className={cn(
+                'flex items-center gap-2 rounded-lg px-3 py-1.5 text-xs font-medium transition-colors',
+                'hover:bg-[var(--surface-2)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--skill-brand-600)]',
+                isActive
+                  ? 'bg-[var(--skill-brand-50)] text-[var(--skill-brand-700)]'
+                  : 'text-[var(--text-muted)]',
+              )}
+              onClick={() => onNavigate(stage.id)}
+            >
+              <span
+                className={cn(
+                  'flex h-6 w-6 shrink-0 items-center justify-center rounded-md text-[10px] font-bold',
+                  isActive
+                    ? 'bg-[var(--skill-brand-600)] text-white'
+                    : 'bg-[var(--surface-2)] text-[var(--text-muted)]',
+                )}
+              >
+                {index + 1}
+              </span>
+              <Icon className="h-3.5 w-3.5 shrink-0" />
+              <span className="hidden whitespace-nowrap sm:inline">{t(stage.labelKey)}</span>
+            </button>
+            {!isLast && <div className="mx-1 h-px w-4 bg-[var(--border)]" />}
+          </div>
+        )
+      })}
+    </nav>
+  )
+}
diff --git a/frontend/components/agents/agent-build/builder-surface-context.tsx b/frontend/components/agents/agent-build/builder-surface-context.tsx
new file mode 100644
index 000000000..90251d77b
--- /dev/null
+++ b/frontend/components/agents/agent-build/builder-surface-context.tsx
@@ -0,0 +1,14 @@
+'use client'
+
+import { createContext, useContext } from 'react'
+import type { BuilderSurface } from './agent-build-types'
+
+export const BuilderSurfaceContext = createContext<BuilderSurface | null>(null)
+
+export function useBuilderSurface(): BuilderSurface {
+  const ctx = useContext(BuilderSurfaceContext)
+  if (!ctx) {
+    throw new Error('useBuilderSurface must be used within a BuilderSurfaceContext.Provider')
+  }
+  return ctx
+}
diff --git a/frontend/components/agents/agent-build/builder-surface-registry.ts b/frontend/components/agents/agent-build/builder-surface-registry.ts
new file mode 100644
index 000000000..3fb78ea73
--- /dev/null
+++ b/frontend/components/agents/agent-build/builder-surface-registry.ts
@@ -0,0 +1,33 @@
+import { cliSurface } from '@/components/agents/surfaces/cli'
+import { codeSurface } from '@/components/agents/surfaces/code'
+import { visualSurface } from '@/components/agents/surfaces/visual'
+import { ENGINE_KINDS } from '@/types/agent'
+
+import type { BuilderSurface } from './agent-build-types'
+import type { EngineKind } from '@/types/agent'
+
+export type BuilderSurfaceKind = 'visual' | 'cli' | 'code'
+
+const SURFACE_MAP: Record<BuilderSurfaceKind, BuilderSurface> = {
+  visual: visualSurface,
+  cli: cliSurface,
+  code: codeSurface,
+}
+
+const ENGINE_TO_SURFACE: Record<EngineKind, BuilderSurfaceKind> = {
+  langgraph_visual: 'visual',
+  langgraph_code: 'code',
+  claude_code: 'cli',
+  codex: 'cli',
+  openclaw: 'cli',
+}
+
+export function resolveBuilderSurface(engineKind: string | null | undefined): BuilderSurface {
+  const surfaceKind = isEngineKind(engineKind) ? ENGINE_TO_SURFACE[engineKind] : 'visual'
+
+  return SURFACE_MAP[surfaceKind]
+}
+
+function isEngineKind(engineKind: string | null | undefined): engineKind is EngineKind {
+  return ENGINE_KINDS.includes(engineKind as EngineKind)
+}
diff --git a/frontend/components/agents/agent-build/stage-renderer.tsx b/frontend/components/agents/agent-build/stage-renderer.tsx
new file mode 100644
index 000000000..3052ae23a
--- /dev/null
+++ b/frontend/components/agents/agent-build/stage-renderer.tsx
@@ -0,0 +1,26 @@
+'use client'
+
+import type { BuildStageId, BuilderSurface, StageProps } from './agent-build-types'
+import { AgentReleaseStage } from './agent-release-stage'
+import { AgentUsageStage } from './agent-usage-stage'
+
+interface StageRendererProps {
+  stageId: BuildStageId
+  surface: BuilderSurface
+  stageProps: StageProps
+}
+
+export function StageRenderer({ stageId, surface, stageProps }: StageRendererProps) {
+  switch (stageId) {
+    case 'brief':
+      return <surface.BriefStage {...stageProps} />
+    case 'build':
+      return <surface.BuildStage {...stageProps} />
+    case 'test-lab':
+      return <surface.TestLabStage {...stageProps} />
+    case 'release':
+      return <AgentReleaseStage {...stageProps} />
+    case 'usage':
+      return <AgentUsageStage {...stageProps} />
+  }
+}
diff --git a/frontend/components/agents/agent-builder-tab.tsx b/frontend/components/agents/agent-builder-tab.tsx
new file mode 100644
index 000000000..f543531e7
--- /dev/null
+++ b/frontend/components/agents/agent-builder-tab.tsx
@@ -0,0 +1,29 @@
+'use client'
+
+// Compatibility wrapper for legacy ?tab=builder links. Visual Agents now use AgentStudioShell by default.
+
+import { useAgent } from '@/hooks/queries/agents'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import AgentBuilder from '@/components/editors/graph-builder/AgentBuilder'
+
+interface AgentBuilderTabProps {
+  agentId: string
+}
+
+export function AgentBuilderTab({ agentId }: AgentBuilderTabProps) {
+  const { workspaceId } = useCurrentWorkspace()
+
+  const { data: agent } = useAgent(agentId, workspaceId)
+
+  if (!agent) return null
+
+  return (
+    <div className="h-full">
+      <AgentBuilder
+        workspaceId={workspaceId}
+        agentId={agentId}
+        versionId={agent.current_draft_version_id || undefined}
+      />
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-card.tsx b/frontend/components/agents/agent-card.tsx
new file mode 100644
index 000000000..a302b384e
--- /dev/null
+++ b/frontend/components/agents/agent-card.tsx
@@ -0,0 +1,96 @@
+'use client'
+
+import { ArrowRight, Bot, Trash2 } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { useTranslation } from '@/lib/i18n'
+import { formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { Agent } from '@/types/agent'
+
+import { AgentStatusIndicator } from './agent-status'
+
+const DEFINITION_LABEL_KEYS: Record<string, { labelKey: string; defaultLabel: string }> = {
+  langgraph_visual: { labelKey: 'agents.graph.shortLabel', defaultLabel: 'Graph' },
+  langgraph_code: { labelKey: 'agents.code.shortLabel', defaultLabel: 'Code' },
+  claude_code: { labelKey: 'agents.claudeCode.shortLabel', defaultLabel: 'Claude Code' },
+  codex: { labelKey: 'agents.codex.shortLabel', defaultLabel: 'Codex' },
+  openclaw: { labelKey: 'agents.openclaw.shortLabel', defaultLabel: 'OpenClaw' },
+}
+
+interface AgentCardProps {
+  agent: Agent
+  onClick: (agent: Agent) => void
+  onDelete?: (agent: Agent) => void
+}
+
+export function AgentCard({ agent, onClick, onDelete }: AgentCardProps) {
+  const { t } = useTranslation()
+  const actionHint = agent.active_release_id
+    ? t('agents.card.hintPublished', { defaultValue: 'View usage & manage' })
+    : agent.current_draft_version_id
+      ? t('agents.card.hintBuilding', { defaultValue: 'Continue building' })
+      : t('agents.card.hintNew', { defaultValue: 'Start building' })
+
+  const timeText = agent.updated_at ? formatRelativeTime(agent.updated_at, t) : ''
+  const definitionLabel = agent.engine_kind ? DEFINITION_LABEL_KEYS[agent.engine_kind] : null
+
+  return (
+    <Card
+      className="group flex cursor-pointer flex-col border-[var(--border)] bg-[var(--surface-1)] p-4 transition-all hover:border-[var(--skill-brand-200)] hover:shadow-md"
+      onClick={() => onClick(agent)}
+    >
+      {/* Header */}
+      <div className="mb-2 flex items-start justify-between">
+        <div className="flex items-center gap-2">
+          <div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-[var(--skill-brand-50)] text-[var(--skill-brand-600)]">
+            <Bot className="h-4 w-4" />
+          </div>
+          <div className="min-w-0">
+            <h3 className="truncate text-sm font-semibold text-[var(--text-primary)]">
+              {agent.name}
+            </h3>
+          </div>
+        </div>
+        <AgentStatusIndicator status={agent.status} />
+      </div>
+
+      {/* Description */}
+      <p className="mb-3 line-clamp-2 min-h-[2rem] text-xs text-[var(--text-muted)]">
+        {agent.description || t('agents.noDescription', { defaultValue: 'No description yet' })}
+      </p>
+
+      {/* Meta + Action — single compact row */}
+      <div className="mt-auto flex items-center justify-between pt-2">
+        <div className="flex items-center gap-1.5">
+          {definitionLabel && (
+            <span className="inline-flex h-5 items-center rounded-md border border-[var(--border)] px-1.5 text-[10px] text-[var(--text-muted)]">
+              {t(definitionLabel.labelKey, { defaultValue: definitionLabel.defaultLabel })}
+            </span>
+          )}
+          {timeText && <span className="text-[10px] text-[var(--text-muted)]">{timeText}</span>}
+        </div>
+        <div className="flex items-center gap-1">
+          <span className="flex items-center gap-0.5 text-[10px] font-medium text-[var(--skill-brand-600)] opacity-0 transition-opacity group-hover:opacity-100">
+            {actionHint}
+            <ArrowRight className="h-2.5 w-2.5" />
+          </span>
+          {onDelete && (
+            <Button
+              variant="ghost"
+              size="sm"
+              className="h-6 w-6 p-0 text-[var(--text-muted)] opacity-0 transition-opacity hover:text-[var(--error-text)] group-hover:opacity-100"
+              aria-label={t('agents.card.delete', { defaultValue: 'Delete agent' })}
+              onClick={(e) => {
+                e.stopPropagation()
+                onDelete(agent)
+              }}
+            >
+              <Trash2 className="h-3 w-3" />
+            </Button>
+          )}
+        </div>
+      </div>
+    </Card>
+  )
+}
diff --git a/frontend/components/agents/agent-form-dialog.tsx b/frontend/components/agents/agent-form-dialog.tsx
new file mode 100644
index 000000000..e1ef43ada
--- /dev/null
+++ b/frontend/components/agents/agent-form-dialog.tsx
@@ -0,0 +1,189 @@
+'use client'
+
+import { Bot, Code2, GitBranch, Terminal } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import type { CreateAgentRequest, EngineKind } from '@/types/agent'
+
+interface BuildMethodOption {
+  value: EngineKind
+  labelKey: string
+  descriptionKey: string
+  icon: React.ComponentType<{ className?: string }>
+}
+
+const BUILD_METHOD_OPTIONS: BuildMethodOption[] = [
+  {
+    value: 'langgraph_visual',
+    labelKey: 'agents.graph.label',
+    descriptionKey: 'agents.graph.description',
+    icon: GitBranch,
+  },
+  {
+    value: 'langgraph_code',
+    labelKey: 'agents.code.label',
+    descriptionKey: 'agents.code.description',
+    icon: Code2,
+  },
+  {
+    value: 'claude_code',
+    labelKey: 'agents.claudeCode.label',
+    descriptionKey: 'agents.claudeCode.description',
+    icon: Terminal,
+  },
+  {
+    value: 'codex',
+    labelKey: 'agents.codex.label',
+    descriptionKey: 'agents.codex.description',
+    icon: Bot,
+  },
+  {
+    value: 'openclaw',
+    labelKey: 'agents.openclaw.label',
+    descriptionKey: 'agents.openclaw.description',
+    icon: Terminal,
+  },
+]
+
+interface CreateAgentDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  onSubmit: (data: CreateAgentRequest) => void
+  isPending?: boolean
+}
+
+export function CreateAgentDialog({
+  open,
+  onOpenChange,
+  onSubmit,
+  isPending,
+}: CreateAgentDialogProps) {
+  const { t } = useTranslation()
+
+  const [name, setName] = useState('')
+  const [engineKind, setEngineKind] = useState<EngineKind>('langgraph_visual')
+
+  function resetForm() {
+    setName('')
+    setEngineKind('langgraph_visual')
+  }
+
+  function handleOpenChange(nextOpen: boolean) {
+    if (!nextOpen) {
+      resetForm()
+    }
+    onOpenChange(nextOpen)
+  }
+
+  function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+    if (!name.trim()) return
+
+    onSubmit({
+      name: name.trim(),
+      engine_kind: engineKind,
+    })
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>{t('agents.newAgent', { defaultValue: 'New Agent' })}</DialogTitle>
+          <DialogDescription>
+            {t('agents.newAgentDescription', {
+              defaultValue: 'Choose a name and build method to get started.',
+            })}
+          </DialogDescription>
+        </DialogHeader>
+
+        <form onSubmit={handleSubmit} className="space-y-5">
+          <div className="space-y-2">
+            <Label htmlFor="agent-name">{t('agents.name', { defaultValue: 'Name' })} *</Label>
+            <Input
+              id="agent-name"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder={t('agents.namePlaceholder', {
+                defaultValue: 'Give your agent a name',
+              })}
+              autoFocus
+              required
+            />
+          </div>
+
+          <div className="space-y-2">
+            <Label>{t('agents.buildMethod', { defaultValue: 'Build method' })}</Label>
+            <div
+              className="grid gap-2"
+              role="radiogroup"
+              aria-label={t('agents.buildMethod', { defaultValue: 'Build method' })}
+            >
+              {BUILD_METHOD_OPTIONS.map((option) => {
+                const Icon = option.icon
+                const isSelected = engineKind === option.value
+                return (
+                  <button
+                    key={option.value}
+                    type="button"
+                    role="radio"
+                    aria-checked={isSelected}
+                    className={cn(
+                      'flex items-center gap-3 rounded-lg border p-3 text-left transition-colors',
+                      'hover:bg-[var(--surface-2)]',
+                      isSelected
+                        ? 'border-[var(--skill-brand-600)] bg-[var(--skill-brand-50)]'
+                        : 'border-[var(--border)]',
+                    )}
+                    onClick={() => setEngineKind(option.value)}
+                  >
+                    <div
+                      className={cn(
+                        'flex h-8 w-8 shrink-0 items-center justify-center rounded-md',
+                        isSelected
+                          ? 'bg-[var(--skill-brand-600)] text-white'
+                          : 'bg-[var(--surface-2)] text-[var(--text-muted)]',
+                      )}
+                    >
+                      <Icon className="h-4 w-4" />
+                    </div>
+                    <div className="min-w-0">
+                      <p className="text-sm font-medium text-[var(--text-primary)]">
+                        {t(option.labelKey)}
+                      </p>
+                      <p className="text-xs text-[var(--text-muted)]">{t(option.descriptionKey)}</p>
+                    </div>
+                  </button>
+                )
+              })}
+            </div>
+          </div>
+
+          <DialogFooter>
+            <Button type="button" variant="outline" onClick={() => handleOpenChange(false)}>
+              {t('common.cancel', { defaultValue: 'Cancel' })}
+            </Button>
+            <Button type="submit" disabled={!name.trim() || isPending}>
+              {isPending
+                ? t('common.creating', { defaultValue: 'Creating...' })
+                : t('common.create', { defaultValue: 'Create' })}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/frontend/components/agents/agent-overview-tab.tsx b/frontend/components/agents/agent-overview-tab.tsx
new file mode 100644
index 000000000..70241e2a0
--- /dev/null
+++ b/frontend/components/agents/agent-overview-tab.tsx
@@ -0,0 +1,265 @@
+'use client'
+
+import {
+  MessageSquare,
+  Activity,
+  Settings,
+  GitBranch,
+  PenTool,
+  LayoutDashboard,
+} from 'lucide-react'
+import Link from 'next/link'
+import { useMemo } from 'react'
+
+import { Badge } from '@/components/ui/badge'
+import { Card } from '@/components/ui/card'
+import { useAgent } from '@/hooks/queries/agents'
+import { useAgentRuns } from '@/hooks/queries/agentRuns'
+import { useReleases } from '@/hooks/queries/agentReleases'
+import { useVersion } from '@/hooks/queries/agentVersions'
+import { useThreads } from '@/hooks/queries/threads'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import { formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { AgentRunStatus } from '@/types/agent-run'
+import { RUN_STATUS_STYLES } from '@/types/agent-run'
+import { hasBuilderSupport } from '@/types/agent'
+
+interface AgentOverviewTabProps {
+  agentId: string
+}
+
+export function AgentOverviewTab({ agentId }: AgentOverviewTabProps) {
+  const { t } = useTranslation()
+  const { workspaceId } = useCurrentWorkspace()
+
+  const { data: agent } = useAgent(agentId, workspaceId)
+  const draftVersionId = agent?.current_draft_version_id || ''
+  const { data: draftVersion } = useVersion(agentId, draftVersionId, workspaceId, {
+    enabled: Boolean(draftVersionId),
+  })
+  const isGraphAgent = hasBuilderSupport(draftVersion?.engine_kind)
+
+  const { data: releases = [] } = useReleases(agentId, workspaceId, {
+    enabled: Boolean(workspaceId),
+  })
+  const releaseIds = new Set(releases.map((r) => r.id))
+
+  const { data: allRuns = [] } = useAgentRuns(
+    { workspace_id: workspaceId },
+    { enabled: Boolean(workspaceId) },
+  )
+  const recentRuns = allRuns.filter((run) => releaseIds.has(run.release_id)).slice(0, 5)
+
+  const { data: threads = [] } = useThreads(agentId, workspaceId)
+  const recentThreads = threads.slice(0, 5)
+
+  // Merge runs and threads into a single recent activity list, sorted by time
+  const activities = useMemo(() => {
+    type ActivityItem =
+      | {
+          kind: 'run'
+          id: string
+          current_execution_id?: string | null
+          label: string
+          status: AgentRunStatus
+          time: string
+        }
+      | { kind: 'thread'; id: string; label: string; status: string; time: string }
+
+    const items: ActivityItem[] = [
+      ...recentRuns.map((run) => ({
+        kind: 'run' as const,
+        id: run.id,
+        current_execution_id: run.current_execution_id,
+        label: run.goal || t('execution.untitled'),
+        status: run.status,
+        time: run.started_at || run.created_at || '',
+      })),
+      ...recentThreads.map((thread) => ({
+        kind: 'thread' as const,
+        id: thread.id,
+        label: thread.title || t('execution.untitled'),
+        status: thread.status,
+        time: thread.created_at,
+      })),
+    ]
+    return items
+      .filter((a) => a.time)
+      .sort((a, b) => new Date(b.time).getTime() - new Date(a.time).getTime())
+      .slice(0, 8)
+  }, [recentRuns, recentThreads, t])
+
+  if (!agent) return null
+
+  return (
+    <div className="grid gap-6 px-8 py-6 md:grid-cols-3 lg:grid-cols-4">
+      {/* Left Column (Main Content) */}
+      <div className="space-y-6 md:col-span-2 lg:col-span-3">
+        {/* About / Profile Card */}
+        <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5 shadow-sm transition-all hover:shadow-md">
+          <div className="mb-4 flex items-center gap-2">
+            <LayoutDashboard className="h-4 w-4 text-[var(--skill-brand-600)]" />
+            <h2 className="text-base font-semibold text-[var(--text-primary)]">
+              {t('agents.detail.about')}
+            </h2>
+          </div>
+          <p className="text-sm leading-relaxed text-[var(--text-secondary)]">
+            {agent.description ||
+              t('agents.detail.noDescription', {
+                defaultValue: 'No description provided for this agent.',
+              })}
+          </p>
+        </Card>
+
+        {/* Recent Activity Card */}
+        <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5 shadow-sm">
+          <div className="mb-4 flex items-center gap-2">
+            <Activity className="h-4 w-4 text-[var(--brand-600)]" />
+            <h2 className="text-base font-semibold text-[var(--text-primary)]">
+              {t('agents.detail.recentActivity')}
+            </h2>
+          </div>
+
+          {activities.length === 0 ? (
+            <div className="flex flex-col items-center justify-center rounded-lg border border-dashed border-[var(--border)] py-8">
+              <Activity className="mb-2 h-8 w-8 text-[var(--border)]" />
+              <p className="text-sm text-[var(--text-muted)]">{t('agents.detail.noActivity')}</p>
+            </div>
+          ) : (
+            <div className="space-y-2.5">
+              {activities.map((item) => {
+                const href =
+                  item.kind === 'run'
+                    ? `/executions/${item.current_execution_id ?? item.id}`
+                    : `/agents/${agentId}?tab=chat&thread=${item.id}`
+
+                return (
+                  <Link
+                    key={`${item.kind}-${item.id}`}
+                    href={href}
+                    className="group flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-2)] p-3 transition-all hover:border-[var(--brand-300)] hover:bg-[var(--surface-3)] hover:shadow-sm"
+                  >
+                    <div className="flex items-center gap-3">
+                      <div className="flex h-8 w-8 items-center justify-center rounded-md bg-[var(--surface-3)] group-hover:bg-[var(--surface-4)]">
+                        {item.kind === 'run' ? (
+                          <GitBranch className="h-4 w-4 text-[var(--text-secondary)] group-hover:text-[var(--text-primary)]" />
+                        ) : (
+                          <MessageSquare className="h-4 w-4 text-[var(--text-secondary)] group-hover:text-[var(--text-primary)]" />
+                        )}
+                      </div>
+                      <span className="truncate text-sm font-medium text-[var(--text-primary)] transition-colors group-hover:text-[var(--brand-600)]">
+                        {item.label}
+                      </span>
+                      {item.kind === 'run' && (
+                        <Badge
+                          variant="outline"
+                          className={cn(RUN_STATUS_STYLES[item.status] || '', 'ml-2')}
+                        >
+                          {item.status}
+                        </Badge>
+                      )}
+                    </div>
+                    <span className="flex-shrink-0 text-xs text-[var(--text-muted)]">
+                      {formatRelativeTime(item.time, t)}
+                    </span>
+                  </Link>
+                )
+              })}
+            </div>
+          )}
+        </Card>
+      </div>
+
+      {/* Right Column (Sidebar / Stats) */}
+      <div className="space-y-6 md:col-span-1">
+        {/* Quick Actions */}
+        <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5 shadow-sm">
+          <h3 className="mb-4 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+            {t('agents.detail.quickActions', { defaultValue: 'Quick Actions' })}
+          </h3>
+          <div className="flex flex-col gap-2">
+            {isGraphAgent && (
+              <Link
+                href={`/agents/${agentId}?stage=canvas`}
+                className="group flex items-center gap-3 rounded-lg border border-[var(--border)] bg-[var(--surface-2)] p-3 transition-all hover:border-[var(--brand-400)] hover:bg-[var(--surface-3)]"
+              >
+                <div className="flex h-8 w-8 items-center justify-center rounded bg-[var(--skill-brand-100)] text-[var(--skill-brand-600)] transition-transform group-hover:scale-105">
+                  <PenTool className="h-4 w-4" />
+                </div>
+                <div className="flex flex-col">
+                  <span className="text-sm font-medium text-[var(--text-primary)]">
+                    {t('agents.detail.openBuilder', { defaultValue: 'Open Studio' })}
+                  </span>
+                  <span className="text-xs text-[var(--text-muted)]">
+                    {t('agents.detail.openBuilderDesc', {
+                      defaultValue: 'Build, test, publish, and use this Agent',
+                    })}
+                  </span>
+                </div>
+              </Link>
+            )}
+
+            <Link
+              href={`/agents/${agentId}?tab=settings`}
+              className="group flex items-center gap-3 rounded-lg border border-[var(--border)] bg-[var(--surface-2)] p-3 transition-all hover:border-[var(--brand-400)] hover:bg-[var(--surface-3)]"
+            >
+              <div className="flex h-8 w-8 items-center justify-center rounded bg-[var(--surface-3)] text-[var(--text-secondary)] transition-transform group-hover:scale-105 group-hover:text-[var(--text-primary)]">
+                <Settings className="h-4 w-4" />
+              </div>
+              <div className="flex flex-col">
+                <span className="text-sm font-medium text-[var(--text-primary)]">
+                  {t('agents.detail.settings', { defaultValue: 'Settings' })}
+                </span>
+                <span className="text-xs text-[var(--text-muted)]">
+                  {t('agents.detail.settingsDesc', { defaultValue: 'Manage agent configuration' })}
+                </span>
+              </div>
+            </Link>
+          </div>
+        </Card>
+
+        {/* Stats & Metrics */}
+        <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5 shadow-sm">
+          <h3 className="mb-4 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+            {t('agents.detail.metrics', { defaultValue: 'Usage Metrics' })}
+          </h3>
+          <div className="grid grid-cols-2 gap-4">
+            <div className="flex flex-col rounded-lg bg-[var(--surface-2)] p-3">
+              <span className="text-xs text-[var(--text-muted)]">
+                {t('agents.detail.totalRuns', { defaultValue: 'Total Runs' })}
+              </span>
+              <span className="mt-1 text-2xl font-bold text-[var(--text-primary)]">
+                {allRuns.length}
+              </span>
+            </div>
+            <div className="flex flex-col rounded-lg bg-[var(--surface-2)] p-3">
+              <span className="text-xs text-[var(--text-muted)]">
+                {t('agents.detail.totalThreads', { defaultValue: 'Threads' })}
+              </span>
+              <span className="mt-1 text-2xl font-bold text-[var(--text-primary)]">
+                {threads.length}
+              </span>
+            </div>
+          </div>
+
+          <div className="mt-4 flex flex-col gap-1 border-t border-[var(--border)] pt-4 text-xs">
+            <div className="flex justify-between">
+              <span className="text-[var(--text-muted)]">{t('agents.detail.createdAt')}</span>
+              <span className="font-medium text-[var(--text-secondary)]">
+                {new Date(agent.created_at).toLocaleDateString()}
+              </span>
+            </div>
+            <div className="flex justify-between">
+              <span className="text-[var(--text-muted)]">{t('agents.detail.updatedAt')}</span>
+              <span className="font-medium text-[var(--text-secondary)]">
+                {new Date(agent.updated_at).toLocaleDateString()}
+              </span>
+            </div>
+          </div>
+        </Card>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-settings-tab.tsx b/frontend/components/agents/agent-settings-tab.tsx
new file mode 100644
index 000000000..1f88cfe29
--- /dev/null
+++ b/frontend/components/agents/agent-settings-tab.tsx
@@ -0,0 +1,320 @@
+'use client'
+
+import {
+  Archive,
+  ChevronDown,
+  ChevronRight,
+  Loader2,
+  MoreHorizontal,
+  Pencil,
+  Save,
+  Undo2,
+} from 'lucide-react'
+import { useState } from 'react'
+
+import { ReleaseStatusBadge } from '@/components/agents/release-status-badge'
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { Input } from '@/components/ui/input'
+import { Textarea } from '@/components/ui/textarea'
+import { useAgent, useUpdateAgent } from '@/hooks/queries/agents'
+import { useReleaseHistory, useRollbackAgent, useRetireRelease } from '@/hooks/queries/agentPublish'
+import { useVersion } from '@/hooks/queries/agentVersions'
+import { useTranslation } from '@/lib/i18n'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+import { canRetire, canRollback } from '@/types/agent-release'
+
+interface AgentSettingsTabProps {
+  agentId: string
+}
+
+export function AgentSettingsTab({ agentId }: AgentSettingsTabProps) {
+  const { t } = useTranslation()
+
+  const { workspaceId } = useCurrentWorkspace()
+  const { canEdit, canAdmin } = useUserPermissionsContext()
+
+  const { data: agent } = useAgent(agentId, workspaceId)
+  const updateAgent = useUpdateAgent()
+
+  const draftVersionId = agent?.current_draft_version_id || ''
+  const { data: draftVersion } = useVersion(agentId, draftVersionId, workspaceId, {
+    enabled: Boolean(draftVersionId),
+  })
+
+  const isPublished = Boolean(agent?.active_release_id)
+  const { data: releases = [], isLoading: releasesLoading } = useReleaseHistory(
+    agentId,
+    workspaceId,
+    {
+      enabled: isPublished,
+    },
+  )
+  const rollbackAgent = useRollbackAgent()
+  const retireRelease = useRetireRelease()
+
+  const [editing, setEditing] = useState(false)
+  const [name, setName] = useState('')
+  const [description, setDescription] = useState('')
+  const [avatar, setAvatar] = useState('')
+
+  const [releasesOpen, setReleasesOpen] = useState(false)
+
+  if (!agent) return null
+
+  const startEditing = () => {
+    setName(agent.name)
+    setDescription(agent.description || '')
+    setAvatar(agent.avatar || '')
+    setEditing(true)
+  }
+
+  const handleSave = async () => {
+    try {
+      await updateAgent.mutateAsync({
+        agentId,
+        workspaceId,
+        name: name.trim() || agent.name,
+        description: description.trim() || undefined,
+        avatar: avatar.trim() || undefined,
+      })
+      setEditing(false)
+    } catch {
+      // Global error handler shows toast
+    }
+  }
+
+  const DEFINITION_KIND_LABELS: Record<string, string> = {
+    langgraph_visual: t('agents.graph.label'),
+    langgraph_code: t('agents.code.label'),
+    claude_code: t('agents.claudeCode.label'),
+    codex: t('agents.codex.label'),
+    openclaw: t('agents.openclaw.label'),
+  }
+
+  return (
+    <div className="space-y-6 px-8 py-6">
+      {/* Section 1: Basic Info */}
+      <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+        <div className="flex items-center justify-between">
+          <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('agents.detail.basicInfo')}
+          </h2>
+          {!editing && canEdit && (
+            <Button variant="outline" size="sm" onClick={startEditing}>
+              <Pencil className="mr-1.5 h-3.5 w-3.5" />
+              {t('settings.edit')}
+            </Button>
+          )}
+        </div>
+
+        {editing ? (
+          <div className="mt-4 space-y-3">
+            <div>
+              <label className="mb-1 block text-xs text-[var(--text-muted)]">
+                {t('settings.name')}
+              </label>
+              <Input
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                placeholder={agent.name}
+              />
+            </div>
+            <div>
+              <label className="mb-1 block text-xs text-[var(--text-muted)]">
+                {t('tasks.description')}
+              </label>
+              <Textarea
+                value={description}
+                onChange={(e) => setDescription(e.target.value)}
+                placeholder={t('tasks.description')}
+                rows={3}
+              />
+            </div>
+            <div>
+              <label className="mb-1 block text-xs text-[var(--text-muted)]">
+                {t('agents.avatar')}
+              </label>
+              <Input
+                value={avatar}
+                onChange={(e) => setAvatar(e.target.value)}
+                placeholder={t('agents.avatarPlaceholder')}
+              />
+            </div>
+            <div className="flex gap-2">
+              <Button size="sm" onClick={handleSave} disabled={updateAgent.isPending}>
+                {updateAgent.isPending ? (
+                  <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />
+                ) : (
+                  <Save className="mr-1.5 h-3.5 w-3.5" />
+                )}
+                {t('settings.save')}
+              </Button>
+              <Button size="sm" variant="outline" onClick={() => setEditing(false)}>
+                {t('common.cancel')}
+              </Button>
+            </div>
+          </div>
+        ) : (
+          <div className="mt-3 space-y-2">
+            <div className="text-sm text-[var(--text-primary)]">{agent.name}</div>
+            <div className="text-sm text-[var(--text-muted)]">
+              {agent.description || t('agents.detail.noActivity')}
+            </div>
+            {agent.avatar && (
+              <div className="text-xs text-[var(--text-muted)]">
+                {t('agents.avatar')}: {agent.avatar}
+              </div>
+            )}
+          </div>
+        )}
+      </Card>
+
+      {/* Section 2: Definition Method */}
+      <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+        <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+          {t('agents.detail.definitionMethod')}
+        </h2>
+        {draftVersion ? (
+          <div className="mt-3 flex items-center gap-3 text-sm text-[var(--text-muted)]">
+            <Badge variant="outline">
+              {DEFINITION_KIND_LABELS[draftVersion.engine_kind] || draftVersion.engine_kind}
+            </Badge>
+            <span>v{draftVersion.version_number}</span>
+            <Badge variant="secondary">
+              {draftVersion.status === 'frozen'
+                ? t('agents.detail.versionStatus.frozen')
+                : t('agents.detail.versionStatus.draft')}
+            </Badge>
+          </div>
+        ) : (
+          <p className="mt-3 text-sm text-[var(--text-muted)]">{t('agents.detail.noActivity')}</p>
+        )}
+      </Card>
+
+      {/* Section 3: Release History (collapsible) */}
+      <Card className="border-[var(--border)] bg-[var(--surface-1)]">
+        <div
+          onClick={() => setReleasesOpen(!releasesOpen)}
+          className="flex w-full cursor-pointer items-center justify-between p-5 text-left"
+        >
+          <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('agents.detail.releaseHistory', { defaultValue: 'Release History' })}
+          </h2>
+          <div className="flex items-center gap-2">
+            <span className="text-xs text-[var(--text-muted)]">
+              {t('agents.detail.goToPublish', { defaultValue: 'Go to publish' })}
+            </span>
+            {releasesOpen ? (
+              <ChevronDown className="h-4 w-4 text-[var(--text-muted)]" />
+            ) : (
+              <ChevronRight className="h-4 w-4 text-[var(--text-muted)]" />
+            )}
+          </div>
+        </div>
+        {releasesOpen && (
+          <div className="border-t border-[var(--border)] px-5 py-4">
+            {releasesLoading ? (
+              <div className="flex items-center gap-2 text-sm text-[var(--text-muted)]">
+                <Loader2 className="h-4 w-4 animate-spin" />
+                {t('common.loading')}
+              </div>
+            ) : releases.length === 0 ? (
+              <p className="text-sm text-[var(--text-muted)]">{t('agents.detail.noActivity')}</p>
+            ) : (
+              <div className="space-y-2">
+                {releases.map((rel) => {
+                  const isActive = rel.status === 'active'
+
+                  return (
+                    <div
+                      key={rel.id}
+                      className={`flex items-center justify-between rounded-lg border p-3 ${
+                        isActive
+                          ? 'bg-[var(--status-success)]/5 border-[var(--status-success)]'
+                          : 'border-[var(--border)] bg-[var(--surface-2)]'
+                      }`}
+                    >
+                      <div className="flex items-center gap-2">
+                        <span className="text-sm font-medium text-[var(--text-primary)]">
+                          {t('agents.detail.releaseVersion', {
+                            defaultValue: 'Version {{number}}',
+                            number: rel.release_number,
+                          })}
+                        </span>
+                        <span className="text-xs text-[var(--text-muted)]">
+                          {rel.published_at
+                            ? t('agents.detail.publishedAt', {
+                                defaultValue: 'published {{date}}',
+                                date: new Date(rel.published_at).toLocaleDateString(),
+                              })
+                            : '-'}
+                        </span>
+                        <ReleaseStatusBadge status={rel.status} />
+                      </div>
+                      <div className="flex items-center gap-2">
+                        {!isActive && canRollback(rel.status) && canAdmin && (
+                          <Button
+                            size="sm"
+                            variant="outline"
+                            onClick={() =>
+                              rollbackAgent.mutate({
+                                agentId,
+                                releaseId: rel.id,
+                                workspaceId,
+                              })
+                            }
+                            disabled={rollbackAgent.isPending}
+                          >
+                            <Undo2 className="mr-1.5 h-3 w-3" />
+                            {t('agents.detail.rollbackToVersion', {
+                              defaultValue: 'Rollback to this version',
+                            })}
+                          </Button>
+                        )}
+                        {canAdmin && canRetire(rel.status) && (
+                          <DropdownMenu>
+                            <DropdownMenuTrigger asChild>
+                              <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
+                                <MoreHorizontal className="h-4 w-4" />
+                              </Button>
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent align="end">
+                              <DropdownMenuItem
+                                onClick={() =>
+                                  retireRelease.mutate({
+                                    agentId,
+                                    releaseId: rel.id,
+                                    workspaceId,
+                                  })
+                                }
+                                className="text-destructive"
+                              >
+                                <Archive className="mr-2 h-4 w-4" />
+                                {t('agents.detail.retireRelease', {
+                                  defaultValue: 'Retire',
+                                })}
+                              </DropdownMenuItem>
+                            </DropdownMenuContent>
+                          </DropdownMenu>
+                        )}
+                      </div>
+                    </div>
+                  )
+                })}
+              </div>
+            )}
+          </div>
+        )}
+      </Card>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/agent-status.tsx b/frontend/components/agents/agent-status.tsx
new file mode 100644
index 000000000..7803fe71b
--- /dev/null
+++ b/frontend/components/agents/agent-status.tsx
@@ -0,0 +1,39 @@
+'use client'
+
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+
+type AgentStatus = 'draft' | 'active' | 'archived'
+
+const statusColors: Record<AgentStatus, string> = {
+  draft: 'bg-[var(--status-warning)]',
+  active: 'bg-[var(--status-success)]',
+  archived: 'bg-[var(--surface-muted)]',
+}
+
+const statusI18nKeys: Record<AgentStatus, string> = {
+  draft: 'agents.status.draft',
+  active: 'agents.status.active',
+  archived: 'agents.status.archived',
+}
+
+interface AgentStatusIndicatorProps {
+  status: AgentStatus
+  className?: string
+}
+
+export function AgentStatusIndicator({ status, className }: AgentStatusIndicatorProps) {
+  const { t } = useTranslation()
+
+  return (
+    <span
+      className={cn(
+        'inline-flex items-center gap-1.5 text-xs text-[var(--text-secondary)]',
+        className,
+      )}
+    >
+      <span className={cn('inline-flex h-2 w-2 rounded-full', statusColors[status])} />
+      {t(statusI18nKeys[status])}
+    </span>
+  )
+}
diff --git a/frontend/components/agents/release-status-badge.tsx b/frontend/components/agents/release-status-badge.tsx
new file mode 100644
index 000000000..a8836c186
--- /dev/null
+++ b/frontend/components/agents/release-status-badge.tsx
@@ -0,0 +1,41 @@
+'use client'
+
+import { Badge } from '@/components/ui/badge'
+import { useTranslation } from '@/lib/i18n'
+import type { ReleaseStatus } from '@/types/agent-release'
+
+export function ReleaseStatusBadge({ status }: { status: ReleaseStatus }) {
+  const { t } = useTranslation()
+  switch (status) {
+    case 'active':
+      return (
+        <Badge className="bg-green-600 text-white hover:bg-green-700">
+          {t('agents.build.release.status.live', { defaultValue: 'Live' })}
+        </Badge>
+      )
+    case 'superseded':
+      return (
+        <Badge variant="secondary">
+          {t('agents.build.release.status.superseded', { defaultValue: 'Superseded' })}
+        </Badge>
+      )
+    case 'ready':
+      return (
+        <Badge variant="outline">
+          {t('agents.build.release.status.ready', { defaultValue: 'Ready' })}
+        </Badge>
+      )
+    case 'failed':
+      return (
+        <Badge variant="destructive">
+          {t('agents.build.release.status.failed', { defaultValue: 'Failed' })}
+        </Badge>
+      )
+    case 'retired':
+      return (
+        <Badge variant="secondary" className="opacity-60">
+          {t('agents.build.release.status.retired', { defaultValue: 'Archived' })}
+        </Badge>
+      )
+  }
+}
diff --git a/frontend/components/agents/surfaces/cli/index.tsx b/frontend/components/agents/surfaces/cli/index.tsx
new file mode 100644
index 000000000..1d7e1bf04
--- /dev/null
+++ b/frontend/components/agents/surfaces/cli/index.tsx
@@ -0,0 +1,15 @@
+import type { BuilderSurface, StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+function PlaceholderStage(_props: StageProps) {
+  return (
+    <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+      Claude Code / Codex / OpenClaw builder coming soon
+    </div>
+  )
+}
+
+export const cliSurface: BuilderSurface = {
+  BriefStage: PlaceholderStage,
+  BuildStage: PlaceholderStage,
+  TestLabStage: PlaceholderStage,
+}
diff --git a/frontend/components/agents/surfaces/code/index.tsx b/frontend/components/agents/surfaces/code/index.tsx
new file mode 100644
index 000000000..0f310c138
--- /dev/null
+++ b/frontend/components/agents/surfaces/code/index.tsx
@@ -0,0 +1,15 @@
+import type { BuilderSurface, StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+function PlaceholderStage(_props: StageProps) {
+  return (
+    <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+      Code Builder — coming soon
+    </div>
+  )
+}
+
+export const codeSurface: BuilderSurface = {
+  BriefStage: PlaceholderStage,
+  BuildStage: PlaceholderStage,
+  TestLabStage: PlaceholderStage,
+}
diff --git a/frontend/components/agents/surfaces/prompt/index.tsx b/frontend/components/agents/surfaces/prompt/index.tsx
new file mode 100644
index 000000000..55bab01fe
--- /dev/null
+++ b/frontend/components/agents/surfaces/prompt/index.tsx
@@ -0,0 +1,15 @@
+import type { BuilderSurface, StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+function PlaceholderStage(_props: StageProps) {
+  return (
+    <div className="flex h-full items-center justify-center text-sm text-[var(--text-muted)]">
+      Prompt Builder — coming soon
+    </div>
+  )
+}
+
+export const promptSurface: BuilderSurface = {
+  BriefStage: PlaceholderStage,
+  BuildStage: PlaceholderStage,
+  TestLabStage: PlaceholderStage,
+}
diff --git a/frontend/components/agents/surfaces/visual/index.tsx b/frontend/components/agents/surfaces/visual/index.tsx
new file mode 100644
index 000000000..7a1ce1757
--- /dev/null
+++ b/frontend/components/agents/surfaces/visual/index.tsx
@@ -0,0 +1,11 @@
+import type { BuilderSurface } from '@/components/agents/agent-build/agent-build-types'
+
+import { VisualBriefStage } from './visual-brief-stage'
+import { VisualBuilderSurface } from './visual-builder-surface'
+import { VisualTestLabStage } from './visual-test-lab-stage'
+
+export const visualSurface: BuilderSurface = {
+  BriefStage: VisualBriefStage,
+  BuildStage: VisualBuilderSurface,
+  TestLabStage: VisualTestLabStage,
+}
diff --git a/frontend/components/agents/surfaces/visual/visual-brief-stage.tsx b/frontend/components/agents/surfaces/visual/visual-brief-stage.tsx
new file mode 100644
index 000000000..ef3d94768
--- /dev/null
+++ b/frontend/components/agents/surfaces/visual/visual-brief-stage.tsx
@@ -0,0 +1,152 @@
+'use client'
+
+import { useMemo, useState } from 'react'
+import { useRouter, useSearchParams } from 'next/navigation'
+import { Sparkles, Wrench } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Textarea } from '@/components/ui/textarea'
+import { useTranslation } from '@/lib/i18n'
+import type { StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+export function VisualBriefStage({ agent, navigateToStage }: StageProps) {
+  const { t } = useTranslation()
+  const router = useRouter()
+  const searchParams = useSearchParams()
+
+  const [goal, setGoal] = useState(agent.description || '')
+  const [input, setInput] = useState('')
+  const [output, setOutput] = useState('')
+  const [tools, setTools] = useState('')
+  const [constraints, setConstraints] = useState('')
+
+  const prompt = useMemo(
+    () =>
+      [
+        `Build a Visual Agent named "${agent.name}".`,
+        `Goal: ${goal || 'Not specified'}`,
+        `Input: ${input || 'Not specified'}`,
+        `Output: ${output || 'Not specified'}`,
+        `Tools or Skills: ${tools || 'Not specified'}`,
+        `Safety and human confirmation rules: ${constraints || 'Not specified'}`,
+        'Create an initial graph, add reasonable nodes and edges, and explain missing configuration.',
+      ].join('\n'),
+    [agent.name, constraints, goal, input, output, tools],
+  )
+
+  const handleGenerate = () => {
+    const params = new URLSearchParams(searchParams.toString())
+    params.set('stage', 'build')
+    params.set('copilotInput', prompt)
+    router.replace(`/agents/${agent.id}?${params.toString()}`, { scroll: false })
+  }
+
+  return (
+    <div className="flex h-full items-start justify-center overflow-y-auto bg-[var(--surface-1)] py-10">
+      <div className="w-full max-w-2xl px-6">
+        {/* Title */}
+        <div className="mb-6 text-center">
+          <h2 className="text-xl font-semibold text-[var(--text-primary)]">
+            {t('agents.studio.brief.title', { defaultValue: 'Describe your Agent' })}
+          </h2>
+          <p className="mt-1.5 text-sm text-[var(--text-secondary)]">
+            {t('agents.studio.brief.subtitle', {
+              defaultValue:
+                'Copilot will turn this into a visual workflow, or skip to build manually.',
+            })}
+          </p>
+        </div>
+
+        {/* Form */}
+        <div className="space-y-4 rounded-xl border border-[var(--border)] bg-[var(--surface-2)] p-5">
+          {/* Goal — primary field, larger */}
+          <div className="space-y-1.5">
+            <Label className="text-xs font-medium text-[var(--text-secondary)]">
+              {t('agents.studio.brief.goal', { defaultValue: 'Goal' })} *
+            </Label>
+            <Textarea
+              value={goal}
+              onChange={(e) => setGoal(e.target.value)}
+              rows={3}
+              placeholder={t('agents.studio.brief.goalPlaceholder', {
+                defaultValue:
+                  'What should this agent do? e.g. "Analyze customer feedback and generate weekly reports"',
+              })}
+              className="resize-none"
+            />
+          </div>
+
+          {/* Input / Output — side by side */}
+          <div className="grid gap-4 sm:grid-cols-2">
+            <div className="space-y-1.5">
+              <Label className="text-xs font-medium text-[var(--text-secondary)]">
+                {t('agents.studio.brief.input', { defaultValue: 'Input' })}
+              </Label>
+              <Input
+                value={input}
+                onChange={(e) => setInput(e.target.value)}
+                placeholder={t('agents.studio.brief.inputPlaceholder', {
+                  defaultValue: 'e.g. CSV file, API request, user message',
+                })}
+              />
+            </div>
+            <div className="space-y-1.5">
+              <Label className="text-xs font-medium text-[var(--text-secondary)]">
+                {t('agents.studio.brief.output', { defaultValue: 'Output' })}
+              </Label>
+              <Input
+                value={output}
+                onChange={(e) => setOutput(e.target.value)}
+                placeholder={t('agents.studio.brief.outputPlaceholder', {
+                  defaultValue: 'e.g. JSON report, email, Slack message',
+                })}
+              />
+            </div>
+          </div>
+
+          {/* Tools */}
+          <div className="space-y-1.5">
+            <Label className="text-xs font-medium text-[var(--text-secondary)]">
+              {t('agents.studio.brief.tools', { defaultValue: 'Tools / Skills' })}
+            </Label>
+            <Input
+              value={tools}
+              onChange={(e) => setTools(e.target.value)}
+              placeholder={t('agents.studio.brief.toolsPlaceholder', {
+                defaultValue: 'e.g. Web search, database query, code execution',
+              })}
+            />
+          </div>
+
+          {/* Constraints */}
+          <div className="space-y-1.5">
+            <Label className="text-xs font-medium text-[var(--text-secondary)]">
+              {t('agents.studio.brief.constraints', { defaultValue: 'Safety / approval rules' })}
+            </Label>
+            <Input
+              value={constraints}
+              onChange={(e) => setConstraints(e.target.value)}
+              placeholder={t('agents.studio.brief.constraintsPlaceholder', {
+                defaultValue: 'e.g. Require human approval before sending emails',
+              })}
+            />
+          </div>
+        </div>
+
+        {/* Actions */}
+        <div className="mt-5 flex justify-end gap-2">
+          <Button variant="outline" onClick={() => navigateToStage('build')} className="gap-1.5">
+            <Wrench className="h-3.5 w-3.5" />
+            {t('agents.studio.brief.skip', { defaultValue: 'Build manually' })}
+          </Button>
+          <Button onClick={handleGenerate} disabled={!goal.trim()} className="gap-1.5">
+            <Sparkles className="h-3.5 w-3.5" />
+            {t('agents.studio.brief.generate', { defaultValue: 'Generate with Copilot' })}
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/surfaces/visual/visual-builder-surface.tsx b/frontend/components/agents/surfaces/visual/visual-builder-surface.tsx
new file mode 100644
index 000000000..db684624e
--- /dev/null
+++ b/frontend/components/agents/surfaces/visual/visual-builder-surface.tsx
@@ -0,0 +1,8 @@
+'use client'
+
+import AgentBuilder from '@/components/editors/graph-builder/AgentBuilder'
+import type { StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+export function VisualBuilderSurface({ agent, version, workspaceId }: StageProps) {
+  return <AgentBuilder agentId={agent.id} workspaceId={workspaceId} versionId={version?.id} />
+}
diff --git a/frontend/components/agents/surfaces/visual/visual-test-lab-stage.tsx b/frontend/components/agents/surfaces/visual/visual-test-lab-stage.tsx
new file mode 100644
index 000000000..3f7ec5e1c
--- /dev/null
+++ b/frontend/components/agents/surfaces/visual/visual-test-lab-stage.tsx
@@ -0,0 +1,54 @@
+'use client'
+
+import { Button } from '@/components/ui/button'
+import { DebugPanel } from '@/components/observation/components/DebugPanel'
+import { useTranslation } from '@/lib/i18n'
+import type { StageProps } from '@/components/agents/agent-build/agent-build-types'
+
+export function VisualTestLabStage({ agent, version, workspaceId, navigateToStage }: StageProps) {
+  const { t } = useTranslation()
+  const agentId = agent.id
+  const versionId = version?.id ?? ''
+
+  return (
+    <div className="flex h-full min-h-0 flex-col bg-[var(--surface-1)]">
+      <div className="shrink-0 border-b border-[var(--border)] px-6 py-2">
+        <div className="flex items-center justify-between gap-4">
+          <div className="flex flex-col gap-0.5">
+            <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+              {t('agents.studio.testLab.title', { defaultValue: 'Test the current draft' })}
+            </h2>
+            <p className="max-w-xl truncate text-xs text-[var(--text-muted)]">
+              {t('agents.studio.testLab.subtitle', {
+                defaultValue:
+                  'Run draft behavior before publishing. These tests do not affect the active release.',
+              })}
+            </p>
+          </div>
+          <div className="flex gap-2">
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => navigateToStage('build')}
+              className="h-8 text-xs"
+            >
+              {t('agents.studio.testLab.backToCanvas', { defaultValue: 'Back to Build' })}
+            </Button>
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => navigateToStage('release')}
+              className="h-8 text-xs"
+            >
+              {t('agents.studio.testLab.openRelease', { defaultValue: 'Open Release' })}
+            </Button>
+          </div>
+        </div>
+      </div>
+
+      <div className="min-h-0 flex-1 overflow-hidden">
+        <DebugPanel agentId={agentId} agentVersionId={versionId} workspaceId={workspaceId} />
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/agents/version-form-dialog.tsx b/frontend/components/agents/version-form-dialog.tsx
new file mode 100644
index 000000000..6010b9133
--- /dev/null
+++ b/frontend/components/agents/version-form-dialog.tsx
@@ -0,0 +1,131 @@
+'use client'
+
+import { Loader2 } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog'
+import { Label } from '@/components/ui/label'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { Textarea } from '@/components/ui/textarea'
+import { useCreateVersion } from '@/hooks/queries/agentVersions'
+import { useTranslation } from '@/lib/i18n'
+import type { EngineKind } from '@/types/agent'
+
+interface VersionFormDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  agentId: string
+  workspaceId: string
+}
+
+export function VersionFormDialog({
+  open,
+  onOpenChange,
+  agentId,
+  workspaceId,
+}: VersionFormDialogProps) {
+  const { t } = useTranslation()
+  const createVersion = useCreateVersion()
+
+  const [engineKind, setEngineKind] = useState<EngineKind>('langgraph_visual')
+  const [changelog, setChangelog] = useState('')
+
+  function resetForm() {
+    setEngineKind('langgraph_visual')
+    setChangelog('')
+  }
+
+  function handleOpenChange(nextOpen: boolean) {
+    if (!nextOpen) {
+      resetForm()
+    }
+    onOpenChange(nextOpen)
+  }
+
+  function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+
+    createVersion.mutate(
+      {
+        agentId,
+        workspaceId,
+        engine_kind: engineKind,
+        changelog: changelog.trim() || undefined,
+      },
+      {
+        onSuccess: () => {
+          handleOpenChange(false)
+        },
+      },
+    )
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle>{t('agents.detail.createVersion')}</DialogTitle>
+          <DialogDescription>{t('agents.detail.selectDefinitionKind')}</DialogDescription>
+        </DialogHeader>
+
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="space-y-2">
+            <Label>{t('agents.buildMethod')} *</Label>
+            <Select value={engineKind} onValueChange={(v) => setEngineKind(v as EngineKind)}>
+              <SelectTrigger>
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="langgraph_visual">{t('agents.graph.label')}</SelectItem>
+                <SelectItem value="langgraph_code">{t('agents.code.label')}</SelectItem>
+                <SelectItem value="claude_code">{t('agents.claudeCode.label')}</SelectItem>
+                <SelectItem value="codex">{t('agents.codex.label')}</SelectItem>
+                <SelectItem value="openclaw">{t('agents.openclaw.label')}</SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
+
+          <div className="space-y-2">
+            <Label>{t('agents.detail.changelog')}</Label>
+            <Textarea
+              value={changelog}
+              onChange={(e) => setChangelog(e.target.value)}
+              placeholder={t('agents.detail.changelogPlaceholder')}
+              rows={3}
+            />
+          </div>
+
+          <DialogFooter>
+            <Button type="button" variant="outline" onClick={() => handleOpenChange(false)}>
+              {t('agents.cancel')}
+            </Button>
+            <Button type="submit" disabled={createVersion.isPending}>
+              {createVersion.isPending ? (
+                <>
+                  <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />
+                  {t('agents.detail.creatingVersion')}
+                </>
+              ) : (
+                t('agents.detail.createVersion')
+              )}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/frontend/components/app-shell/index.tsx b/frontend/components/app-shell/index.tsx
index 9bcec65d5..b3a8d4d2a 100644
--- a/frontend/components/app-shell/index.tsx
+++ b/frontend/components/app-shell/index.tsx
@@ -7,45 +7,24 @@ import { AppSidebar } from '@/components/app-sidebar'
 import { isPublicRoute } from '@/lib/core/constants/routes'
 import { useSidebarStore } from '@/stores/sidebar/store'
 
-/**
- * AppShell Component - Global application layout
- *
- * Layout strategy:
- * 1. Authentication pages (/signin, /signup, etc.)
- *    - Do not display any sidebar
- *
- * 2. All application pages (/workspace, /chat, /memory, /discover)
- *    - Display AppSidebar (global navigation) on the far left
- *    - If the page has a Workspace Sidebar, it will be displayed side by side to the right of AppSidebar
- *    - Both sidebars can be managed and interacted with independently
- */
 export function AppShell({ children }: { children: React.ReactNode }) {
   const pathname = usePathname()
   const setIsAppSidebarCollapsed = useSidebarStore((state) => state.setIsAppSidebarCollapsed)
 
-  // Automatically determine whether to collapse based on pathname: collapse when path starts with /workspace or /openclaw
-  const isAppSidebarCollapsed = !!(
-    pathname?.startsWith('/workspace') || pathname?.startsWith('/openclaw')
-  )
-
   useEffect(() => {
-    // Sync state to store so other components can access it
-    setIsAppSidebarCollapsed(isAppSidebarCollapsed)
-  }, [isAppSidebarCollapsed, setIsAppSidebarCollapsed])
+    setIsAppSidebarCollapsed(false)
+  }, [setIsAppSidebarCollapsed])
+
   if (isPublicRoute(pathname)) {
     return <>{children}</>
   }
   return (
     <div className="flex h-screen bg-[var(--bg)]">
       <div
-        style={{
-          width: isAppSidebarCollapsed
-            ? 'var(--sidebar-width-collapsed)'
-            : 'var(--sidebar-width)',
-        }}
+        style={{ width: 'var(--sidebar-width)' }}
         className="flex-shrink-0 overflow-hidden transition-all duration-300 ease-in-out"
       >
-        <AppSidebar isCollapsed={isAppSidebarCollapsed} />
+        <AppSidebar />
       </div>
       <main className="flex-1 overflow-auto">{children}</main>
     </div>
diff --git a/frontend/components/app-sidebar/app-logo.tsx b/frontend/components/app-sidebar/app-logo.tsx
index d0615454b..5e7945ffe 100644
--- a/frontend/components/app-sidebar/app-logo.tsx
+++ b/frontend/components/app-sidebar/app-logo.tsx
@@ -12,11 +12,11 @@ interface AppLogoProps {
 export function AppLogo({ isCollapsed = false }: AppLogoProps) {
   return (
     <div className="flex h-[60px] min-w-0 items-center pl-2 pr-4">
-      <Link href="/chat" className="flex min-w-0 flex-1 items-center gap-1.5">
+      <Link href="/agents" className="flex min-w-0 flex-1 items-center gap-1.5">
         <div className="relative flex h-8 w-8 flex-shrink-0 items-center justify-center">
-          <div className="absolute inset-0 rounded-lg brand-gradient opacity-100" />
+          <div className="brand-gradient absolute inset-0 rounded-lg opacity-100" />
 
-          <div className="absolute inset-0 rounded-lg brand-gradient opacity-20 blur-md" />
+          <div className="brand-gradient absolute inset-0 rounded-lg opacity-20 blur-md" />
 
           <svg
             className="relative z-10 h-5 w-5 text-white"
@@ -61,7 +61,7 @@ export function AppLogo({ isCollapsed = false }: AppLogoProps) {
         </div>
 
         {!isCollapsed && (
-          <span className="whitespace-nowrap brand-gradient-text text-xl font-bold tracking-tight">
+          <span className="brand-gradient-text whitespace-nowrap text-xl font-bold tracking-tight">
             JoySafeter
           </span>
         )}
diff --git a/frontend/components/app-sidebar/app-sidebar.tsx b/frontend/components/app-sidebar/app-sidebar.tsx
index af3fd21bf..98a2d7ec9 100644
--- a/frontend/components/app-sidebar/app-sidebar.tsx
+++ b/frontend/components/app-sidebar/app-sidebar.tsx
@@ -1,19 +1,11 @@
 'use client'
 
-import {
-  LayoutDashboard,
-  Blocks,
-  ShieldCheck,
-  Wrench,
-  Brain,
-  Clapperboard,
-  Activity,
-} from 'lucide-react'
+import { Bot, LayoutDashboard, ListChecks, Sparkles, Wrench, Settings } from 'lucide-react'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
-import { env as runtimeEnv } from 'next-runtime-env'
 
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
+import { useSidebarStore } from '@/stores/sidebar/store'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
 
@@ -21,68 +13,44 @@ import { AppLogo } from './app-logo'
 import { UserInfo } from './user-info'
 import { VersionBadge } from './version-badge'
 
-const menuItems = [
-  {
-    id: 'dashboard',
-    labelKey: 'sidebar.dashboard',
-    icon: LayoutDashboard,
-    href: '/chat',
-  },
-  {
-    id: 'agent',
-    labelKey: 'sidebar.agentBuilder',
-    icon: Blocks,
-    href: '/workspace',
-  },
-  {
-    id: 'tools',
-    labelKey: 'sidebar.toolsAndMcp',
-    icon: Wrench,
-    href: '/tools',
-  },
+interface MenuItem {
+  id: string
+  labelKey: string
+  icon: typeof Bot
+  href: string
+}
+
+interface MenuGroup {
+  items: MenuItem[]
+}
+
+const menuGroups: MenuGroup[] = [
   {
-    id: 'skills',
-    labelKey: 'sidebar.skillsHub',
-    icon: ShieldCheck,
-    href: '/skills',
+    items: [
+      { id: 'dashboard', labelKey: 'sidebar.dashboard', icon: LayoutDashboard, href: '/dashboard' },
+    ],
   },
   {
-    id: 'runs',
-    labelKey: 'sidebar.runCenter',
-    icon: Activity,
-    href: '/runs',
+    items: [
+      { id: 'agents', labelKey: 'sidebar.agents', icon: Bot, href: '/agents' },
+      { id: 'tasks', labelKey: 'sidebar.tasks', icon: ListChecks, href: '/tasks' },
+    ],
   },
   {
-    id: 'memory',
-    labelKey: 'sidebar.memory',
-    icon: Brain,
-    href: '/memory',
+    items: [
+      { id: 'skills', labelKey: 'sidebar.skillsHub', icon: Sparkles, href: '/skills' },
+      { id: 'tools', labelKey: 'sidebar.toolsAndMcp', icon: Wrench, href: '/tools' },
+    ],
   },
   {
-    id: 'openclaw',
-    labelKey: 'sidebar.openclaw',
-    icon: Clapperboard,
-    href: '/openclaw',
+    items: [{ id: 'settings', labelKey: 'sidebar.settings', icon: Settings, href: '/settings' }],
   },
 ]
 
-interface AppSidebarProps {
-  isCollapsed?: boolean
-}
-
-export function AppSidebar({ isCollapsed = false }: AppSidebarProps) {
+export function AppSidebar() {
   const pathname = usePathname()
   const { t } = useTranslation()
-
-  // NEXT_PUBLIC_OPENCLAW_ENABLED controls OpenClaw visibility at deployment level
-  // Defaults to hidden (false) when env var is not set; set to "true" to show
-  const openclawEnv =
-    runtimeEnv('NEXT_PUBLIC_OPENCLAW_ENABLED') || process.env.NEXT_PUBLIC_OPENCLAW_ENABLED
-  const openclawEnabled = openclawEnv?.toLowerCase() === 'true' || openclawEnv === '1'
-
-  const visibleMenuItems = openclawEnabled
-    ? menuItems
-    : menuItems.filter((item) => item.id !== 'openclaw')
+  const isCollapsed = useSidebarStore((state) => state.isCollapsed)
 
   return (
     <TooltipProvider>
@@ -91,42 +59,46 @@ export function AppSidebar({ isCollapsed = false }: AppSidebarProps) {
           <AppLogo isCollapsed={isCollapsed} />
 
           <nav className="flex-1 px-2 py-2">
-            <ul className="space-y-1">
-              {visibleMenuItems.map((item) => {
-                const Icon = item.icon
-                const isActive = pathname?.startsWith(item.href)
-                const label = t(item.labelKey)
-
-                const menuItem = (
-                  <Link
-                    href={item.href}
-                    className={cn(
-                      'flex items-center gap-2 rounded-lg px-2 py-1.5 text-base leading-[16px] transition-colors',
-                      isCollapsed ? 'justify-center' : '',
-                      isActive
-                        ? 'bg-[var(--surface-5)] text-[var(--text-primary)] font-medium'
-                        : 'text-[var(--text-tertiary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)] font-normal',
-                    )}
-                  >
-                    <Icon className="h-3.5 w-3.5 flex-shrink-0" strokeWidth={isActive ? 2 : 1.75} />
-                    {!isCollapsed && <span className="truncate">{label}</span>}
-                  </Link>
-                )
+            {menuGroups.map((group, groupIdx) => (
+              <div key={groupIdx}>
+                {groupIdx > 0 && <div className="mx-2 my-2 border-t border-[var(--border)]" />}
+                <ul className="space-y-1">
+                  {group.items.map((item) => {
+                    const Icon = item.icon
+                    const isActive = pathname?.startsWith(item.href)
+                    const label = t(item.labelKey)
 
-                return (
-                  <li key={item.id}>
-                    {isCollapsed ? (
-                      <Tooltip>
-                        <TooltipTrigger asChild>{menuItem}</TooltipTrigger>
-                        <TooltipContent side="right">{label}</TooltipContent>
-                      </Tooltip>
-                    ) : (
-                      menuItem
-                    )}
-                  </li>
-                )
-              })}
-            </ul>
+                    return (
+                      <li key={item.id}>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Link
+                              href={item.href}
+                              className={cn(
+                                'flex items-center rounded-lg px-3 py-2 text-sm transition-colors',
+                                isCollapsed ? 'justify-center' : 'gap-2.5',
+                                isActive
+                                  ? 'bg-[var(--surface-5)] font-medium text-[var(--text-primary)]'
+                                  : 'font-normal text-[var(--text-tertiary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)]',
+                              )}
+                            >
+                              <Icon
+                                className="h-4 w-4 flex-shrink-0"
+                                strokeWidth={isActive ? 2 : 1.75}
+                              />
+                              {!isCollapsed && <span className="truncate">{label}</span>}
+                            </Link>
+                          </TooltipTrigger>
+                          <TooltipContent side="right" className={cn(!isCollapsed && 'hidden')}>
+                            {label}
+                          </TooltipContent>
+                        </Tooltip>
+                      </li>
+                    )
+                  })}
+                </ul>
+              </div>
+            ))}
           </nav>
 
           <UserInfo isCollapsed={isCollapsed} showContent={!isCollapsed} />
diff --git a/frontend/components/app-sidebar/user-info.tsx b/frontend/components/app-sidebar/user-info.tsx
index 074c09b86..98a9de04b 100644
--- a/frontend/components/app-sidebar/user-info.tsx
+++ b/frontend/components/app-sidebar/user-info.tsx
@@ -117,7 +117,7 @@ export function UserInfo({ isCollapsed: _isCollapsed = false, showContent = true
                 className="flex items-center gap-2 text-base"
               >
                 <Settings className="h-3.5 w-3.5" />
-                <span>{t('user.settings')}</span>
+                <span>{t('settings.profile')}</span>
               </DropdownMenuItem>
 
               <DropdownMenuSeparator />
diff --git a/frontend/components/app-sidebar/version-badge.tsx b/frontend/components/app-sidebar/version-badge.tsx
index cef94e4af..738dd0780 100644
--- a/frontend/components/app-sidebar/version-badge.tsx
+++ b/frontend/components/app-sidebar/version-badge.tsx
@@ -23,12 +23,12 @@ export function VersionBadge({ isCollapsed = false }: VersionBadgeProps) {
     <div className="px-2 pb-2">
       <Tooltip>
         <TooltipTrigger asChild>
-          <p className="text-center text-sm text-[var(--text-muted)] cursor-default select-none">
+          <p className="cursor-default select-none text-center text-sm text-[var(--text-muted)]">
             v{data.version}
           </p>
         </TooltipTrigger>
         <TooltipContent side="right">
-          <div className="text-xs space-y-0.5">
+          <div className="space-y-0.5 text-xs">
             <p>Version: {data.version}</p>
             <p>Commit: {data.git_sha}</p>
             <p>Env: {data.environment}</p>
diff --git a/frontend/components/auth/oauth-buttons.tsx b/frontend/components/auth/oauth-buttons.tsx
index 68a416d38..900f9c836 100644
--- a/frontend/components/auth/oauth-buttons.tsx
+++ b/frontend/components/auth/oauth-buttons.tsx
@@ -3,12 +3,12 @@
 import { useQuery } from '@tanstack/react-query'
 import { Chrome, Github, Globe, Key, Shield } from 'lucide-react'
 
-
 import { Button } from '@/components/ui/button'
 import { Skeleton } from '@/components/ui/skeleton'
-import { API_BASE } from '@/lib/api-client'
+import { apiGet, ApiError } from '@/lib/api-client'
 import { useTranslation } from '@/lib/i18n'
 import { createLogger } from '@/lib/logs/console/logger'
+import { toastError } from '@/lib/utils/toast'
 
 const logger = createLogger('OAuthButtons')
 
@@ -34,19 +34,16 @@ interface OAuthProvidersResponse {
   providers: OAuthProvider[]
 }
 
+interface OAuthAuthorizationResponse {
+  authorization_url: string
+  state: string
+}
+
 /**
  * Fetch the list of OAuth providers
  */
 async function fetchOAuthProviders(): Promise<OAuthProvider[]> {
-  const response = await fetch(`${API_BASE}/auth/oauth/providers`, {
-    credentials: 'include',
-  })
-
-  if (!response.ok) {
-    throw new Error('Failed to fetch OAuth providers')
-  }
-
-  const data: OAuthProvidersResponse = await response.json()
+  const data = await apiGet<OAuthProvidersResponse>('auth/oauth/providers', { withAuth: false })
   return data.providers
 }
 
@@ -66,7 +63,10 @@ interface OAuthButtonsProps {
  *
  * Dynamically fetches enabled OAuth providers from the backend and renders login buttons.
  */
-export function OAuthButtons({ callbackUrl = '/chat', showDivider = true }: OAuthButtonsProps) {
+export function OAuthButtons({
+  callbackUrl = '/dashboard',
+  showDivider = true,
+}: OAuthButtonsProps) {
   const { t } = useTranslation()
 
   const {
@@ -111,17 +111,48 @@ export function OAuthButtons({ callbackUrl = '/chat', showDivider = true }: OAut
     return null
   }
 
-  const handleOAuthLogin = (providerId: string) => {
-    const params = new URLSearchParams()
-    if (callbackUrl) {
-      params.set('callback_url', callbackUrl)
+  const getOAuthErrorMessage = (error: unknown): string => {
+    if (error instanceof ApiError) {
+      switch (error.code) {
+        case 'OAUTH_PROVIDER_NOT_FOUND':
+          return t('auth.oauthProviderNotFound')
+        case 'OAUTH_DISCOVERY_FAILED':
+        case 'OAUTH_TOKEN_ENDPOINT_DISCOVERY_FAILED':
+        case 'OAUTH_USERINFO_ENDPOINT_DISCOVERY_FAILED':
+          return t('auth.oauthDiscoveryFailed')
+        case 'OAUTH_AUTHORIZE_URL_MISSING':
+          return t('auth.oauthAuthorizeUrlMissing')
+        case 'NETWORK_ERROR':
+        case 'REQUEST_TIMEOUT':
+          return t('auth.networkError')
+        default:
+          return error.message || t('auth.oauthFailed')
+      }
+    }
+
+    if (error instanceof Error) {
+      return error.message
     }
-    const queryString = params.toString()
-    const url = `${API_BASE}/auth/oauth/${providerId}${queryString ? `?${queryString}` : ''}`
 
-    logger.info('Initiating OAuth login:', { provider: providerId, callbackUrl })
-    // eslint-disable-next-line react-hooks/immutability
-    window.location.href = url
+    return t('auth.oauthFailed')
+  }
+
+  const handleOAuthLogin = async (providerId: string) => {
+    try {
+      const params = new URLSearchParams()
+      if (callbackUrl) {
+        params.set('callback_url', callbackUrl)
+      }
+      const queryString = params.toString()
+      const path = `auth/oauth/${providerId}${queryString ? `?${queryString}` : ''}`
+
+      logger.info('Initiating OAuth login:', { provider: providerId, callbackUrl })
+      const response = await apiGet<OAuthAuthorizationResponse>(path, { withAuth: false })
+      window.location.href = response.authorization_url
+    } catch (error) {
+      logger.error('Failed to initiate OAuth login:', { providerId, error })
+      toastError(getOAuthErrorMessage(error))
+    }
   }
 
   return (
@@ -147,7 +178,7 @@ export function OAuthButtons({ callbackUrl = '/chat', showDivider = true }: OAut
               key={provider.id}
               variant="outline"
               className="w-full"
-              onClick={() => handleOAuthLogin(provider.id)}
+              onClick={() => void handleOAuthLogin(provider.id)}
             >
               <Icon className="mr-2 h-4 w-4" />
               {t('auth.signInWith', { provider: provider.display_name })}
diff --git a/frontend/components/chat/AttachmentChip.tsx b/frontend/components/chat/AttachmentChip.tsx
new file mode 100644
index 000000000..bda8b5cc5
--- /dev/null
+++ b/frontend/components/chat/AttachmentChip.tsx
@@ -0,0 +1,47 @@
+'use client'
+
+import { X, FileIcon } from 'lucide-react'
+import { cn } from '@/lib/utils'
+
+interface AttachmentChipProps {
+  filename: string
+  mimeType: string
+  sizeBytes: number
+  uploading?: boolean
+  onRemove?: () => void
+}
+
+export function AttachmentChip({
+  filename,
+  mimeType,
+  sizeBytes,
+  uploading,
+  onRemove,
+}: AttachmentChipProps) {
+  const sizeLabel =
+    sizeBytes < 1024 * 1024
+      ? `${(sizeBytes / 1024).toFixed(0)} KB`
+      : `${(sizeBytes / (1024 * 1024)).toFixed(1)} MB`
+
+  return (
+    <div
+      className={cn(
+        'inline-flex items-center gap-1.5 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-2 py-1 text-xs',
+        uploading && 'opacity-60',
+      )}
+    >
+      <FileIcon className="h-3 w-3 text-[var(--text-muted)]" />
+      <span className="max-w-[120px] truncate text-[var(--text-primary)]">{filename}</span>
+      <span className="text-[var(--text-muted)]">{sizeLabel}</span>
+      {onRemove && (
+        <button
+          type="button"
+          onClick={onRemove}
+          className="ml-0.5 rounded p-0.5 hover:bg-[var(--surface-3)]"
+        >
+          <X className="h-3 w-3" />
+        </button>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/chat/ChatEventBubble.tsx b/frontend/components/chat/ChatEventBubble.tsx
new file mode 100644
index 000000000..25b949fc7
--- /dev/null
+++ b/frontend/components/chat/ChatEventBubble.tsx
@@ -0,0 +1,199 @@
+'use client'
+
+import {
+  Bot,
+  Wrench,
+  AlertCircle,
+  ChevronDown,
+  Loader2,
+  CheckCircle,
+  XCircle,
+  Package,
+} from 'lucide-react'
+import { useState } from 'react'
+import ReactMarkdown from 'react-markdown'
+import { cn } from '@/lib/utils'
+import { ChatFilePreview } from './ChatFilePreview'
+import type { ThreadEvent } from '@/types/thread'
+
+interface ChatEventBubbleProps {
+  event: ThreadEvent
+}
+
+interface AttachmentData {
+  filename: string
+  storage_ref: string
+  mime_type: string
+  size_bytes: number
+}
+
+export function ChatEventBubble({ event }: ChatEventBubbleProps) {
+  const { event_type, payload } = event
+  const [collapsed, setCollapsed] = useState(true)
+
+  if (event_type === 'user_message') {
+    const text = (payload.text as string) || ''
+    const attachments = (payload.attachments as AttachmentData[]) || []
+
+    return (
+      <div className="flex justify-end">
+        <div className="max-w-[70%] rounded-lg bg-[var(--skill-brand-600)] px-4 py-3 text-white">
+          <p className="whitespace-pre-wrap break-words text-sm">{text}</p>
+          {attachments.map((a) => (
+            <ChatFilePreview
+              key={a.storage_ref}
+              filename={a.filename}
+              storageRef={a.storage_ref}
+              mimeType={a.mime_type}
+              sizeBytes={a.size_bytes}
+            />
+          ))}
+          <span className="mt-1 block text-xs opacity-70">
+            {new Date(event.created_at).toLocaleTimeString()}
+          </span>
+        </div>
+      </div>
+    )
+  }
+
+  if (event_type === 'assistant_text') {
+    const text = (payload.text as string) || (payload.delta as string) || ''
+    return (
+      <div className="flex justify-start">
+        <div className="flex max-w-[70%] gap-3 rounded-lg bg-[var(--surface-2)] px-4 py-3">
+          <Bot className="mt-0.5 h-4 w-4 flex-shrink-0 text-[var(--text-muted)]" />
+          <div className="min-w-0 flex-1">
+            <div className="prose prose-sm max-w-none break-words text-sm text-[var(--text-primary)]">
+              <ReactMarkdown>{text}</ReactMarkdown>
+            </div>
+            <span className="mt-1 block text-xs text-[var(--text-muted)]">
+              {new Date(event.created_at).toLocaleTimeString()}
+            </span>
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  if (event_type === 'thinking') {
+    const text = (payload.text as string) || ''
+    return (
+      <div className="flex items-start gap-1.5">
+        <button
+          type="button"
+          onClick={() => setCollapsed(!collapsed)}
+          className="flex items-center gap-1.5 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+        >
+          <ChevronDown className={cn('h-3 w-3 transition-transform', !collapsed && 'rotate-180')} />
+          Thinking...
+        </button>
+        {!collapsed && (
+          <div className="max-w-md rounded bg-[var(--surface-2)] p-2 text-xs text-[var(--text-muted)]">
+            {text}
+          </div>
+        )}
+      </div>
+    )
+  }
+
+  if (event_type === 'tool_use_start') {
+    const name = (payload.name as string) || 'tool'
+    return (
+      <button
+        type="button"
+        onClick={() => setCollapsed(!collapsed)}
+        className="flex items-center gap-1.5 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 text-xs"
+      >
+        <Wrench className="h-3 w-3 text-[var(--text-muted)]" />
+        <span className="font-medium text-[var(--text-primary)]">{name}</span>
+        <Loader2 className="h-3 w-3 animate-spin text-[var(--text-muted)]" />
+        <ChevronDown className={cn('h-3 w-3 transition-transform', !collapsed && 'rotate-180')} />
+        {!collapsed && (
+          <pre className="mt-1 max-h-40 overflow-auto whitespace-pre-wrap text-[var(--text-muted)]">
+            {JSON.stringify(payload.input, null, 2)}
+          </pre>
+        )}
+      </button>
+    )
+  }
+
+  if (event_type === 'tool_use_end') {
+    const name = (payload.name as string) || 'tool'
+    const success = payload.success !== false
+    return (
+      <button
+        type="button"
+        onClick={() => setCollapsed(!collapsed)}
+        className="flex items-center gap-1.5 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 text-xs"
+      >
+        <Wrench className="h-3 w-3 text-[var(--text-muted)]" />
+        <span className="font-medium text-[var(--text-primary)]">{name}</span>
+        {success ? (
+          <CheckCircle className="h-3 w-3 text-green-500" />
+        ) : (
+          <XCircle className="h-3 w-3 text-red-500" />
+        )}
+        {!collapsed && (
+          <pre className="mt-1 max-h-40 overflow-auto whitespace-pre-wrap text-[var(--text-muted)]">
+            {typeof payload.output === 'string'
+              ? payload.output
+              : JSON.stringify(payload.output, null, 2)}
+          </pre>
+        )}
+      </button>
+    )
+  }
+
+  if (event_type === 'error') {
+    return (
+      <div className="rounded-md border border-red-500/20 bg-red-500/5 px-4 py-3">
+        <div className="flex items-center gap-2 text-sm text-red-400">
+          <AlertCircle className="h-4 w-4" />
+          <span>{(payload.message as string) || 'Error'}</span>
+        </div>
+        {typeof payload.trace === 'string' && (
+          <button
+            type="button"
+            onClick={() => setCollapsed(!collapsed)}
+            className="mt-1 text-xs text-red-400/70"
+          >
+            {collapsed ? 'Show trace' : 'Hide trace'}
+            {!collapsed && <pre className="mt-1 max-h-40 overflow-auto">{payload.trace}</pre>}
+          </button>
+        )}
+      </div>
+    )
+  }
+
+  if (event_type === 'artifact_created') {
+    return (
+      <div className="flex items-center gap-2 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 text-xs">
+        <Package className="h-3 w-3 text-[var(--text-muted)]" />
+        <span className="text-[var(--text-primary)]">
+          Artifact: {(payload.name as string) || 'output'}
+        </span>
+      </div>
+    )
+  }
+
+  if (event_type === 'execution_started' || event_type === 'execution_completed') {
+    const isComplete = event_type === 'execution_completed'
+    const terminalStatus = (payload.terminal_status as string) || event.execution_status
+    return (
+      <div className="flex justify-center">
+        <span
+          className={cn(
+            'rounded-full px-3 py-0.5 text-[10px] font-medium',
+            isComplete && terminalStatus === 'succeeded' && 'bg-green-500/10 text-green-500',
+            isComplete && terminalStatus !== 'succeeded' && 'bg-red-500/10 text-red-400',
+            !isComplete && 'bg-[var(--surface-3)] text-[var(--text-muted)]',
+          )}
+        >
+          {isComplete ? `Execution ${terminalStatus}` : 'Execution started'}
+        </span>
+      </div>
+    )
+  }
+
+  return null
+}
diff --git a/frontend/components/chat/ChatFilePreview.tsx b/frontend/components/chat/ChatFilePreview.tsx
new file mode 100644
index 000000000..f38e79e65
--- /dev/null
+++ b/frontend/components/chat/ChatFilePreview.tsx
@@ -0,0 +1,254 @@
+'use client'
+
+import { FileIcon, Download, Loader2, ChevronDown } from 'lucide-react'
+import { useEffect, useState } from 'react'
+import { API_BASE, createApiError } from '@/lib/api-client'
+import { cn } from '@/lib/utils'
+
+interface ChatFilePreviewProps {
+  filename: string
+  storageRef: string
+  mimeType: string
+  sizeBytes: number
+}
+
+function isImage(mime: string) {
+  return mime.startsWith('image/')
+}
+
+function isText(mime: string) {
+  return (
+    mime.startsWith('text/') ||
+    mime === 'application/json' ||
+    mime === 'application/xml' ||
+    mime === 'application/javascript' ||
+    mime === 'application/typescript' ||
+    mime === 'application/x-yaml' ||
+    mime === 'application/x-sh'
+  )
+}
+
+function isPdf(mime: string) {
+  return mime === 'application/pdf'
+}
+
+const MAX_PREVIEW_LINES = 50
+
+export function ChatFilePreview({
+  filename,
+  storageRef,
+  mimeType,
+  sizeBytes,
+}: ChatFilePreviewProps) {
+  const basename = filename.split('/').pop() || filename
+  const rawUrl = `${API_BASE}/files/read/${encodeURIComponent(basename)}?mode=raw`
+  const sizeLabel =
+    sizeBytes < 1024 * 1024
+      ? `${(sizeBytes / 1024).toFixed(0)} KB`
+      : `${(sizeBytes / (1024 * 1024)).toFixed(1)} MB`
+
+  if (isImage(mimeType)) {
+    return <ImagePreview rawUrl={rawUrl} filename={filename} sizeLabel={sizeLabel} />
+  }
+
+  if (isPdf(mimeType)) {
+    return <PdfPreview rawUrl={rawUrl} filename={filename} sizeLabel={sizeLabel} />
+  }
+
+  if (isText(mimeType)) {
+    return (
+      <TextPreview
+        rawUrl={rawUrl}
+        filename={filename}
+        sizeLabel={sizeLabel}
+        sizeBytes={sizeBytes}
+      />
+    )
+  }
+
+  return (
+    <a
+      href={rawUrl}
+      download={filename}
+      className="mt-2 inline-flex items-center gap-2 rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 text-xs hover:bg-[var(--surface-3)]"
+    >
+      <FileIcon className="h-4 w-4 text-[var(--text-muted)]" />
+      <span className="text-[var(--text-primary)]">{filename}</span>
+      <span className="text-[var(--text-muted)]">{sizeLabel}</span>
+      <Download className="h-3 w-3 text-[var(--text-muted)]" />
+    </a>
+  )
+}
+
+function ImagePreview({
+  rawUrl,
+  filename,
+  sizeLabel,
+}: {
+  rawUrl: string
+  filename: string
+  sizeLabel: string
+}) {
+  const [fullscreen, setFullscreen] = useState(false)
+
+  return (
+    <>
+      <div className="mt-2 max-w-sm">
+        <button
+          type="button"
+          onClick={() => setFullscreen(true)}
+          className="block w-full overflow-hidden rounded-md border border-[var(--border)] hover:opacity-90"
+        >
+          <img
+            src={rawUrl}
+            alt={filename}
+            className="max-h-64 w-full object-contain"
+            loading="lazy"
+          />
+        </button>
+        <p className="mt-1 text-xs text-[var(--text-muted)]">
+          {filename} ({sizeLabel})
+        </p>
+      </div>
+      {fullscreen && (
+        <div
+          className="fixed inset-0 z-50 flex items-center justify-center bg-black/80"
+          onClick={() => setFullscreen(false)}
+        >
+          <img src={rawUrl} alt={filename} className="max-h-[90vh] max-w-[90vw] object-contain" />
+        </div>
+      )}
+    </>
+  )
+}
+
+function PdfPreview({
+  rawUrl,
+  filename,
+  sizeLabel,
+}: {
+  rawUrl: string
+  filename: string
+  sizeLabel: string
+}) {
+  const [open, setOpen] = useState(false)
+
+  return (
+    <div className="mt-2 max-w-md">
+      <button
+        type="button"
+        onClick={() => setOpen(!open)}
+        className="flex w-full items-center justify-between rounded-md border border-[var(--border)] bg-[var(--surface-2)] px-3 py-2 text-xs hover:bg-[var(--surface-3)]"
+      >
+        <span className="flex items-center gap-2">
+          <FileIcon className="h-4 w-4 text-red-400" />
+          <span className="text-[var(--text-primary)]">{filename}</span>
+          <span className="text-[var(--text-muted)]">{sizeLabel}</span>
+        </span>
+        <ChevronDown className={cn('h-3 w-3 transition-transform', open && 'rotate-180')} />
+      </button>
+      {open && (
+        <iframe
+          src={rawUrl}
+          title={filename}
+          className="mt-1 h-96 w-full rounded-md border border-[var(--border)]"
+        />
+      )}
+    </div>
+  )
+}
+
+function TextPreview({
+  rawUrl,
+  filename,
+  sizeLabel,
+  sizeBytes,
+}: {
+  rawUrl: string
+  filename: string
+  sizeLabel: string
+  sizeBytes: number
+}) {
+  const [content, setContent] = useState<string | null>(null)
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState<string | null>(null)
+  const [expanded, setExpanded] = useState(false)
+  const [open, setOpen] = useState(sizeBytes < 50 * 1024) // Auto-open small files
+
+  useEffect(() => {
+    if (!open || content !== null) return
+    setLoading(true)
+    fetch(rawUrl, { credentials: 'include' })
+      .then((r) => {
+        if (!r.ok) {
+          throw createApiError(r.status, r.statusText, {
+            code: 'FILE_PREVIEW_LOAD_FAILED',
+            message: 'Failed to load file preview',
+            data: { filename },
+          })
+        }
+        return r.text()
+      })
+      .then((text) => {
+        setContent(text)
+        setError(null)
+      })
+      .catch((e) => setError(e instanceof Error ? e.message : 'Failed to load'))
+      .finally(() => setLoading(false))
+  }, [open, rawUrl, content])
+
+  const lines = content?.split('\n') ?? []
+  const displayed =
+    expanded || lines.length <= MAX_PREVIEW_LINES ? lines : lines.slice(0, MAX_PREVIEW_LINES)
+  const hasMore = lines.length > MAX_PREVIEW_LINES
+
+  return (
+    <div className="mt-2 max-w-md">
+      <button
+        type="button"
+        onClick={() => setOpen(!open)}
+        className="flex w-full items-center justify-between rounded-t-md border border-[var(--border)] bg-[var(--surface-3)] px-3 py-1.5 hover:bg-[var(--surface-4)]"
+      >
+        <span className="flex items-center gap-2 text-xs">
+          <FileIcon className="h-3 w-3 text-[var(--text-muted)]" />
+          <span className="font-medium text-[var(--text-primary)]">{filename}</span>
+          <span className="text-[var(--text-muted)]">{sizeLabel}</span>
+        </span>
+        <ChevronDown
+          className={cn(
+            'h-3 w-3 text-[var(--text-muted)] transition-transform',
+            open && 'rotate-180',
+          )}
+        />
+      </button>
+      {open && (
+        <div className="rounded-b-md border border-t-0 border-[var(--border)] bg-[var(--surface-2)]">
+          {loading && (
+            <div className="flex items-center gap-2 px-3 py-3 text-xs text-[var(--text-muted)]">
+              <Loader2 className="h-3 w-3 animate-spin" /> Loading…
+            </div>
+          )}
+          {error && <div className="px-3 py-3 text-xs text-red-400">Failed: {error}</div>}
+          {content !== null && (
+            <>
+              <pre className="max-h-96 overflow-auto p-3 text-xs text-[var(--text-primary)]">
+                {displayed.join('\n')}
+              </pre>
+              {hasMore && (
+                <button
+                  type="button"
+                  onClick={() => setExpanded(!expanded)}
+                  className="block w-full border-t border-[var(--border)] px-3 py-1.5 text-center text-xs text-[var(--text-muted)] hover:bg-[var(--surface-3)]"
+                >
+                  {expanded
+                    ? `Show less (showing ${lines.length} lines)`
+                    : `Show all ${lines.length} lines (${lines.length - MAX_PREVIEW_LINES} more)`}
+                </button>
+              )}
+            </>
+          )}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/chat/ChatHistory.tsx b/frontend/components/chat/ChatHistory.tsx
new file mode 100644
index 000000000..ef2ef91e0
--- /dev/null
+++ b/frontend/components/chat/ChatHistory.tsx
@@ -0,0 +1,67 @@
+'use client'
+
+import { useEffect, useMemo, useRef } from 'react'
+import { Loader2 } from 'lucide-react'
+import { ChatEventBubble } from './ChatEventBubble'
+import { useTranslation } from '@/lib/i18n'
+import type { ThreadEvent } from '@/types/thread'
+
+interface ChatHistoryProps {
+  events: ThreadEvent[]
+  isLoading?: boolean
+  isExecuting?: boolean
+}
+
+const IGNORED_EVENTS = new Set([
+  'execution_status_change',
+  'approval_requested',
+  'approval_resolved',
+])
+
+export function ChatHistory({ events, isLoading, isExecuting }: ChatHistoryProps) {
+  const { t } = useTranslation()
+  const endRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    endRef.current?.scrollIntoView({ behavior: 'smooth' })
+  }, [events.length])
+
+  const visible = useMemo(
+    () =>
+      events.filter(
+        (e) => !IGNORED_EVENTS.has(e.event_type) && !e.event_type.startsWith('copilot_'),
+      ),
+    [events],
+  )
+
+  if (isLoading) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <Loader2 className="h-5 w-5 animate-spin text-[var(--text-muted)]" />
+      </div>
+    )
+  }
+
+  if (visible.length === 0) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <p className="text-sm text-[var(--text-muted)]">{t('chat.noMessages')}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-3 px-6 py-4">
+      {visible.map((event) => (
+        <ChatEventBubble key={event.id} event={event} />
+      ))}
+      {isExecuting && (
+        <div className="flex items-center gap-2 py-2">
+          <Loader2 className="h-4 w-4 animate-spin text-[var(--text-muted)]" />
+          <span className="text-xs text-[var(--text-muted)]">Agent is working...</span>
+        </div>
+      )}
+      <div ref={endRef} />
+    </div>
+  )
+}
diff --git a/frontend/components/chat/ChatInput.tsx b/frontend/components/chat/ChatInput.tsx
new file mode 100644
index 000000000..1642d329d
--- /dev/null
+++ b/frontend/components/chat/ChatInput.tsx
@@ -0,0 +1,165 @@
+'use client'
+
+import { Paperclip, Send, Loader2, Upload } from 'lucide-react'
+import { useCallback, useRef, useState } from 'react'
+import { Button } from '@/components/ui/button'
+import { AttachmentChip } from './AttachmentChip'
+import { useTranslation } from '@/lib/i18n'
+import { UPLOAD_LIMITS, ALLOWED_MIME_TYPES } from '@/lib/core/constants/upload-limits'
+import { cn } from '@/lib/utils'
+
+interface ChatInputProps {
+  onSend: (message: string, files: File[]) => void
+  disabled?: boolean
+}
+
+export function ChatInput({ onSend, disabled }: ChatInputProps) {
+  const { t } = useTranslation()
+  const [text, setText] = useState('')
+  const [files, setFiles] = useState<File[]>([])
+  const [isDragOver, setIsDragOver] = useState(false)
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const textareaRef = useRef<HTMLTextAreaElement>(null)
+
+  const handleSend = useCallback(() => {
+    if (!text.trim() && files.length === 0) return
+    onSend(text.trim(), files)
+    setText('')
+    setFiles([])
+  }, [text, files, onSend])
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault()
+      handleSend()
+    }
+  }
+
+  const addFiles = (newFiles: FileList | File[]) => {
+    const incoming = Array.from(newFiles)
+    const valid: File[] = []
+    const rejected: string[] = []
+
+    for (const f of incoming) {
+      if (f.size > UPLOAD_LIMITS.MAX_FILE_SIZE_BYTES) {
+        rejected.push(`${f.name}: exceeds ${UPLOAD_LIMITS.MAX_FILE_SIZE_MB}MB`)
+        continue
+      }
+      if (f.type && !(ALLOWED_MIME_TYPES as readonly string[]).includes(f.type)) {
+        rejected.push(`${f.name}: unsupported type (${f.type})`)
+        continue
+      }
+      valid.push(f)
+    }
+
+    if (rejected.length > 0) {
+      console.warn('Rejected files:', rejected)
+    }
+
+    setFiles((prev) => [...prev, ...valid].slice(0, UPLOAD_LIMITS.MAX_FILES_PER_UPLOAD))
+  }
+
+  const handleDrop = (e: React.DragEvent) => {
+    e.preventDefault()
+    setIsDragOver(false)
+    if (e.dataTransfer.files.length) addFiles(e.dataTransfer.files)
+  }
+
+  const handleDragEnter = (e: React.DragEvent) => {
+    e.preventDefault()
+    setIsDragOver(true)
+  }
+
+  const handleDragLeave = (e: React.DragEvent) => {
+    e.preventDefault()
+    if (e.currentTarget === e.target) setIsDragOver(false)
+  }
+
+  // Auto-resize textarea
+  const handleTextChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    setText(e.target.value)
+    const el = e.target
+    el.style.height = 'auto'
+    el.style.height = `${Math.min(el.scrollHeight, 200)}px`
+  }
+
+  return (
+    <div
+      className={cn(
+        'relative border-t border-[var(--border)] bg-[var(--surface-elevated)] px-4 py-3 transition-colors',
+        isDragOver &&
+          'bg-[var(--skill-brand-600)]/5 ring-[var(--skill-brand-600)]/30 ring-2 ring-inset',
+      )}
+      onDrop={handleDrop}
+      onDragOver={(e) => e.preventDefault()}
+      onDragEnter={handleDragEnter}
+      onDragLeave={handleDragLeave}
+    >
+      {isDragOver && (
+        <div className="pointer-events-none absolute inset-0 z-10 flex items-center justify-center">
+          <div className="flex items-center gap-2 rounded-lg bg-[var(--skill-brand-600)] px-4 py-2 text-sm text-white shadow-lg">
+            <Upload className="h-4 w-4" />
+            Drop files here
+          </div>
+        </div>
+      )}
+      {files.length > 0 && (
+        <div className="mb-2 flex flex-wrap gap-1.5">
+          {files.map((f, i) => (
+            <AttachmentChip
+              key={`${f.name}-${i}`}
+              filename={f.name}
+              mimeType={f.type}
+              sizeBytes={f.size}
+              onRemove={() => setFiles((prev) => prev.filter((_, j) => j !== i))}
+            />
+          ))}
+          {files.length >= UPLOAD_LIMITS.MAX_FILES_PER_UPLOAD && (
+            <span className="self-center text-[10px] text-[var(--text-muted)]">
+              Max {UPLOAD_LIMITS.MAX_FILES_PER_UPLOAD} files
+            </span>
+          )}
+        </div>
+      )}
+      <div className="flex gap-2">
+        <textarea
+          ref={textareaRef}
+          value={text}
+          onChange={handleTextChange}
+          onKeyDown={handleKeyDown}
+          placeholder={t('chat.describeHelpNeeded')}
+          disabled={disabled}
+          rows={1}
+          className="flex-1 resize-none rounded-md border border-[var(--border)] bg-[var(--surface)] px-3 py-2 text-sm text-[var(--text-primary)] placeholder:text-[var(--text-muted)] focus:outline-none focus:ring-1 focus:ring-[var(--skill-brand-600)]"
+        />
+        <input
+          ref={fileInputRef}
+          type="file"
+          multiple
+          className="hidden"
+          onChange={(e) => {
+            if (e.target.files) addFiles(e.target.files)
+            e.target.value = ''
+          }}
+        />
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={() => fileInputRef.current?.click()}
+          disabled={disabled}
+          className="h-9 w-9 p-0"
+          title="Attach files"
+        >
+          <Paperclip className="h-4 w-4" />
+        </Button>
+        <Button
+          onClick={handleSend}
+          disabled={disabled || (!text.trim() && files.length === 0)}
+          className="h-9 gap-1.5"
+        >
+          {disabled ? <Loader2 className="h-4 w-4 animate-spin" /> : <Send className="h-4 w-4" />}
+        </Button>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/chat/ChatPanel.tsx b/frontend/components/chat/ChatPanel.tsx
new file mode 100644
index 000000000..e51aad7e2
--- /dev/null
+++ b/frontend/components/chat/ChatPanel.tsx
@@ -0,0 +1,98 @@
+'use client'
+
+import { useCallback } from 'react'
+import { MessageSquare, Plus } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { ThreadSidebar } from './ThreadSidebar'
+import { ChatHistory } from './ChatHistory'
+import { ChatInput } from './ChatInput'
+import { useThreads, useCreateThread } from '@/hooks/queries/threads'
+import { useThreadEvents } from '@/hooks/use-thread-events'
+import { useChatSend } from '@/hooks/use-chat-send'
+import { useChatStream } from '@/hooks/use-chat-stream'
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+
+interface ChatPanelProps {
+  agentId: string
+  workspaceId: string
+  threadId?: string
+  onThreadChange?: (id: string) => void
+  showThreadSidebar?: boolean
+  className?: string
+}
+
+export function ChatPanel({
+  agentId,
+  workspaceId,
+  threadId,
+  onThreadChange,
+  showThreadSidebar = true,
+  className,
+}: ChatPanelProps) {
+  const { t } = useTranslation()
+  const { data: threads = [], isLoading: threadsLoading } = useThreads(agentId, workspaceId)
+  const createThread = useCreateThread()
+
+  const { data: eventsData, isLoading: eventsLoading } = useThreadEvents(
+    threadId || '',
+    workspaceId,
+    { enabled: Boolean(threadId) },
+  )
+
+  const { send, isSending, executionId } = useChatSend(threadId || '', workspaceId)
+  const { isExecuting } = useChatStream(executionId, threadId || '', workspaceId)
+
+  const handleCreateThread = useCallback(async () => {
+    const thread = await createThread.mutateAsync({
+      agent_id: agentId,
+      workspace_id: workspaceId,
+    })
+    onThreadChange?.(thread.id)
+  }, [agentId, workspaceId, createThread, onThreadChange])
+
+  const handleSend = useCallback(
+    (message: string, files: File[]) => {
+      send(message, files)
+    },
+    [send],
+  )
+
+  return (
+    <div className={cn('flex h-full', className)}>
+      {showThreadSidebar && (
+        <ThreadSidebar
+          threads={threads}
+          activeThreadId={threadId}
+          onSelect={(id) => onThreadChange?.(id)}
+          onCreate={handleCreateThread}
+          isLoading={threadsLoading}
+          isCreating={createThread.isPending}
+        />
+      )}
+
+      <div className="flex flex-1 flex-col">
+        {!threadId ? (
+          <div className="flex h-full flex-col items-center justify-center gap-3">
+            <MessageSquare className="h-12 w-12 text-[var(--text-muted)]" />
+            <p className="text-sm text-[var(--text-muted)]">{t('agents.detail.startChat')}</p>
+            <Button onClick={handleCreateThread} disabled={createThread.isPending}>
+              <Plus className="mr-1.5 h-4 w-4" /> {t('chat.newChat')}
+            </Button>
+          </div>
+        ) : (
+          <>
+            <div className="flex-1 overflow-y-auto">
+              <ChatHistory
+                events={eventsData?.events ?? []}
+                isLoading={eventsLoading}
+                isExecuting={isExecuting}
+              />
+            </div>
+            <ChatInput onSend={handleSend} disabled={isSending || isExecuting} />
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/chat/ThreadSidebar.tsx b/frontend/components/chat/ThreadSidebar.tsx
new file mode 100644
index 000000000..696a8790e
--- /dev/null
+++ b/frontend/components/chat/ThreadSidebar.tsx
@@ -0,0 +1,72 @@
+'use client'
+
+import { Plus, Loader2, MessageSquare } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+import type { Thread } from '@/types/thread'
+
+interface ThreadSidebarProps {
+  threads: Thread[]
+  activeThreadId?: string
+  onSelect: (threadId: string) => void
+  onCreate: () => void
+  isLoading?: boolean
+  isCreating?: boolean
+}
+
+export function ThreadSidebar({
+  threads,
+  activeThreadId,
+  onSelect,
+  onCreate,
+  isLoading,
+  isCreating,
+}: ThreadSidebarProps) {
+  const { t } = useTranslation()
+
+  return (
+    <div className="flex w-64 flex-shrink-0 flex-col border-r border-[var(--border)] bg-[var(--surface-elevated)]">
+      <div className="flex items-center justify-between border-b border-[var(--border)] px-4 py-3">
+        <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+          {t('agents.detail.tabs.chat')}
+        </h3>
+        <Button
+          size="sm"
+          variant="ghost"
+          onClick={onCreate}
+          disabled={isCreating}
+          className="h-7 w-7 p-0"
+        >
+          {isCreating ? <Loader2 className="h-4 w-4 animate-spin" /> : <Plus className="h-4 w-4" />}
+        </Button>
+      </div>
+      <div className="flex-1 overflow-y-auto p-2">
+        {isLoading ? (
+          <div className="flex items-center gap-2 py-6 text-sm text-[var(--text-muted)]">
+            <Loader2 className="h-4 w-4 animate-spin" /> {t('common.loading')}
+          </div>
+        ) : threads.length === 0 ? (
+          <p className="py-6 text-center text-xs text-[var(--text-muted)]">No threads yet</p>
+        ) : (
+          threads.map((thread) => (
+            <button
+              key={thread.id}
+              type="button"
+              onClick={() => onSelect(thread.id)}
+              className={cn(
+                'flex w-full items-center gap-2 rounded-md px-3 py-2 text-left text-sm transition-colors',
+                thread.id === activeThreadId
+                  ? 'bg-[var(--surface-3)] text-[var(--text-primary)]'
+                  : 'text-[var(--text-secondary)] hover:bg-[var(--surface-2)]',
+              )}
+            >
+              <MessageSquare className="h-3.5 w-3.5 flex-shrink-0" />
+              <span className="truncate">{thread.title || 'Untitled'}</span>
+            </button>
+          ))
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/copilot/CopilotErrorBoundary.tsx b/frontend/components/copilot/CopilotErrorBoundary.tsx
index b1a8744f0..6b6f6d67e 100644
--- a/frontend/components/copilot/CopilotErrorBoundary.tsx
+++ b/frontend/components/copilot/CopilotErrorBoundary.tsx
@@ -4,6 +4,7 @@ import { AlertCircle } from 'lucide-react'
 import React, { Component, ErrorInfo, ReactNode } from 'react'
 
 import { Button } from '@/components/ui/button'
+import { ApiError } from '@/lib/api-client'
 
 interface Props {
   children: ReactNode
@@ -55,13 +56,17 @@ export class CopilotErrorBoundary extends Component<Props, State> {
       }
 
       const errorMessage = this.state.error?.message || 'An unexpected error occurred'
-      const isNetworkError = errorMessage.includes('fetch') || errorMessage.includes('network')
-      const isWebSocketError = errorMessage.includes('WebSocket') || errorMessage.includes('ws')
+      const errorCode = this.state.error instanceof ApiError ? this.state.error.code : undefined
+      const isNetworkError = errorCode === 'NETWORK_ERROR' || errorCode === 'REQUEST_TIMEOUT'
+      const isWebSocketError =
+        errorCode === 'WEBSOCKET_CONNECTION_FAILED' || errorCode === 'WEBSOCKET_UNAVAILABLE'
 
       return (
         <div className="flex min-h-[200px] flex-col items-center justify-center p-8 text-center">
           <AlertCircle className="mb-4 h-12 w-12 text-[var(--status-error)]" />
-          <h3 className="mb-2 text-lg font-semibold text-[var(--text-primary)]">Something went wrong</h3>
+          <h3 className="mb-2 text-lg font-semibold text-[var(--text-primary)]">
+            Something went wrong
+          </h3>
           <p className="mb-4 max-w-md text-sm text-[var(--text-secondary)]">
             {isNetworkError
               ? 'Network connection error. Please check your internet connection and try again.'
diff --git a/frontend/components/dashboard/active-agents.tsx b/frontend/components/dashboard/active-agents.tsx
new file mode 100644
index 000000000..5663a554f
--- /dev/null
+++ b/frontend/components/dashboard/active-agents.tsx
@@ -0,0 +1,91 @@
+'use client'
+
+import { Bot, ChevronRight } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+import { useMemo } from 'react'
+
+import { Card } from '@/components/ui/card'
+import { useTranslation } from '@/lib/i18n'
+import type { Agent } from '@/types/agent'
+import type { Task } from '@/types/tasks'
+
+interface ActiveAgentsProps {
+  workspaceId: string
+  agents: Agent[]
+  tasks: Task[]
+}
+
+export function ActiveAgents({ workspaceId, agents, tasks }: ActiveAgentsProps) {
+  const { t } = useTranslation()
+  const router = useRouter()
+
+  const activeTaskCounts = useMemo(() => {
+    const counts: Record<string, number> = {}
+    tasks.forEach((task: Task) => {
+      const agentId = task.agent_id
+      if (agentId && task.status === 'in_progress') {
+        counts[agentId] = (counts[agentId] || 0) + 1
+      }
+    })
+    return counts
+  }, [tasks])
+
+  return (
+    <Card className="border-[var(--border)] bg-[var(--surface-elevated)] p-5">
+      <div className="mb-4 flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <Bot className="h-4 w-4 text-[var(--text-muted)]" />
+          <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('dashboard.activeAgents')}
+          </h2>
+        </div>
+        <button
+          type="button"
+          className="flex items-center gap-1 text-xs text-[var(--brand-500)] hover:underline"
+          onClick={() => router.push('/agents')}
+        >
+          {t('dashboard.viewAll')}
+          <ChevronRight className="h-3 w-3" />
+        </button>
+      </div>
+
+      {agents.length === 0 ? (
+        <p className="text-sm text-[var(--text-muted)]">{t('tasks.noTasks')}</p>
+      ) : (
+        <div className="flex gap-3 overflow-x-auto pb-1">
+          {agents.map((agent: Agent) => {
+            const taskCount = activeTaskCounts[agent.id] || 0
+            const isIdle = taskCount === 0
+
+            return (
+              <button
+                key={agent.id}
+                type="button"
+                className={`flex shrink-0 items-center gap-3 rounded-xl border border-[var(--border)] px-4 py-3 transition-colors hover:bg-[var(--surface-3)] ${
+                  isIdle ? 'opacity-50' : 'bg-[var(--surface-1)]'
+                }`}
+                onClick={() => router.push(`/agents/${agent.id}`)}
+              >
+                <div
+                  className={`flex h-8 w-8 items-center justify-center rounded-lg text-xs font-semibold ${
+                    isIdle
+                      ? 'bg-[var(--surface-3)] text-[var(--text-muted)]'
+                      : 'bg-[var(--skill-brand-50)] text-[var(--skill-brand-600)]'
+                  }`}
+                >
+                  {agent.name.charAt(0).toUpperCase()}
+                </div>
+                <div className="text-left">
+                  <p className="text-sm font-medium text-[var(--text-primary)]">{agent.name}</p>
+                  <p className="text-xs text-[var(--text-muted)]">
+                    {isIdle ? t('dashboard.idle') : `${taskCount} active`}
+                  </p>
+                </div>
+              </button>
+            )
+          })}
+        </div>
+      )}
+    </Card>
+  )
+}
diff --git a/frontend/components/dashboard/empty-state.tsx b/frontend/components/dashboard/empty-state.tsx
new file mode 100644
index 000000000..70c03e3f7
--- /dev/null
+++ b/frontend/components/dashboard/empty-state.tsx
@@ -0,0 +1,63 @@
+'use client'
+
+import { ArrowRight, BarChart3, Bot, ListChecks } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+
+import { Button } from '@/components/ui/button'
+import { useTranslation } from '@/lib/i18n'
+
+export function DashboardEmptyState() {
+  const { t } = useTranslation()
+  const router = useRouter()
+
+  return (
+    <div className="flex h-full flex-col items-center justify-center bg-[var(--bg)] px-6">
+      <div className="max-w-md text-center">
+        <h1 className="text-2xl font-semibold text-[var(--text-primary)]">
+          {t('dashboard.onboarding.title')}
+        </h1>
+        <p className="mt-2 text-sm text-[var(--text-muted)]">
+          {t('dashboard.onboarding.subtitle')}
+        </p>
+
+        <Button className="mt-6 gap-1.5" onClick={() => router.push('/agents')}>
+          {t('dashboard.onboarding.createAgent')}
+        </Button>
+
+        {/* Three-step flow */}
+        <div className="mt-10 flex items-center justify-center gap-4">
+          <div className="flex flex-col items-center gap-1.5">
+            <div className="flex h-10 w-10 items-center justify-center rounded-xl bg-[var(--surface-3)]">
+              <Bot className="h-5 w-5 text-[var(--text-muted)]" />
+            </div>
+            <span className="text-xs text-[var(--text-muted)]">
+              {t('dashboard.onboarding.step1')}
+            </span>
+          </div>
+
+          <ArrowRight className="h-4 w-4 shrink-0 text-[var(--text-muted)]" />
+
+          <div className="flex flex-col items-center gap-1.5">
+            <div className="flex h-10 w-10 items-center justify-center rounded-xl bg-[var(--surface-3)]">
+              <ListChecks className="h-5 w-5 text-[var(--text-muted)]" />
+            </div>
+            <span className="text-xs text-[var(--text-muted)]">
+              {t('dashboard.onboarding.step2')}
+            </span>
+          </div>
+
+          <ArrowRight className="h-4 w-4 shrink-0 text-[var(--text-muted)]" />
+
+          <div className="flex flex-col items-center gap-1.5">
+            <div className="flex h-10 w-10 items-center justify-center rounded-xl bg-[var(--surface-3)]">
+              <BarChart3 className="h-5 w-5 text-[var(--text-muted)]" />
+            </div>
+            <span className="text-xs text-[var(--text-muted)]">
+              {t('dashboard.onboarding.step3')}
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/dashboard/needs-attention.tsx b/frontend/components/dashboard/needs-attention.tsx
new file mode 100644
index 000000000..f3d3586d4
--- /dev/null
+++ b/frontend/components/dashboard/needs-attention.tsx
@@ -0,0 +1,88 @@
+'use client'
+
+import { AlertTriangle, CheckCircle2, ChevronRight } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+
+import { Card } from '@/components/ui/card'
+import { useAgentRuns } from '@/hooks/queries/agentRuns'
+import { useTranslation } from '@/lib/i18n'
+import type { Task } from '@/types/tasks'
+import type { AgentRun } from '@/types/agent-run'
+
+interface NeedsAttentionProps {
+  workspaceId: string
+  tasks: Task[]
+}
+
+export function NeedsAttention({ workspaceId, tasks }: NeedsAttentionProps) {
+  const { t } = useTranslation()
+  const router = useRouter()
+
+  const { data: runs = [] } = useAgentRuns(
+    { workspace_id: workspaceId },
+    { enabled: Boolean(workspaceId) },
+  )
+
+  const reviewTasks = tasks.filter((task: Task) => task.status === 'in_review')
+  const failedRuns = runs.filter((run: AgentRun) => run.status === 'failed')
+
+  const hasItems = reviewTasks.length > 0 || failedRuns.length > 0
+
+  return (
+    <Card className="border-[var(--border)] bg-[var(--surface-elevated)] p-5">
+      <div className="mb-4 flex items-center gap-2">
+        <AlertTriangle className="h-4 w-4 text-[var(--status-warning)]" />
+        <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+          {t('dashboard.needsAttention')}
+        </h2>
+      </div>
+
+      {hasItems ? (
+        <div className="space-y-2">
+          {reviewTasks.length > 0 && (
+            <button
+              type="button"
+              className="flex w-full items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-3 text-left transition-colors hover:bg-[var(--surface-3)]"
+              onClick={() => router.push('/tasks')}
+            >
+              <div className="flex items-center gap-2">
+                <div className="h-2 w-2 rounded-full bg-[var(--status-warning)]" />
+                <span className="text-sm text-[var(--text-primary)]">
+                  {t('dashboard.awaitingApproval')}
+                </span>
+                <span className="text-xs font-medium text-[var(--text-secondary)]">
+                  x{reviewTasks.length}
+                </span>
+              </div>
+              <ChevronRight className="h-4 w-4 text-[var(--text-muted)]" />
+            </button>
+          )}
+
+          {failedRuns.length > 0 && (
+            <button
+              type="button"
+              className="flex w-full items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-3 text-left transition-colors hover:bg-[var(--surface-3)]"
+              onClick={() => router.push('/tasks')}
+            >
+              <div className="flex items-center gap-2">
+                <div className="h-2 w-2 rounded-full bg-[var(--status-error)]" />
+                <span className="text-sm text-[var(--text-primary)]">
+                  {t('dashboard.failedCount')}
+                </span>
+                <span className="text-xs font-medium text-[var(--text-secondary)]">
+                  x{failedRuns.length}
+                </span>
+              </div>
+              <ChevronRight className="h-4 w-4 text-[var(--text-muted)]" />
+            </button>
+          )}
+        </div>
+      ) : (
+        <div className="flex items-center gap-2 rounded-lg border border-[var(--border)] bg-[var(--surface-1)] p-4">
+          <CheckCircle2 className="h-4 w-4 text-[var(--status-success)]" />
+          <span className="text-sm text-[var(--text-secondary)]">{t('dashboard.allClear')}</span>
+        </div>
+      )}
+    </Card>
+  )
+}
diff --git a/frontend/components/dashboard/recent-tasks.tsx b/frontend/components/dashboard/recent-tasks.tsx
new file mode 100644
index 000000000..41f6b2f2a
--- /dev/null
+++ b/frontend/components/dashboard/recent-tasks.tsx
@@ -0,0 +1,91 @@
+'use client'
+
+import { ChevronRight, Clock } from 'lucide-react'
+import { useRouter } from 'next/navigation'
+import { useMemo } from 'react'
+
+import { Badge } from '@/components/ui/badge'
+import { Card } from '@/components/ui/card'
+import { useAgentNameMap } from '@/hooks/queries/agents'
+import { useTranslation } from '@/lib/i18n'
+import { formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { Task } from '@/types/tasks'
+import { TASK_STATUS_LABELS, TASK_STATUS_STYLES } from '@/types/tasks'
+
+interface RecentTasksProps {
+  workspaceId: string
+  tasks: Task[]
+}
+
+export function RecentTasks({ workspaceId, tasks }: RecentTasksProps) {
+  const { t } = useTranslation()
+  const router = useRouter()
+
+  const agentsMap = useAgentNameMap(workspaceId)
+
+  const recentTasks = useMemo(
+    () =>
+      tasks
+        .slice()
+        .sort((a, b) => new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime())
+        .slice(0, 10),
+    [tasks],
+  )
+
+  return (
+    <Card className="border-[var(--border)] bg-[var(--surface-elevated)] p-5">
+      <div className="mb-4 flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <Clock className="h-4 w-4 text-[var(--text-muted)]" />
+          <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('dashboard.recentTasks')}
+          </h2>
+        </div>
+        <button
+          type="button"
+          className="flex items-center gap-1 text-xs text-[var(--brand-500)] hover:underline"
+          onClick={() => router.push('/tasks')}
+        >
+          {t('dashboard.viewAll')}
+          <ChevronRight className="h-3 w-3" />
+        </button>
+      </div>
+
+      {recentTasks.length === 0 ? (
+        <p className="text-sm text-[var(--text-muted)]">{t('tasks.noTasks')}</p>
+      ) : (
+        <div className="space-y-1">
+          {recentTasks.map((task: Task) => {
+            const agentId = task.agent_id
+            const agentName = agentId ? agentsMap[agentId] : undefined
+
+            return (
+              <button
+                key={task.id}
+                type="button"
+                className="flex w-full items-center gap-3 rounded-lg px-3 py-2 text-left transition-colors hover:bg-[var(--surface-3)]"
+                onClick={() => router.push(`/tasks?task=${task.id}`)}
+              >
+                <span className="min-w-0 flex-1 truncate text-sm text-[var(--text-primary)]">
+                  {task.title}
+                </span>
+                {agentName && (
+                  <span className="shrink-0 text-xs text-[var(--text-muted)]">{agentName}</span>
+                )}
+                <Badge
+                  variant="outline"
+                  className={`shrink-0 text-[10px] ${TASK_STATUS_STYLES[task.status] || ''}`}
+                >
+                  {TASK_STATUS_LABELS[task.status] || task.status}
+                </Badge>
+                <span className="shrink-0 text-xs text-[var(--text-tertiary)]">
+                  {formatRelativeTime(task.updated_at, t)}
+                </span>
+              </button>
+            )
+          })}
+        </div>
+      )}
+    </Card>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/AgentBuilder.tsx b/frontend/components/editors/graph-builder/AgentBuilder.tsx
new file mode 100644
index 000000000..0726a79f3
--- /dev/null
+++ b/frontend/components/editors/graph-builder/AgentBuilder.tsx
@@ -0,0 +1,335 @@
+'use client'
+
+import { Loader2 } from 'lucide-react'
+import React, { useEffect } from 'react'
+import { ReactFlowProvider } from 'reactflow'
+
+import { useVersionGraphState } from '@/hooks/queries/agentVersions'
+import { useAgent } from '@/hooks/queries/agents'
+import { useTranslation } from '@/lib/i18n'
+import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
+import { useQueryClient } from '@tanstack/react-query'
+
+import { CodeEditorPage } from './CodeEditorPage'
+import { GraphBuilderShell } from './GraphBuilderShell'
+import { visualDefinitionAdapter } from './services/visualDefinitionAdapter'
+import { agentService } from './services/agentService'
+import { useGraphStore } from './stores/graphStore'
+import { useSaveStore, setSaveStoreQueryClient } from './stores/saveStore'
+import { useCodeEditorStore } from './stores/codeEditorStore'
+import { useExecutionStore } from './stores/execution/executionStore'
+import type { StateField } from './types/graph'
+
+/** Typed shape of graph variables stored alongside canvas state. */
+interface BuilderVariables {
+  graph_mode?: string
+  state_fields?: StateField[]
+  code_content?: string
+  fallback_node_id?: string
+  context?: Record<string, { type?: string; description?: string; value?: unknown }>
+}
+
+const isValidUUID = (str: string): boolean => {
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  return uuidRegex.test(str)
+}
+
+interface AgentBuilderProps {
+  agentId: string
+  versionId?: string
+  workspaceId: string
+}
+
+function AgentBuilderInit({
+  agentId: agentIdProp,
+  versionId: versionIdProp,
+  workspaceId: workspaceIdProp,
+}: AgentBuilderProps) {
+  const { t } = useTranslation()
+  const { workspaceId: currentWorkspaceId } = useCurrentWorkspace()
+  const queryClient = useQueryClient()
+  setSaveStoreQueryClient(queryClient)
+
+  const workspaceId = workspaceIdProp || currentWorkspaceId
+  const agentId = agentIdProp && isValidUUID(agentIdProp) ? agentIdProp : null
+
+  const { isInitializing, rfInstance, loadGraph, setWorkspaceId, setGraphId, setGraphName } =
+    useGraphStore()
+
+  const { startAutoSave, stopAutoSave } = useSaveStore()
+
+  const { setCurrentGraphId } = useExecutionStore()
+
+  const { data: agentData } = useAgent(agentId ?? '', workspaceId, {
+    enabled: Boolean(agentId && workspaceId),
+  })
+  const { data: graphStateData, isSuccess: isGraphStateLoaded } = useVersionGraphState(
+    agentId ?? undefined,
+    versionIdProp,
+    workspaceId || undefined,
+    { refetchOnMount: 'always', enabled: Boolean(versionIdProp && agentId && workspaceId) },
+  )
+
+  // Sync workspaceId into the store
+  useEffect(() => {
+    if (workspaceId) {
+      setWorkspaceId(workspaceId)
+    }
+  }, [workspaceId, setWorkspaceId])
+
+  // Sync agentId + versionId props into the store
+  useEffect(() => {
+    useGraphStore.setState({
+      agentId: agentId ?? null,
+      versionId: versionIdProp ?? null,
+    })
+  }, [agentId, versionIdProp])
+
+  // Sync currentGraphId in executionStore when agentId changes
+  useEffect(() => {
+    setCurrentGraphId(agentId || null)
+  }, [agentId, setCurrentGraphId])
+
+  // Cleanup execution state on unmount
+  useEffect(() => {
+    return () => {
+      const { currentGraphId } = useExecutionStore.getState()
+      if (currentGraphId) {
+        useExecutionStore.getState().clearGraphState(currentGraphId)
+      }
+    }
+  }, [])
+
+  const graphId = useGraphStore((state) => state.graphId)
+  const graphName = useGraphStore((state) => state.graphName)
+
+  // Auto-save lifecycle
+  useEffect(() => {
+    if (graphId && graphId === agentId && graphName && !isInitializing) {
+      startAutoSave()
+    }
+
+    return () => {
+      stopAutoSave()
+    }
+  }, [graphId, graphName, isInitializing, agentId, startAutoSave, stopAutoSave])
+
+  // Handle online event (reconnect save)
+  useEffect(() => {
+    const handleOnline = () => {
+      const { hasPendingChanges, lastSaveError } = useSaveStore.getState()
+      if (hasPendingChanges || lastSaveError === 'offline') {
+        useSaveStore.setState({ saveRetryCount: 0, lastSaveError: null })
+        useSaveStore.getState().autoSave()
+      }
+    }
+
+    window.addEventListener('online', handleOnline)
+    return () => {
+      window.removeEventListener('online', handleOnline)
+    }
+  }, [])
+
+  // Handle beforeunload (beacon save)
+  useEffect(() => {
+    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+      const { nodes, edges, rfInstance, graphId, versionId, workspaceId } = useGraphStore.getState()
+      const { hasPendingChanges } = useSaveStore.getState()
+
+      if (!graphId || graphId !== agentId || !isValidUUID(graphId)) {
+        return
+      }
+
+      if (hasPendingChanges && versionId && workspaceId) {
+        try {
+          const viewport = rfInstance?.getViewport() || { x: 0, y: 0, zoom: 1 }
+          visualDefinitionAdapter.sendBeaconSave(graphId, versionId, workspaceId, {
+            nodes,
+            edges,
+            viewport,
+          })
+        } catch {
+          // Silent fail for sendBeacon
+        }
+
+        e.preventDefault()
+        e.returnValue = ''
+        return ''
+      }
+    }
+
+    window.addEventListener('beforeunload', handleBeforeUnload)
+    return () => {
+      window.removeEventListener('beforeunload', handleBeforeUnload)
+    }
+  }, [agentId])
+
+  // Use ref to track loaded graphId, avoiding duplicate initialization
+  const loadedGraphIdRef = React.useRef<string | null>(null)
+  // Track viewport setting timers for cleanup
+  const viewportTimersRef = React.useRef<NodeJS.Timeout[]>([])
+
+  // Load graph when agentId changes and graph state is loaded from React Query
+  useEffect(() => {
+    if (!agentId) {
+      loadGraph()
+      return
+    }
+
+    if (loadedGraphIdRef.current !== agentId) {
+      useGraphStore.setState({ isInitializing: true, rfInstance: null })
+
+      if (!isGraphStateLoaded || !graphStateData) {
+        return
+      }
+    }
+
+    if (!isGraphStateLoaded || !graphStateData) {
+      useGraphStore.setState({ isInitializing: true })
+      return
+    }
+
+    if (loadedGraphIdRef.current === agentId && !useGraphStore.getState().isInitializing) {
+      return
+    }
+
+    const state = graphStateData
+
+    // Code mode: hydrate code editor store instead of canvas
+    if (state.definitionKind === 'langgraph_code' && agentId) {
+      const loadedVars = (state.variables ?? {}) as BuilderVariables
+      const agentName = agentData?.name
+      useCodeEditorStore
+        .getState()
+        .hydrate(
+          agentId,
+          loadedVars.code_content ?? '',
+          agentName ?? '',
+          versionIdProp ?? null,
+          workspaceId || null,
+        )
+      loadedGraphIdRef.current = agentId
+      useGraphStore.setState({ isInitializing: false })
+      return
+    }
+
+    if (agentId) {
+      agentService.setCachedGraphId(agentId)
+      setGraphId(agentId)
+    }
+
+    if (agentData) {
+      if (agentData.name) {
+        agentService.setCachedGraphName(agentData.name)
+        setGraphName(agentData.name)
+      }
+      if (agentData.updated_at) {
+        const updatedAtTime = new Date(agentData.updated_at).getTime()
+        useSaveStore.setState({ lastAutoSaveTime: updatedAtTime })
+      }
+    }
+
+    const loadedVariables = (state.variables || {}) as BuilderVariables
+    const loadedStateFields = (() => {
+      const sf = loadedVariables.state_fields || []
+      if (sf.length > 0) return sf
+      const ctx = loadedVariables.context || {}
+      if (Object.keys(ctx).length === 0) return []
+      return Object.entries(ctx).map(([key, v]) => ({
+        name: key,
+        type: (v?.type === 'number'
+          ? 'int'
+          : v?.type === 'boolean'
+            ? 'bool'
+            : v?.type || 'string') as StateField['type'],
+        description: v?.description || '',
+        defaultValue: v?.value,
+      }))
+    })()
+    const loadedFallbackNodeId = loadedVariables.fallback_node_id ?? null
+
+    const initialHash = computeGraphStateHash(
+      state.nodes || [],
+      state.edges || [],
+      loadedStateFields,
+      loadedFallbackNodeId,
+    )
+
+    useGraphStore.setState({
+      nodes: state.nodes || [],
+      edges: state.edges || [],
+      graphStateFields: loadedStateFields,
+      fallbackNodeId: loadedFallbackNodeId,
+      past: [],
+      future: [],
+      selectedNodeId: null,
+      isInitializing: false,
+    })
+
+    useSaveStore.setState({
+      lastSavedStateHash: initialHash,
+      saveRetryCount: 0,
+      lastSaveError: null,
+    })
+
+    loadedGraphIdRef.current = agentId
+
+    let retryCount = 0
+    const maxRetries = 40
+    const setViewportWhenReady = () => {
+      const currentRfInstance = useGraphStore.getState().rfInstance
+      const currentNodes = useGraphStore.getState().nodes
+
+      if (currentRfInstance && currentNodes.length > 0) {
+        const finalTimer = setTimeout(() => {
+          if (state.viewport) {
+            currentRfInstance.setViewport(state.viewport, { duration: 0 })
+          } else {
+            currentRfInstance.fitView({ padding: 0.2, duration: 0 })
+          }
+        }, 150)
+        viewportTimersRef.current.push(finalTimer)
+      } else if (retryCount < maxRetries) {
+        retryCount++
+        const retryTimer = setTimeout(setViewportWhenReady, 50)
+        viewportTimersRef.current.push(retryTimer)
+      }
+    }
+
+    setViewportWhenReady()
+
+    return () => {
+      viewportTimersRef.current.forEach((timer) => {
+        if (timer) clearTimeout(timer)
+      })
+      viewportTimersRef.current = []
+    }
+  }, [agentId, isGraphStateLoaded, graphStateData, agentData, loadGraph, setGraphId, setGraphName])
+
+  // Code mode: render CodeEditorPage instead of canvas
+  if (graphStateData?.definitionKind === 'langgraph_code' && agentId && !isInitializing) {
+    return <CodeEditorPage graphId={agentId} workspaceId={workspaceId} />
+  }
+
+  // Loading overlay
+  if (isInitializing) {
+    return (
+      <div className="absolute inset-0 z-50 flex flex-col items-center justify-center bg-[var(--bg)] backdrop-blur-sm">
+        <Loader2 size={40} className="mb-3 animate-spin text-[var(--brand-500)]" />
+        <p className="font-medium text-[var(--text-muted)]">{t('workspace.loadingWorkspace')}</p>
+      </div>
+    )
+  }
+
+  return <GraphBuilderShell agentId={agentIdProp} />
+}
+
+export default function AgentBuilder(props: AgentBuilderProps) {
+  return (
+    <ReactFlowProvider>
+      <AgentBuilderInit {...props} />
+    </ReactFlowProvider>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/CodeEditorPage.tsx b/frontend/components/editors/graph-builder/CodeEditorPage.tsx
new file mode 100644
index 000000000..00558eb05
--- /dev/null
+++ b/frontend/components/editors/graph-builder/CodeEditorPage.tsx
@@ -0,0 +1,182 @@
+'use client'
+
+import { useQueryClient } from '@tanstack/react-query'
+import { Loader2, Play, Rocket, Save, Square, ChevronDown, ChevronUp } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { useToast } from '@/hooks/use-toast'
+import { versionKeys } from '@/hooks/queries/agentVersions'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+
+import { CodeEditor } from './components/CodeEditor'
+import { useCodeEditorStore } from './stores/codeEditorStore'
+import { useExecutionStore } from './stores/execution/executionStore'
+import { DebugPanel } from '@/components/observation/components/DebugPanel'
+import { RunInputModal } from './components/RunInputModal'
+import { usePublishAgent } from '@/hooks/queries/agentPublish'
+import { useAgent } from '@/hooks/queries/agents'
+
+interface Props {
+  graphId: string
+  workspaceId: string
+}
+
+export function CodeEditorPage({ graphId, workspaceId }: Props) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const queryClient = useQueryClient()
+
+  const isDirty = useCodeEditorStore((s) => s.isDirty)
+  const isSaving = useCodeEditorStore((s) => s.isSaving)
+  const save = useCodeEditorStore((s) => s.save)
+  const graphName = useCodeEditorStore((s) => s.graphName)
+  const setGraphName = useCodeEditorStore((s) => s.setGraphName)
+  const versionId = useCodeEditorStore((s) => s.versionId)
+
+  const publishAgent = usePublishAgent()
+  const { data: agent } = useAgent(graphId, workspaceId)
+
+  const isExecuting = useExecutionStore((s) => s.isExecuting)
+  const showExecutionPanel = useExecutionStore((s) => s.showPanel)
+
+  const [isRunModalOpen, setIsRunModalOpen] = useState(false)
+  const [runInput, setRunInput] = useState('')
+
+  const handleRunClick = () => {
+    if (isExecuting) {
+      useExecutionStore.getState().stopExecution()
+      return
+    }
+    setIsRunModalOpen(true)
+  }
+
+  const handleStartExecution = () => {
+    if (!runInput.trim()) return
+    setIsRunModalOpen(false)
+    useExecutionStore.getState().startExecution(runInput)
+    setRunInput('')
+  }
+
+  const handleDeploy = async () => {
+    if (publishAgent.isPending || !graphId) return
+    if (isDirty) await save()
+    publishAgent.mutate(
+      { agentId: graphId, workspaceId },
+      {
+        onSuccess: () => {
+          queryClient.invalidateQueries({ queryKey: versionKeys.all(graphId, workspaceId) })
+          toast({ title: t('workspace.deploySuccess'), variant: 'success' })
+        },
+        onError: (error) => {
+          toast({
+            title: t('workspace.deployFailed'),
+            description:
+              error instanceof Error ? error.message : t('workspace.deployFailedDescription'),
+            variant: 'destructive',
+          })
+        },
+      },
+    )
+  }
+
+  const isDeploying = publishAgent.isPending
+  const isDeployed = Boolean(agent?.active_release_id) || publishAgent.isSuccess
+
+  return (
+    <div className="relative flex h-full w-full flex-col overflow-hidden bg-[var(--bg)] text-[var(--text-primary)]">
+      <div className="flex shrink-0 items-center justify-between border-b border-[var(--border)] bg-[var(--surface-1)] px-4 py-2">
+        <div className="flex items-center gap-3">
+          <input
+            className="min-w-0 max-w-xs border-none bg-transparent text-sm font-medium text-[var(--text-primary)] outline-none"
+            value={graphName ?? ''}
+            onChange={(e) => setGraphName(e.target.value)}
+            placeholder={t('workspace.untitledGraph')}
+          />
+          <button
+            className="flex items-center gap-1.5 rounded-md border border-[var(--border)] px-3 py-1.5 text-xs transition-colors hover:bg-[var(--surface-2)] disabled:cursor-not-allowed disabled:opacity-40"
+            onClick={() => save()}
+            disabled={!isDirty || isSaving}
+          >
+            {isSaving ? <Loader2 size={13} className="animate-spin" /> : <Save size={13} />}
+            {isSaving ? t('workspace.savingEllipsis') : t('workspace.save')}
+          </button>
+        </div>
+
+        <div className="flex items-center gap-2">
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={() => useExecutionStore.getState().togglePanel(!showExecutionPanel)}
+            className="h-7 w-7 rounded-md hover:bg-[var(--surface-2)]"
+          >
+            {showExecutionPanel ? (
+              <ChevronDown size={16} className="text-[var(--text-secondary)]" />
+            ) : (
+              <ChevronUp size={16} className="text-[var(--text-secondary)]" />
+            )}
+          </Button>
+
+          <Button
+            size="sm"
+            onClick={handleDeploy}
+            disabled={isDeploying}
+            className={cn(
+              'h-7 gap-1.5 rounded-md px-3 text-xs font-medium',
+              isDeployed
+                ? 'border border-[var(--status-success-border)] bg-[var(--status-success-bg)] text-[var(--status-success-strong)] hover:bg-[var(--status-success-bg)]'
+                : 'border border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-secondary)] hover:bg-[var(--surface-3)]',
+            )}
+          >
+            {isDeploying ? <Loader2 size={13} className="animate-spin" /> : <Rocket size={13} />}
+            {isDeploying
+              ? t('workspace.deploying', { defaultValue: 'Publishing' })
+              : isDeployed
+                ? t('workspace.activeDeploymentShort', { defaultValue: 'Published' })
+                : t('workspace.publish', { defaultValue: 'Publish' })}
+          </Button>
+
+          <Button
+            size="sm"
+            onClick={handleRunClick}
+            className={cn(
+              'h-7 gap-1.5 rounded-md px-3 text-xs font-medium',
+              isExecuting
+                ? 'bg-[var(--status-error)] text-white hover:bg-[var(--status-error-hover)]'
+                : 'bg-primary text-white hover:bg-primary/90',
+            )}
+          >
+            {isExecuting ? (
+              <>
+                <Square size={13} className="fill-current" />
+                {t('workspace.stop')}
+              </>
+            ) : (
+              <>
+                <Play size={13} className="fill-current" />
+                {t('workspace.run')}
+              </>
+            )}
+          </Button>
+        </div>
+      </div>
+
+      <div className="relative min-h-0 flex-1 overflow-hidden">
+        <CodeEditor />
+      </div>
+
+      <RunInputModal
+        isOpen={isRunModalOpen}
+        input={runInput}
+        onInputChange={setRunInput}
+        onStart={handleStartExecution}
+        onClose={() => setIsRunModalOpen(false)}
+      />
+
+      {showExecutionPanel && (
+        <DebugPanel agentId={graphId} agentVersionId={versionId ?? ''} workspaceId={workspaceId} />
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/GraphBuilderShell.tsx b/frontend/components/editors/graph-builder/GraphBuilderShell.tsx
new file mode 100644
index 000000000..3783648cd
--- /dev/null
+++ b/frontend/components/editors/graph-builder/GraphBuilderShell.tsx
@@ -0,0 +1,48 @@
+'use client'
+
+import { BuilderCanvas } from './components/BuilderCanvas'
+import { CopilotOverlay } from './components/CopilotOverlay'
+import { GraphStatusBar } from './components/GraphStatusBar'
+import { GraphToolbar } from './components/GraphToolbar'
+import { InspectorPanel } from './components/InspectorPanel'
+import { useGraphStore } from './stores/graphStore'
+import { useBuilderUIStore } from './stores/builderUIStore'
+
+interface GraphBuilderShellProps {
+  agentId: string
+}
+
+export function GraphBuilderShell({ agentId }: GraphBuilderShellProps) {
+  const selectedNodeId = useGraphStore((s) => s.selectedNodeId)
+  const selectedEdgeId = useGraphStore((s) => s.selectedEdgeId)
+  const clearSelection = useGraphStore((s) => s.selectNode)
+  const hasSelection = Boolean(selectedNodeId || selectedEdgeId)
+
+  const copilotExpanded = useBuilderUIStore((s) => s.copilotExpanded)
+  const toggleCopilot = useBuilderUIStore((s) => s.toggleCopilot)
+
+  return (
+    <div className="flex h-full flex-col">
+      <div className="relative flex min-h-0 flex-1">
+        <div className="relative min-w-0 flex-1">
+          <BuilderCanvas />
+          <div className="pointer-events-none absolute inset-x-0 top-3 z-10 flex justify-center">
+            <div className="pointer-events-auto">
+              <GraphToolbar />
+            </div>
+          </div>
+        </div>
+
+        {hasSelection && (
+          <aside className="w-[360px] shrink-0 overflow-y-auto border-l border-[var(--border)]">
+            <InspectorPanel onClose={() => clearSelection(null)} />
+          </aside>
+        )}
+
+        <CopilotOverlay agentId={agentId} expanded={copilotExpanded} onToggle={toggleCopilot} />
+      </div>
+
+      <GraphStatusBar />
+    </div>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/AddNodeButton.tsx b/frontend/components/editors/graph-builder/components/AddNodeButton.tsx
new file mode 100644
index 000000000..caa088168
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/AddNodeButton.tsx
@@ -0,0 +1,38 @@
+'use client'
+
+import { Plus } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { useTranslation } from '@/lib/i18n'
+
+import { AddNodePalette } from './AddNodePalette'
+
+interface AddNodeButtonProps {
+  onAddNode: (node: { type: string; label: string }) => void
+}
+
+export function AddNodeButton({ onAddNode }: AddNodeButtonProps) {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(false)
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button size="sm" variant="outline" className="h-7 gap-1.5 px-2.5">
+          <Plus size={13} />
+          <span>{t('agents.studio.addNode.button', { defaultValue: 'Add' })}</span>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent align="start" className="w-auto p-0">
+        <AddNodePalette
+          onSelect={(node) => {
+            onAddNode(node)
+            setOpen(false)
+          }}
+        />
+      </PopoverContent>
+    </Popover>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/AddNodePalette.tsx b/frontend/components/editors/graph-builder/components/AddNodePalette.tsx
new file mode 100644
index 000000000..bb647b0f4
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/AddNodePalette.tsx
@@ -0,0 +1,95 @@
+'use client'
+
+import { Search } from 'lucide-react'
+import { useMemo, useState } from 'react'
+
+import { Input } from '@/components/ui/input'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+
+import { nodeRegistry } from '../services/nodeRegistry'
+
+interface AddNodePaletteProps {
+  onSelect: (node: { type: string; label: string }) => void
+  className?: string
+}
+
+export function AddNodePalette({ onSelect, className }: AddNodePaletteProps) {
+  const { t } = useTranslation()
+  const [query, setQuery] = useState('')
+  const groupedTools = nodeRegistry.getGrouped()
+
+  const filteredGroups = useMemo(() => {
+    const normalizedQuery = query.trim().toLowerCase()
+    return Object.entries(groupedTools)
+      .map(([category, items]) => ({
+        category,
+        items: items.filter((item) => {
+          if (!normalizedQuery) return true
+          return [item.label, item.subLabel, item.type]
+            .filter(Boolean)
+            .some((value) => String(value).toLowerCase().includes(normalizedQuery))
+        }),
+      }))
+      .filter((group) => group.items.length > 0)
+  }, [groupedTools, query])
+
+  return (
+    <div className={cn('flex max-h-[520px] w-80 flex-col overflow-hidden', className)}>
+      <div className="border-b border-[var(--border)] p-3">
+        <div className="relative">
+          <Search className="pointer-events-none absolute left-2.5 top-2.5 h-4 w-4 text-[var(--text-muted)]" />
+          <Input
+            autoFocus
+            value={query}
+            onChange={(event) => setQuery(event.target.value)}
+            placeholder={t('agents.studio.addNode.search', { defaultValue: 'Search nodes...' })}
+            className="pl-8"
+          />
+        </div>
+      </div>
+      <div className="custom-scrollbar flex-1 overflow-y-auto p-2">
+        {filteredGroups.length === 0 ? (
+          <p className="px-2 py-6 text-center text-sm text-[var(--text-muted)]">
+            {t('agents.studio.addNode.empty', { defaultValue: 'No nodes found' })}
+          </p>
+        ) : (
+          filteredGroups.map((group) => (
+            <div key={group.category} className="mb-3">
+              <p className="px-2 py-1 text-xs font-bold uppercase tracking-wider text-[var(--text-muted)]">
+                {group.category}
+              </p>
+              <div className="space-y-1">
+                {group.items.map((item) => {
+                  const Icon = item.icon
+                  return (
+                    <button
+                      key={item.type}
+                      type="button"
+                      onClick={() => onSelect({ type: item.type, label: item.label })}
+                      className="flex w-full items-center gap-3 rounded-xl px-2 py-2 text-left hover:bg-[var(--surface-3)]"
+                    >
+                      <span className={cn('rounded-lg p-1.5', item.style.bg, item.style.color)}>
+                        <Icon size={16} />
+                      </span>
+                      <span className="min-w-0">
+                        <span className="block truncate text-sm font-semibold text-[var(--text-primary)]">
+                          {item.label}
+                        </span>
+                        {item.subLabel && (
+                          <span className="block truncate text-xs text-[var(--text-muted)]">
+                            {item.subLabel}
+                          </span>
+                        )}
+                      </span>
+                    </button>
+                  )
+                })}
+              </div>
+            </div>
+          ))
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/ApiAccessDialog.tsx b/frontend/components/editors/graph-builder/components/ApiAccessDialog.tsx
new file mode 100644
index 000000000..8be49d00e
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/ApiAccessDialog.tsx
@@ -0,0 +1 @@
+export { AgentApiAccessDialog as ApiAccessDialog } from '@/components/agents/agent-build/agent-api-access-dialog'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderCanvas.tsx b/frontend/components/editors/graph-builder/components/BuilderCanvas.tsx
similarity index 52%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderCanvas.tsx
rename to frontend/components/editors/graph-builder/components/BuilderCanvas.tsx
index 1978349f0..2ce8ac76d 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderCanvas.tsx
+++ b/frontend/components/editors/graph-builder/components/BuilderCanvas.tsx
@@ -1,138 +1,32 @@
 'use client'
 
-import { Plus, Undo2, Redo2, ZoomIn, ZoomOut, Maximize } from 'lucide-react'
-import { useParams } from 'next/navigation'
+import { Plus } from 'lucide-react'
 import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
-import ReactFlow, { Background, BackgroundVariant, useReactFlow } from 'reactflow'
+import ReactFlow, { Background, BackgroundVariant } from 'reactflow'
 
 import { useToast } from '@/hooks/use-toast'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
 import { useTranslation } from '@/lib/i18n'
-import { useSidebarStore } from '@/stores/sidebar/store'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 
-import { useBuilderStore } from '../stores/builderStore'
+import { useGraphStore } from '../stores/graphStore'
 import { EdgeData } from '../types/graph'
 import { EDGE_COLORS } from '../utils/edgeStyles'
 import { nodeTypes, edgeTypes } from '../utils/reactFlowConfig'
 
-import { EdgePropertiesPanel } from './EdgePropertiesPanel'
-import { GraphStatusBar } from './GraphStatusBar'
-import PropertiesPanel from './PropertiesPanel'
+import { CanvasContextMenu } from './CanvasContextMenu'
+import { getContextMenuFlowPosition } from './canvasContextMenuPosition'
 
 import 'reactflow/dist/style.css'
 
-// Custom Controls Component
-interface CustomControlsProps {
-  past: unknown[]
-  future: unknown[]
-  canEdit: boolean
-  onUndo: () => void
-  onRedo: () => void
-  onPermissionDenied: () => void
-  undoTitle: string
-  redoTitle: string
-  zoomInTitle: string
-  zoomOutTitle: string
-  fitViewTitle: string
-}
-
-function CustomControls({
-  past,
-  future,
-  canEdit,
-  onUndo,
-  onRedo,
-  onPermissionDenied,
-  undoTitle,
-  redoTitle,
-  zoomInTitle,
-  zoomOutTitle,
-  fitViewTitle,
-}: CustomControlsProps) {
-  const { zoomIn, zoomOut, fitView } = useReactFlow()
-
-  const handleUndo = () => {
-    if (!canEdit) {
-      onPermissionDenied()
-      return
-    }
-    onUndo()
-  }
-
-  const handleRedo = () => {
-    if (!canEdit) {
-      onPermissionDenied()
-      return
-    }
-    onRedo()
-  }
-
-  return (
-    <div className="absolute bottom-4 left-1/2 z-50 -translate-x-1/2 transform">
-      <div className="flex items-center gap-0.5 rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] p-1 shadow-lg">
-        {/* Zoom Controls */}
-        <button
-          onClick={() => zoomIn()}
-          className="flex h-7 w-7 items-center justify-center rounded transition-colors hover:bg-[var(--surface-3)] active:bg-[var(--surface-5)]"
-          title={zoomInTitle}
-        >
-          <ZoomIn size={15} className="text-[var(--text-secondary)]" />
-        </button>
-        <button
-          onClick={() => zoomOut()}
-          className="flex h-7 w-7 items-center justify-center rounded transition-colors hover:bg-[var(--surface-3)] active:bg-[var(--surface-5)]"
-          title={zoomOutTitle}
-        >
-          <ZoomOut size={15} className="text-[var(--text-secondary)]" />
-        </button>
-        <button
-          onClick={() => fitView({ padding: 0.2 })}
-          className="flex h-7 w-7 items-center justify-center rounded transition-colors hover:bg-[var(--surface-3)] active:bg-[var(--surface-5)]"
-          title={fitViewTitle}
-        >
-          <Maximize size={15} className="text-[var(--text-secondary)]" />
-        </button>
-
-        {/* Divider */}
-        <div className="mx-1 h-5 w-px bg-[var(--surface-5)]" />
-
-        {/* Undo/Redo */}
-        <button
-          onClick={handleUndo}
-          disabled={past.length === 0 || !canEdit}
-          className="flex h-7 w-7 items-center justify-center rounded transition-colors hover:bg-[var(--surface-3)] active:bg-[var(--surface-5)] disabled:cursor-not-allowed disabled:opacity-40"
-          title={undoTitle}
-        >
-          <Undo2 size={15} className="text-[var(--text-secondary)]" />
-        </button>
-        <button
-          onClick={handleRedo}
-          disabled={future.length === 0 || !canEdit}
-          className="flex h-7 w-7 items-center justify-center rounded transition-colors hover:bg-[var(--surface-3)] active:bg-[var(--surface-5)] disabled:cursor-not-allowed disabled:opacity-40"
-          title={redoTitle}
-        >
-          <Redo2 size={15} className="text-[var(--text-secondary)]" />
-        </button>
-      </div>
-    </div>
-  )
-}
-
 export function BuilderCanvas() {
   const { t } = useTranslation()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
   const { toast } = useToast()
-  const { permissions, loading: permissionsLoading } = useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
+  const userPermissions = useUserPermissionsContext()
   const {
     nodes,
     edges,
     selectedNodeId,
     selectedEdgeId,
-    past,
-    future,
     onNodesChange,
     onEdgesChange,
     onConnect,
@@ -142,23 +36,21 @@ export function BuilderCanvas() {
     selectEdge,
     deleteNode,
     duplicateNode,
-    updateNodeConfig,
-    updateNodeLabel,
-    updateEdge,
     takeSnapshot,
     undo,
     redo,
     graphId,
-  } = useBuilderStore()
-
-  // Get sidebar state to adjust status bar position
-  const isSidebarCollapsed = useSidebarStore((state) => state.isCollapsed)
+  } = useGraphStore()
 
   const [isDragOver, setIsDragOver] = useState(false)
+  const [contextMenu, setContextMenu] = useState<{
+    open: boolean
+    screenX: number
+    screenY: number
+    flowPosition: { x: number; y: number }
+  }>({ open: false, screenX: 0, screenY: 0, flowPosition: { x: 0, y: 0 } })
   const reactFlowWrapper = useRef<HTMLDivElement>(null)
 
-  const selectedNode = nodes.find((n) => n.id === selectedNodeId)
-
   // Keyboard shortcuts
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
@@ -174,7 +66,7 @@ export function BuilderCanvas() {
       // Undo: Ctrl+Z / Cmd+Z
       if (ctrlOrCmd && event.key === 'z' && !event.shiftKey) {
         event.preventDefault()
-        if (past.length > 0 && userPermissions.canEdit) {
+        if (useGraphStore.getState().past.length > 0 && userPermissions.canEdit) {
           undo()
         }
         return
@@ -183,7 +75,7 @@ export function BuilderCanvas() {
       // Redo: Ctrl+Shift+Z / Cmd+Shift+Z or Ctrl+Y / Cmd+Y
       if ((ctrlOrCmd && event.key === 'z' && event.shiftKey) || (ctrlOrCmd && event.key === 'y')) {
         event.preventDefault()
-        if (future.length > 0 && userPermissions.canEdit) {
+        if (useGraphStore.getState().future.length > 0 && userPermissions.canEdit) {
           redo()
         }
         return
@@ -279,8 +171,6 @@ export function BuilderCanvas() {
       window.removeEventListener('keydown', handleKeyDown)
     }
   }, [
-    past,
-    future,
     selectedNodeId,
     selectedEdgeId,
     nodes,
@@ -321,6 +211,12 @@ export function BuilderCanvas() {
 
   const onDragLeave = useCallback(() => setIsDragOver(false), [])
 
+  const getFlowPositionFromEvent = useCallback((clientX: number, clientY: number) => {
+    const instance = useGraphStore.getState().rfInstance
+    if (!instance) return { x: 0, y: 0 }
+    return getContextMenuFlowPosition(instance.screenToFlowPosition, clientX, clientY)
+  }, [])
+
   const onDrop = useCallback(
     async (event: React.DragEvent) => {
       event.preventDefault()
@@ -341,17 +237,14 @@ export function BuilderCanvas() {
       if (!type || !reactFlowWrapper.current) return
 
       const bounds = reactFlowWrapper.current.getBoundingClientRect()
-      const instance = useBuilderStore.getState().rfInstance
+      const instance = useGraphStore.getState().rfInstance
 
       const position = instance?.screenToFlowPosition({
         x: event.clientX - bounds.left,
         y: event.clientY - bounds.top,
       }) || { x: 0, y: 0 }
 
-      // Agent nodes: model field left empty, user must select in node config
-      const configOverride: Record<string, unknown> | undefined = undefined
-
-      addNode(type, position, label, configOverride)
+      addNode(type, position, label)
     },
     [addNode, userPermissions.canEdit, toast, t],
   )
@@ -373,6 +266,16 @@ export function BuilderCanvas() {
       onDragOver={onDragOver}
       onDragLeave={onDragLeave}
       onDrop={onDrop}
+      onContextMenu={(event) => {
+        if (!userPermissions.canEdit) return
+        event.preventDefault()
+        setContextMenu({
+          open: true,
+          screenX: event.clientX,
+          screenY: event.clientY,
+          flowPosition: getFlowPositionFromEvent(event.clientX, event.clientY),
+        })
+      }}
     >
       <div
         className={`pointer-events-none absolute inset-4 z-50 flex items-center justify-center rounded-xl border-2 border-dashed transition-all duration-200 ${isDragOver ? 'scale-100 border-[var(--brand-500)] bg-[var(--brand-500)] opacity-100 backdrop-blur-[1px]' : 'scale-95 border-transparent opacity-0'}`}
@@ -382,18 +285,6 @@ export function BuilderCanvas() {
         </div>
       </div>
 
-      {/* Status Bar - Top Left */}
-      {/* Adjust position based on sidebar state to avoid overlap */}
-      {/* Sidebar header when collapsed is at left-[190px] with max-w-[232px], but actual content is narrower */}
-      <div
-        className="absolute top-4 z-50"
-        style={{
-          left: isSidebarCollapsed ? '320px' : '16px',
-        }}
-      >
-        <GraphStatusBar />
-      </div>
-
       <ReactFlow
         nodes={nodes}
         edges={processedEdges}
@@ -418,84 +309,15 @@ export function BuilderCanvas() {
         proOptions={{ hideAttribution: true }}
       >
         <Background color="var(--canvas-dot)" gap={20} size={1} variant={BackgroundVariant.Dots} />
-        {/* Custom Controls with Zoom + Undo/Redo - Bottom Center */}
-        <CustomControls
-          past={past}
-          future={future}
-          canEdit={userPermissions.canEdit}
-          onUndo={undo}
-          onRedo={redo}
-          onPermissionDenied={() => {
-            toast({
-              title: t('workspace.noPermission'),
-              description: t('workspace.cannotEditNode'),
-              variant: 'destructive',
-            })
-          }}
-          undoTitle={t('workspace.undo')}
-          redoTitle={t('workspace.redo')}
-          zoomInTitle={t('workspace.zoomIn')}
-          zoomOutTitle={t('workspace.zoomOut')}
-          fitViewTitle={t('workspace.fitView')}
-        />
       </ReactFlow>
 
-      {selectedNode && (
-        <PropertiesPanel
-          node={selectedNode}
-          nodes={nodes}
-          edges={edges}
-          onUpdate={(id, data) => {
-            if (!userPermissions.canEdit) {
-              toast({
-                title: t('workspace.noPermission'),
-                description: t('workspace.cannotEditNode'),
-                variant: 'destructive',
-              })
-              return
-            }
-            takeSnapshot()
-            const nodeData = selectedNode.data as { label?: string }
-            if (data.label !== nodeData.label) updateNodeLabel(id, data.label)
-            if (data.config) updateNodeConfig(id, data.config)
-          }}
-          onClose={() => selectNode(null)}
-        />
-      )}
-
-      {selectedEdgeId && (
-        <EdgePropertiesPanel
-          edge={edges.find((e) => e.id === selectedEdgeId)!}
-          nodes={nodes}
-          edges={edges}
-          onUpdate={(id, data) => {
-            if (!userPermissions.canEdit) {
-              toast({
-                title: t('workspace.noPermission'),
-                description: t('workspace.cannotEditNode'),
-                variant: 'destructive',
-              })
-              return
-            }
-            takeSnapshot()
-            updateEdge(id, data)
-          }}
-          onDelete={(id) => {
-            if (!userPermissions.canEdit) {
-              toast({
-                title: t('workspace.noPermission'),
-                description: t('workspace.cannotEditNode'),
-                variant: 'destructive',
-              })
-              return
-            }
-            takeSnapshot()
-            onEdgesChange([{ type: 'remove', id }])
-            selectEdge(null)
-          }}
-          onClose={() => selectEdge(null)}
-        />
-      )}
+      <CanvasContextMenu
+        open={contextMenu.open}
+        x={contextMenu.screenX}
+        y={contextMenu.screenY}
+        onClose={() => setContextMenu((current) => ({ ...current, open: false }))}
+        onAddNode={(node) => addNode(node.type, contextMenu.flowPosition, node.label)}
+      />
     </div>
   )
 }
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderNode.tsx b/frontend/components/editors/graph-builder/components/BuilderNode.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderNode.tsx
rename to frontend/components/editors/graph-builder/components/BuilderNode.tsx
index bdfa001bb..1e4703072 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/BuilderNode.tsx
+++ b/frontend/components/editors/graph-builder/components/BuilderNode.tsx
@@ -1,7 +1,6 @@
 'use client'
 
 import { Bot, Loader2, Zap, Layers, Copy, Trash2, PauseCircle, ArrowRight } from 'lucide-react'
-import { useParams } from 'next/navigation'
 import React, { memo, useState, useMemo } from 'react'
 import { Handle, Position } from 'reactflow'
 
@@ -19,15 +18,13 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
 import { useToast } from '@/hooks/use-toast'
 import { useModels } from '@/hooks/queries/models'
 import { useBuiltinTools } from '@/hooks/queries/tools'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
 import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 import { cn } from '@/lib/utils'
 
 import { nodeRegistry, type FieldSchema } from '../services/nodeRegistry'
-import { useBuilderStore } from '../stores/builderStore'
-import { useExecutionStore } from '../stores/executionStore'
-
+import { useGraphStore } from '../stores/graphStore'
+import { useExecutionStore } from '../stores/execution/executionStore'
 
 interface BuilderNodeProps {
   id: string
@@ -41,15 +38,12 @@ interface BuilderNodeProps {
 
 const BuilderNode = ({ id, data, selected }: BuilderNodeProps) => {
   const { t } = useTranslation()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
   const { toast } = useToast()
-  const { permissions, loading: permissionsLoading } = useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
-  const activeExecutionNodeId = useBuilderStore((state) => state.activeExecutionNodeId)
-  const deleteNode = useBuilderStore((state) => state.deleteNode)
-  const duplicateNode = useBuilderStore((state) => state.duplicateNode)
-  const isExecuting = activeExecutionNodeId === id
+  const userPermissions = useUserPermissionsContext()
+  const activeNodeId = useExecutionStore((state) => state.activeNodeId)
+  const deleteNode = useGraphStore((state) => state.deleteNode)
+  const duplicateNode = useGraphStore((state) => state.duplicateNode)
+  const isExecuting = activeNodeId === id
 
   const executionSteps = useExecutionStore((state) => state.steps)
   const nodeExecutionStatus = useMemo(() => {
@@ -230,9 +224,14 @@ const BuilderNode = ({ id, data, selected }: BuilderNodeProps) => {
     const importantFields = def.schema.filter((field) => {
       // Skip fields that shouldn't be displayed
       if (
-        ['systemPrompt', 'memoryPrompt', 'description', 'useDeepAgents', 'enableMemory', 'skills'].includes(
-          field.key,
-        )
+        [
+          'systemPrompt',
+          'memoryPrompt',
+          'description',
+          'useDeepAgents',
+          'enableMemory',
+          'skills',
+        ].includes(field.key)
       ) {
         return false
       }
@@ -258,7 +257,7 @@ const BuilderNode = ({ id, data, selected }: BuilderNodeProps) => {
         key: field.key,
       }
     })
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [def?.schema, data.config, t, models, builtinTools])
 
   return (
diff --git a/frontend/components/editors/graph-builder/components/CanvasContextMenu.tsx b/frontend/components/editors/graph-builder/components/CanvasContextMenu.tsx
new file mode 100644
index 000000000..7eb8c41f3
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/CanvasContextMenu.tsx
@@ -0,0 +1,36 @@
+'use client'
+
+import { AddNodePalette } from './AddNodePalette'
+
+interface CanvasContextMenuProps {
+  open: boolean
+  x: number
+  y: number
+  onClose: () => void
+  onAddNode: (node: { type: string; label: string }) => void
+}
+
+export function CanvasContextMenu({ open, x, y, onClose, onAddNode }: CanvasContextMenuProps) {
+  if (!open) return null
+
+  return (
+    <div
+      className="fixed inset-0 z-[80]"
+      onClick={onClose}
+      onContextMenu={(event) => event.preventDefault()}
+    >
+      <div
+        className="absolute rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] shadow-2xl"
+        style={{ left: x, top: y }}
+        onClick={(event) => event.stopPropagation()}
+      >
+        <AddNodePalette
+          onSelect={(node) => {
+            onAddNode(node)
+            onClose()
+          }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/CodeEditor.tsx b/frontend/components/editors/graph-builder/components/CodeEditor.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/CodeEditor.tsx
rename to frontend/components/editors/graph-builder/components/CodeEditor.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/ComponentsSidebar.tsx b/frontend/components/editors/graph-builder/components/ComponentsSidebar.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/ComponentsSidebar.tsx
rename to frontend/components/editors/graph-builder/components/ComponentsSidebar.tsx
index 058870d8c..65259b6e5 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/ComponentsSidebar.tsx
+++ b/frontend/components/editors/graph-builder/components/ComponentsSidebar.tsx
@@ -20,7 +20,9 @@ export function ComponentsSidebar({ showHeader = true }: ComponentsSidebarProps)
       {showHeader && (
         <div className="flex items-center gap-2 border-b border-[var(--border-muted)] px-3 py-3">
           <Wrench size={14} className="text-[var(--text-tertiary)]" />
-          <span className="text-base font-medium text-[var(--text-secondary)]">{t('workspace.components')}</span>
+          <span className="text-base font-medium text-[var(--text-secondary)]">
+            {t('workspace.components')}
+          </span>
         </div>
       )}
 
diff --git a/frontend/components/editors/graph-builder/components/CopilotOverlay.tsx b/frontend/components/editors/graph-builder/components/CopilotOverlay.tsx
new file mode 100644
index 000000000..72097f9d4
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/CopilotOverlay.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import { ChevronDown, Sparkles } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { useTranslation } from '@/lib/i18n'
+
+import { CopilotPanel } from './CopilotPanel'
+
+interface CopilotOverlayProps {
+  agentId: string
+  expanded: boolean
+  onToggle: () => void
+}
+
+export function CopilotOverlay({ agentId, expanded, onToggle }: CopilotOverlayProps) {
+  const { t } = useTranslation()
+
+  if (!expanded) {
+    return (
+      <div className="absolute bottom-2 left-1/2 z-30 w-full max-w-xl -translate-x-1/2 px-4">
+        <button
+          className="bg-[var(--surface-2)]/90 flex w-full items-center gap-2 rounded-xl border border-[var(--border)] px-4 py-2.5 text-sm text-[var(--text-muted)] shadow-lg backdrop-blur transition-colors hover:bg-[var(--surface-2)]"
+          onClick={onToggle}
+        >
+          <Sparkles className="h-4 w-4 shrink-0 text-[var(--skill-brand-600)]" />
+          {t('graph.copilot.placeholder', {
+            defaultValue: 'Ask Build Copilot to build or modify your graph...',
+          })}
+        </button>
+      </div>
+    )
+  }
+
+  return (
+    <div className="absolute bottom-2 left-1/2 z-30 flex h-[40vh] w-full max-w-2xl -translate-x-1/2 flex-col rounded-xl border border-[var(--border)] bg-[var(--surface-1)] shadow-2xl">
+      <div className="flex items-center justify-between border-b border-[var(--border)] px-4 py-2">
+        <span className="flex items-center gap-1.5 text-sm font-medium">
+          <Sparkles className="h-3.5 w-3.5 text-[var(--skill-brand-600)]" />
+          {t('agents.studio.rightPanel.copilot', { defaultValue: 'Build Copilot' })}
+        </span>
+        <Button variant="ghost" size="sm" className="h-7 w-7 p-0" onClick={onToggle}>
+          <ChevronDown className="h-4 w-4" />
+        </Button>
+      </div>
+
+      <div className="min-h-0 flex-1">
+        <CopilotPanel />
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/CopilotPanel.tsx b/frontend/components/editors/graph-builder/components/CopilotPanel.tsx
similarity index 81%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/CopilotPanel.tsx
rename to frontend/components/editors/graph-builder/components/CopilotPanel.tsx
index 268fce493..e28983251 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/CopilotPanel.tsx
+++ b/frontend/components/editors/graph-builder/components/CopilotPanel.tsx
@@ -1,22 +1,11 @@
 'use client'
 
-/**
- * CopilotPanel - Main Copilot component
- *
- * Architecture:
- * - useCopilotState: Unified state management
- * - useCopilotWebSocketHandler: WebSocket event handling
- * - useCopilotActions: Business logic (send, stop, reset)
- * - useCopilotEffects: Side effects (session recovery, auto-scroll, URL params)
- *
- * This component is now focused solely on UI rendering and composition.
- */
-
 import { Loader2 } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import { useCallback, useState } from 'react'
 
 import { CopilotErrorBoundary } from '@/components/copilot/CopilotErrorBoundary'
+import { useCopilotExecutionBridge } from '@/hooks/copilot/useCopilotExecutionBridge'
 import { useModelSelector } from '@/hooks/use-model-selector'
 import { useTranslation } from '@/lib/i18n'
 
@@ -41,12 +30,17 @@ export function CopilotPanel() {
   const graphId = params.agentId as string | undefined
 
   const [copilotMode, setCopilotMode] = useState<CopilotMode>('deepagents')
-  const { modelOptions, selectedModel, setSelectedModel, selectedProviderName, selectedModelName, modelLabel } = useModelSelector()
+  const {
+    modelOptions,
+    selectedModel,
+    setSelectedModel,
+    selectedProviderName,
+    selectedModelName,
+    modelLabel,
+  } = useModelSelector()
 
-  // Unified state management
   const { state, actions, refs } = useCopilotState(graphId)
 
-  // WebSocket event handlers
   const webSocketCallbacks = useCopilotWebSocketHandler({
     state,
     actions,
@@ -54,39 +48,46 @@ export function CopilotPanel() {
     graphId,
   })
 
-  // Business logic handlers
+  // Bridges execution WS events → copilot UI callbacks (closes the event loop)
+  useCopilotExecutionBridge({
+    executionId: state.currentExecutionId,
+    callbacks: {
+      onStatus: webSocketCallbacks.onStatus,
+      onContent: webSocketCallbacks.onContent,
+      onThoughtStep: webSocketCallbacks.onThoughtStep,
+      onToolCall: webSocketCallbacks.onToolCall,
+      onToolResult: webSocketCallbacks.onToolResult,
+      onResult: webSocketCallbacks.onResult,
+      onError: webSocketCallbacks.onError,
+      onDone: webSocketCallbacks.onDone,
+    },
+  })
+
   const { handleSend, handleSendWithInput, handleStop, handleReset, handleAIDecision } =
     useCopilotActions({
       state,
       actions,
       refs,
-      graphId,
       copilotMode,
       selectedProviderName,
       selectedModelName,
-      onCopilotEvent: webSocketCallbacks.handleCopilotEvent,
     })
 
-  // Side effects (session recovery, auto-scroll, URL params, etc.)
   useCopilotEffects({
     state,
     actions,
     refs,
-    graphId,
     handleSendWithInput,
-    handleCopilotEvent: webSocketCallbacks.handleCopilotEvent,
   })
 
-  // Stage config
   const stageConfig = getStageConfig(t)
+  const { scrollRef, streamingContentRef } = refs
 
-  // Copy streaming content handler
   const handleCopyStreaming = useCallback(async () => {
     try {
       await navigator.clipboard.writeText(state.streamingContent)
       if (!refs.isMountedRef.current) return
 
-      // Clear previous timeout if exists
       if (refs.copyTimeoutRef.current) {
         clearTimeout(refs.copyTimeoutRef.current)
         // eslint-disable-next-line react-hooks/immutability
@@ -109,12 +110,14 @@ export function CopilotPanel() {
     <CopilotErrorBoundary>
       <div className="relative flex h-full flex-col bg-[var(--surface-2)]">
         {/* Messages and streaming area */}
-        <div className="custom-scrollbar flex-1 space-y-5 overflow-y-auto p-3" ref={refs.scrollRef}>
+        <div className="custom-scrollbar flex-1 space-y-5 overflow-y-auto p-3" ref={scrollRef}>
           {/* Loading history indicator */}
           {state.loadingHistory && (
             <div className="flex items-center justify-center py-4">
               <Loader2 size={16} className="mr-2 animate-spin text-[var(--brand-500)]" />
-              <span className="text-xs text-[var(--text-tertiary)]">{t('workspace.loadingHistory')}</span>
+              <span className="text-xs text-[var(--text-tertiary)]">
+                {t('workspace.loadingHistory')}
+              </span>
             </div>
           )}
 
@@ -137,7 +140,7 @@ export function CopilotPanel() {
             toolResults={state.toolResults}
             expandedToolTypes={state.expandedToolTypes}
             copiedStreaming={state.copiedStreaming}
-            streamingContentRef={refs.streamingContentRef}
+            streamingContentRef={streamingContentRef}
             stageConfig={stageConfig}
             onToggleToolType={actions.toggleToolType}
             onCopyStreaming={handleCopyStreaming}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/DefaultEdge.tsx b/frontend/components/editors/graph-builder/components/DefaultEdge.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/DefaultEdge.tsx
rename to frontend/components/editors/graph-builder/components/DefaultEdge.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentHistoryPanel.tsx b/frontend/components/editors/graph-builder/components/DeploymentHistoryPanel.tsx
similarity index 90%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentHistoryPanel.tsx
rename to frontend/components/editors/graph-builder/components/DeploymentHistoryPanel.tsx
index af0cf046f..9c58fe642 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentHistoryPanel.tsx
+++ b/frontend/components/editors/graph-builder/components/DeploymentHistoryPanel.tsx
@@ -1,9 +1,6 @@
 'use client'
 
-import {
-  History,
-  Loader2,
-} from 'lucide-react'
+import { History, Loader2 } from 'lucide-react'
 import { useCallback } from 'react'
 
 import {
@@ -50,10 +47,6 @@ export function DeploymentHistoryPanel({
     showToggle,
     isLoadingPreview,
     previewState,
-    editingVersion,
-    editName,
-    setEditName,
-    isSaving,
     isUndeploying,
     currentPage,
     handleSelectVersion,
@@ -115,7 +108,9 @@ export function DeploymentHistoryPanel({
               <DeploymentPreview
                 previewMode={previewMode}
                 selectedVersion={selectedVersion}
-                selectedVersionName={selectedVersionInfo?.name || (selectedVersion ? `v${selectedVersion}` : undefined)}
+                selectedVersionName={
+                  selectedVersionInfo?.name || (selectedVersion ? `v${selectedVersion}` : undefined)
+                }
                 showToggle={showToggle}
                 isLoadingPreview={isLoadingPreview}
                 previewState={previewState}
@@ -128,9 +123,6 @@ export function DeploymentHistoryPanel({
                 versions={versions}
                 isLoadingVersions={isLoadingVersions}
                 selectedVersion={selectedVersion}
-                editingVersion={editingVersion}
-                editName={editName}
-                isSaving={isSaving}
                 deploymentStatus={deploymentStatus}
                 isUndeploying={isUndeploying}
                 totalPages={totalPages}
@@ -139,9 +131,6 @@ export function DeploymentHistoryPanel({
                 onSelectVersion={handleSelectVersion}
                 onRevertClick={handleRevertClick}
                 onStartEdit={handleStartEdit}
-                onCancelEdit={handleCancelEdit}
-                onSaveName={handleSaveName}
-                onEditNameChange={setEditName}
                 onDeleteClick={handleDeleteClick}
                 onUndeployClick={handleUndeployClick}
                 onPageChange={handlePageChange}
@@ -172,10 +161,7 @@ export function DeploymentHistoryPanel({
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
-            <AlertDialogCancel
-              onClick={handleRevertCancel}
-              disabled={isReverting}
-            >
+            <AlertDialogCancel onClick={handleRevertCancel} disabled={isReverting}>
               {t('workspace.cancel')}
             </AlertDialogCancel>
             <AlertDialogAction
@@ -217,10 +203,7 @@ export function DeploymentHistoryPanel({
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
-            <AlertDialogCancel
-              onClick={handleDeleteCancel}
-              disabled={isDeleting}
-            >
+            <AlertDialogCancel onClick={handleDeleteCancel} disabled={isDeleting}>
               {t('workspace.cancel')}
             </AlertDialogCancel>
             <AlertDialogAction
@@ -249,10 +232,7 @@ export function DeploymentHistoryPanel({
             <AlertDialogDescription>{t('workspace.undeployConfirmMessage')}</AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
-            <AlertDialogCancel
-              onClick={handleUndeployCancel}
-              disabled={isUndeploying}
-            >
+            <AlertDialogCancel onClick={handleUndeployCancel} disabled={isUndeploying}>
               {t('workspace.cancel')}
             </AlertDialogCancel>
             <AlertDialogAction
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentPreview.tsx b/frontend/components/editors/graph-builder/components/DeploymentPreview.tsx
similarity index 96%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentPreview.tsx
rename to frontend/components/editors/graph-builder/components/DeploymentPreview.tsx
index 785a1a3bf..6c7cd7e15 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentPreview.tsx
+++ b/frontend/components/editors/graph-builder/components/DeploymentPreview.tsx
@@ -7,7 +7,7 @@ import { Button } from '@/components/ui/button'
 
 import { GraphPreview } from './GraphPreview'
 
-import type { GraphVersionState } from '@/services/graphDeploymentService'
+import type { GraphVersionState } from '../hooks/useDeploymentHistory'
 
 interface DeploymentPreviewProps {
   previewMode: 'current' | 'selected'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentVersionsList.tsx b/frontend/components/editors/graph-builder/components/DeploymentVersionsList.tsx
similarity index 70%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentVersionsList.tsx
rename to frontend/components/editors/graph-builder/components/DeploymentVersionsList.tsx
index 6f5ba1d2b..5fb90baef 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/DeploymentVersionsList.tsx
+++ b/frontend/components/editors/graph-builder/components/DeploymentVersionsList.tsx
@@ -5,8 +5,6 @@ import {
   History,
   RotateCcw,
   Edit2,
-  Check,
-  X,
   Loader2,
   Clock,
   User,
@@ -17,12 +15,11 @@ import {
 } from 'lucide-react'
 
 import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
 import { Pagination } from '@/components/ui/pagination'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
 
-import type { GraphDeploymentVersion, GraphDeploymentStatus } from '@/services/graphDeploymentService'
+import type { GraphDeploymentVersion, GraphDeploymentStatus } from '../hooks/useDeploymentHistory'
 
 function formatDeploymentDate(dateString: string): string {
   const date = new Date(dateString)
@@ -38,9 +35,6 @@ interface DeploymentVersionsListProps {
   versions: GraphDeploymentVersion[]
   isLoadingVersions: boolean
   selectedVersion: number | null
-  editingVersion: number | null
-  editName: string
-  isSaving: boolean
   deploymentStatus: GraphDeploymentStatus | undefined
   isUndeploying: boolean
   totalPages: number
@@ -49,9 +43,6 @@ interface DeploymentVersionsListProps {
   onSelectVersion: (version: number) => void
   onRevertClick: (version: number) => void
   onStartEdit: (version: GraphDeploymentVersion) => void
-  onCancelEdit: () => void
-  onSaveName: () => void
-  onEditNameChange: (name: string) => void
   onDeleteClick: (version: number) => void
   onUndeployClick: () => void
   onPageChange: (page: number) => void
@@ -61,9 +52,6 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
   versions,
   isLoadingVersions,
   selectedVersion,
-  editingVersion,
-  editName,
-  isSaving,
   deploymentStatus,
   isUndeploying,
   totalPages,
@@ -72,9 +60,6 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
   onSelectVersion,
   onRevertClick,
   onStartEdit,
-  onCancelEdit,
-  onSaveName,
-  onEditNameChange,
   onDeleteClick,
   onUndeployClick,
   onPageChange,
@@ -90,27 +75,19 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
               <Rocket
                 size={14}
                 className={
-                  deploymentStatus.isDeployed ? 'text-[var(--status-success)]' : 'text-[var(--text-muted)]'
+                  deploymentStatus.is_deployed
+                    ? 'text-[var(--status-success)]'
+                    : 'text-[var(--text-muted)]'
                 }
               />
               <span className="font-medium">
-                {deploymentStatus.isDeployed
+                {deploymentStatus.is_deployed
                   ? t('workspace.deployed')
                   : t('workspace.notDeployed')}
               </span>
-              {deploymentStatus.deployment && (
-                <span className="text-xs text-[var(--text-tertiary)]">
-                  v{deploymentStatus.deployment.version}
-                </span>
-              )}
             </div>
             <div className="flex items-center gap-2">
-              {deploymentStatus.needsRedeployment && deploymentStatus.isDeployed && (
-                <span className="rounded bg-[var(--status-warning-bg)] px-2 py-0.5 text-xs text-[var(--status-warning)]">
-                  {t('workspace.needsRedeployment')}
-                </span>
-              )}
-              {deploymentStatus.isDeployed && (
+              {deploymentStatus.is_deployed && (
                 <Button
                   size="sm"
                   variant="ghost"
@@ -151,8 +128,7 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
                 version.isActive
                   ? 'border-[var(--status-success)] bg-[var(--status-success-bg)] shadow-sm shadow-[var(--status-success-border)]'
                   : 'border-[var(--border)] bg-[var(--surface-elevated)] hover:border-[var(--border-strong)] hover:bg-[var(--surface-2)]',
-                selectedVersion === version.version &&
-                  'ring-2 ring-primary ring-offset-1',
+                selectedVersion === version.version && 'ring-2 ring-primary ring-offset-1',
               )}
               onClick={() => onSelectVersion(version.version)}
             >
@@ -171,57 +147,18 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
                     )}
                   </div>
 
-                  {/* Name editing */}
-                  {editingVersion === version.version ? (
-                    <div
-                      className="mb-1 flex items-center gap-1"
-                      onClick={(e) => e.stopPropagation()}
-                    >
-                      <Input
-                        value={editName}
-                        onChange={(e) => onEditNameChange(e.target.value)}
-                        placeholder={t('workspace.versionName')}
-                        className="h-6 text-xs"
-                        autoFocus
-                      />
-                      <Button
-                        size="sm"
-                        variant="ghost"
-                        className="h-6 w-6 p-0"
-                        onClick={onSaveName}
-                        disabled={isSaving}
-                        aria-label={t('workspace.saveName', { defaultValue: 'Save name' })}
-                      >
-                        {isSaving ? (
-                          <Loader2 size={12} className="animate-spin" />
-                        ) : (
-                          <Check size={12} />
-                        )}
-                      </Button>
-                      <Button
-                        size="sm"
-                        variant="ghost"
-                        className="h-6 w-6 p-0"
-                        onClick={onCancelEdit}
-                        disabled={isSaving}
-                        aria-label={t('workspace.cancelEdit', { defaultValue: 'Cancel edit' })}
-                      >
-                        <X size={12} />
-                      </Button>
-                    </div>
-                  ) : (
-                    version.name && (
-                      <p className="mb-0.5 truncate text-xs text-[var(--text-secondary)]">
-                        {version.name}
-                      </p>
-                    )
+                  {/* Name */}
+                  {version.name && (
+                    <p className="mb-0.5 truncate text-xs text-[var(--text-secondary)]">
+                      {version.name}
+                    </p>
                   )}
 
                   {/* Time and username */}
                   <div className="flex items-center gap-2 text-xs text-[var(--text-secondary)]">
                     <div className="flex items-center gap-0.5">
                       <Clock size={10} />
-                      <span>{formatDeploymentDate(version.createdAt)}</span>
+                      <span>{formatDeploymentDate(version.createdAt || version.created_at)}</span>
                     </div>
                     {(version.createdByName || version.createdBy) && (
                       <div className="flex items-center gap-0.5">
@@ -235,10 +172,7 @@ export const DeploymentVersionsList = React.memo(function DeploymentVersionsList
                 </div>
 
                 {/* Action buttons */}
-                <div
-                  className="flex items-center gap-0.5"
-                  onClick={(e) => e.stopPropagation()}
-                >
+                <div className="flex items-center gap-0.5" onClick={(e) => e.stopPropagation()}>
                   <Button
                     size="sm"
                     variant="ghost"
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/DraggableItem.tsx b/frontend/components/editors/graph-builder/components/DraggableItem.tsx
similarity index 93%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/DraggableItem.tsx
rename to frontend/components/editors/graph-builder/components/DraggableItem.tsx
index fedcc340a..0dbaf4608 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/DraggableItem.tsx
+++ b/frontend/components/editors/graph-builder/components/DraggableItem.tsx
@@ -53,8 +53,12 @@ export const DraggableItem = ({ def }: { def: NodeDefinition }) => {
         <Icon size={16} />
       </div>
       <div className="flex min-w-0 flex-col">
-        <span className="truncate text-base font-semibold text-[var(--text-secondary)]">{translatedLabel}</span>
-        <span className="truncate text-xs text-[var(--text-muted)]">{t('workspace.dragToAdd')}</span>
+        <span className="truncate text-base font-semibold text-[var(--text-secondary)]">
+          {translatedLabel}
+        </span>
+        <span className="truncate text-xs text-[var(--text-muted)]">
+          {t('workspace.dragToAdd')}
+        </span>
       </div>
       <GripVertical
         size={12}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/EdgePropertiesPanel.tsx b/frontend/components/editors/graph-builder/components/EdgePropertiesPanel.tsx
similarity index 77%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/EdgePropertiesPanel.tsx
rename to frontend/components/editors/graph-builder/components/EdgePropertiesPanel.tsx
index ddae5ff8d..e43ddcddd 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/EdgePropertiesPanel.tsx
+++ b/frontend/components/editors/graph-builder/components/EdgePropertiesPanel.tsx
@@ -1,7 +1,6 @@
 'use client'
 
 import { X, ArrowRight, Trash2 } from 'lucide-react'
-import { useParams } from 'next/navigation'
 import { useMemo, useState } from 'react'
 import { Node, Edge } from 'reactflow'
 
@@ -19,9 +18,8 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { useToast } from '@/hooks/use-toast'
-import { useUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
 import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 
 import { EdgeData } from '../types/graph'
 
@@ -32,6 +30,7 @@ interface EdgePropertiesPanelProps {
   onUpdate: (id: string, data: Partial<EdgeData>) => void
   onDelete?: (id: string) => void
   onClose: () => void
+  embedded?: boolean
 }
 
 export function EdgePropertiesPanel({
@@ -41,13 +40,11 @@ export function EdgePropertiesPanel({
   onUpdate,
   onDelete,
   onClose,
+  embedded = false,
 }: EdgePropertiesPanelProps) {
   const { t } = useTranslation()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
   const { toast } = useToast()
-  const { permissions, loading: permissionsLoading } = useWorkspacePermissions(workspaceId)
-  const userPermissions = useUserPermissions(permissions, permissionsLoading, null)
+  const userPermissions = useUserPermissionsContext()
 
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
 
@@ -73,12 +70,20 @@ export function EdgePropertiesPanel({
 
   return (
     <>
-      <div className="absolute right-4 top-16 z-50 w-72 rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] shadow-xl">
+      <div
+        className={
+          embedded
+            ? 'flex h-full flex-col overflow-hidden bg-[var(--surface-1)]'
+            : 'absolute right-4 top-16 z-50 w-72 rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] shadow-xl'
+        }
+      >
         {/* Header */}
         <div className="flex items-center justify-between border-b border-[var(--border)] px-4 py-3">
           <div className="flex items-center gap-2">
             <ArrowRight size={14} className="text-[var(--text-muted)]" />
-            <span className="text-sm font-medium">{t('workspace.edgeProperties', { defaultValue: 'Edge Properties' })}</span>
+            <span className="text-sm font-medium">
+              {t('workspace.edgeProperties', { defaultValue: 'Edge Properties' })}
+            </span>
           </div>
           <Button variant="ghost" size="icon" onClick={onClose} className="h-6 w-6">
             <X size={14} />
@@ -89,9 +94,13 @@ export function EdgePropertiesPanel({
         <div className="space-y-4 p-4">
           {/* Connection info */}
           <div className="flex items-center gap-2 text-xs text-[var(--text-secondary)]">
-            <span className="rounded bg-primary/10 px-1.5 py-0.5 font-medium text-primary">{sourceLabel}</span>
+            <span className="rounded bg-primary/10 px-1.5 py-0.5 font-medium text-primary">
+              {sourceLabel}
+            </span>
             <ArrowRight size={12} />
-            <span className="rounded bg-primary/10 px-1.5 py-0.5 font-medium text-primary">{targetLabel}</span>
+            <span className="rounded bg-primary/10 px-1.5 py-0.5 font-medium text-primary">
+              {targetLabel}
+            </span>
           </div>
 
           {/* Label */}
@@ -126,14 +135,21 @@ export function EdgePropertiesPanel({
       <AlertDialog open={showDeleteConfirm} onOpenChange={setShowDeleteConfirm}>
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>{t('workspace.deleteEdgeConfirmTitle', { defaultValue: 'Delete Edge?' })}</AlertDialogTitle>
+            <AlertDialogTitle>
+              {t('workspace.deleteEdgeConfirmTitle', { defaultValue: 'Delete Edge?' })}
+            </AlertDialogTitle>
             <AlertDialogDescription>
-              {t('workspace.deleteEdgeConfirmMessage', { defaultValue: 'This will remove the connection between nodes.' })}
+              {t('workspace.deleteEdgeConfirmMessage', {
+                defaultValue: 'This will remove the connection between nodes.',
+              })}
             </AlertDialogDescription>
           </AlertDialogHeader>
           <AlertDialogFooter>
             <AlertDialogCancel>{t('workspace.cancel')}</AlertDialogCancel>
-            <AlertDialogAction onClick={handleDelete} className="bg-destructive text-white hover:bg-destructive/90">
+            <AlertDialogAction
+              onClick={handleDelete}
+              className="bg-destructive text-white hover:bg-destructive/90"
+            >
               {t('workspace.delete')}
             </AlertDialogAction>
           </AlertDialogFooter>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/GraphPreview.tsx b/frontend/components/editors/graph-builder/components/GraphPreview.tsx
similarity index 96%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/GraphPreview.tsx
rename to frontend/components/editors/graph-builder/components/GraphPreview.tsx
index c76bf41a1..cdb9f35f5 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/GraphPreview.tsx
+++ b/frontend/components/editors/graph-builder/components/GraphPreview.tsx
@@ -15,7 +15,7 @@ import ReactFlow, {
 import 'reactflow/dist/style.css'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
-import type { GraphVersionState } from '@/services/graphDeploymentService'
+import type { GraphVersionState } from '../hooks/useDeploymentHistory'
 
 import { nodeRegistry } from '../services/nodeRegistry'
 
@@ -214,7 +214,10 @@ export function GraphPreview({
     <ReactFlowProvider>
       <div
         style={{ height, width }}
-        className={cn('relative overflow-hidden rounded-lg border border-[var(--border)]', className)}
+        className={cn(
+          'relative overflow-hidden rounded-lg border border-[var(--border)]',
+          className,
+        )}
       >
         <PreviewContent nodes={nodes} edges={edges} />
       </div>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/GraphStatusBar.tsx b/frontend/components/editors/graph-builder/components/GraphStatusBar.tsx
similarity index 62%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/GraphStatusBar.tsx
rename to frontend/components/editors/graph-builder/components/GraphStatusBar.tsx
index cca2ec583..1c63ec4e6 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/GraphStatusBar.tsx
+++ b/frontend/components/editors/graph-builder/components/GraphStatusBar.tsx
@@ -5,20 +5,15 @@ import { AlertCircle, Wifi, WifiOff, Loader2, Save } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { useTranslation } from '@/lib/i18n'
 
-import { useBuilderStore } from '../stores/builderStore'
+import { useGraphStore } from '../stores/graphStore'
+import { useSaveStore } from '../stores/saveStore'
+import { ZoomControls } from './ZoomControls'
 
 export function GraphStatusBar() {
   const { t } = useTranslation()
-  const {
-    lastAutoSaveTime,
-    deployedAt,
-    hasPendingChanges,
-    lastSaveError,
-    saveRetryCount,
-    isSaving,
-    graphId,
-    autoSave,
-  } = useBuilderStore()
+  const { lastAutoSaveTime, hasPendingChanges, lastSaveError, saveRetryCount, isSaving, autoSave } =
+    useSaveStore()
+  const graphId = useGraphStore((s) => s.graphId)
 
   const formatTime = (timestamp: number | null): string => {
     if (!timestamp) return ''
@@ -29,32 +24,9 @@ export function GraphStatusBar() {
     return `${hours}:${minutes}:${seconds}`
   }
 
-  const formatPublishedTime = (publishedAt: string | null): string => {
-    if (!publishedAt) return ''
-    const published = new Date(publishedAt)
-    const now = new Date()
-    const diffMs = now.getTime() - published.getTime()
-    const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24))
-
-    if (diffDays === 0) {
-      const diffHours = Math.floor(diffMs / (1000 * 60 * 60))
-      if (diffHours === 0) {
-        const diffMinutes = Math.floor(diffMs / (1000 * 60))
-        return diffMinutes <= 0
-          ? t('workspace.justPublished')
-          : t('workspace.publishedMinutesAgo', { minutes: diffMinutes })
-      }
-      return t('workspace.publishedHoursAgo', { hours: diffHours })
-    }
-    return t('workspace.publishedDaysAgo', { days: diffDays })
-  }
-
-  // Render save status
   const renderSaveStatus = () => {
-    // Check if graph is ready for saving
     const isGraphReady = graphId !== null
 
-    // Network offline status
     if (lastSaveError === 'offline') {
       return (
         <span className="flex items-center gap-1 text-[var(--status-warning)]">
@@ -64,7 +36,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Currently saving
     if (isSaving) {
       return (
         <span className="flex items-center gap-1 text-primary">
@@ -74,7 +45,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Save failed with unsaved changes
     if (lastSaveError && hasPendingChanges && saveRetryCount >= 3) {
       return (
         <span className="flex items-center gap-1 text-[var(--status-error)]" title={lastSaveError}>
@@ -84,7 +54,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Retrying
     if (saveRetryCount > 0 && saveRetryCount < 3) {
       return (
         <span className="text-[var(--status-warning)]">
@@ -93,7 +62,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Graph not ready for saving
     if (!isGraphReady) {
       return (
         <span className="text-[var(--text-muted)]" title={t('workspace.waiting')}>
@@ -102,7 +70,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Has unsaved changes
     if (hasPendingChanges) {
       return (
         <span className="flex items-center gap-1.5 text-[var(--text-muted)]">
@@ -120,7 +87,6 @@ export function GraphStatusBar() {
       )
     }
 
-    // Normally display last save time
     if (lastAutoSaveTime) {
       return (
         <span className="flex items-center gap-1">
@@ -134,16 +100,9 @@ export function GraphStatusBar() {
   }
 
   return (
-    <div className="text-xs text-[var(--text-secondary)]">
-      <div className="flex items-center gap-2">
-        {renderSaveStatus()}
-        <span className="text-[var(--text-subtle)]">·</span>
-        {deployedAt ? (
-          <span>{formatPublishedTime(deployedAt)}</span>
-        ) : (
-          <span className="text-[var(--text-muted)]">{t('workspace.unpublished')}</span>
-        )}
-      </div>
+    <div className="flex items-center justify-between border-t border-[var(--border)] px-3 py-1 text-xs text-[var(--text-secondary)]">
+      <div className="flex items-center">{renderSaveStatus()}</div>
+      <ZoomControls />
     </div>
   )
 }
diff --git a/frontend/components/editors/graph-builder/components/GraphToolbar.tsx b/frontend/components/editors/graph-builder/components/GraphToolbar.tsx
new file mode 100644
index 000000000..a440a0131
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/GraphToolbar.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import { Redo2, Undo2 } from 'lucide-react'
+
+import { Button } from '@/components/ui/button'
+import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+import { useGraphStore } from '../stores/graphStore'
+import { AddNodeButton } from './AddNodeButton'
+import { ImportExportMenu } from './ImportExportMenu'
+
+export function GraphToolbar() {
+  const { t } = useTranslation()
+  const { canEdit } = useUserPermissionsContext()
+  const addNode = useGraphStore((s) => s.addNode)
+  const canUndo = useGraphStore((s) => s.past.length > 0)
+  const canRedo = useGraphStore((s) => s.future.length > 0)
+  const undo = useGraphStore((s) => s.undo)
+  const redo = useGraphStore((s) => s.redo)
+
+  const handleAddNode = (node: { type: string; label: string }) => {
+    addNode(node.type, { x: 200, y: 200 }, node.label)
+  }
+
+  return (
+    <div className="flex items-center gap-1 rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] px-2 py-1 shadow-md">
+      {canEdit && <AddNodeButton onAddNode={handleAddNode} />}
+      <ImportExportMenu />
+      <div className="mx-1 h-4 w-px bg-[var(--border)]" />
+      <Button
+        variant="ghost"
+        size="sm"
+        className="h-7 w-7 p-0"
+        disabled={!canUndo || !canEdit}
+        onClick={undo}
+        aria-label={t('workspace.undo', { defaultValue: 'Undo' })}
+      >
+        <Undo2 className="h-3.5 w-3.5" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="sm"
+        className="h-7 w-7 p-0"
+        disabled={!canRedo || !canEdit}
+        onClick={redo}
+        aria-label={t('workspace.redo', { defaultValue: 'Redo' })}
+      >
+        <Redo2 className="h-3.5 w-3.5" />
+      </Button>
+    </div>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/ImportExportMenu.tsx b/frontend/components/editors/graph-builder/components/ImportExportMenu.tsx
new file mode 100644
index 000000000..5121718b5
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/ImportExportMenu.tsx
@@ -0,0 +1,131 @@
+'use client'
+
+import { AlertTriangle, Download, MoreHorizontal, Upload } from 'lucide-react'
+import { useRef, useState } from 'react'
+
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/components/ui/alert-dialog'
+import { Button } from '@/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/lib/i18n'
+
+import { useGraphStore } from '../stores/graphStore'
+
+export function ImportExportMenu() {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const [pendingFile, setPendingFile] = useState<File | null>(null)
+
+  const doImport = async (file: File) => {
+    try {
+      await useGraphStore.getState().importGraph(file)
+      toast({
+        title: t('workspace.graphImported'),
+        description: t('workspace.graphImportedSuccess', { name: file.name }),
+      })
+      setTimeout(() => {
+        useGraphStore.getState().rfInstance?.fitView({ padding: 0.2 })
+      }, 100)
+    } catch (error: unknown) {
+      toast({
+        variant: 'destructive',
+        title: t('workspace.importFailed'),
+        description: error instanceof Error ? error.message : t('workspace.importFailedMessage'),
+      })
+    }
+  }
+
+  const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0]
+    e.target.value = ''
+    if (!file) return
+
+    if (useGraphStore.getState().nodes.length > 0) {
+      setPendingFile(file)
+    } else {
+      await doImport(file)
+    }
+  }
+
+  return (
+    <>
+      <input
+        type="file"
+        ref={fileInputRef}
+        onChange={handleFileChange}
+        accept=".json"
+        className="hidden"
+      />
+      <DropdownMenu>
+        <DropdownMenuTrigger asChild>
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-7 w-7 rounded-md hover:bg-[var(--surface-2)]"
+            aria-label={t('workspace.moreOptions', { defaultValue: 'More options' })}
+          >
+            <MoreHorizontal size={16} className="text-[var(--text-secondary)]" />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="start" side="bottom" sideOffset={8}>
+          <DropdownMenuItem onClick={() => fileInputRef.current?.click()}>
+            <Upload size={14} className="mr-2" />
+            {t('workspace.importGraph', { defaultValue: 'Import JSON' })}
+          </DropdownMenuItem>
+          <DropdownMenuSeparator />
+          <DropdownMenuItem onClick={() => useGraphStore.getState().exportGraph()}>
+            <Download size={14} className="mr-2" />
+            {t('workspace.exportGraph', { defaultValue: 'Export JSON' })}
+          </DropdownMenuItem>
+        </DropdownMenuContent>
+      </DropdownMenu>
+
+      <AlertDialog
+        open={!!pendingFile}
+        onOpenChange={(open) => {
+          if (!open) setPendingFile(null)
+        }}
+      >
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <div className="mb-2 flex items-center gap-1 text-[var(--status-warning)]">
+              <AlertTriangle size={20} />
+              <AlertDialogTitle>{t('workspace.overwriteCanvas')}</AlertDialogTitle>
+            </div>
+            <AlertDialogDescription>{t('workspace.importOverwriteWarning')}</AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel onClick={() => setPendingFile(null)}>
+              {t('common.cancel')}
+            </AlertDialogCancel>
+            <AlertDialogAction
+              onClick={async () => {
+                if (pendingFile) await doImport(pendingFile)
+                setPendingFile(null)
+              }}
+              className="bg-primary hover:bg-primary/90"
+            >
+              {t('workspace.import')}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/InspectorPanel.tsx b/frontend/components/editors/graph-builder/components/InspectorPanel.tsx
new file mode 100644
index 000000000..f2ba533ed
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/InspectorPanel.tsx
@@ -0,0 +1,192 @@
+'use client'
+
+import { AlertCircle, X } from 'lucide-react'
+import { useEffect, useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+
+import { nodeRegistry } from '../services/nodeRegistry'
+import { useGraphStore } from '../stores/graphStore'
+import { EdgePropertiesPanel } from './EdgePropertiesPanel'
+import PropertiesPanel from './PropertiesPanel'
+
+interface InspectorPanelProps {
+  onClose: () => void
+}
+
+export function InspectorPanel({ onClose }: InspectorPanelProps) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const userPermissions = useUserPermissionsContext()
+  const {
+    nodes,
+    edges,
+    selectedNodeId,
+    selectedEdgeId,
+    updateNodeConfig,
+    updateNodeLabel,
+    updateEdge,
+    onEdgesChange,
+    selectNode,
+    selectEdge,
+    takeSnapshot,
+  } = useGraphStore()
+
+  const selectedNode = nodes.find((n) => n.id === selectedNodeId)
+  const selectedEdge = edges.find((e) => e.id === selectedEdgeId)
+
+  const nodeData = selectedNode?.data as
+    | { type: string; label?: string; config?: Record<string, unknown> }
+    | undefined
+  const nodeDef = nodeData ? nodeRegistry.get(nodeData.type) : undefined
+
+  const edgeTitle = selectedEdge
+    ? t('agents.studio.rightPanel.edgeInspector', { defaultValue: 'Edge Inspector' })
+    : ''
+
+  const denyEdit = () =>
+    toast({
+      title: t('workspace.noPermission'),
+      description: t('workspace.cannotEditNode'),
+      variant: 'destructive',
+    })
+
+  const NodeIcon = nodeDef?.icon || AlertCircle
+
+  const [isEditingName, setIsEditingName] = useState(false)
+  const [editName, setEditName] = useState('')
+
+  useEffect(() => {
+    setIsEditingName(false)
+  }, [selectedNodeId])
+
+  const startEditingName = () => {
+    if (!userPermissions.canEdit) return
+    setEditName(nodeData?.label || nodeDef?.label || '')
+    setIsEditingName(true)
+  }
+
+  const commitName = () => {
+    const trimmed = editName.trim()
+    if (trimmed && selectedNodeId && trimmed !== (nodeData?.label || '')) {
+      takeSnapshot()
+      updateNodeLabel(selectedNodeId, trimmed)
+    }
+    setIsEditingName(false)
+  }
+
+  return (
+    <div className="flex h-full flex-col bg-[var(--surface-1)]">
+      {selectedNode && nodeDef ? (
+        <div className="flex h-11 shrink-0 items-center justify-between border-b border-[var(--border)] bg-[var(--surface-1)] px-3">
+          <div className="flex min-w-0 items-center gap-2 text-[var(--text-primary)]">
+            <div className={cn('shrink-0 rounded-md p-1', nodeDef.style.bg, nodeDef.style.color)}>
+              <NodeIcon size={14} />
+            </div>
+            {isEditingName ? (
+              <input
+                autoFocus
+                value={editName}
+                onChange={(e) => setEditName(e.target.value)}
+                onBlur={commitName}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') e.currentTarget.blur()
+                  if (e.key === 'Escape') setIsEditingName(false)
+                }}
+                className="h-6 min-w-0 flex-1 truncate rounded-sm border border-[var(--brand-300)] bg-transparent px-1 text-sm font-semibold outline-none focus:ring-1 focus:ring-[var(--brand-400)]"
+              />
+            ) : (
+              <span
+                className={cn(
+                  'truncate text-sm font-semibold',
+                  userPermissions.canEdit &&
+                    'cursor-text rounded-sm px-1 hover:bg-[var(--surface-2)]',
+                )}
+                onClick={startEditingName}
+              >
+                {nodeData?.label || nodeDef.label}
+              </span>
+            )}
+            <span className="shrink-0 rounded bg-[var(--surface-3)] px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wider text-[var(--text-muted)]">
+              {nodeDef.label}
+            </span>
+          </div>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={() => selectNode(null)}
+            className="h-7 w-7 text-[var(--text-disabled)] hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)]"
+            aria-label={t('workspace.closePanel', { defaultValue: 'Close panel' })}
+          >
+            <X size={16} />
+          </Button>
+        </div>
+      ) : (
+        <div className="flex h-11 shrink-0 items-center justify-between border-b border-[var(--border)] px-3">
+          <span className="text-sm font-semibold">{edgeTitle}</span>
+          <Button
+            variant="ghost"
+            size="icon"
+            className="h-6 w-6"
+            onClick={onClose}
+            aria-label="Close"
+          >
+            <X size={14} />
+          </Button>
+        </div>
+      )}
+
+      <div className="min-h-0 flex-1 overflow-y-auto">
+        {selectedNode && (
+          <PropertiesPanel
+            embedded
+            node={selectedNode}
+            nodes={nodes}
+            edges={edges}
+            onUpdate={(id, data) => {
+              if (!userPermissions.canEdit) {
+                denyEdit()
+                return
+              }
+              takeSnapshot()
+              const nodeData = selectedNode.data as { label?: string }
+              if (data.label !== nodeData.label) updateNodeLabel(id, data.label)
+              if (data.config) updateNodeConfig(id, data.config)
+            }}
+            onClose={() => selectNode(null)}
+          />
+        )}
+        {selectedEdge && (
+          <EdgePropertiesPanel
+            embedded
+            edge={selectedEdge}
+            nodes={nodes}
+            edges={edges}
+            onUpdate={(id, data) => {
+              if (!userPermissions.canEdit) {
+                denyEdit()
+                return
+              }
+              takeSnapshot()
+              updateEdge(id, data)
+            }}
+            onDelete={(id) => {
+              if (!userPermissions.canEdit) {
+                denyEdit()
+                return
+              }
+              takeSnapshot()
+              onEdgesChange([{ type: 'remove', id }])
+              selectEdge(null)
+            }}
+            onClose={() => selectEdge(null)}
+          />
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/InterruptPanel.tsx b/frontend/components/editors/graph-builder/components/InterruptPanel.tsx
similarity index 96%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/InterruptPanel.tsx
rename to frontend/components/editors/graph-builder/components/InterruptPanel.tsx
index 7eadef606..c358a0e5a 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/InterruptPanel.tsx
+++ b/frontend/components/editors/graph-builder/components/InterruptPanel.tsx
@@ -26,8 +26,9 @@ import { useToast } from '@/hooks/use-toast'
 import { useTranslation } from '@/lib/i18n'
 
 import { resumeWithCommand } from '../services/commandService'
-import { useBuilderStore } from '../stores/builderStore'
-import { useExecutionStore, type InterruptInfo } from '../stores/executionStore'
+import { useGraphStore } from '../stores/graphStore'
+import { useExecutionStore } from '../stores/execution/executionStore'
+import type { InterruptInfo } from '../stores/execution/types'
 import { getNodeNameFromFlowNode } from '../utils/nodeNameUtils'
 
 interface InterruptPanelProps {
@@ -147,7 +148,7 @@ function extractKeyStateFields(state: any): { key: string; value: any }[] {
 export function InterruptPanel({ interrupt, onClose }: InterruptPanelProps) {
   const { t } = useTranslation()
   const { removeInterrupt } = useExecutionStore()
-  const { nodes } = useBuilderStore()
+  const { nodes } = useGraphStore()
   const { toast } = useToast()
   const [isResuming, setIsResuming] = useState(false)
   const [editedState, setEditedState] = useState(interrupt.state)
@@ -285,7 +286,9 @@ export function InterruptPanel({ interrupt, onClose }: InterruptPanelProps) {
       removeInterrupt(interrupt.nodeId)
       toast({
         title: t('workspace.executionJumped'),
-        description: t('workspace.jumpedToNode', { nodeLabel: (targetNode?.data as { label?: string })?.label || nodeName }),
+        description: t('workspace.jumpedToNode', {
+          nodeLabel: (targetNode?.data as { label?: string })?.label || nodeName,
+        }),
       })
       setShowGotoSelector(false)
       onClose?.()
@@ -319,11 +322,15 @@ export function InterruptPanel({ interrupt, onClose }: InterruptPanelProps) {
         {/* State Summary */}
         {!isEditing && keyStateFields.length > 0 && (
           <div className="space-y-2">
-            <label className="text-sm font-medium text-[var(--text-secondary)]">{t('workspace.stateSummary')}</label>
+            <label className="text-sm font-medium text-[var(--text-secondary)]">
+              {t('workspace.stateSummary')}
+            </label>
             <div className="space-y-1 rounded-md border border-[var(--border)] bg-[var(--surface-elevated)] p-3">
               {keyStateFields.slice(0, 5).map((field, idx) => (
                 <div key={idx} className="text-xs">
-                  <span className="font-mono font-semibold text-[var(--text-secondary)]">{field.key}:</span>{' '}
+                  <span className="font-mono font-semibold text-[var(--text-secondary)]">
+                    {field.key}:
+                  </span>{' '}
                   <span className="text-[var(--text-tertiary)]">{String(field.value)}</span>
                 </div>
               ))}
@@ -419,7 +426,9 @@ export function InterruptPanel({ interrupt, onClose }: InterruptPanelProps) {
 
         {showGotoSelector && (
           <div className="space-y-2 rounded-md border border-[var(--border)] bg-[var(--surface-elevated)] p-3">
-            <label className="text-sm font-medium text-[var(--text-secondary)]">{t('workspace.selectNodeToJumpTo')}</label>
+            <label className="text-sm font-medium text-[var(--text-secondary)]">
+              {t('workspace.selectNodeToJumpTo')}
+            </label>
             <Select value={selectedNodeId} onValueChange={setSelectedNodeId}>
               <SelectTrigger>
                 <SelectValue placeholder={t('workspace.selectNodePlaceholder')} />
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/MemorySection.tsx b/frontend/components/editors/graph-builder/components/MemorySection.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/MemorySection.tsx
rename to frontend/components/editors/graph-builder/components/MemorySection.tsx
index c851913fd..a2611ba05 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/MemorySection.tsx
+++ b/frontend/components/editors/graph-builder/components/MemorySection.tsx
@@ -86,11 +86,7 @@ export const MemorySection = React.memo(function MemorySection({
                 currentNodeId={currentNodeId}
                 onCreateEdge={undefined}
                 graphStateFields={graphStateFields}
-                onModelChange={
-                  field.key === 'memory_model_name'
-                    ? onMemoryModelChange
-                    : undefined
-                }
+                onModelChange={field.key === 'memory_model_name' ? onMemoryModelChange : undefined}
               />
             ))}
         </div>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/ModelIOCard.tsx b/frontend/components/editors/graph-builder/components/ModelIOCard.tsx
similarity index 95%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/ModelIOCard.tsx
rename to frontend/components/editors/graph-builder/components/ModelIOCard.tsx
index dfbf1a21c..e30aabd2a 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/ModelIOCard.tsx
+++ b/frontend/components/editors/graph-builder/components/ModelIOCard.tsx
@@ -78,7 +78,9 @@ function DataSection({
       >
         <div className="flex items-center gap-2">
           <span className={iconColor}>{icon}</span>
-          <span className="text-xs font-semibold uppercase text-[var(--text-secondary)]">{title}</span>
+          <span className="text-xs font-semibold uppercase text-[var(--text-secondary)]">
+            {title}
+          </span>
         </div>
         {collapsed ? (
           <ChevronRight size={12} className="text-[var(--text-muted)]" />
@@ -185,7 +187,9 @@ export function ModelIOCard({
           {!hasOutput && hasInput && (
             <div className="flex items-center gap-2 rounded-lg border border-[var(--status-warning-border)] bg-[var(--status-warning-bg)] p-3">
               <div className="h-2 w-2 animate-pulse rounded-full bg-[var(--status-warning)]" />
-              <span className="text-xs text-[var(--status-warning)]">Awaiting model response...</span>
+              <span className="text-xs text-[var(--status-warning)]">
+                Awaiting model response...
+              </span>
             </div>
           )}
         </div>
@@ -198,7 +202,9 @@ export function ModelIOCard({
     <div
       className={cn(
         'rounded-lg border transition-all',
-        hasOutput ? 'border-[var(--status-success-border)] bg-[var(--status-success-bg)]' : 'border-[var(--status-warning-border)] bg-[var(--status-warning-bg)]',
+        hasOutput
+          ? 'border-[var(--status-success-border)] bg-[var(--status-success-bg)]'
+          : 'border-[var(--status-warning-border)] bg-[var(--status-warning-bg)]',
       )}
     >
       {/* Header */}
@@ -214,7 +220,9 @@ export function ModelIOCard({
             <ChevronDown size={14} className="shrink-0 text-[var(--text-tertiary)]" />
           )}
           <Brain size={14} className="shrink-0 text-[var(--brand-600)]" />
-          <span className="truncate text-xs font-semibold text-[var(--text-secondary)]">Model I/O</span>
+          <span className="truncate text-xs font-semibold text-[var(--text-secondary)]">
+            Model I/O
+          </span>
           <span className="truncate font-mono text-xs text-[var(--text-tertiary)]">
             {modelProvider}/{modelName}
           </span>
@@ -272,7 +280,9 @@ export function ModelIOCard({
           {!hasOutput && hasInput && (
             <div className="flex items-center gap-2 rounded border border-[var(--status-warning-border)] bg-[var(--status-warning-bg)] p-2">
               <div className="h-2 w-2 animate-pulse rounded-full bg-[var(--status-warning)]" />
-              <span className="text-xs text-[var(--status-warning)]">Awaiting model response...</span>
+              <span className="text-xs text-[var(--status-warning)]">
+                Awaiting model response...
+              </span>
             </div>
           )}
         </div>
diff --git a/frontend/components/editors/graph-builder/components/PropertiesPanel.tsx b/frontend/components/editors/graph-builder/components/PropertiesPanel.tsx
new file mode 100644
index 000000000..9a3776bcd
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/PropertiesPanel.tsx
@@ -0,0 +1,423 @@
+'use client'
+
+import { X, AlertCircle, MessageSquare, Hammer, Sparkles } from 'lucide-react'
+import React, { useCallback, useMemo } from 'react'
+import { Node, Edge } from 'reactflow'
+
+import { Button } from '@/components/ui/button'
+import { Label } from '@/components/ui/label'
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
+import { cn } from '@/lib/utils'
+
+import { nodeRegistry, FieldSchema } from '../services/nodeRegistry'
+import { useGraphStore } from '../stores/graphStore'
+
+import { MemorySection } from './MemorySection'
+import { SchemaFieldRenderer } from './SchemaFieldRenderer'
+import { SectionHeader } from './SectionHeader'
+
+// Re-export SectionHeader for any existing consumers
+export { SectionHeader } from './SectionHeader'
+
+interface PropertiesPanelProps {
+  node: Node
+  nodes: Node[]
+  edges: Edge[]
+  onUpdate: (id: string, data: { label: string; config?: Record<string, unknown> }) => void
+  onClose: () => void
+  embedded?: boolean
+}
+
+function normalizeValue(value: unknown): string | boolean | number {
+  if (typeof value === 'boolean') return value
+  if (typeof value === 'number') return value
+  if (typeof value === 'string') {
+    const lower = value.toLowerCase()
+    return lower === 'true' ? true : lower === 'false' ? false : value
+  }
+  return String(value)
+}
+
+function shouldShowField(field: FieldSchema, config: Record<string, unknown>): boolean {
+  if (!field.showWhen) return true
+  const dependentValue = config[field.showWhen.field]
+  const normalizedDependent = normalizeValue(dependentValue)
+  return field.showWhen.values.some((val) => normalizeValue(val) === normalizedDependent)
+}
+
+const FieldListSection = React.memo(function FieldListSection({
+  icon,
+  title,
+  fields,
+  config,
+  updateConfig,
+  canEdit,
+  t,
+  nodes,
+  edges,
+  currentNodeId,
+  graphStateFields,
+}: {
+  icon: React.ElementType
+  title: string
+  fields: FieldSchema[]
+  config: Record<string, unknown>
+  updateConfig: (key: string, value: unknown) => void
+  canEdit: boolean
+  t: (key: string, options?: Record<string, unknown>) => string
+  nodes: Node[]
+  edges: Edge[]
+  currentNodeId: string
+  graphStateFields?: import('../types/graph').StateField[]
+}) {
+  if (fields.length === 0) return null
+  return (
+    <div className="space-y-4">
+      <SectionHeader icon={icon} title={title} />
+      {fields.map((field) => (
+        <SchemaFieldRenderer
+          key={field.key}
+          schema={field}
+          value={config[field.key]}
+          onChange={(val) => updateConfig(field.key, val)}
+          canEdit={canEdit}
+          t={t}
+          nodes={nodes}
+          edges={edges}
+          currentNodeId={currentNodeId}
+          onCreateEdge={undefined}
+          graphStateFields={graphStateFields}
+        />
+      ))}
+    </div>
+  )
+})
+
+export default function PropertiesPanel({
+  node,
+  nodes,
+  edges,
+  onUpdate,
+  onClose,
+  embedded = false,
+}: PropertiesPanelProps) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const userPermissions = useUserPermissionsContext()
+  const { onConnect, updateEdge, graphStateFields } = useGraphStore()
+  const nodeData = node?.data as
+    | { type: string; label?: string; config?: Record<string, unknown> }
+    | undefined
+  const def = nodeData ? nodeRegistry.get(nodeData.type) : undefined
+
+  const config = useMemo(() => nodeData?.config || {}, [nodeData?.config])
+
+  const validationErrors = useMemo(() => {
+    const errors: { field: string; message: string; severity?: string }[] = []
+    if (!def) return errors
+    def.schema.forEach((field) => {
+      if (
+        field.required &&
+        !config[field.key] &&
+        config[field.key] !== 0 &&
+        config[field.key] !== false
+      ) {
+        if (field.showWhen && !shouldShowField(field, config)) return
+        errors.push({
+          field: field.label || field.key,
+          message: t('workspace.fieldRequired', { defaultValue: 'Field is required' }),
+          severity: 'error',
+        })
+      }
+    })
+    return errors
+  }, [def, config, t])
+
+  const updateConfig = useCallback(
+    (key: string, value: unknown) => {
+      if (!userPermissions.canEdit) {
+        toast({
+          title: t('workspace.noPermission'),
+          description: t('workspace.cannotEditNode'),
+          variant: 'destructive',
+        })
+        return
+      }
+      onUpdate(node.id, { label: nodeData?.label || '', config: { ...config, [key]: value } })
+    },
+    [userPermissions.canEdit, toast, t, onUpdate, node.id, nodeData?.label, config],
+  )
+
+  const updateModelConfig = useCallback(
+    (modelName: string, providerName: string) => {
+      onUpdate(node.id, {
+        label: nodeData?.label || '',
+        config: { ...config, provider_name: providerName, model_name: modelName },
+      })
+    },
+    [onUpdate, node.id, nodeData?.label, config],
+  )
+
+  const handleMemoryModelChange = useCallback(
+    (modelName: string, providerName: string) => {
+      onUpdate(node.id, {
+        label: nodeData?.label || '',
+        config: { ...config, memory_provider_name: providerName, memory_model_name: modelName },
+      })
+    },
+    [onUpdate, node.id, nodeData?.label, config],
+  )
+
+  const schema = def?.schema
+  const modelField = useMemo(() => schema?.find((s) => s.key === 'model_name'), [schema])
+  const behaviorFields = useMemo(
+    () =>
+      schema?.filter(
+        (s) =>
+          s.key !== 'model_name' &&
+          !['enableMemory', 'memory_model_name', 'memoryPrompt', 'description'].includes(s.key) &&
+          s.type !== 'toolSelector' &&
+          s.type !== 'skillSelector',
+      ) || [],
+    [schema],
+  )
+  const deepAgentSkillFields = useMemo(
+    () => schema?.filter((s) => s.type === 'skillSelector' && s.showWhen) || [],
+    [schema],
+  )
+  const toolsFields = useMemo(
+    () => schema?.filter((s) => s.type === 'toolSelector') || [],
+    [schema],
+  )
+  const skillsFields = useMemo(
+    () => schema?.filter((s) => s.type === 'skillSelector' && !s.showWhen) || [],
+    [schema],
+  )
+  const memoryFields = useMemo(
+    () =>
+      schema?.filter((s) =>
+        ['enableMemory', 'memory_model_name', 'memoryPrompt'].includes(s.key),
+      ) || [],
+    [schema],
+  )
+  const descriptionField = useMemo(() => schema?.find((s) => s.key === 'description'), [schema])
+
+  if (!node || !nodeData) return null
+
+  const Icon = def?.icon || AlertCircle
+  const enableMemory = config.enableMemory === true
+
+  const parentNodes = edges
+    .filter((edge) => edge.target === node.id)
+    .map((edge) => nodes.find((n) => n.id === edge.source))
+    .filter(Boolean) as Node[]
+  const hasParentWithDeepAgents = parentNodes.some((p) => {
+    const pd = p?.data as { config?: Record<string, unknown> }
+    return pd?.config?.useDeepAgents === true
+  })
+  const visibleDeepAgentSkillFields = deepAgentSkillFields.filter((f) => shouldShowField(f, config))
+
+  return (
+    <div
+      className={cn(
+        'flex flex-col overflow-hidden bg-[var(--surface-1)]',
+        embedded
+          ? 'h-full'
+          : 'absolute bottom-[60px] right-[336px] top-[56px] z-50 w-[400px] rounded-2xl border border-[var(--border)] shadow-2xl duration-300 animate-in fade-in slide-in-from-right-10',
+      )}
+    >
+      {!embedded && (
+        <div className="flex shrink-0 items-center justify-between border-b border-[var(--border)] bg-[var(--surface-1)] px-4 py-3.5">
+          <div className="flex items-center gap-3 overflow-hidden text-[var(--text-primary)]">
+            <div
+              className={cn(
+                'shrink-0 rounded-lg border border-[var(--border)] p-1.5 shadow-sm',
+                def?.style.bg,
+                def?.style.color,
+              )}
+            >
+              <Icon size={14} />
+            </div>
+            <div className="flex min-w-0 flex-col">
+              <h3 className="truncate text-sm font-bold leading-tight">
+                {nodeData.label || def?.label}
+              </h3>
+              <span className="text-xs font-bold uppercase tracking-widest text-[var(--text-muted)]">
+                {def?.label}
+              </span>
+            </div>
+          </div>
+          <Button
+            variant="ghost"
+            size="icon"
+            onClick={onClose}
+            className="h-7 w-7 text-[var(--text-disabled)] hover:bg-[var(--surface-2)] hover:text-[var(--text-secondary)]"
+            aria-label={t('workspace.closePanel', { defaultValue: 'Close panel' })}
+          >
+            <X size={16} />
+          </Button>
+        </div>
+      )}
+
+      <div className="custom-scrollbar flex-1 space-y-6 overflow-y-auto p-4 pb-12">
+        {validationErrors.length > 0 && (
+          <div className="space-y-2">
+            <Label className="text-xs font-bold uppercase tracking-wider text-[var(--status-error)]">
+              Configuration Errors
+            </Label>
+            <div className="space-y-1">
+              {validationErrors.map((error, idx) => (
+                <div
+                  key={idx}
+                  className="flex items-start gap-2 rounded border border-[var(--status-error-border)] bg-[var(--status-error-bg)] p-2 text-xs"
+                >
+                  <AlertCircle
+                    size={14}
+                    className="mt-0.5 flex-shrink-0 text-[var(--status-error)]"
+                  />
+                  <div className="text-[var(--status-error-strong)]">
+                    <div className="font-medium">{error.field}</div>
+                    <div className="text-[var(--status-error)]">{error.message}</div>
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+
+        {modelField && (
+          <SchemaFieldRenderer
+            key={modelField.key}
+            schema={modelField}
+            value={
+              config.provider_name
+                ? `${config.provider_name}:${config.model_name || ''}`
+                : config.model_name
+            }
+            onChange={(val) => updateConfig(modelField.key, val)}
+            canEdit={userPermissions.canEdit}
+            t={t}
+            onModelChange={updateModelConfig}
+            nodes={nodes}
+            edges={edges}
+            currentNodeId={node.id}
+            onCreateEdge={undefined}
+            graphStateFields={graphStateFields}
+          />
+        )}
+
+        {behaviorFields.length > 0 && (
+          <div className="space-y-4">
+            <SectionHeader
+              icon={MessageSquare}
+              title={t('workspace.behavior', { defaultValue: 'Behavior' })}
+            />
+            {behaviorFields
+              .filter((field) => shouldShowField(field, config))
+              .map((field) => (
+                <SchemaFieldRenderer
+                  key={field.key}
+                  schema={field}
+                  value={config[field.key]}
+                  onChange={(val) => updateConfig(field.key, val)}
+                  canEdit={userPermissions.canEdit}
+                  t={t}
+                  nodes={nodes}
+                  edges={edges}
+                  currentNodeId={node.id}
+                  onCreateEdge={undefined}
+                  graphStateFields={graphStateFields}
+                />
+              ))}
+          </div>
+        )}
+
+        {visibleDeepAgentSkillFields.length > 0 && (
+          <div className="space-y-4 border-l-2 border-[var(--brand-100)] pl-4 duration-300 animate-in slide-in-from-top-2">
+            {visibleDeepAgentSkillFields.map((field) => (
+              <SchemaFieldRenderer
+                key={field.key}
+                schema={field}
+                value={config[field.key]}
+                onChange={(val) => updateConfig(field.key, val)}
+                canEdit={userPermissions.canEdit}
+                t={t}
+                nodes={nodes}
+                edges={edges}
+                currentNodeId={node.id}
+                onCreateEdge={undefined}
+                graphStateFields={graphStateFields}
+              />
+            ))}
+          </div>
+        )}
+
+        {hasParentWithDeepAgents && descriptionField && (
+          <div className="space-y-1.5 border-l-2 border-[var(--brand-200)] pl-4 duration-300 animate-in slide-in-from-top-2">
+            <SchemaFieldRenderer
+              schema={{ ...descriptionField, required: true }}
+              value={config[descriptionField.key]}
+              onChange={(val) => updateConfig(descriptionField.key, val)}
+              canEdit={userPermissions.canEdit}
+              t={t}
+              nodes={nodes}
+              edges={edges}
+              currentNodeId={node.id}
+              onCreateEdge={undefined}
+              graphStateFields={graphStateFields}
+            />
+          </div>
+        )}
+
+        <FieldListSection
+          icon={Hammer}
+          title={t('workspace.capabilities')}
+          fields={toolsFields}
+          config={config}
+          updateConfig={updateConfig}
+          canEdit={userPermissions.canEdit}
+          t={t}
+          nodes={nodes}
+          edges={edges}
+          currentNodeId={node.id}
+          graphStateFields={graphStateFields}
+        />
+
+        <FieldListSection
+          icon={Sparkles}
+          title={t('workspace.skills', { defaultValue: 'Skills' })}
+          fields={skillsFields}
+          config={config}
+          updateConfig={updateConfig}
+          canEdit={userPermissions.canEdit}
+          t={t}
+          nodes={nodes}
+          edges={edges}
+          currentNodeId={node.id}
+          graphStateFields={graphStateFields}
+        />
+
+        <MemorySection
+          memoryFields={memoryFields}
+          config={config}
+          enableMemory={enableMemory}
+          updateConfig={updateConfig}
+          canEdit={userPermissions.canEdit}
+          nodes={nodes}
+          edges={edges}
+          currentNodeId={node.id}
+          graphStateFields={graphStateFields}
+          onMemoryModelChange={handleMemoryModelChange}
+        />
+      </div>
+
+      {!embedded && (
+        <div className="border-t border-[var(--border)] bg-[var(--surface-2)] px-4 py-1.5 font-mono text-[10px] uppercase tracking-wider text-[var(--text-muted)]">
+          {nodeData.type}
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/RunInputModal.tsx b/frontend/components/editors/graph-builder/components/RunInputModal.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/RunInputModal.tsx
rename to frontend/components/editors/graph-builder/components/RunInputModal.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/SchemaFieldRenderer.tsx b/frontend/components/editors/graph-builder/components/SchemaFieldRenderer.tsx
similarity index 93%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/SchemaFieldRenderer.tsx
rename to frontend/components/editors/graph-builder/components/SchemaFieldRenderer.tsx
index bb9354ccb..c23dda451 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/SchemaFieldRenderer.tsx
+++ b/frontend/components/editors/graph-builder/components/SchemaFieldRenderer.tsx
@@ -76,7 +76,9 @@ const SchemaFieldRenderer = React.memo(function SchemaFieldRenderer({
         <div
           className={cn(
             'flex cursor-pointer select-none items-center justify-between rounded-lg border p-2 transition-all',
-            value ? 'border-[var(--brand-200)] bg-[var(--brand-50)]' : 'border-[var(--border)] bg-[var(--surface-2)]',
+            value
+              ? 'border-[var(--brand-200)] bg-[var(--brand-50)]'
+              : 'border-[var(--border)] bg-[var(--surface-2)]',
           )}
           onClick={() => onChange(!value)}
         >
@@ -86,7 +88,9 @@ const SchemaFieldRenderer = React.memo(function SchemaFieldRenderer({
           <div
             className={cn(
               'relative h-4 w-7 rounded-full border transition-all',
-              value ? 'border-[var(--brand-600)] bg-[var(--brand-500)]' : 'border-[var(--border-strong)] bg-[var(--surface-3)]',
+              value
+                ? 'border-[var(--brand-600)] bg-[var(--brand-500)]'
+                : 'border-[var(--border-strong)] bg-[var(--surface-3)]',
             )}
           >
             <div
@@ -111,11 +115,7 @@ const SchemaFieldRenderer = React.memo(function SchemaFieldRenderer({
       break
     case 'textarea': {
       // Check if variable input support is needed (for expression fields)
-      const needsVariableSupport = [
-        'expression',
-        'prompt',
-        'template',
-      ].includes(schema.key)
+      const needsVariableSupport = ['expression', 'prompt', 'template'].includes(schema.key)
 
       if (needsVariableSupport && nodes && edges && currentNodeId) {
         input = (
@@ -219,7 +219,9 @@ const SchemaFieldRenderer = React.memo(function SchemaFieldRenderer({
       </Label>
       {input}
       {schema.description && (
-        <p className="text-xs italic leading-tight text-[var(--text-muted)]">{schema.description}</p>
+        <p className="text-xs italic leading-tight text-[var(--text-muted)]">
+          {schema.description}
+        </p>
       )}
     </div>
   )
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/SectionHeader.tsx b/frontend/components/editors/graph-builder/components/SectionHeader.tsx
similarity index 95%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/SectionHeader.tsx
rename to frontend/components/editors/graph-builder/components/SectionHeader.tsx
index ff4575766..490444d79 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/SectionHeader.tsx
+++ b/frontend/components/editors/graph-builder/components/SectionHeader.tsx
@@ -17,7 +17,9 @@ export const SectionHeader = ({
   <div className="mb-3 mt-2 flex items-center gap-2">
     <Icon size={14} className="text-[var(--text-muted)]" />
     <div className="flex items-center gap-1.5">
-      <h4 className="text-sm font-bold uppercase tracking-[0.1em] text-[var(--text-muted)]">{title}</h4>
+      <h4 className="text-sm font-bold uppercase tracking-[0.1em] text-[var(--text-muted)]">
+        {title}
+      </h4>
       {tooltip && (
         <TooltipProvider delayDuration={300}>
           <Tooltip>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/ThoughtContent.tsx b/frontend/components/editors/graph-builder/components/ThoughtContent.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/ThoughtContent.tsx
rename to frontend/components/editors/graph-builder/components/ThoughtContent.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/ToolCallCard.tsx b/frontend/components/editors/graph-builder/components/ToolCallCard.tsx
similarity index 96%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/ToolCallCard.tsx
rename to frontend/components/editors/graph-builder/components/ToolCallCard.tsx
index 777618160..6e23e959e 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/ToolCallCard.tsx
+++ b/frontend/components/editors/graph-builder/components/ToolCallCard.tsx
@@ -127,7 +127,9 @@ export function ToolCallCard({
             )}
             <div className="flex min-w-0 flex-1 items-center gap-1.5">
               {getStatusIcon()}
-              <span className="truncate text-sm font-semibold text-[var(--text-secondary)]">{step.title}</span>
+              <span className="truncate text-sm font-semibold text-[var(--text-secondary)]">
+                {step.title}
+              </span>
             </div>
           </div>
           <div className="flex shrink-0 items-center gap-2">
@@ -140,8 +142,10 @@ export function ToolCallCard({
             <div
               className={cn(
                 'rounded px-1.5 py-0.5 text-xs font-medium',
-                step.status === 'running' && 'bg-[color-mix(in_srgb,var(--brand-secondary)_10%,transparent)] text-[var(--brand-secondary)]',
-                step.status === 'success' && 'bg-[var(--status-success-bg)] text-[var(--status-success)]',
+                step.status === 'running' &&
+                  'bg-[color-mix(in_srgb,var(--brand-secondary)_10%,transparent)] text-[var(--brand-secondary)]',
+                step.status === 'success' &&
+                  'bg-[var(--status-success-bg)] text-[var(--status-success)]',
                 step.status === 'error' && 'bg-[var(--status-error-bg)] text-[var(--status-error)]',
                 step.status === 'pending' && 'bg-[var(--surface-3)] text-[var(--text-secondary)]',
               )}
diff --git a/frontend/components/editors/graph-builder/components/ZoomControls.tsx b/frontend/components/editors/graph-builder/components/ZoomControls.tsx
new file mode 100644
index 000000000..bf9b5be31
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/ZoomControls.tsx
@@ -0,0 +1,42 @@
+'use client'
+
+import { Maximize, Minus, Plus } from 'lucide-react'
+import { useReactFlow } from 'reactflow'
+
+import { Button } from '@/components/ui/button'
+
+export function ZoomControls() {
+  const { fitView, zoomIn, zoomOut } = useReactFlow()
+
+  return (
+    <div className="flex items-center gap-0.5">
+      <Button
+        variant="ghost"
+        size="sm"
+        className="h-6 w-6 p-0"
+        onClick={() => fitView({ duration: 300 })}
+        aria-label="Fit view"
+      >
+        <Maximize className="h-3 w-3" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="sm"
+        className="h-6 w-6 p-0"
+        onClick={() => zoomOut({ duration: 200 })}
+        aria-label="Zoom out"
+      >
+        <Minus className="h-3 w-3" />
+      </Button>
+      <Button
+        variant="ghost"
+        size="sm"
+        className="h-6 w-6 p-0"
+        onClick={() => zoomIn({ duration: 200 })}
+        aria-label="Zoom in"
+      >
+        <Plus className="h-3 w-3" />
+      </Button>
+    </div>
+  )
+}
diff --git a/frontend/components/editors/graph-builder/components/canvasContextMenuPosition.ts b/frontend/components/editors/graph-builder/components/canvasContextMenuPosition.ts
new file mode 100644
index 000000000..77dfeae07
--- /dev/null
+++ b/frontend/components/editors/graph-builder/components/canvasContextMenuPosition.ts
@@ -0,0 +1,9 @@
+type FlowPosition = { x: number; y: number }
+
+export function getContextMenuFlowPosition(
+  screenToFlowPosition: (position: FlowPosition) => FlowPosition,
+  clientX: number,
+  clientY: number,
+) {
+  return screenToFlowPosition({ x: clientX, y: clientY })
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CollapsibleList.tsx b/frontend/components/editors/graph-builder/components/copilot/CollapsibleList.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CollapsibleList.tsx
rename to frontend/components/editors/graph-builder/components/copilot/CollapsibleList.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotChat.tsx b/frontend/components/editors/graph-builder/components/copilot/CopilotChat.tsx
similarity index 98%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotChat.tsx
rename to frontend/components/editors/graph-builder/components/copilot/CopilotChat.tsx
index b77d04af2..2375058e9 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotChat.tsx
+++ b/frontend/components/editors/graph-builder/components/copilot/CopilotChat.tsx
@@ -57,7 +57,7 @@ export function CopilotChat({
   if (loadingHistory) {
     return (
       <div className="flex items-center justify-center py-4">
-      <span className="text-xs text-[var(--text-tertiary)]">{t('workspace.loadingHistory')}</span>
+        <span className="text-xs text-[var(--text-tertiary)]">{t('workspace.loadingHistory')}</span>
       </div>
     )
   }
@@ -92,7 +92,9 @@ export function CopilotChat({
                     size={16}
                     className="shrink-0 text-[var(--brand-600)] group-hover:text-[var(--brand-500)]"
                   />
-                  <span className="text-sm font-semibold text-[var(--text-primary)]">{t(bp.titleKey)}</span>
+                  <span className="text-sm font-semibold text-[var(--text-primary)]">
+                    {t(bp.titleKey)}
+                  </span>
                 </div>
                 <p className="line-clamp-2 text-xs text-[var(--text-tertiary)]">{t(bp.descKey)}</p>
               </button>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotInput.tsx b/frontend/components/editors/graph-builder/components/copilot/CopilotInput.tsx
similarity index 97%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotInput.tsx
rename to frontend/components/editors/graph-builder/components/copilot/CopilotInput.tsx
index 4b496b852..fca62587c 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotInput.tsx
+++ b/frontend/components/editors/graph-builder/components/copilot/CopilotInput.tsx
@@ -111,7 +111,9 @@ export function CopilotInput({
               disabled={loading || executingActions}
             >
               <SelectTrigger className="h-6 min-w-[6rem] max-w-[8rem] border-[var(--border)] px-2 py-0.5 text-xs text-[var(--text-secondary)]">
-                <SelectValue placeholder={t('workspace.selectModel', { defaultValue: 'Select model' })} />
+                <SelectValue
+                  placeholder={t('workspace.selectModel', { defaultValue: 'Select model' })}
+                />
               </SelectTrigger>
               <SelectContent>
                 {availableModels.map((m) => (
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotStreaming.tsx b/frontend/components/editors/graph-builder/components/copilot/CopilotStreaming.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotStreaming.tsx
rename to frontend/components/editors/graph-builder/components/copilot/CopilotStreaming.tsx
index 6df0c58d7..33f9b1f1b 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/copilot/CopilotStreaming.tsx
+++ b/frontend/components/editors/graph-builder/components/copilot/CopilotStreaming.tsx
@@ -82,7 +82,8 @@ export function CopilotStreaming({
               <span
                 className={`text-xs font-medium ${currentStage ? stageConfig[currentStage.stage]?.color || 'text-[var(--text-tertiary)]' : 'text-[var(--text-tertiary)]'}`}
               >
-                {(currentStage && stageConfig[currentStage.stage]?.label) || t('workspace.processing', { defaultValue: 'Processing...' })}
+                {(currentStage && stageConfig[currentStage.stage]?.label) ||
+                  t('workspace.processing', { defaultValue: 'Processing...' })}
               </span>
               <Loader2 size={12} className="animate-spin text-[var(--brand-500)]" />
             </div>
@@ -107,18 +108,25 @@ export function CopilotStreaming({
         {(streamingContent || currentToolCall) && (
           <div
             className={`overflow-hidden rounded-2xl rounded-bl-none border shadow-sm duration-200 animate-in fade-in ${
-              streamingContent ? 'border-[var(--border-muted)] bg-[var(--surface-elevated)]' : 'border-[var(--status-warning-border)] bg-[var(--status-warning-bg)]'
+              streamingContent
+                ? 'border-[var(--border-muted)] bg-[var(--surface-elevated)]'
+                : 'border-[var(--status-warning-border)] bg-[var(--status-warning-bg)]'
             }`}
           >
             {/* Tool call info - fixed at top, always visible */}
             {currentToolCall && (
               <div
                 className={`shrink-0 p-2.5 ${
-                  streamingContent ? 'border-b border-[color-mix(in_srgb,var(--status-warning-border)_50%,transparent)] bg-[var(--status-warning-bg)]' : ''
+                  streamingContent
+                    ? 'border-b border-[color-mix(in_srgb,var(--status-warning-border)_50%,transparent)] bg-[var(--status-warning-bg)]'
+                    : ''
                 }`}
               >
                 <div className="flex items-center gap-2">
-                  <Loader2 size={12} className="shrink-0 animate-spin text-[var(--status-warning)]" />
+                  <Loader2
+                    size={12}
+                    className="shrink-0 animate-spin text-[var(--status-warning)]"
+                  />
                   <span className="text-xs font-medium text-[var(--status-warning)]">
                     {t('workspace.callingTool') || 'Calling Tool'}:
                   </span>
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/fields/ModelSelectField.tsx b/frontend/components/editors/graph-builder/components/fields/ModelSelectField.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/fields/ModelSelectField.tsx
rename to frontend/components/editors/graph-builder/components/fields/ModelSelectField.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/fields/SkillsField.tsx b/frontend/components/editors/graph-builder/components/fields/SkillsField.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/fields/SkillsField.tsx
rename to frontend/components/editors/graph-builder/components/fields/SkillsField.tsx
index 1452e023b..db1b8e492 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/fields/SkillsField.tsx
+++ b/frontend/components/editors/graph-builder/components/fields/SkillsField.tsx
@@ -145,12 +145,16 @@ export function SkillsField({ value, onChange }: SkillsFieldProps) {
                   <div className="flex items-center gap-1.5">
                     <Sparkles
                       size={11}
-                      className={isSelected ? 'text-[var(--skill-brand)]' : 'text-[var(--text-subtle)]'}
+                      className={
+                        isSelected ? 'text-[var(--skill-brand)]' : 'text-[var(--text-subtle)]'
+                      }
                     />
                     <span
                       className={cn(
                         'truncate text-xs font-medium',
-                        isSelected ? 'text-[var(--skill-brand-700)]' : 'text-[var(--text-secondary)]',
+                        isSelected
+                          ? 'text-[var(--skill-brand-700)]'
+                          : 'text-[var(--text-secondary)]',
                       )}
                     >
                       {skill.name}
@@ -173,7 +177,9 @@ export function SkillsField({ value, onChange }: SkillsFieldProps) {
                         </span>
                       ))}
                       {skill.tags.length > 3 && (
-                        <span className="text-2xs text-[var(--text-muted)]">+{skill.tags.length - 3}</span>
+                        <span className="text-2xs text-[var(--text-muted)]">
+                          +{skill.tags.length - 3}
+                        </span>
                       )}
                     </div>
                   )}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/fields/ToolsField.tsx b/frontend/components/editors/graph-builder/components/fields/ToolsField.tsx
similarity index 98%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/fields/ToolsField.tsx
rename to frontend/components/editors/graph-builder/components/fields/ToolsField.tsx
index 546b944d4..ee4408e88 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/fields/ToolsField.tsx
+++ b/frontend/components/editors/graph-builder/components/fields/ToolsField.tsx
@@ -3,7 +3,6 @@
 import { Loader2, Check, Search, X, Hammer, Server } from 'lucide-react'
 import { useState, useMemo } from 'react'
 
-
 import { Badge } from '@/components/ui/badge'
 import { Input } from '@/components/ui/input'
 import { useBuiltinTools } from '@/hooks/queries/tools'
@@ -211,7 +210,9 @@ export function ToolsField({ value, onChange }: ToolsFieldProps) {
                     ) : (
                       <Server
                         size={11}
-                        className={isSelected ? 'text-[var(--brand-500)]' : 'text-[var(--text-subtle)]'}
+                        className={
+                          isSelected ? 'text-[var(--brand-500)]' : 'text-[var(--text-subtle)]'
+                        }
                       />
                     )}
                     <span
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/error-boundary/error-boundary.tsx b/frontend/components/editors/graph-builder/error-boundary/error-boundary.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/error-boundary/error-boundary.tsx
rename to frontend/components/editors/graph-builder/error-boundary/error-boundary.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/error-boundary/index.ts b/frontend/components/editors/graph-builder/error-boundary/index.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/error-boundary/index.ts
rename to frontend/components/editors/graph-builder/error-boundary/index.ts
diff --git a/frontend/components/editors/graph-builder/hooks/useCopilotActions.ts b/frontend/components/editors/graph-builder/hooks/useCopilotActions.ts
new file mode 100644
index 000000000..296fb6151
--- /dev/null
+++ b/frontend/components/editors/graph-builder/hooks/useCopilotActions.ts
@@ -0,0 +1,198 @@
+import { useCallback } from 'react'
+
+import { ApiError } from '@/lib/api-client'
+import { useTranslation } from '@/lib/i18n'
+import { agentRunService } from '@/services/agentRunService'
+import { draftCopilotService } from '@/services/draftCopilotService'
+
+import { useGraphStore } from '../stores/graphStore'
+
+import type { CopilotState, CopilotActions, CopilotRefs } from './useCopilotState'
+
+export type CopilotMode = 'standard' | 'deepagents'
+
+interface UseCopilotActionsOptions {
+  state: CopilotState
+  actions: CopilotActions
+  refs: CopilotRefs
+  copilotMode?: CopilotMode
+  selectedProviderName?: string
+  selectedModelName?: string
+}
+
+export function useCopilotActions({
+  state,
+  actions,
+  refs,
+  copilotMode = 'deepagents',
+  selectedProviderName,
+  selectedModelName,
+}: UseCopilotActionsOptions) {
+  const { t } = useTranslation()
+  const { getGraphContext } = useGraphStore()
+
+  const handleSendWithInput = useCallback(
+    async (userText: string) => {
+      if (!userText.trim() || state.loading || !refs.isMountedRef.current) return
+
+      actions.setInput('')
+      actions.addMessage({ role: 'user', text: userText })
+
+      if (!refs.isMountedRef.current) return
+      actions.setLoading(true)
+      actions.clearStreaming()
+
+      // Follow-up to active execution
+      if (state.currentExecutionId) {
+        try {
+          await agentRunService.sendMessage(state.currentExecutionId, userText)
+        } catch (e) {
+          console.error('[CopilotPanel] Failed to send follow-up:', e)
+          if (refs.isMountedRef.current) {
+            actions.setLoading(false)
+            actions.finalizeCurrentMessage(t('workspace.systemError'))
+          }
+        }
+        return
+      }
+
+      // eslint-disable-next-line react-hooks/immutability
+      refs.isCreatingSessionRef.current = true
+      actions.clearSession()
+
+      const graphContext = getGraphContext()
+      const storeState = useGraphStore.getState()
+      const storeGraphId = storeState.graphId
+      const storeAgentId = storeState.agentId
+      const storeVersionId = storeState.versionId
+      const storeWorkspaceId = storeState.workspaceId
+
+      if (!storeGraphId || !storeAgentId || !storeVersionId || !storeWorkspaceId) {
+        console.error('[CopilotPanel] Missing graph, agent, version, or workspace in store')
+        if (refs.isMountedRef.current) {
+          actions.setLoading(false)
+          actions.finalizeCurrentMessage(
+            `${t('workspace.systemError')}: ${t('workspace.couldNotProcessRequest')}`,
+          )
+        }
+        return
+      }
+
+      try {
+        actions.setCurrentStage({ stage: 'thinking', message: 'Connecting...' })
+        actions.setThinkingMessage()
+
+        const { run_id, execution_id } = await draftCopilotService.dispatchRun({
+          agentId: storeAgentId,
+          versionId: storeVersionId,
+          workspaceId: storeWorkspaceId,
+          prompt: userText,
+          graphContext,
+          conversationHistory: state.messages,
+          mode: copilotMode,
+          providerName: selectedProviderName,
+          modelName: selectedModelName,
+        })
+
+        if (!refs.isMountedRef.current) return
+
+        // Bridge auto-subscribes to /ws/executions when executionId is set
+        actions.setSession(run_id, execution_id)
+        // eslint-disable-next-line react-hooks/immutability
+        refs.isCreatingSessionRef.current = false
+      } catch (e: unknown) {
+        console.error('[DraftCopilotPanel] Failed to dispatch copilot run:', e)
+
+        if (!refs.isMountedRef.current) return
+
+        actions.setLoading(false)
+        actions.clearStreaming()
+
+        let errorMessage = t('workspace.couldNotProcessRequest')
+
+        if (e instanceof ApiError) {
+          if (e.status === 401 || e.status === 403) {
+            errorMessage = t('workspace.copilotError.auth', {
+              defaultValue: 'Authentication error. Please check your credentials.',
+            })
+          } else if (e.code === 'NETWORK_ERROR' || e.code === 'REQUEST_TIMEOUT') {
+            errorMessage = t('workspace.copilotError.network', {
+              defaultValue: 'Network error. Please check your connection and try again.',
+            })
+          } else if (e.message) {
+            errorMessage = e.message
+          }
+        }
+
+        actions.finalizeCurrentMessage(`${t('workspace.systemError')}: ${errorMessage}`)
+        refs.isCreatingSessionRef.current = false
+        actions.clearSession()
+      }
+    },
+    [
+      state.loading,
+      state.messages,
+      state.currentExecutionId,
+      actions,
+      refs,
+      copilotMode,
+      selectedProviderName,
+      selectedModelName,
+      getGraphContext,
+      t,
+    ],
+  )
+
+  const handleSend = useCallback(async () => {
+    if (!state.input.trim() || state.loading) return
+    await handleSendWithInput(state.input.trim())
+  }, [state.input, state.loading, handleSendWithInput])
+
+  const handleStop = useCallback(async () => {
+    if (state.currentRunId) {
+      try {
+        await agentRunService.cancel(state.currentRunId)
+      } catch (e) {
+        console.warn('[Copilot] Failed to cancel run:', e)
+      }
+    }
+
+    actions.clearSession()
+
+    if (!refs.isMountedRef.current) return
+    actions.setLoading(false)
+    actions.clearStreaming()
+
+    // eslint-disable-next-line react-hooks/immutability
+    refs.isCreatingSessionRef.current = false
+    actions.removeCurrentMessage()
+    actions.addMessage({ role: 'model', text: t('workspace.requestCancelled') })
+  }, [state.currentRunId, actions, refs, t])
+
+  const handleReset = useCallback(async () => {
+    actions.clearSession()
+
+    if (!refs.isMountedRef.current) return
+    actions.clearMessages()
+    actions.setInput('')
+    actions.setLoading(false)
+    actions.clearStreaming()
+    actions.clearExpandedItems()
+    // eslint-disable-next-line react-hooks/immutability
+    refs.hasProcessedUrlInputRef.current = false
+  }, [actions, refs])
+
+  const handleAIDecision = useCallback(() => {
+    if (!state.loading) {
+      handleSendWithInput(t('workspace.aiDecisionPrompt'))
+    }
+  }, [state.loading, handleSendWithInput, t])
+
+  return {
+    handleSend,
+    handleSendWithInput,
+    handleStop,
+    handleReset,
+    handleAIDecision,
+  }
+}
diff --git a/frontend/components/editors/graph-builder/hooks/useCopilotEffects.ts b/frontend/components/editors/graph-builder/hooks/useCopilotEffects.ts
new file mode 100644
index 000000000..8e1be36a9
--- /dev/null
+++ b/frontend/components/editors/graph-builder/hooks/useCopilotEffects.ts
@@ -0,0 +1,198 @@
+import { useSearchParams, useRouter } from 'next/navigation'
+import { useEffect, useRef } from 'react'
+
+import { useToast } from '@/hooks/use-toast'
+import { createLogger } from '@/lib/logs/console/logger'
+import { agentRunService } from '@/services/agentRunService'
+
+import { useGraphStore } from '../stores/graphStore'
+
+import type { CopilotState, CopilotActions, CopilotRefs } from './useCopilotState'
+
+const logger = createLogger('DraftCopilotEffects')
+
+interface CopilotSearchParams {
+  get: (name: string) => string | null
+}
+
+export function getCopilotInputFromSearchParams(searchParams: CopilotSearchParams): string | null {
+  return searchParams.get('copilotInput')
+}
+
+interface UseCopilotEffectsOptions {
+  state: CopilotState
+  actions: CopilotActions
+  refs: CopilotRefs
+  handleSendWithInput: (input: string) => Promise<void>
+}
+
+export function useCopilotEffects({
+  state,
+  actions,
+  refs,
+  handleSendWithInput,
+}: UseCopilotEffectsOptions) {
+  const searchParams = useSearchParams()
+  const router = useRouter()
+  const { toast } = useToast()
+  const lastRestoredSessionIdRef = useRef<string | null>(null)
+
+  useEffect(() => {
+    const currentRunId = state.currentRunId
+    if (
+      !currentRunId ||
+      refs.isCreatingSessionRef.current ||
+      lastRestoredSessionIdRef.current === currentRunId
+    )
+      return
+
+    const restoreSession = async () => {
+      logger.debug('Restoring from run:', currentRunId)
+      lastRestoredSessionIdRef.current = currentRunId
+
+      try {
+        actions.setLoading(true)
+        const run = await agentRunService.get(currentRunId)
+        if (!refs.isMountedRef.current) return
+
+        if (run.status === 'running' || run.status === 'pending') {
+          // Set executionId — the bridge (useCopilotExecutionBridge) automatically
+          // subscribes via /ws/executions, receives snapshot + replay + live events
+          if (run.current_execution_id) {
+            actions.setSession(currentRunId, run.current_execution_id)
+          }
+          actions.setCurrentStage({ stage: 'processing', message: 'Reconnecting...' })
+        } else if (run.status === 'succeeded') {
+          actions.clearSession()
+          actions.setLoading(false)
+        } else if (run.status === 'failed') {
+          toast({
+            title: 'Build Copilot task failed',
+            description: run.result_summary || 'An error occurred during execution. Please retry.',
+            variant: 'destructive',
+          })
+          actions.clearSession()
+          actions.setLoading(false)
+        } else {
+          actions.clearSession()
+          actions.setLoading(false)
+        }
+      } catch (error) {
+        logger.warn('Failed to restore session:', error)
+        if (refs.isMountedRef.current) {
+          actions.clearSession()
+          actions.setLoading(false)
+        }
+      }
+    }
+
+    restoreSession()
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [state.currentRunId, actions, refs])
+
+  // Reconnect to active run on mount when localStorage is empty.
+  // Delayed so useCopilotSession's localStorage read settles first — otherwise
+  // this effect and the restore effect race on an empty state.
+  useEffect(() => {
+    if (state.currentRunId || refs.isCreatingSessionRef.current) return
+
+    const { agentId, workspaceId } = useGraphStore.getState()
+    if (!agentId || !workspaceId) return
+
+    const timer = setTimeout(() => {
+      if (lastRestoredSessionIdRef.current || !refs.isMountedRef.current) return
+
+      agentRunService
+        .list({
+          agent_id: agentId,
+          workspace_id: workspaceId,
+          trigger_medium: 'ui',
+          run_purpose: 'internal_builder',
+          status: 'running',
+        })
+        .then((runs) => {
+          if (!refs.isMountedRef.current || runs.length === 0) return
+          if (lastRestoredSessionIdRef.current) return
+          const activeRun = runs[0]
+          if (activeRun.current_execution_id) {
+            actions.setSession(activeRun.id, activeRun.current_execution_id)
+          }
+        })
+        .catch((err) => {
+          logger.debug('Failed to check for active draft copilot run:', err)
+        })
+    }, 50)
+
+    return () => clearTimeout(timer)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  // Update page title to show loading status
+  useEffect(() => {
+    const baseTitle = 'Agent Platform'
+    document.title =
+      state.loading && state.currentStage
+        ? `⏳ ${state.currentStage.message} - ${baseTitle}`
+        : baseTitle
+  }, [state.loading, state.currentStage])
+
+  // Auto-scroll to bottom when content changes
+  useEffect(() => {
+    const scrollEl = refs.scrollRef.current
+    if (!scrollEl) return
+
+    const contentSignature = `${state.messages.length}-${state.streamingContent.length}-${state.loading}`
+    if (contentSignature === refs.lastScrollContentRef.current) return
+    refs.lastScrollContentRef.current = contentSignature
+
+    requestAnimationFrame(() => {
+      if (!refs.isMountedRef.current || !scrollEl) return
+      scrollEl.scrollTo({
+        top: scrollEl.scrollHeight,
+        behavior: state.streamingContent ? 'smooth' : 'auto',
+      })
+      if (refs.streamingContentRef.current) {
+        refs.streamingContentRef.current.scrollTo({
+          top: refs.streamingContentRef.current.scrollHeight,
+          behavior: 'smooth',
+        })
+      }
+    })
+  }, [state.messages, state.loading, state.streamingContent, refs])
+
+  // Warn user before leaving page during generation
+  useEffect(() => {
+    const handleBeforeUnload = (e: BeforeUnloadEvent) => {
+      if (state.loading || state.executingActions) {
+        e.preventDefault()
+        e.returnValue = ''
+        return ''
+      }
+    }
+    window.addEventListener('beforeunload', handleBeforeUnload)
+    return () => window.removeEventListener('beforeunload', handleBeforeUnload)
+  }, [state.loading, state.executingActions])
+
+  // Handle URL parameter for auto-executing copilot input
+  useEffect(() => {
+    const copilotInput = getCopilotInputFromSearchParams(searchParams)
+    if (!copilotInput || refs.hasProcessedUrlInputRef.current || state.loading) return
+
+    refs.hasProcessedUrlInputRef.current = true
+    const params = new URLSearchParams(searchParams.toString())
+    params.delete('copilotInput')
+    const newSearch = params.toString()
+    router.replace(
+      newSearch ? `${window.location.pathname}?${newSearch}` : window.location.pathname,
+      { scroll: false },
+    )
+
+    setTimeout(() => {
+      if (!refs.isMountedRef.current) return
+      actions.setInput(copilotInput)
+      setTimeout(() => {
+        if (refs.isMountedRef.current) handleSendWithInput(copilotInput)
+      }, 100)
+    }, 300)
+  }, [searchParams, state.loading, router, actions, refs, handleSendWithInput])
+}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotState.ts b/frontend/components/editors/graph-builder/hooks/useCopilotState.ts
similarity index 95%
rename from frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotState.ts
rename to frontend/components/editors/graph-builder/hooks/useCopilotState.ts
index 42635dfdc..01bbd94b0 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotState.ts
+++ b/frontend/components/editors/graph-builder/hooks/useCopilotState.ts
@@ -1,5 +1,5 @@
 /**
- * useCopilotState - Unified state management hook for Copilot
+ * useCopilotState - Unified state management hook for Build Copilot
  *
  * Aggregates four sub-hooks (messages, streaming, actionExecutor, session) into:
  * - state: readonly snapshot (messages, streaming, session, local UI)
@@ -34,8 +34,9 @@ export interface CopilotState {
   // Action execution state
   executingActions: boolean
 
-  // Session state (run_id via Run Center)
+  // Session state (run_id + execution_id via execution engine)
   currentRunId: string | null
+  currentExecutionId: string | null
 
   // Local UI state
   input: string
@@ -70,7 +71,7 @@ export interface CopilotActions {
   executeActions: (actions: any[]) => Promise<void>
 
   // Session actions
-  setSession: (sessionId: string) => void
+  setSession: (runId: string, executionId?: string | null) => void
   clearSession: () => void
 
   // Local UI actions
@@ -160,6 +161,7 @@ export function useCopilotState(graphId?: string) {
       expandedToolTypes: streamingHook.expandedToolTypes,
       executingActions: actionExecutorHook.executingActions,
       currentRunId: sessionHook.currentRunId,
+      currentExecutionId: sessionHook.currentExecutionId,
       input,
       loading,
       expandedItems,
@@ -175,6 +177,7 @@ export function useCopilotState(graphId?: string) {
       streamingHook.expandedToolTypes,
       actionExecutorHook.executingActions,
       sessionHook.currentRunId,
+      sessionHook.currentExecutionId,
       input,
       loading,
       expandedItems,
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotWebSocketHandler.ts b/frontend/components/editors/graph-builder/hooks/useCopilotWebSocketHandler.ts
similarity index 55%
rename from frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotWebSocketHandler.ts
rename to frontend/components/editors/graph-builder/hooks/useCopilotWebSocketHandler.ts
index edbb8fb55..ea4dea80f 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/hooks/useCopilotWebSocketHandler.ts
+++ b/frontend/components/editors/graph-builder/hooks/useCopilotWebSocketHandler.ts
@@ -1,25 +1,23 @@
 /**
- * useCopilotWebSocketHandler - WebSocket event handler hook for Copilot
+ * useCopilotWebSocketHandler - WebSocket event handler hook for Build Copilot
  *
  * Architecture: Backend is the single writer for graph state. On "result" we only
  * do optimistic render (applyAIChanges, no save). On "done" we invalidate caches
  * and clear session. The callback system ensures onResult
  * completes before onDone runs.
- *
- * The handleCopilotEvent bridge receives ChatStreamEvent from the shared chat WS
- * and dispatches to the existing callback system (onStatus, onContent, etc.).
  */
 
 import { useQueryClient } from '@tanstack/react-query'
-import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 
 import type { StageType } from '@/hooks/copilot/useCopilotStreaming'
-import { graphKeys } from '@/hooks/queries/graphs'
+import { versionKeys } from '@/hooks/queries/agentVersions'
 import { useTranslation } from '@/lib/i18n'
-import type { ChatStreamEvent } from '@/services/chatBackend'
+import type { AppErrorPayload } from '@/types/agent-run'
 import type { GraphAction } from '@/types/copilot'
 
 import { hasCurrentMessage } from '../utils/copilotUtils'
+import { useGraphStore } from '../stores/graphStore'
 
 import type { CopilotState, CopilotActions, CopilotRefs } from './useCopilotState'
 
@@ -101,33 +99,40 @@ export function useCopilotWebSocketHandler({
         }
       },
 
-      onError: (error: string, code?: string) => {
+      onError: (error: AppErrorPayload) => {
         if (!refs.isMountedRef.current) return
         try {
           actions.clearStreaming()
-          let errorMessage = error
-          if (code === 'MODEL_NO_CREDENTIALS') {
-            errorMessage = t('workspace.copilot.error.credentialNotConfigured', {
+          let errorMessage = error.message
+          if (error.code === 'MODEL_NO_CREDENTIALS') {
+            errorMessage = t('workspace.copilotError.credentialNotConfigured', {
               defaultValue: 'No model configured. Please set up your LLM credentials in settings.',
             })
-          } else if (code === 'MODEL_NOT_FOUND') {
-            errorMessage = t('workspace.copilot.error.modelNotFound', {
+          } else if (error.code === 'BUILD_COPILOT_MODEL_REQUIRED') {
+            errorMessage = t('workspace.copilotError.buildCopilotModelRequired', {
+              defaultValue: 'Build Copilot has no model configured. Select a model and try again.',
+            })
+          } else if (error.code === 'MODEL_NOT_FOUND') {
+            errorMessage = t('workspace.copilotError.modelNotFound', {
               defaultValue: 'Model not found. Please check your model configuration.',
             })
-          } else if (code === 'MODEL_NAME_REQUIRED') {
-            errorMessage = t('workspace.copilot.error.modelNameRequired', {
+          } else if (error.code === 'MODEL_NAME_REQUIRED') {
+            errorMessage = t('workspace.copilotError.modelNameRequired', {
               defaultValue: 'No model selected. Please select a model first.',
             })
-          } else if (code === 'CREDENTIAL_ERROR') {
-            errorMessage = t('workspace.copilot.error.credential', {
+          } else if (error.code === 'CREDENTIAL_ERROR') {
+            errorMessage = t('workspace.copilotError.credential', {
               defaultValue: 'Authentication error. Please check API credentials.',
             })
-          } else if (error.includes('Connection') || error.includes('WebSocket')) {
-            errorMessage = t('workspace.copilot.error.connection', {
+          } else if (
+            error.code === 'WEBSOCKET_CONNECTION_FAILED' ||
+            error.code === 'WEBSOCKET_UNAVAILABLE'
+          ) {
+            errorMessage = t('workspace.copilotError.connection', {
               defaultValue: 'Connection error. Please check your network.',
             })
           } else {
-            errorMessage = `${t('workspace.systemError')}: ${error}`
+            errorMessage = `${t('workspace.systemError')}: ${error.message}`
           }
           actions.finalizeCurrentMessage(errorMessage)
         } finally {
@@ -143,9 +148,12 @@ export function useCopilotWebSocketHandler({
         if (!refs.isMountedRef.current) return
         refs.isCreatingSessionRef.current = false
         if (graphId) {
-          // Invalidate to allow AgentBuilder/useGraphState to refetch authoritative backend state
-          queryClient.invalidateQueries({ queryKey: graphKeys.state(graphId) })
-          queryClient.invalidateQueries({ queryKey: graphKeys.copilotHistory(graphId) })
+          const { versionId, workspaceId } = useGraphStore.getState()
+          if (versionId && workspaceId) {
+            queryClient.invalidateQueries({
+              queryKey: versionKeys.graphState(graphId, versionId, workspaceId),
+            })
+          }
         }
         actions.clearStreaming()
         actions.clearSession()
@@ -155,71 +163,5 @@ export function useCopilotWebSocketHandler({
     [actions, refs, graphId, queryClient, t],
   )
 
-  /**
-   * Bridge: receives ChatStreamEvent from the shared chat WS onEvent callback
-   * and dispatches to the existing copilot callback system.
-   *
-   * The copilot backend emits events through the standard envelope format.
-   * Copilot-specific event types (thought_step, tool_call, tool_result, result)
-   * are carried in evt.data.type when the envelope type is generic, or may
-   * use the envelope type directly.
-   */
-  const handleCopilotEvent = useCallback(
-    (evt: ChatStreamEvent) => {
-      const data = evt.data as Record<string, unknown> | undefined
-      if (!data) return
-
-      // Check for copilot-specific type in data, fall back to envelope type
-      const type = (data.type as string | undefined) || evt.type
-      if (!type) return
-
-      switch (type) {
-        case 'status':
-          callbacks.onStatus(
-            (data.stage as string) ?? evt.type,
-            (data.message as string) ?? '',
-          )
-          break
-        case 'content':
-          callbacks.onContent((data.content as string) ?? '')
-          break
-        case 'thought_step':
-          callbacks.onThoughtStep?.(data.step as { index: number; content: string })
-          break
-        case 'tool_call':
-          callbacks.onToolCall(
-            data.tool as string,
-            data.input as Record<string, unknown>,
-          )
-          break
-        case 'tool_result':
-          callbacks.onToolResult(
-            data.action as {
-              type: string
-              payload: Record<string, unknown>
-              reasoning?: string
-            },
-          )
-          break
-        case 'result':
-          callbacks.onResult?.({
-            message: (data.message as string) ?? '',
-            actions: data.actions as GraphAction[] | undefined,
-          })
-          break
-        case 'error':
-          callbacks.onError(
-            (data.message as string) ?? 'Unknown error',
-            data.code as string | undefined,
-          )
-          break
-        case 'done':
-          callbacks.onDone?.()
-          break
-      }
-    },
-    [callbacks],
-  )
-
-  return { ...callbacks, handleCopilotEvent }
+  return callbacks
 }
diff --git a/frontend/components/editors/graph-builder/hooks/useDeploymentHistory.ts b/frontend/components/editors/graph-builder/hooks/useDeploymentHistory.ts
new file mode 100644
index 000000000..72cab3a23
--- /dev/null
+++ b/frontend/components/editors/graph-builder/hooks/useDeploymentHistory.ts
@@ -0,0 +1,446 @@
+'use client'
+
+import { useQuery } from '@tanstack/react-query'
+import { useEffect, useState, useCallback, useMemo } from 'react'
+
+import { useToast } from '@/hooks/use-toast'
+import { useTranslation } from '@/lib/i18n'
+import { agentVersionService } from '@/services/agentVersionService'
+
+import { agentPublishService } from '@/services/agentPublishService'
+import {
+  publishKeys,
+  useRollbackAgent,
+  useRetireRelease,
+  useUnpublishAgent,
+} from '@/hooks/queries/agentPublish'
+import { STALE_TIME } from '@/hooks/queries/constants'
+import { useGraphStore } from '../stores/graphStore'
+
+export interface GraphDeploymentVersion {
+  id?: string
+  version: number
+  name?: string
+  created_at: string
+  createdAt?: string
+  is_current?: boolean
+  isActive?: boolean
+  createdBy?: string
+  createdByName?: string
+  /** The underlying release id (used for activate/retire calls). */
+  releaseId?: string
+  /** The underlying agent version id (used for preview). */
+  agentVersionId?: string
+}
+
+export interface GraphDeploymentStatus {
+  is_deployed: boolean
+  version?: number
+  deployed_at?: string
+}
+
+export interface GraphVersionState {
+  nodes: Array<{
+    id: string
+    type: string
+    position: { x: number; y: number }
+    data: Record<string, unknown>
+  }>
+  edges: Array<{ id: string; source: string; target: string }>
+}
+
+type PreviewMode = 'current' | 'selected'
+
+export function useDeploymentHistory(
+  _graphId: string,
+  open: boolean,
+  onOpenChange: (open: boolean) => void,
+) {
+  const { t } = useTranslation()
+  const { toast } = useToast()
+  const agentId = useGraphStore((state) => state.agentId)
+  const workspaceId = useGraphStore((state) => state.workspaceId)
+  const rfInstance = useGraphStore((state) => state.rfInstance)
+  const currentNodes = useGraphStore((state) => state.nodes)
+  const currentEdges = useGraphStore((state) => state.edges)
+
+  // ── List loading ──────────────────────────────────────────────────────────
+
+  const releasesQuery = useQuery({
+    queryKey: publishKeys.list(agentId ?? '', workspaceId ?? ''),
+    queryFn: () => agentPublishService.list(agentId!, workspaceId!),
+    enabled: open && !!agentId && !!workspaceId,
+    staleTime: STALE_TIME.STANDARD,
+  })
+
+  // Map DeploymentVersion[] → GraphDeploymentVersion[]
+  // We store the releaseId (the release's own id) in `releaseId` so mutation
+  // handlers can call activate/retire without a second lookup.
+  // We also propagate agent_version_id from the raw AgentRelease objects if available.
+  const rawReleases = releasesQuery.data ?? []
+
+  const versions: GraphDeploymentVersion[] = useMemo(
+    () =>
+      rawReleases.map((r) => ({
+        id: r.id,
+        releaseId: r.id,
+        version: r.release_number,
+        name: undefined,
+        created_at: r.published_at ?? '',
+        createdAt: r.published_at ?? '',
+        isActive: r.status === 'active',
+        is_current: r.status === 'active',
+        agentVersionId: r.agent_version_id,
+      })),
+    [rawReleases],
+  )
+
+  const isLoadingVersions = releasesQuery.isLoading
+
+  // Pagination: frontend pagination over the full list
+  const [currentPage, setCurrentPage] = useState(1)
+  const pageSize = 10
+  const totalVersions = versions.length
+  const totalPages = Math.max(1, Math.ceil(totalVersions / pageSize))
+  const pagedVersions = versions.slice((currentPage - 1) * pageSize, currentPage * pageSize)
+
+  // Deployment status derived from releases (any release in 'ready' state = deployed)
+  const deploymentStatus: GraphDeploymentStatus | undefined = useMemo(() => {
+    if (!releasesQuery.isFetched) return undefined
+    const activeRelease = versions.find((v) => v.isActive)
+    return {
+      is_deployed: !!activeRelease,
+      version: activeRelease?.version,
+      deployed_at: activeRelease?.createdAt ?? activeRelease?.created_at,
+    }
+  }, [releasesQuery.isFetched, versions])
+
+  // ── Preview state ─────────────────────────────────────────────────────────
+
+  const [selectedVersion, setSelectedVersion] = useState<number | null>(null)
+  const [previewMode, setPreviewMode] = useState<PreviewMode>('current')
+  const [isLoadingPreview, setIsLoadingPreview] = useState(false)
+  const [versionCache, setVersionCache] = useState<Record<number, GraphVersionState>>({})
+
+  const currentState: GraphVersionState = useMemo(
+    () => ({
+      nodes: currentNodes.map((node) => ({
+        id: node.id,
+        type: node.type || 'custom',
+        position: node.position,
+        data: node.data as Record<string, unknown>,
+      })),
+      edges: currentEdges.map((edge) => ({
+        id: edge.id,
+        source: edge.source,
+        target: edge.target,
+      })),
+    }),
+    [currentNodes, currentEdges],
+  )
+
+  const cachedSelectedState =
+    selectedVersion !== null ? (versionCache[selectedVersion] ?? null) : null
+
+  const fetchVersionState = useCallback(
+    async (version: number) => {
+      if (!agentId || !workspaceId) return
+      if (versionCache[version]) return
+
+      // Find the corresponding release to get its agent_version_id
+      const release = rawReleases.find((r) => r.release_number === version)
+      if (!release) return
+
+      setIsLoadingPreview(true)
+      try {
+        // Use agent_version_id from the release when available; otherwise fall
+        // back to a heuristic lookup via the version list.
+        let versionId = release.agent_version_id
+        if (!versionId) {
+          const agentVersions = await agentVersionService.list(agentId, workspaceId)
+          const sorted = [...agentVersions].sort((a, b) => a.version_number - b.version_number)
+          const agentVersion = sorted[version - 1] ?? sorted[sorted.length - 1]
+          if (!agentVersion) return
+          versionId = agentVersion.id
+        }
+
+        const fullVersion = await agentVersionService.get(agentId, versionId, workspaceId)
+        const payload = fullVersion.definition_payload as {
+          nodes?: GraphVersionState['nodes']
+          edges?: GraphVersionState['edges']
+        }
+        const state: GraphVersionState = {
+          nodes: payload.nodes ?? [],
+          edges: payload.edges ?? [],
+        }
+        setVersionCache((prev) => ({ ...prev, [version]: state }))
+      } catch (error) {
+        console.error('Failed to fetch version state:', error)
+      } finally {
+        setIsLoadingPreview(false)
+      }
+    },
+    [agentId, workspaceId, versionCache, rawReleases],
+  )
+
+  useEffect(() => {
+    if (selectedVersion !== null) {
+      fetchVersionState(selectedVersion)
+      setPreviewMode('selected')
+    } else {
+      setPreviewMode('current')
+    }
+  }, [selectedVersion, fetchVersionState])
+
+  useEffect(() => {
+    if (open) {
+      setCurrentPage(1)
+      setSelectedVersion(null)
+      setPreviewMode('current')
+    } else {
+      setVersionCache({})
+      setSelectedVersion(null)
+      setPreviewMode('current')
+    }
+  }, [open])
+
+  const previewState =
+    previewMode === 'selected' && cachedSelectedState ? cachedSelectedState : currentState
+
+  const selectedVersionInfo = pagedVersions.find((v) => v.version === selectedVersion)
+  const showToggle = selectedVersion !== null
+
+  // ── UI state ──────────────────────────────────────────────────────────────
+
+  const [revertConfirmOpen, setRevertConfirmOpen] = useState(false)
+  const [versionToRevert, setVersionToRevert] = useState<number | null>(null)
+
+  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false)
+  const [versionToDelete, setVersionToDelete] = useState<number | null>(null)
+
+  const [undeployConfirmOpen, setUndeployConfirmOpen] = useState(false)
+
+  // ── Mutations ─────────────────────────────────────────────────────────────
+
+  const rollbackMutation = useRollbackAgent()
+  const retireMutation = useRetireRelease()
+  const unpublishMutation = useUnpublishAgent()
+
+  // ── Handlers ──────────────────────────────────────────────────────────────
+
+  const handleSelectVersion = useCallback((version: number) => {
+    setSelectedVersion((prev) => (prev === version ? null : version))
+  }, [])
+
+  const handlePageChange = useCallback(
+    (page: number) => {
+      if (page >= 1 && page <= totalPages) {
+        setCurrentPage(page)
+      }
+    },
+    [totalPages],
+  )
+
+  const handleRevertClick = (version: number) => {
+    setVersionToRevert(version)
+    setRevertConfirmOpen(true)
+  }
+
+  const handleDeleteClick = (version: number) => {
+    setVersionToDelete(version)
+    setDeleteConfirmOpen(true)
+  }
+
+  const handleConfirmRevert = async () => {
+    if (versionToRevert === null || !agentId || !workspaceId) return
+
+    const release = versions.find((v) => v.version === versionToRevert)
+    const releaseId = release?.releaseId
+    if (!releaseId) return
+
+    try {
+      await rollbackMutation.mutateAsync({
+        agentId: agentId!,
+        releaseId,
+        workspaceId: workspaceId!,
+      })
+
+      // Reload canvas state from the activated version's definition_payload
+      try {
+        const agentVersions = await agentVersionService.list(agentId, workspaceId)
+        const sorted = [...agentVersions].sort((a, b) => a.version_number - b.version_number)
+        const agentVersion = sorted[versionToRevert - 1] ?? sorted[sorted.length - 1]
+        if (agentVersion) {
+          const fullVersion = await agentVersionService.get(agentId, agentVersion.id, workspaceId)
+          const payload = fullVersion.definition_payload as {
+            nodes?: unknown[]
+            edges?: unknown[]
+            viewport?: { x: number; y: number; zoom: number }
+          }
+          useGraphStore.setState({
+            nodes: (payload.nodes as import('reactflow').Node[]) ?? [],
+            edges: (payload.edges as import('reactflow').Edge[]) ?? [],
+            past: [],
+            future: [],
+            selectedNodeId: null,
+          })
+          if (payload.viewport && rfInstance) {
+            rfInstance.setViewport(payload.viewport)
+          } else if (rfInstance) {
+            setTimeout(() => rfInstance.fitView({ padding: 0.2 }), 100)
+          }
+        }
+      } catch (loadError) {
+        console.error('Failed to reload canvas after revert:', loadError)
+      }
+
+      toast({
+        title: t('workspace.revertSuccess'),
+        description: t('workspace.revertSuccessDescription', { version: versionToRevert }),
+        variant: 'success',
+      })
+      setRevertConfirmOpen(false)
+      setVersionToRevert(null)
+      onOpenChange(false)
+    } catch (error) {
+      console.error('Failed to activate version:', error)
+      toast({
+        title: t('workspace.revertFailed'),
+        description: t('workspace.revertFailedDescription'),
+        variant: 'destructive',
+      })
+    }
+  }
+
+  const handleConfirmDelete = async () => {
+    if (versionToDelete === null || !agentId || !workspaceId) return
+
+    const release = versions.find((v) => v.version === versionToDelete)
+    const releaseId = release?.releaseId
+    if (!releaseId) return
+
+    try {
+      await retireMutation.mutateAsync({ agentId: agentId!, releaseId, workspaceId: workspaceId! })
+
+      toast({
+        title: t('workspace.deleteVersionSuccess'),
+        description: t('workspace.deleteVersionSuccessDescription', { version: versionToDelete }),
+        variant: 'success',
+      })
+      setDeleteConfirmOpen(false)
+      setVersionToDelete(null)
+      if (selectedVersion === versionToDelete) {
+        setSelectedVersion(null)
+        setPreviewMode('current')
+      }
+    } catch (error) {
+      console.error('Failed to retire version:', error)
+      toast({
+        title: t('workspace.deleteVersionFailed'),
+        description: t('workspace.deleteVersionFailedDescription'),
+        variant: 'destructive',
+      })
+    }
+  }
+
+  const handleConfirmUndeploy = async () => {
+    if (!agentId || !workspaceId) return
+
+    try {
+      await unpublishMutation.mutateAsync({ agentId: agentId!, workspaceId: workspaceId! })
+
+      toast({
+        title: t('workspace.undeploySuccess'),
+        description: t('workspace.undeploySuccessDescription'),
+        variant: 'success',
+      })
+      setUndeployConfirmOpen(false)
+    } catch (error) {
+      console.error('Failed to undeploy:', error)
+      toast({
+        title: t('workspace.undeployFailed'),
+        description: t('workspace.undeployFailedDescription'),
+        variant: 'destructive',
+      })
+    }
+  }
+
+  // Rename is not supported in the new API — show an informational toast instead.
+  const handleStartEdit = (_version: GraphDeploymentVersion) => {
+    toast({
+      title: t('workspace.renameNotSupported', { defaultValue: 'Rename not supported' }),
+      description: t('workspace.renameNotSupportedDescription', {
+        defaultValue: 'Version renaming is not available in this release.',
+      }),
+    })
+  }
+
+  const handleCancelEdit = () => {
+    // no-op: rename UI is removed
+  }
+
+  const handleSaveName = async () => {
+    // No-op: rename is not supported; handleStartEdit already shows a toast.
+  }
+
+  const formatDate = (dateString: string) => {
+    if (!dateString) return ''
+    const date = new Date(dateString)
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    return `${year}-${month}-${day} ${hours}:${minutes}`
+  }
+
+  const isReverting = rollbackMutation.isPending
+  const isDeleting = retireMutation.isPending
+  const isUndeploying = unpublishMutation.isPending
+
+  return {
+    t,
+    // Data
+    deploymentStatus,
+    versions: pagedVersions,
+    totalVersions,
+    totalPages,
+    isLoadingVersions,
+    // Preview
+    previewMode,
+    setPreviewMode,
+    selectedVersion,
+    selectedVersionInfo,
+    showToggle,
+    isLoadingPreview,
+    previewState,
+    // Version list
+    isUndeploying,
+    currentPage,
+    // Handlers
+    handleSelectVersion,
+    handlePageChange,
+    handleRevertClick,
+    handleDeleteClick,
+    handleStartEdit,
+    handleCancelEdit,
+    handleSaveName,
+    formatDate,
+    // Confirmation dialogs
+    revertConfirmOpen,
+    setRevertConfirmOpen,
+    versionToRevert,
+    setVersionToRevert,
+    isReverting,
+    handleConfirmRevert,
+    deleteConfirmOpen,
+    setDeleteConfirmOpen,
+    versionToDelete,
+    setVersionToDelete,
+    isDeleting,
+    handleConfirmDelete,
+    undeployConfirmOpen,
+    setUndeployConfirmOpen,
+    handleConfirmUndeploy,
+  }
+}
diff --git a/frontend/components/editors/graph-builder/index.ts b/frontend/components/editors/graph-builder/index.ts
new file mode 100644
index 000000000..08ac8ace8
--- /dev/null
+++ b/frontend/components/editors/graph-builder/index.ts
@@ -0,0 +1,6 @@
+export { default as AgentBuilder } from './AgentBuilder'
+export { CodeEditorPage } from './CodeEditorPage'
+export { GraphBuilderShell } from './GraphBuilderShell'
+export { useGraphStore } from './stores/graphStore'
+export { useSaveStore } from './stores/saveStore'
+export { useBuilderUIStore } from './stores/builderUIStore'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/layout.tsx b/frontend/components/editors/graph-builder/layout.tsx
similarity index 82%
rename from frontend/app/workspace/[workspaceId]/[agentId]/layout.tsx
rename to frontend/components/editors/graph-builder/layout.tsx
index 81394044f..cc1313100 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/layout.tsx
+++ b/frontend/components/editors/graph-builder/layout.tsx
@@ -1,4 +1,4 @@
-import { ErrorBoundary } from '@/app/workspace/[workspaceId]/[agentId]/error-boundary'
+import { ErrorBoundary } from './error-boundary'
 
 /**
  * Agent Detail Layout
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/lib/tree-building.ts b/frontend/components/editors/graph-builder/lib/execution-tree-building.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/lib/tree-building.ts
rename to frontend/components/editors/graph-builder/lib/execution-tree-building.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/page.tsx b/frontend/components/editors/graph-builder/page.tsx
similarity index 63%
rename from frontend/app/workspace/[workspaceId]/[agentId]/page.tsx
rename to frontend/components/editors/graph-builder/page.tsx
index b08cce0dc..6ab768a16 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/page.tsx
+++ b/frontend/components/editors/graph-builder/page.tsx
@@ -2,6 +2,8 @@
 
 import { useParams } from 'next/navigation'
 
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+
 import AgentBuilder from './AgentBuilder'
 
 /**
@@ -14,6 +16,7 @@ import AgentBuilder from './AgentBuilder'
 export default function AgentPage() {
   const params = useParams()
   const agentId = params.agentId as string
+  const { workspaceId } = useCurrentWorkspace()
 
-  return <AgentBuilder key={agentId} />
+  return <AgentBuilder key={agentId} agentId={agentId} workspaceId={workspaceId} />
 }
diff --git a/frontend/components/editors/graph-builder/services/agentService.ts b/frontend/components/editors/graph-builder/services/agentService.ts
new file mode 100644
index 000000000..82379da43
--- /dev/null
+++ b/frontend/components/editors/graph-builder/services/agentService.ts
@@ -0,0 +1,181 @@
+'use client'
+
+import { apiGet } from '@/lib/api-client'
+
+import { modelService } from './modelService'
+
+// --- Types ---
+
+export interface ModelOption {
+  id: string
+  name: string // raw model name from API (e.g. "qwen3.5:latest")
+  label: string
+  provider: string // provider_display_name (for display)
+  provider_name: string
+  isAvailable?: boolean
+}
+
+export interface ToolOption {
+  id: string
+  label: string
+  description?: string
+  name?: string
+  toolType?: string
+  category?: string | null
+  tags?: string[]
+  mcpServer?: string | null
+  raw?: unknown
+}
+
+export interface SkillOption {
+  id: string
+  name: string
+  description: string
+  tags: string[]
+}
+
+const isValidUUID = (str: string): boolean => {
+  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+  return uuidRegex.test(str)
+}
+
+const GRAPH_ID_CACHE_KEY = 'current_graph_id'
+const GRAPH_NAME_CACHE_KEY = 'current_graph_name'
+const getCachedGraphId = (): string | null => {
+  try {
+    const id = localStorage.getItem(GRAPH_ID_CACHE_KEY)
+    if (id && !isValidUUID(id)) {
+      return null
+    }
+    return id
+  } catch {
+    return null
+  }
+}
+
+const setCachedGraphId = (graphId: string): void => {
+  try {
+    if (!isValidUUID(graphId)) {
+      console.warn('[agentService] Invalid graphId passed to setCachedGraphId, ignored:', graphId)
+      return
+    }
+    localStorage.setItem(GRAPH_ID_CACHE_KEY, graphId)
+  } catch {
+    // Silent fail
+  }
+}
+
+const clearCachedGraphId = (): void => {
+  try {
+    localStorage.removeItem(GRAPH_ID_CACHE_KEY)
+  } catch {
+    // Silent fail
+  }
+}
+
+const getCachedGraphName = (): string | null => {
+  try {
+    return localStorage.getItem(GRAPH_NAME_CACHE_KEY)
+  } catch {
+    return null
+  }
+}
+
+const setCachedGraphName = (graphName: string): void => {
+  try {
+    localStorage.setItem(GRAPH_NAME_CACHE_KEY, graphName)
+  } catch {
+    // Silent fail
+  }
+}
+
+const clearCachedGraphName = (): void => {
+  try {
+    localStorage.removeItem(GRAPH_NAME_CACHE_KEY)
+  } catch {
+    // Silent fail
+  }
+}
+
+export const agentService = {
+  async getModels(): Promise<ModelOption[]> {
+    try {
+      const models = await modelService.getAvailableModels('chat')
+      return models.map((model) => ({
+        id: `${model.provider_name}:${model.name}`,
+        name: model.name,
+        label: model.display_name || model.name,
+        provider: model.provider_display_name || model.provider_name, // for display
+        provider_name: model.provider_name,
+        isAvailable: model.is_available,
+      }))
+    } catch {
+      return []
+    }
+  },
+
+  async getBuiltinTools(): Promise<ToolOption[]> {
+    try {
+      // apiGet automatically unwraps response.data, directly return tools array
+      const tools = await apiGet<
+        Array<{
+          id: string
+          label: string
+          name: string
+          description?: string
+          tool_type: string
+          category?: string | null
+          tags?: string[]
+          mcp_server?: string | null
+        }>
+      >('tools/builtin')
+      return (tools || []).map((tool) => ({
+        id: tool.id,
+        label: tool.label,
+        description: tool.description,
+        name: tool.name,
+        toolType: tool.tool_type,
+        category: tool.category ?? null,
+        tags: tool.tags ?? [],
+        mcpServer: tool.mcp_server ?? null,
+        raw: tool,
+      }))
+    } catch {
+      return []
+    }
+  },
+
+  /**
+   * Get available skills for the agent
+   * Uses the skills API to fetch all skills the user has access to
+   */
+  async getAvailableSkills(): Promise<SkillOption[]> {
+    try {
+      const skills = await apiGet<
+        Array<{
+          id: string
+          name: string
+          description: string
+          tags?: string[]
+        }>
+      >('skills?include_public=true')
+      return (skills || []).map((skill) => ({
+        id: skill.id,
+        name: skill.name,
+        description: skill.description,
+        tags: skill.tags || [],
+      }))
+    } catch (error) {
+      console.error('Failed to fetch skills from backend:', error)
+      return []
+    }
+  },
+
+  // --- Cache Management ---
+  getCachedGraphId: getCachedGraphId,
+  setCachedGraphId: setCachedGraphId,
+  clearCachedGraphId: clearCachedGraphId,
+  getCachedGraphName: getCachedGraphName,
+  setCachedGraphName: setCachedGraphName,
+  clearCachedGraphName: clearCachedGraphName,
+}
diff --git a/frontend/components/editors/graph-builder/services/commandService.ts b/frontend/components/editors/graph-builder/services/commandService.ts
new file mode 100644
index 000000000..9fe972938
--- /dev/null
+++ b/frontend/components/editors/graph-builder/services/commandService.ts
@@ -0,0 +1,75 @@
+/**
+ * Command Service - Handles resuming interrupted graph execution
+ *
+ * Uses executionAdapter.injectMessage to deliver resume commands to running
+ * executions, consistent with the rest of the execution flow.
+ */
+
+import { createApiError, ApiError } from '@/lib/api-client'
+
+import { useExecutionStore } from '../stores/execution/executionStore'
+
+import { executionAdapter } from './executionAdapter'
+
+export interface Command {
+  update?: Record<string, unknown>
+  goto?: string
+}
+
+/**
+ * Resume interrupted graph execution with a Command.
+ *
+ * Fetches the current execution ID from the active run (stored in executionStore),
+ * serialises the Command as JSON, and injects it via the REST API.
+ *
+ * The `_onEvent` parameter is kept for call-site compatibility but is no longer
+ * used — the execution WebSocket (subscribed in executionStore) already receives
+ * all events from the resumed execution.
+ */
+export async function resumeWithCommand(
+  _threadId: string,
+  command: Command,
+  _onEvent?: unknown,
+): Promise<void> {
+  const store = useExecutionStore.getState()
+  const graphId = store.currentGraphId
+
+  if (!graphId) {
+    throw createApiError(400, 'Bad Request', {
+      code: 'EXECUTION_RESUME_GRAPH_MISSING',
+      message: 'No active graph for resume',
+      data: null,
+    })
+  }
+
+  const context = store.getContext(graphId)
+  const runId = context.runId
+
+  if (!runId) {
+    throw createApiError(400, 'Bad Request', {
+      code: 'EXECUTION_RESUME_RUN_MISSING',
+      message: 'No active run to resume',
+      data: { graph_id: graphId },
+    })
+  }
+
+  try {
+    const executionId = await executionAdapter.getExecutionId(runId)
+    const message = JSON.stringify(command)
+    await executionAdapter.injectMessage(executionId, message)
+  } catch (e: unknown) {
+    const error = e as { name?: string; message?: string }
+    if (error?.name === 'AbortError') {
+      throw e
+    }
+    store.setExecuting(false)
+    if (e instanceof ApiError) {
+      throw e
+    }
+    throw createApiError(0, 'Resume Failed', {
+      code: 'EXECUTION_RESUME_FAILED',
+      message: error?.message || 'Resume failed',
+      data: { run_id: runId, graph_id: graphId },
+    })
+  }
+}
diff --git a/frontend/components/editors/graph-builder/services/executionAdapter.ts b/frontend/components/editors/graph-builder/services/executionAdapter.ts
new file mode 100644
index 000000000..c5a7d4d7b
--- /dev/null
+++ b/frontend/components/editors/graph-builder/services/executionAdapter.ts
@@ -0,0 +1,59 @@
+import { apiPost } from '@/lib/api-client'
+import { agentRunService } from '@/services/agentRunService'
+
+export interface StartRunParams {
+  releaseId: string
+  prompt: string
+  workspaceId: string
+  threadId?: string
+  taskId?: string
+}
+
+export interface StartDraftRunParams {
+  agentId: string
+  versionId: string
+  prompt: string
+  workspaceId: string
+}
+
+export interface RunResult {
+  id: string
+  current_execution_id: string
+  status: string
+}
+
+export const executionAdapter = {
+  async startRun(params: StartRunParams): Promise<RunResult> {
+    return apiPost<RunResult>('runs', {
+      release_id: params.releaseId,
+      goal: params.prompt,
+      workspace_id: params.workspaceId,
+      trigger_medium: 'api',
+      run_purpose: 'production',
+      thread_id: params.threadId,
+      task_id: params.taskId,
+    })
+  },
+
+  async startDraftRun(params: StartDraftRunParams): Promise<RunResult> {
+    return apiPost<RunResult>('runs/draft', {
+      agent_id: params.agentId,
+      version_id: params.versionId,
+      goal: params.prompt,
+      workspace_id: params.workspaceId,
+    })
+  },
+
+  async cancelRun(runId: string): Promise<void> {
+    await agentRunService.cancel(runId)
+  },
+
+  async injectMessage(executionId: string, message: string): Promise<void> {
+    await agentRunService.sendMessage(executionId, message)
+  },
+
+  async getExecutionId(runId: string): Promise<string> {
+    const run = await agentRunService.get(runId)
+    return run.current_execution_id!
+  },
+}
diff --git a/frontend/components/editors/graph-builder/services/graphDataAdapter.ts b/frontend/components/editors/graph-builder/services/graphDataAdapter.ts
new file mode 100644
index 000000000..17cf3a3e4
--- /dev/null
+++ b/frontend/components/editors/graph-builder/services/graphDataAdapter.ts
@@ -0,0 +1,3 @@
+import { visualDefinitionAdapter } from './visualDefinitionAdapter'
+
+export const graphDataAdapter = visualDefinitionAdapter
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/index.ts b/frontend/components/editors/graph-builder/services/index.ts
similarity index 64%
rename from frontend/app/workspace/[workspaceId]/[agentId]/services/index.ts
rename to frontend/components/editors/graph-builder/services/index.ts
index f9d1a19b1..275800a69 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/index.ts
+++ b/frontend/components/editors/graph-builder/services/index.ts
@@ -6,5 +6,3 @@
 
 export { agentService } from './agentService'
 export { nodeRegistry } from './nodeRegistry'
-export { mapChatEventToExecutionStep } from './eventAdapter'
-export type { AdapterResult } from './eventAdapter'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/modelService.ts b/frontend/components/editors/graph-builder/services/modelService.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/services/modelService.ts
rename to frontend/components/editors/graph-builder/services/modelService.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/services/nodeRegistry.tsx b/frontend/components/editors/graph-builder/services/nodeRegistry.tsx
similarity index 99%
rename from frontend/app/workspace/[workspaceId]/[agentId]/services/nodeRegistry.tsx
rename to frontend/components/editors/graph-builder/services/nodeRegistry.tsx
index a09ba5d78..749f310e6 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/services/nodeRegistry.tsx
+++ b/frontend/components/editors/graph-builder/services/nodeRegistry.tsx
@@ -1,11 +1,6 @@
 'use client'
 
-import {
-  Bot,
-  LucideIcon,
-  Globe2,
-  BrainCircuit,
-} from 'lucide-react'
+import { Bot, LucideIcon, Globe2, BrainCircuit } from 'lucide-react'
 
 // --- Types ---
 
diff --git a/frontend/components/editors/graph-builder/services/visualDefinitionAdapter.ts b/frontend/components/editors/graph-builder/services/visualDefinitionAdapter.ts
new file mode 100644
index 000000000..6c2a895f8
--- /dev/null
+++ b/frontend/components/editors/graph-builder/services/visualDefinitionAdapter.ts
@@ -0,0 +1,143 @@
+import { agentVersionService } from '@/services/agentVersionService'
+import { API_BASE } from '@/lib/api-client'
+import type { EngineKind } from '@/types/agent'
+import type { GraphState } from '../utils/saveManager'
+
+export interface LoadedVersionGraphState {
+  graphState: GraphState
+  definitionKind: EngineKind
+  versionStatus: 'draft' | 'frozen'
+  rawPayload: Record<string, unknown>
+}
+
+const payloadCache = new Map<string, Record<string, unknown>>()
+
+function cacheKey(agentId: string, versionId: string, workspaceId: string): string {
+  return `${workspaceId}:${agentId}:${versionId}`
+}
+
+function cachePayload(
+  agentId: string,
+  versionId: string,
+  workspaceId: string,
+  payload: Record<string, unknown> | null | undefined,
+): Record<string, unknown> {
+  const definitionPayload = payload ?? {}
+  payloadCache.set(cacheKey(agentId, versionId, workspaceId), definitionPayload)
+  return definitionPayload
+}
+
+function getCachedPayload(
+  agentId: string,
+  versionId: string,
+  workspaceId: string,
+): Record<string, unknown> {
+  return payloadCache.get(cacheKey(agentId, versionId, workspaceId)) ?? {}
+}
+
+function toGraphState(
+  payload: Record<string, unknown> | null | undefined,
+  agentId: string,
+  versionId: string,
+  workspaceId: string,
+): GraphState {
+  const definitionPayload = payload ?? {}
+
+  return {
+    graphId: (definitionPayload.graphId as string) ?? null,
+    graphName: (definitionPayload.graphName as string) ?? null,
+    nodes: (definitionPayload.nodes as any[]) ?? [],
+    edges: (definitionPayload.edges as any[]) ?? [],
+    viewport: (definitionPayload.viewport as { x: number; y: number; zoom: number }) ?? {
+      x: 0,
+      y: 0,
+      zoom: 1,
+    },
+    graphStateFields:
+      (definitionPayload.graphStateFields as any[]) ??
+      (definitionPayload.state_fields as any[]) ??
+      [],
+    fallbackNodeId:
+      (definitionPayload.fallbackNodeId as string) ??
+      (definitionPayload.fallback_node_id as string) ??
+      null,
+    agentId,
+    versionId,
+    workspaceId,
+  }
+}
+
+export const visualDefinitionAdapter = {
+  async load(agentId: string, versionId: string, workspaceId: string): Promise<GraphState> {
+    const version = await agentVersionService.get(agentId, versionId, workspaceId)
+    const rawPayload = cachePayload(agentId, versionId, workspaceId, version.definition_payload)
+    return toGraphState(rawPayload, agentId, versionId, workspaceId)
+  },
+
+  async loadVersionGraphState(
+    agentId: string,
+    versionId: string,
+    workspaceId: string,
+  ): Promise<LoadedVersionGraphState> {
+    const version = await agentVersionService.get(agentId, versionId, workspaceId)
+    const rawPayload = cachePayload(agentId, versionId, workspaceId, version.definition_payload)
+
+    return {
+      graphState: toGraphState(rawPayload, agentId, versionId, workspaceId),
+      definitionKind: version.engine_kind,
+      versionStatus: version.status,
+      rawPayload,
+    }
+  },
+
+  async save(
+    agentId: string,
+    versionId: string,
+    workspaceId: string,
+    graphState: Partial<GraphState>,
+  ): Promise<{ versionId: string }> {
+    const current = await agentVersionService.get(agentId, versionId, workspaceId)
+    const mergedPayload = {
+      ...(current.definition_payload ?? {}),
+      ...graphState,
+    }
+    cachePayload(agentId, versionId, workspaceId, mergedPayload)
+    const updated = await agentVersionService.update(agentId, versionId, workspaceId, {
+      definition_payload: mergedPayload,
+    })
+    cachePayload(agentId, updated.id, workspaceId, mergedPayload)
+    return { versionId: updated.id }
+  },
+
+  sendBeaconSave(
+    agentId: string,
+    versionId: string,
+    workspaceId: string,
+    graphState: { nodes: unknown[]; edges: unknown[]; viewport?: unknown },
+  ): void {
+    const url = `${API_BASE}/agents/${agentId}/versions/${versionId}?workspace_id=${workspaceId}`
+    const mergedPayload = {
+      ...getCachedPayload(agentId, versionId, workspaceId),
+      ...graphState,
+    }
+    const body = JSON.stringify({ definition_payload: mergedPayload })
+    fetch(url, {
+      method: 'PATCH',
+      headers: { 'Content-Type': 'application/json' },
+      body,
+      keepalive: true,
+    }).catch(() => {})
+  },
+
+  async createDraft(
+    agentId: string,
+    workspaceId: string,
+    basePayload?: Record<string, unknown>,
+  ): Promise<string> {
+    const version = await agentVersionService.create(agentId, workspaceId, {
+      engine_kind: 'langgraph_visual',
+      definition_payload: basePayload || {},
+    })
+    return version.id
+  },
+}
diff --git a/frontend/components/editors/graph-builder/stores/builderStore.ts b/frontend/components/editors/graph-builder/stores/builderStore.ts
new file mode 100644
index 000000000..b62c6d448
--- /dev/null
+++ b/frontend/components/editors/graph-builder/stores/builderStore.ts
@@ -0,0 +1,7 @@
+/**
+ * Backward-compatibility shim.
+ *
+ * New code should import useGraphStore / useSaveStore / useBuilderUIStore directly.
+ * This re-export will be removed once all consumers are migrated.
+ */
+export { useGraphStore as useBuilderStore } from './graphStore'
diff --git a/frontend/components/editors/graph-builder/stores/builderUIStore.ts b/frontend/components/editors/graph-builder/stores/builderUIStore.ts
new file mode 100644
index 000000000..96098ce4e
--- /dev/null
+++ b/frontend/components/editors/graph-builder/stores/builderUIStore.ts
@@ -0,0 +1,13 @@
+import { create } from 'zustand'
+
+interface BuilderUIState {
+  copilotExpanded: boolean
+  toggleCopilot: () => void
+  setCopilotExpanded: (expanded: boolean) => void
+}
+
+export const useBuilderUIStore = create<BuilderUIState>((set) => ({
+  copilotExpanded: false,
+  toggleCopilot: () => set((s) => ({ copilotExpanded: !s.copilotExpanded })),
+  setCopilotExpanded: (expanded) => set({ copilotExpanded: expanded }),
+}))
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/codeEditorStore.ts b/frontend/components/editors/graph-builder/stores/codeEditorStore.ts
similarity index 65%
rename from frontend/app/workspace/[workspaceId]/[agentId]/stores/codeEditorStore.ts
rename to frontend/components/editors/graph-builder/stores/codeEditorStore.ts
index 432046b21..927b8c114 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/codeEditorStore.ts
+++ b/frontend/components/editors/graph-builder/stores/codeEditorStore.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand'
-import { apiPost } from '@/lib/api-client'
+import { agentVersionService } from '@/services/agentVersionService'
 
 // ---------------------------------------------------------------------------
 // Types
@@ -13,12 +13,20 @@ interface CodeEditorState {
 
   graphId: string | null
   graphName: string | null
+  versionId: string | null
+  workspaceId: string | null
 
   setCode: (code: string) => void
   setGraphId: (id: string) => void
   setGraphName: (name: string) => void
   save: () => Promise<void>
-  hydrate: (graphId: string, code: string, name: string) => void
+  hydrate: (
+    graphId: string,
+    code: string,
+    name: string,
+    versionId: string | null,
+    workspaceId: string | null,
+  ) => void
   reset: () => void
 }
 
@@ -33,6 +41,8 @@ export const useCodeEditorStore = create<CodeEditorState>((set, get) => ({
   isDirty: false,
   graphId: null,
   graphName: null,
+  versionId: null,
+  workspaceId: null,
 
   setCode: (code) => set({ code, isDirty: code !== get().savedCode }),
 
@@ -40,18 +50,23 @@ export const useCodeEditorStore = create<CodeEditorState>((set, get) => ({
   setGraphName: (name) => set({ graphName: name }),
 
   save: async () => {
-    const { graphId, code, graphName } = get()
-    if (!graphId) return
+    const { graphId, versionId, workspaceId, code, graphName } = get()
+    if (!graphId || !versionId || !workspaceId) return
     set({ isSaving: true })
     try {
-      await apiPost(`graphs/${graphId}/code/save`, { code, name: graphName })
+      await agentVersionService.update(graphId, versionId, workspaceId, {
+        definition_payload: {
+          graph_mode: 'code',
+          code_content: code,
+        },
+      })
       set({ savedCode: code, isDirty: false })
     } finally {
       set({ isSaving: false })
     }
   },
 
-  hydrate: (graphId, code, name) =>
+  hydrate: (graphId, code, name, versionId, workspaceId) =>
     set({
       graphId,
       code,
@@ -59,6 +74,8 @@ export const useCodeEditorStore = create<CodeEditorState>((set, get) => ({
       isDirty: false,
       graphName: name,
       isSaving: false,
+      versionId: versionId ?? null,
+      workspaceId: workspaceId ?? null,
     }),
 
   reset: () =>
@@ -69,5 +86,7 @@ export const useCodeEditorStore = create<CodeEditorState>((set, get) => ({
       isDirty: false,
       graphId: null,
       graphName: null,
+      versionId: null,
+      workspaceId: null,
     }),
 }))
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/ExecutionManager.ts b/frontend/components/editors/graph-builder/stores/execution/ExecutionManager.ts
similarity index 97%
rename from frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/ExecutionManager.ts
rename to frontend/components/editors/graph-builder/stores/execution/ExecutionManager.ts
index cfd63e6cc..776a4f734 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/ExecutionManager.ts
+++ b/frontend/components/editors/graph-builder/stores/execution/ExecutionManager.ts
@@ -35,8 +35,9 @@ export function createExecutionContext(graphId: string): ExecutionContext {
   return {
     graphId,
     abortController: null,
-    threadId: null,
-    requestId: null,
+    runId: null,
+    subscribedExecutionId: null,
+    timeoutId: null,
     state: createEmptyGraphState(),
   }
 }
diff --git a/frontend/components/editors/graph-builder/stores/execution/executionStore.ts b/frontend/components/editors/graph-builder/stores/execution/executionStore.ts
new file mode 100644
index 000000000..97eeaf370
--- /dev/null
+++ b/frontend/components/editors/graph-builder/stores/execution/executionStore.ts
@@ -0,0 +1,885 @@
+'use client'
+
+/**
+ * Execution Store
+ *
+ * Zustand Store for managing Graph execution state
+ *
+ * Responsibilities:
+ * - Multi-Graph state isolation
+ * - LRU cache management
+ * - Execution flow control
+ */
+
+import { create } from 'zustand'
+
+import { getExecutionWsClient } from '@/lib/ws/executions/executionWsClient'
+import type {
+  ExecutionEventFrame,
+  ExecutionCompletedFrame,
+  ExecutionSnapshotFrame,
+} from '@/lib/ws/executions/types'
+import type { AppErrorPayload } from '@/types/agent-run'
+import type { ExecutionStep, ExecutionTreeNode } from '@/types'
+
+import { buildExecutionTree } from '../../lib/execution-tree-building'
+import type { GraphState, TraceStep } from './types'
+import { generateId } from './utils'
+
+import {
+  createEmptyGraphState,
+  createExecutionContext,
+  getExecutionManager,
+} from './ExecutionManager'
+import type {
+  ExecutionStore,
+  ExecutionContext,
+  GraphExecutionState,
+  InterruptInfo,
+  StartExecutionOptions,
+  StartDraftExecutionInput,
+} from './types'
+import { executionAdapter } from '../../services/executionAdapter'
+import { agentService as globalAgentService } from '@/services/agentService'
+import { useGraphStore } from '../graphStore'
+
+const pendingContentUpdates = new Map<string, string>()
+let contentUpdateScheduled = false
+
+function getOrCreateContext(
+  contexts: Map<string, ExecutionContext>,
+  graphId: string | null,
+): ExecutionContext {
+  if (!graphId) return createExecutionContext('')
+  let context = contexts.get(graphId)
+  if (!context) {
+    context = createExecutionContext(graphId)
+  }
+  return context
+}
+
+function syncComputedProperties(state: GraphExecutionState) {
+  return {
+    steps: state.steps,
+    isExecuting: state.isExecuting,
+    showPanel: state.showPanel,
+    activeNodeId: state.activeNodeId,
+    pendingInterrupts: state.pendingInterrupts,
+    currentState: state.currentState,
+    executionTrace: state.executionTrace,
+    routeDecisions: state.routeDecisions,
+    treeRoots: state.treeRoots,
+    treeNodeMap: state.treeNodeMap,
+  }
+}
+
+/**
+ * Rebuild tree structure from steps and merge into state updates.
+ */
+function rebuildTree(steps: ExecutionStep[]): {
+  treeRoots: ExecutionTreeNode[]
+  treeNodeMap: Map<string, ExecutionTreeNode>
+} {
+  const { roots, nodeMap } = buildExecutionTree(steps)
+  return { treeRoots: roots, treeNodeMap: nodeMap }
+}
+
+// ============ Store ============
+
+export const useExecutionStore = create<ExecutionStore>((set, get) => {
+  const manager = getExecutionManager()
+
+  const getCurrentState = (): GraphExecutionState => {
+    const { contexts, currentGraphId } = get()
+    return getOrCreateContext(contexts, currentGraphId).state
+  }
+
+  const updateCurrentState = (updates: Partial<GraphExecutionState>) => {
+    const { contexts, currentGraphId } = get()
+    if (!currentGraphId) return
+
+    const context = getOrCreateContext(contexts, currentGraphId)
+    const newState = { ...context.state, ...updates }
+    const newContext = { ...context, state: newState }
+
+    const newContexts = new Map(contexts)
+    newContexts.set(currentGraphId, newContext)
+
+    set({
+      contexts: newContexts,
+      ...syncComputedProperties(newState),
+    })
+  }
+
+  return {
+    // ============ State ============
+    contexts: new Map<string, ExecutionContext>(),
+    currentGraphId: null,
+    steps: [],
+    isExecuting: false,
+    showPanel: false,
+    activeNodeId: null,
+    pendingInterrupts: new Map<string, InterruptInfo>(),
+    currentState: null,
+    executionTrace: [],
+    routeDecisions: [],
+    treeRoots: [],
+    treeNodeMap: new Map(),
+
+    // ============ Graph Switching ============
+
+    setCurrentGraphId: (graphId: string | null) => {
+      const { contexts, clearGraphState } = get()
+
+      if (graphId) {
+        manager.recordAccess(graphId)
+        const toEvict = manager.getGraphsToEvict(contexts)
+        toEvict.forEach((id) => clearGraphState(id))
+      }
+
+      const context = getOrCreateContext(contexts, graphId)
+
+      if (graphId && !contexts.has(graphId)) {
+        const newContexts = new Map(contexts)
+        newContexts.set(graphId, context)
+        set({
+          contexts: newContexts,
+          currentGraphId: graphId,
+          ...syncComputedProperties(context.state),
+        })
+      } else {
+        set({
+          currentGraphId: graphId,
+          ...syncComputedProperties(context.state),
+        })
+      }
+    },
+
+    // ============ State Updates ============
+
+    updateGraphState: (graphId: string, updates: Partial<GraphExecutionState>) => {
+      const { contexts, currentGraphId } = get()
+      const context = getOrCreateContext(contexts, graphId)
+      const newState = { ...context.state, ...updates }
+      const newContext = { ...context, state: newState }
+
+      const newContexts = new Map(contexts)
+      newContexts.set(graphId, newContext)
+
+      if (graphId === currentGraphId) {
+        set({ contexts: newContexts, ...syncComputedProperties(newState) })
+      } else {
+        set({ contexts: newContexts })
+      }
+    },
+
+    // ============ Step Management ============
+
+    addStep: (step: ExecutionStep) => {
+      const state = getCurrentState()
+      if (state.steps.some((s) => s.id === step.id)) return
+      const newSteps = [...state.steps, step]
+      updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
+    },
+
+    updateStep: (stepId: string, updates: Partial<ExecutionStep>) => {
+      const state = getCurrentState()
+      const idx = state.steps.findIndex((s) => s.id === stepId)
+      if (idx === -1) return
+
+      const step = state.steps[idx]
+      const hasChanges = Object.keys(updates).some(
+        (k) => step[k as keyof ExecutionStep] !== updates[k as keyof ExecutionStep],
+      )
+      if (!hasChanges) return
+
+      const newSteps = [...state.steps]
+      // Deep merge data field instead of overwriting
+      const mergedData = updates.data ? { ...(step.data || {}), ...updates.data } : step.data
+      newSteps[idx] = { ...step, ...updates, data: mergedData }
+      updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
+    },
+
+    appendContent: (stepId: string, text: string) => {
+      if (!text) return
+
+      // Accumulate to buffer instead of immediate update
+      const existing = pendingContentUpdates.get(stepId) || ''
+      pendingContentUpdates.set(stepId, existing + text)
+
+      // Schedule batch update (execute once per microtask cycle)
+      if (!contentUpdateScheduled) {
+        contentUpdateScheduled = true
+        queueMicrotask(() => {
+          contentUpdateScheduled = false
+          const updates = new Map(pendingContentUpdates)
+          pendingContentUpdates.clear()
+
+          const state = getCurrentState()
+          const newSteps = [...state.steps]
+          let hasChanges = false
+
+          updates.forEach((content, id) => {
+            const idx = newSteps.findIndex((s) => s.id === id)
+            if (idx !== -1) {
+              newSteps[idx] = {
+                ...newSteps[idx],
+                content: (newSteps[idx].content || '') + content,
+              }
+              hasChanges = true
+            }
+          })
+
+          if (hasChanges) {
+            updateCurrentState({ steps: newSteps, ...rebuildTree(newSteps) })
+          }
+        })
+      }
+    },
+
+    // ============ Panel ============
+
+    togglePanel: (show?: boolean) => {
+      const state = getCurrentState()
+      updateCurrentState({ showPanel: show ?? !state.showPanel })
+    },
+
+    // ============ Interrupt Management ============
+
+    addInterrupt: (interrupt: InterruptInfo) => {
+      const state = getCurrentState()
+      const newInterrupts = new Map(state.pendingInterrupts)
+      newInterrupts.set(interrupt.nodeId, interrupt)
+
+      const nodeStep = state.steps.find(
+        (s) => s.nodeId === interrupt.nodeId && s.status === 'running',
+      )
+
+      if (nodeStep) {
+        const updatedSteps = state.steps.map((s) =>
+          s.id === nodeStep.id ? { ...s, status: 'waiting' as const } : s,
+        )
+        updateCurrentState({ pendingInterrupts: newInterrupts, steps: updatedSteps })
+      } else {
+        updateCurrentState({ pendingInterrupts: newInterrupts })
+      }
+    },
+
+    removeInterrupt: (nodeId: string) => {
+      const state = getCurrentState()
+      const newInterrupts = new Map(state.pendingInterrupts)
+      newInterrupts.delete(nodeId)
+      updateCurrentState({ pendingInterrupts: newInterrupts })
+    },
+
+    clearInterrupts: () => {
+      updateCurrentState({ pendingInterrupts: new Map() })
+    },
+
+    getInterrupt: (nodeId: string) => getCurrentState().pendingInterrupts.get(nodeId),
+
+    // ============ Execution Control ============
+
+    clear: () => {
+      updateCurrentState({
+        steps: [],
+        currentState: null,
+        executionTrace: [],
+        routeDecisions: [],
+        treeRoots: [],
+        treeNodeMap: new Map(),
+      })
+    },
+
+    clearGraphState: (graphId: string) => {
+      const { contexts, currentGraphId } = get()
+
+      const context = contexts.get(graphId)
+      if (context?.subscribedExecutionId) {
+        try {
+          getExecutionWsClient().unsubscribe(context.subscribedExecutionId)
+        } catch {
+          /* ignore */
+        }
+      }
+      if (context?.abortController) {
+        context.abortController.abort()
+      }
+      if (context?.timeoutId !== null && context?.timeoutId !== undefined) {
+        clearTimeout(context.timeoutId)
+      }
+
+      manager.removeFromAccess(graphId)
+
+      const newContexts = new Map(contexts)
+      newContexts.delete(graphId)
+
+      if (graphId === currentGraphId) {
+        set({ contexts: newContexts, ...syncComputedProperties(createEmptyGraphState()) })
+      } else {
+        set({ contexts: newContexts })
+      }
+    },
+
+    getRunningGraphIds: () => {
+      const { contexts } = get()
+      const running: string[] = []
+      contexts.forEach((ctx, id) => {
+        if (ctx.state.isExecuting) running.push(id)
+      })
+      return running
+    },
+
+    setExecuting: (isExecuting: boolean) => {
+      const state = getCurrentState()
+      updateCurrentState({
+        isExecuting,
+        activeNodeId: isExecuting ? state.activeNodeId : null,
+      })
+    },
+
+    // ============ Execution Context ============
+
+    getContext: (graphId: string) => {
+      const { contexts } = get()
+      return getOrCreateContext(contexts, graphId)
+    },
+
+    setAbortController: (graphId: string, controller: AbortController | null) => {
+      const { contexts } = get()
+      const context = getOrCreateContext(contexts, graphId)
+      const newContexts = new Map(contexts)
+      newContexts.set(graphId, { ...context, abortController: controller })
+      set({ contexts: newContexts })
+    },
+
+    setRunId: (graphId: string, runId: string | null) => {
+      const { contexts } = get()
+      const context = getOrCreateContext(contexts, graphId)
+      const newContexts = new Map(contexts)
+      newContexts.set(graphId, { ...context, runId })
+      set({ contexts: newContexts })
+    },
+
+    setSubscribedExecutionId: (graphId: string, executionId: string | null) => {
+      const { contexts } = get()
+      const context = getOrCreateContext(contexts, graphId)
+      const newContexts = new Map(contexts)
+      newContexts.set(graphId, { ...context, subscribedExecutionId: executionId })
+      set({ contexts: newContexts })
+    },
+
+    setTimeoutId: (graphId: string, timeoutId: ReturnType<typeof setTimeout> | null) => {
+      const { contexts } = get()
+      const context = getOrCreateContext(contexts, graphId)
+      const newContexts = new Map(contexts)
+      newContexts.set(graphId, { ...context, timeoutId })
+      set({ contexts: newContexts })
+    },
+
+    // ============ Command Mode ============
+
+    updateState: (stateUpdate: Partial<GraphState>) => {
+      const state = getCurrentState()
+      updateCurrentState({
+        currentState: state.currentState
+          ? { ...state.currentState, ...stateUpdate }
+          : (stateUpdate as GraphState),
+      })
+    },
+
+    addTraceStep: (step: TraceStep) => {
+      const state = getCurrentState()
+      updateCurrentState({ executionTrace: [...state.executionTrace, step] })
+    },
+
+    addRouteDecision: (nodeId, decision) => {
+      const state = getCurrentState()
+      updateCurrentState({
+        routeDecisions: [...state.routeDecisions, { nodeId, decision, timestamp: Date.now() }],
+      })
+    },
+
+    // ============ Execution Methods ============
+
+    startExecution: async (
+      input: string,
+      draftInput?: StartDraftExecutionInput,
+      options: StartExecutionOptions = {},
+    ) => {
+      const store = get()
+      if (!input.trim()) return
+      const openPanel = options.openPanel ?? true
+
+      const builderState = useGraphStore.getState()
+      const agentId = draftInput?.agentId ?? builderState.agentId
+      const workspaceId = draftInput?.workspaceId ?? builderState.workspaceId
+
+      if (!agentId || !workspaceId) {
+        throw new Error(
+          'agentId and workspaceId are required to start execution. Legacy workspace route is no longer supported.',
+        )
+      }
+
+      const graphId = store.currentGraphId
+      if (!graphId) {
+        console.error('No graph_id available for execution')
+        store.togglePanel(true)
+        store.addStep({
+          id: generateId('error'),
+          nodeId: 'system',
+          nodeLabel: 'Error',
+          stepType: 'system_log',
+          title: 'Execution Error',
+          status: 'error',
+          startTime: Date.now(),
+          content: 'No graph available for execution. Please save your graph first.',
+        })
+        return
+      }
+
+      // If already executing, cancel the existing backend run before starting a new one
+      const currentGraphState = store.getContext(graphId).state
+      if (currentGraphState.isExecuting) {
+        await get().stopExecution()
+      }
+
+      // Cancel previous subscription
+      const existingContext = store.getContext(graphId)
+      if (existingContext.subscribedExecutionId) {
+        try {
+          getExecutionWsClient().unsubscribe(existingContext.subscribedExecutionId)
+        } catch {
+          /* ignore */
+        }
+      }
+      if (existingContext.abortController) {
+        existingContext.abortController.abort()
+      }
+
+      const abortController = new AbortController()
+      store.setAbortController(graphId, abortController)
+      store.setRunId(graphId, null)
+      store.setSubscribedExecutionId(graphId, null)
+
+      store.updateGraphState(graphId, {
+        steps: [],
+        isExecuting: true,
+        activeNodeId: null,
+        pendingInterrupts: new Map(),
+      })
+      if (openPanel) {
+        store.togglePanel(true)
+      }
+
+      const workflowId = generateId('workflow')
+      store.addStep({
+        id: workflowId,
+        nodeId: 'system',
+        nodeLabel: 'Workflow',
+        stepType: 'node_lifecycle',
+        title: 'Workflow Execution',
+        status: 'running',
+        startTime: Date.now(),
+        data: { input },
+      })
+
+      // toolUseId → stepId
+      const toolStepMap = new Map<string, string>() // toolUseId → stepId
+      let currentThoughtStepId: string | null = null
+
+      /**
+       * Handle a single execution event and map it to store operations.
+       */
+      const handleExecutionEvent = (frame: ExecutionEventFrame) => {
+        const { event_type, payload } = frame
+
+        switch (event_type) {
+          case 'assistant_text': {
+            const text =
+              (payload.delta as string) ??
+              (payload.content as string) ??
+              (payload.text as string) ??
+              ''
+            if (currentThoughtStepId) {
+              store.appendContent(currentThoughtStepId, text)
+            } else {
+              const stepId = generateId('thought')
+              currentThoughtStepId = stepId
+              store.addStep({
+                id: stepId,
+                nodeId: 'assistant',
+                nodeLabel: 'Assistant',
+                stepType: 'agent_thought',
+                title: 'Assistant Response',
+                status: 'running',
+                startTime: Date.now(),
+                content: text,
+              })
+            }
+            break
+          }
+
+          case 'thinking': {
+            const text = (payload.text as string) ?? ''
+            const stepId = generateId('thinking')
+            currentThoughtStepId = stepId
+            store.addStep({
+              id: stepId,
+              nodeId: 'assistant',
+              nodeLabel: 'Assistant',
+              stepType: 'agent_thought',
+              title: 'Thinking',
+              status: 'running',
+              startTime: Date.now(),
+              content: text,
+            })
+            break
+          }
+
+          case 'tool_use_start': {
+            if (currentThoughtStepId) {
+              store.updateStep(currentThoughtStepId, { status: 'success', endTime: Date.now() })
+              currentThoughtStepId = null
+            }
+            const toolUseId = (payload.tool_use_id as string) ?? ''
+            const toolName = (payload.tool_name as string) ?? 'tool'
+            const toolInput = (payload.input as Record<string, unknown>) ?? {}
+            const stepId = generateId('tool')
+            toolStepMap.set(toolUseId, stepId)
+            store.addStep({
+              id: stepId,
+              nodeId: 'tool',
+              nodeLabel: toolName,
+              stepType: 'tool_execution',
+              title: toolName,
+              status: 'running',
+              startTime: Date.now(),
+              data: { request: toolInput },
+            })
+            break
+          }
+
+          case 'tool_use_end': {
+            const toolUseId = (payload.tool_use_id as string) ?? ''
+            const isError = (payload.is_error as boolean) ?? false
+            const output = payload.output ?? payload.result ?? ''
+            const stepId = toolStepMap.get(toolUseId)
+            if (stepId) {
+              store.updateStep(stepId, {
+                status: isError ? 'error' : 'success',
+                endTime: Date.now(),
+                data: { response: output as string | Record<string, unknown> },
+              })
+              toolStepMap.delete(toolUseId)
+            }
+            break
+          }
+
+          case 'error': {
+            const code = (payload.code as string) ?? ''
+            const message = (payload.message as string) ?? String(payload.error ?? 'Unknown error')
+            if (code === 'stopped') {
+              // User-initiated stop — mark workflow as stopped, don't add error step
+              store.updateStep(workflowId, { status: 'error', endTime: Date.now() })
+            } else {
+              store.addStep({
+                id: generateId('error'),
+                nodeId: 'system',
+                nodeLabel: 'Error',
+                stepType: 'system_log',
+                title: 'Error',
+                status: 'error',
+                startTime: Date.now(),
+                content: message,
+              })
+            }
+            break
+          }
+
+          case 'artifact_created': {
+            const artifactName = (payload.name as string) ?? 'Artifact'
+            store.addStep({
+              id: generateId('artifact'),
+              nodeId: 'artifact',
+              nodeLabel: artifactName,
+              stepType: 'artifact',
+              title: artifactName,
+              status: 'success',
+              startTime: Date.now(),
+              data: payload,
+            })
+            break
+          }
+
+          case 'approval_requested': {
+            const nodeId = (payload.node_id as string) ?? 'unknown'
+            const nodeLabel = (payload.node_label as string) ?? nodeId
+            const threadId = (payload.thread_id as string) ?? ''
+            store.addInterrupt({
+              nodeId,
+              nodeLabel,
+              state: payload as Record<string, unknown>,
+              threadId,
+            })
+            break
+          }
+
+          case 'approval_resolved': {
+            const nodeId = (payload.node_id as string) ?? 'unknown'
+            store.removeInterrupt(nodeId)
+            break
+          }
+
+          // Lifecycle events — handled by onCompleted / noop here
+          case 'execution_started':
+          case 'execution_status_change':
+          case 'execution_completed':
+          case 'user_message':
+            break
+
+          // Copilot events — handled by separate copilot pipeline
+          case 'copilot_status':
+          case 'copilot_content':
+          case 'copilot_thought_step':
+          case 'copilot_tool_call':
+          case 'copilot_tool_result':
+          case 'copilot_result':
+            break
+
+          default:
+            // Unknown event types — ignore
+            break
+        }
+      }
+
+      const EXECUTION_TIMEOUT_MS = 10 * 60 * 1000 // 10 minutes
+      try {
+        const run = draftInput
+          ? await executionAdapter.startDraftRun({
+              agentId,
+              versionId: draftInput.versionId,
+              prompt: input,
+              workspaceId,
+            })
+          : await (async () => {
+              const agent = await globalAgentService.get(agentId, workspaceId)
+              const releaseId = agent.active_release_id
+              if (!releaseId) {
+                throw new Error('Agent has no active release. Please publish the agent first.')
+              }
+
+              return executionAdapter.startRun({
+                releaseId,
+                prompt: input,
+                workspaceId,
+              })
+            })()
+        store.setRunId(graphId, run.id)
+
+        const executionId = run.current_execution_id
+
+        const timeoutId = setTimeout(() => {
+          const context = getOrCreateContext(get().contexts, graphId)
+          if (context.runId) {
+            executionAdapter.cancelRun(context.runId).catch(() => {})
+          }
+          if (context.subscribedExecutionId) {
+            try {
+              getExecutionWsClient().unsubscribe(context.subscribedExecutionId)
+            } catch {
+              /* ignore */
+            }
+          }
+          store.addStep({
+            id: generateId('timeout'),
+            nodeId: 'system',
+            nodeLabel: 'System',
+            stepType: 'system_log',
+            title: 'Execution Timeout',
+            status: 'error',
+            startTime: Date.now(),
+            content: 'Execution timed out after 10 minutes',
+          })
+          store.updateGraphState(graphId, { isExecuting: false })
+        }, EXECUTION_TIMEOUT_MS)
+        store.setTimeoutId(graphId, timeoutId)
+
+        await new Promise<void>((resolve, reject) => {
+          const onAbort = () => {
+            try {
+              getExecutionWsClient().unsubscribe(executionId)
+            } catch {
+              /* ignore */
+            }
+            resolve()
+          }
+          abortController.signal.addEventListener('abort', onAbort, { once: true })
+
+          getExecutionWsClient()
+            .subscribe(executionId, 0, {
+              onEvent: (frame: ExecutionEventFrame) => {
+                try {
+                  handleExecutionEvent(frame)
+                } catch (err) {
+                  console.warn('[executionStore] Failed to handle execution event:', err)
+                }
+              },
+
+              onSnapshot: (frame: ExecutionSnapshotFrame) => {
+                for (const evt of frame.events) {
+                  try {
+                    handleExecutionEvent({
+                      type: 'event',
+                      execution_id: frame.execution_id,
+                      seq: evt.seq,
+                      event_type: evt.event_type,
+                      payload: evt.payload,
+                      created_at: evt.created_at,
+                    })
+                  } catch (err) {
+                    console.warn('[executionStore] Failed to replay snapshot event:', err)
+                  }
+                }
+              },
+
+              onCompleted: (frame: ExecutionCompletedFrame) => {
+                abortController.signal.removeEventListener('abort', onAbort)
+                if (currentThoughtStepId) {
+                  store.updateStep(currentThoughtStepId, { status: 'success', endTime: Date.now() })
+                  currentThoughtStepId = null
+                }
+                const now = Date.now()
+                const graphContext = store.getContext(graphId)
+                const workflowStep = graphContext.state.steps.find((s) => s.id === workflowId)
+                const status =
+                  frame.status === 'succeeded' || frame.status === 'completed'
+                    ? 'success'
+                    : ('error' as const)
+                store.updateStep(workflowId, {
+                  status,
+                  endTime: now,
+                  duration: now - (workflowStep?.startTime || now),
+                })
+                if (frame.error) {
+                  store.addStep({
+                    id: generateId('error'),
+                    nodeId: 'system',
+                    nodeLabel: 'Error',
+                    stepType: 'system_log',
+                    title: frame.error.code,
+                    status: 'error',
+                    startTime: now,
+                    content: frame.error.message,
+                    data: { ...frame.error },
+                  })
+                }
+                resolve()
+              },
+
+              onError: (error: AppErrorPayload) => {
+                abortController.signal.removeEventListener('abort', onAbort)
+                reject(new Error(`Execution WebSocket error: ${error.message}`))
+              },
+            })
+            .catch((err) => {
+              abortController.signal.removeEventListener('abort', onAbort)
+              reject(err)
+            })
+
+          store.setSubscribedExecutionId(graphId, executionId)
+        })
+      } catch (e: unknown) {
+        const error = e as { name?: string; message?: string }
+        store.updateStep(workflowId, { status: 'error', endTime: Date.now() })
+        if (error?.name !== 'AbortError') {
+          store.addStep({
+            id: generateId('error'),
+            nodeId: 'system',
+            nodeLabel: 'Error',
+            stepType: 'system_log',
+            title: 'Execution Error',
+            status: 'error',
+            startTime: Date.now(),
+            content: String(error?.message || e),
+          })
+        }
+      } finally {
+        // Clear the execution timeout on any completion path
+        const finalContext = store.getContext(graphId)
+        if (finalContext.timeoutId !== null) {
+          clearTimeout(finalContext.timeoutId)
+        }
+        // Unsubscribe if still subscribed
+        if (finalContext.subscribedExecutionId) {
+          try {
+            getExecutionWsClient().unsubscribe(finalContext.subscribedExecutionId)
+          } catch {
+            /* ignore */
+          }
+        }
+        store.updateGraphState(graphId, { isExecuting: false })
+        store.setAbortController(graphId, null)
+        store.setRunId(graphId, null)
+        store.setSubscribedExecutionId(graphId, null)
+        store.setTimeoutId(graphId, null)
+      }
+    },
+
+    startDraftExecution: async (params: StartDraftExecutionInput) => {
+      await get().startExecution(params.input, params, { openPanel: false })
+    },
+
+    stopExecution: async () => {
+      const {
+        currentGraphId,
+        getContext,
+        setAbortController,
+        setRunId,
+        setSubscribedExecutionId,
+        updateGraphState,
+      } = get()
+      if (!currentGraphId) return
+
+      const context = getContext(currentGraphId)
+
+      // Cancel via executionAdapter
+      if (context.runId) {
+        try {
+          await executionAdapter.cancelRun(context.runId)
+        } catch (error) {
+          console.error('Failed to cancel run on backend:', error)
+          // Surface the failure so the user knows the backend run may still be active
+          get().addStep({
+            id: generateId('cancel-error'),
+            nodeId: 'system',
+            nodeLabel: 'System',
+            stepType: 'system_log',
+            title: 'Cancel Failed',
+            status: 'error',
+            startTime: Date.now(),
+            content: 'Failed to cancel execution on server. It may still be running.',
+          })
+        }
+        setRunId(currentGraphId, null)
+      }
+
+      // Unsubscribe from execution WS
+      if (context.subscribedExecutionId) {
+        try {
+          getExecutionWsClient().unsubscribe(context.subscribedExecutionId)
+        } catch {
+          /* ignore */
+        }
+        setSubscribedExecutionId(currentGraphId, null)
+      }
+
+      if (context.abortController) {
+        context.abortController.abort()
+        setAbortController(currentGraphId, null)
+      }
+
+      updateGraphState(currentGraphId, { isExecuting: false, activeNodeId: null })
+    },
+  }
+})
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/types.ts b/frontend/components/editors/graph-builder/stores/execution/types.ts
similarity index 70%
rename from frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/types.ts
rename to frontend/components/editors/graph-builder/stores/execution/types.ts
index 0ff42535b..daa50eb2d 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/types.ts
+++ b/frontend/components/editors/graph-builder/stores/execution/types.ts
@@ -6,7 +6,20 @@
 
 import type { ExecutionStep, ExecutionTreeNode } from '@/types'
 
-import type { GraphState, TraceStep } from '../../services/eventProcessor'
+export interface GraphState {
+  context?: Record<string, unknown>
+  messages?: unknown[]
+  current_node?: string
+}
+
+export interface TraceStep {
+  nodeId: string
+  nodeType: string
+  timestamp: number
+  command: { update: Record<string, unknown>; goto?: string; reason?: string }
+  stateSnapshot: GraphState
+  routeDecision?: { result: boolean | string; reason: string; goto: string }
+}
 
 // ============ Basic Types ============
 
@@ -34,6 +47,17 @@ export interface RouteDecision {
   timestamp: number
 }
 
+export interface StartDraftExecutionInput {
+  agentId: string
+  versionId: string
+  workspaceId: string
+  input: string
+}
+
+export interface StartExecutionOptions {
+  openPanel?: boolean
+}
+
 // ============ Graph Execution State ============
 
 export interface GraphExecutionState {
@@ -55,8 +79,12 @@ export interface GraphExecutionState {
 export interface ExecutionContext {
   graphId: string
   abortController: AbortController | null
-  threadId: string | null
-  requestId: string | null
+  /** Run ID returned by executionAdapter.startRun — used for cancel */
+  runId: string | null
+  /** Execution ID currently subscribed to via the shared WS client */
+  subscribedExecutionId: string | null
+  /** Timeout handle — cleared on normal completion, fires to force-stop stalled executions */
+  timeoutId: ReturnType<typeof setTimeout> | null
   state: GraphExecutionState
 }
 
@@ -67,7 +95,7 @@ export interface ExecutionStoreState {
   contexts: Map<string, ExecutionContext>
   currentGraphId: string | null
 
-  // Computed properties for current graph (backward compatible)
+  // Computed properties for current graph
   steps: ExecutionStep[]
   isExecuting: boolean
   showPanel: boolean
@@ -106,14 +134,20 @@ export interface ExecutionStoreActions {
   clearGraphState: (graphId: string) => void
   getRunningGraphIds: () => string[]
   setExecuting: (isExecuting: boolean) => void
-  startExecution: (input: string) => Promise<void>
+  startExecution: (
+    input: string,
+    draftInput?: StartDraftExecutionInput,
+    options?: StartExecutionOptions,
+  ) => Promise<void>
+  startDraftExecution: (params: StartDraftExecutionInput) => Promise<void>
   stopExecution: () => Promise<void>
 
   // Execution context management
   getContext: (graphId: string) => ExecutionContext
   setAbortController: (graphId: string, controller: AbortController | null) => void
-  setThreadId: (graphId: string, threadId: string | null) => void
-  setRequestId: (graphId: string, requestId: string | null) => void
+  setRunId: (graphId: string, runId: string | null) => void
+  setSubscribedExecutionId: (graphId: string, executionId: string | null) => void
+  setTimeoutId: (graphId: string, timeoutId: ReturnType<typeof setTimeout> | null) => void
 
   // Command Mode visualization
   updateState: (state: Partial<GraphState>) => void
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/utils.ts b/frontend/components/editors/graph-builder/stores/execution/utils.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/stores/execution/utils.ts
rename to frontend/components/editors/graph-builder/stores/execution/utils.ts
diff --git a/frontend/components/editors/graph-builder/stores/graphStore.ts b/frontend/components/editors/graph-builder/stores/graphStore.ts
new file mode 100644
index 000000000..c9f3b142b
--- /dev/null
+++ b/frontend/components/editors/graph-builder/stores/graphStore.ts
@@ -0,0 +1,473 @@
+'use client'
+
+import {
+  Connection,
+  Edge,
+  EdgeChange,
+  Node,
+  NodeChange,
+  addEdge,
+  OnNodesChange,
+  OnEdgesChange,
+  OnConnect,
+  applyNodeChanges,
+  applyEdgeChanges,
+  ReactFlowInstance,
+} from 'reactflow'
+import { create } from 'zustand'
+
+import { generateUUID } from '@/lib/utils/uuid'
+import { createLogger } from '@/lib/logs/console/logger'
+import { useSidebarStore } from '@/stores/sidebar/store'
+
+import { nodeRegistry } from '../services/nodeRegistry'
+import type { StateField } from '../types/graph'
+import { EdgeData } from '../types/graph'
+import { determineEdgeTypeAndRouteKey } from '../utils/connectionUtils'
+import { getEdgeStyleByType, processEdgesForReactFlow } from '../utils/edgeStyles'
+import { exportGraphToJson, parseImportedGraph } from '../utils/graphImportExport'
+
+const logger = createLogger('GraphStore')
+
+interface HistoryState {
+  nodes: Node[]
+  edges: Edge[]
+}
+
+let importGraphTimeout1: NodeJS.Timeout | null = null
+let importGraphTimeout2: NodeJS.Timeout | null = null
+
+interface GraphState {
+  // Canvas State
+  nodes: Node[]
+  edges: Edge[]
+  rfInstance: ReactFlowInstance | null
+  selectedNodeId: string | null
+  selectedEdgeId: string | null
+
+  // History State
+  past: HistoryState[]
+  future: HistoryState[]
+
+  // Identity fields
+  agentId: string | null
+  versionId: string | null
+  workspaceId: string | null
+  graphId: string | null
+  graphName: string | null
+
+  // Graph schema
+  graphStateFields: StateField[]
+  fallbackNodeId: string | null
+
+  // UI State
+  isInitializing: boolean
+
+  // ReactFlow handlers
+  onNodesChange: OnNodesChange
+  onEdgesChange: OnEdgesChange
+  onConnect: OnConnect
+  setRfInstance: (instance: ReactFlowInstance) => void
+
+  // Selection
+  selectNode: (id: string | null) => void
+  selectEdge: (id: string | null) => void
+  clearSelection: () => void
+
+  // History
+  undo: () => void
+  redo: () => void
+  takeSnapshot: () => void
+
+  // Identity setters
+  setWorkspaceId: (workspaceId: string) => void
+  setGraphId: (graphId: string | null) => void
+  setGraphName: (graphName: string | null) => void
+
+  // Direct setters
+  setNodes: (nodes: Node[]) => void
+  setEdges: (edges: Edge[]) => void
+
+  // Node actions
+  addNode: (
+    type: string,
+    position: { x: number; y: number },
+    label?: string,
+    configOverride?: Record<string, unknown>,
+  ) => void
+  updateNodeData: (id: string, data: Partial<Record<string, unknown>>) => void
+  updateNodeConfig: (id: string, config: Record<string, unknown>) => void
+  updateNodeLabel: (id: string, label: string) => void
+  deleteNode: (id: string) => void
+  duplicateNode: (id: string) => void
+
+  // Edge actions
+  updateEdge: (id: string, data: Partial<EdgeData>) => void
+  getOutgoingEdges: (nodeId: string) => Edge[]
+
+  // Graph persistence
+  loadGraph: () => Promise<void>
+  exportGraph: () => void
+  importGraph: (file: File) => Promise<void>
+
+  // AI integration
+  applyAIChanges: (changes: { nodes?: Node[]; edges?: Edge[] }) => void
+  getGraphContext: () => { nodes: Node[]; edges: { source: string; target: string }[] }
+
+  // State schema
+  addStateField: (field: StateField) => void
+  updateStateField: (name: string, field: Partial<StateField>) => void
+  deleteStateField: (name: string) => void
+  setFallbackNodeId: (nodeId: string | null) => void
+}
+
+export type { GraphState }
+
+let _triggerAutoSave: (() => void) | null = null
+
+export function setAutoSaveTrigger(fn: () => void) {
+  _triggerAutoSave = fn
+}
+
+function triggerAutoSave() {
+  _triggerAutoSave?.()
+}
+
+export const useGraphStore = create<GraphState>((set, get) => ({
+  nodes: [],
+  edges: [],
+  rfInstance: null,
+  selectedNodeId: null,
+  selectedEdgeId: null,
+  past: [],
+  future: [],
+  agentId: null,
+  versionId: null,
+  workspaceId: null,
+  graphId: null,
+  graphName: null,
+  graphStateFields: [],
+  fallbackNodeId: null,
+  isInitializing: false,
+
+  onNodesChange: (changes: NodeChange[]) => {
+    if (changes.some((c) => c.type === 'remove')) get().takeSnapshot()
+    set({ nodes: applyNodeChanges(changes, get().nodes) })
+    const isContentChange = changes.some((c) => c.type !== 'select' && c.type !== 'dimensions')
+    if (isContentChange) triggerAutoSave()
+  },
+
+  onEdgesChange: (changes: EdgeChange[]) => {
+    if (changes.some((c) => c.type === 'remove')) get().takeSnapshot()
+    set({ edges: applyEdgeChanges(changes, get().edges) })
+    const isContentChange = changes.some((c) => c.type !== 'select')
+    if (isContentChange) triggerAutoSave()
+  },
+
+  onConnect: (connection: Connection) => {
+    try {
+      if (!connection.source || !connection.target) return
+
+      const { edges, nodes } = get()
+      const exists = edges.some(
+        (e) => e.source === connection.source && e.target === connection.target,
+      )
+      if (exists) return
+      if (connection.source === connection.target) return
+
+      const sourceNode = nodes.find((n) => n.id === connection.source)
+      const targetNode = nodes.find((n) => n.id === connection.target)
+      if (!sourceNode || !targetNode) return
+
+      const { edgeType, routeKey } = determineEdgeTypeAndRouteKey(
+        connection.source,
+        connection.target,
+        nodes,
+        edges,
+      )
+
+      const edgeData: EdgeData = {
+        edge_type: edgeType,
+        route_key: routeKey,
+      }
+
+      const { style: edgeStyle } = getEdgeStyleByType(edgeType)
+
+      get().takeSnapshot()
+      set({
+        edges: addEdge(
+          {
+            ...connection,
+            data: edgeData,
+            type: 'default',
+            animated: true,
+            style: edgeStyle,
+          },
+          get().edges,
+        ),
+      })
+
+      triggerAutoSave()
+    } catch (error) {
+      logger.error('Failed to create connection:', error)
+    }
+  },
+
+  setRfInstance: (instance) => set({ rfInstance: instance }),
+
+  selectNode: (id) => set({ selectedNodeId: id, selectedEdgeId: null }),
+  selectEdge: (id) => set({ selectedEdgeId: id, selectedNodeId: null }),
+  clearSelection: () => set({ selectedNodeId: null, selectedEdgeId: null }),
+
+  takeSnapshot: () => {
+    const { nodes, edges, past } = get()
+    const newPast = [...past, { nodes: [...nodes], edges: [...edges] }].slice(-50)
+    set({ past: newPast, future: [] })
+  },
+
+  undo: () => {
+    const { past, future, nodes, edges } = get()
+    if (past.length === 0) return
+    const previous = past[past.length - 1]
+    set({
+      past: past.slice(0, past.length - 1),
+      future: [{ nodes, edges }, ...future],
+      nodes: previous.nodes,
+      edges: previous.edges,
+    })
+    triggerAutoSave()
+  },
+
+  redo: () => {
+    const { past, future, nodes, edges } = get()
+    if (future.length === 0) return
+    const next = future[0]
+    set({
+      past: [...past, { nodes, edges }],
+      future: future.slice(1),
+      nodes: next.nodes,
+      edges: next.edges,
+    })
+    triggerAutoSave()
+  },
+
+  setWorkspaceId: (workspaceId) => set({ workspaceId }),
+  setGraphId: (graphId) => set({ graphId }),
+  setGraphName: (graphName) => set({ graphName }),
+  setNodes: (nodes) => set({ nodes }),
+  setEdges: (edges) => set({ edges }),
+
+  addNode: (type, position, label, configOverride) => {
+    get().takeSnapshot()
+    const def = nodeRegistry.get(type)
+    const defaultConfig = { ...def?.defaultConfig }
+    if (configOverride) {
+      Object.assign(defaultConfig, configOverride)
+    }
+    const newNode: Node = {
+      id: generateUUID(),
+      type: 'custom',
+      position,
+      data: {
+        label: label || def?.label || 'New Node',
+        type,
+        config: defaultConfig,
+      },
+    }
+    set({ nodes: [...get().nodes, newNode], selectedNodeId: newNode.id })
+    triggerAutoSave()
+  },
+
+  updateNodeData: (id, data) => {
+    set({
+      nodes: get().nodes.map((n) => {
+        if (n.id !== id) return n
+        return { ...n, data: { ...n.data, ...data } }
+      }),
+    })
+  },
+
+  updateNodeConfig: (id, config) => {
+    set({
+      nodes: get().nodes.map((n) => {
+        if (n.id !== id) return n
+        const nodeData = n.data as { config?: Record<string, unknown> }
+        return { ...n, data: { ...n.data, config: { ...nodeData.config, ...config } } }
+      }),
+    })
+    triggerAutoSave()
+  },
+
+  updateNodeLabel: (id, label) => {
+    set({
+      nodes: get().nodes.map((node) => {
+        if (node.id !== id) return node
+        return { ...node, data: { ...node.data, label } }
+      }),
+    })
+    triggerAutoSave()
+  },
+
+  deleteNode: (id) => {
+    get().takeSnapshot()
+    const { nodes, edges } = get()
+    set({
+      nodes: nodes.filter((n) => n.id !== id),
+      edges: edges.filter((e) => e.source !== id && e.target !== id),
+      selectedNodeId: null,
+    })
+    triggerAutoSave()
+  },
+
+  duplicateNode: (id) => {
+    get().takeSnapshot()
+    const nodeToDuplicate = get().nodes.find((n) => n.id === id)
+    if (!nodeToDuplicate) return
+
+    const sidebarState = useSidebarStore.getState()
+    const isSidebarCollapsed = sidebarState.isCollapsed
+    const sidebarWidth = sidebarState.sidebarWidth || 280
+    const offsetX = 200
+    const offsetY = 50
+    let newX = nodeToDuplicate.position.x + offsetX
+    const newY = nodeToDuplicate.position.y + offsetY
+    const sidebarRightBoundary = isSidebarCollapsed ? 422 : sidebarWidth
+
+    if (newX < sidebarRightBoundary + 50) {
+      newX = sidebarRightBoundary + 50
+    }
+
+    const newNode: Node = {
+      ...nodeToDuplicate,
+      id: generateUUID(),
+      position: { x: newX, y: newY },
+      selected: false,
+    }
+    set({ nodes: [...get().nodes, newNode], selectedNodeId: newNode.id })
+    triggerAutoSave()
+  },
+
+  // Edge actions
+  updateEdge: (id, data) => {
+    set((state) => ({
+      edges: state.edges.map((e) => {
+        if (e.id !== id) return e
+        const updatedData = { ...(e.data || {}), ...data } as EdgeData
+        const edgeType = updatedData.edge_type
+        const { type: edgeTypeForReactFlow, style: edgeStyle } = getEdgeStyleByType(
+          edgeType,
+          e.style,
+        )
+        return { ...e, type: edgeTypeForReactFlow, data: updatedData, style: edgeStyle }
+      }),
+    }))
+    triggerAutoSave()
+  },
+
+  getOutgoingEdges: (nodeId) => {
+    return get().edges.filter((e) => e.source === nodeId)
+  },
+
+  // Graph persistence
+  loadGraph: async () => {
+    set({ isInitializing: true })
+    try {
+      const processedEdges = processEdgesForReactFlow([])
+      set({ nodes: [], edges: processedEdges, past: [], future: [], isInitializing: false })
+    } catch {
+      set({ nodes: [], edges: [], past: [], future: [], isInitializing: false })
+    }
+  },
+
+  exportGraph: () => {
+    const { nodes, edges, rfInstance } = get()
+    exportGraphToJson(nodes, edges, rfInstance)
+  },
+
+  importGraph: async (file: File) => {
+    const { nodes, edges, viewport } = await parseImportedGraph(file)
+
+    get().takeSnapshot()
+
+    set({
+      nodes,
+      edges,
+      past: [],
+      future: [],
+      selectedNodeId: null,
+    })
+
+    if (importGraphTimeout1) {
+      clearTimeout(importGraphTimeout1)
+      importGraphTimeout1 = null
+    }
+    if (importGraphTimeout2) {
+      clearTimeout(importGraphTimeout2)
+      importGraphTimeout2 = null
+    }
+
+    importGraphTimeout1 = setTimeout(() => {
+      const { rfInstance } = get()
+      if (viewport && rfInstance) {
+        rfInstance.setViewport(viewport)
+        importGraphTimeout1 = null
+      } else if (rfInstance) {
+        importGraphTimeout2 = setTimeout(() => {
+          rfInstance?.fitView({ padding: 0.2 })
+          importGraphTimeout2 = null
+        }, 100)
+        importGraphTimeout1 = null
+      } else {
+        importGraphTimeout1 = null
+      }
+    }, 100)
+  },
+
+  // AI integration
+  applyAIChanges: ({ nodes, edges }) => {
+    get().takeSnapshot()
+    set((state) => ({
+      nodes: nodes !== undefined ? nodes : state.nodes,
+      edges: edges !== undefined ? edges : state.edges,
+    }))
+  },
+
+  getGraphContext: () => {
+    const { nodes, edges } = get()
+    return {
+      nodes,
+      edges: edges.map((e) => ({ source: e.source, target: e.target })),
+    }
+  },
+
+  // State schema
+  addStateField: (field) => {
+    set((state) => ({ graphStateFields: [...state.graphStateFields, field] }))
+    triggerAutoSave()
+  },
+
+  updateStateField: (name, updates) => {
+    set((state) => ({
+      graphStateFields: state.graphStateFields.map((f) =>
+        f.name === name ? { ...f, ...updates } : f,
+      ),
+    }))
+    triggerAutoSave()
+  },
+
+  deleteStateField: (name) => {
+    set((state) => ({
+      graphStateFields: state.graphStateFields.filter((f) => f.name !== name),
+    }))
+    triggerAutoSave()
+  },
+
+  setFallbackNodeId: (nodeId) => {
+    set({ fallbackNodeId: nodeId })
+    triggerAutoSave()
+  },
+}))
+
+const graphStoreInitialState = useGraphStore.getState()
+;(useGraphStore as unknown as { getInitialState: () => GraphState }).getInitialState = () =>
+  graphStoreInitialState
diff --git a/frontend/components/editors/graph-builder/stores/saveStore.ts b/frontend/components/editors/graph-builder/stores/saveStore.ts
new file mode 100644
index 000000000..eddd70dd9
--- /dev/null
+++ b/frontend/components/editors/graph-builder/stores/saveStore.ts
@@ -0,0 +1,146 @@
+'use client'
+
+import { QueryClient } from '@tanstack/react-query'
+import { create } from 'zustand'
+
+import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
+import { agentKeys } from '@/hooks/queries/agents'
+
+import { SaveManager, type GraphState as SaveManagerGraphState } from '../utils/saveManager'
+import { useGraphStore, setAutoSaveTrigger } from './graphStore'
+
+let _queryClient: QueryClient | null = null
+export function setSaveStoreQueryClient(qc: QueryClient) {
+  _queryClient = qc
+}
+
+interface SaveState {
+  isSaving: boolean
+  lastAutoSaveTime: number | null
+  lastSavedStateHash: string | null
+  hasPendingChanges: boolean
+  saveRetryCount: number
+  lastSaveError: string | null
+
+  startAutoSave: () => void
+  stopAutoSave: () => void
+  saveNow: (reason?: string) => Promise<void>
+  autoSave: () => Promise<void>
+  triggerAutoSave: () => void
+}
+
+function getGraphSnapshot(): SaveManagerGraphState {
+  const gs = useGraphStore.getState()
+  return {
+    agentId: gs.agentId,
+    versionId: gs.versionId,
+    workspaceId: gs.workspaceId,
+    graphId: gs.graphId,
+    graphName: gs.graphName,
+    nodes: gs.nodes,
+    edges: gs.edges,
+    viewport: gs.rfInstance?.getViewport(),
+    graphStateFields: gs.graphStateFields,
+    fallbackNodeId: gs.fallbackNodeId,
+  }
+}
+
+export const useSaveStore = create<SaveState>((set, get) => {
+  const manager = new SaveManager(getGraphSnapshot, {
+    onSaveSuccess: (hash, savedGraphId) => {
+      const gs = useGraphStore.getState()
+      if (savedGraphId && savedGraphId !== gs.graphId && savedGraphId !== gs.agentId) return
+      set({
+        isSaving: false,
+        lastSavedStateHash: hash,
+        lastAutoSaveTime: Date.now(),
+        saveRetryCount: 0,
+        lastSaveError: null,
+      })
+    },
+    onSaveError: (error) => {
+      set((s) => ({
+        isSaving: false,
+        saveRetryCount: s.saveRetryCount + 1,
+        lastSaveError: error,
+      }))
+    },
+    onVersionForked: (oldVersionId, newVersionId) => {
+      const gs = useGraphStore.getState()
+      if (gs.versionId !== oldVersionId) return
+      useGraphStore.setState({ versionId: newVersionId })
+      if (_queryClient && gs.agentId && gs.workspaceId) {
+        _queryClient.invalidateQueries({
+          queryKey: agentKeys.detail(gs.agentId, gs.workspaceId),
+        })
+      }
+    },
+  })
+
+  return {
+    isSaving: false,
+    lastAutoSaveTime: null,
+    lastSavedStateHash: null,
+    hasPendingChanges: false,
+    saveRetryCount: 0,
+    lastSaveError: null,
+
+    startAutoSave: () => {
+      manager.save('auto')
+    },
+
+    stopAutoSave: () => {
+      manager.stopAll()
+    },
+
+    saveNow: async (reason = 'manual') => {
+      set({ isSaving: true })
+      await manager.save(reason as 'manual' | 'auto' | 'debounce')
+    },
+
+    autoSave: async () => {
+      await manager.save('auto')
+    },
+
+    triggerAutoSave: () => {
+      const gs = useGraphStore.getState()
+      const hasPath = !!(gs.agentId && gs.versionId && gs.workspaceId)
+      if (!gs.graphId && !hasPath) return
+      manager.debouncedSave()
+    },
+  }
+})
+
+setAutoSaveTrigger(() => {
+  useSaveStore.getState().triggerAutoSave()
+})
+
+// Reactive hasPendingChanges: subscribe to graphStore and recompute on change
+useGraphStore.subscribe((state, prev) => {
+  if (
+    state.nodes === prev.nodes &&
+    state.edges === prev.edges &&
+    state.graphStateFields === prev.graphStateFields &&
+    state.fallbackNodeId === prev.fallbackNodeId
+  ) {
+    return
+  }
+
+  const { lastSavedStateHash } = useSaveStore.getState()
+  const { nodes, edges, graphStateFields, fallbackNodeId, graphId } = state
+
+  if (!graphId && nodes.length === 0 && edges.length === 0) {
+    useSaveStore.setState({ hasPendingChanges: false })
+    return
+  }
+
+  const currentHash = computeGraphStateHash(nodes, edges, graphStateFields, fallbackNodeId)
+  const hasPendingChanges =
+    lastSavedStateHash !== null
+      ? currentHash !== lastSavedStateHash
+      : nodes.length > 0 || edges.length > 0
+  useSaveStore.setState({ hasPendingChanges })
+})
+const saveStoreInitialState = useSaveStore.getState()
+;(useSaveStore as unknown as { getInitialState: () => SaveState }).getInitialState = () =>
+  saveStoreInitialState
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/types/graph.ts b/frontend/components/editors/graph-builder/types/graph.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/types/graph.ts
rename to frontend/components/editors/graph-builder/types/graph.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/codeTemplate.ts b/frontend/components/editors/graph-builder/utils/codeTemplate.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/codeTemplate.ts
rename to frontend/components/editors/graph-builder/utils/codeTemplate.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/connectionUtils.ts b/frontend/components/editors/graph-builder/utils/connectionUtils.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/connectionUtils.ts
rename to frontend/components/editors/graph-builder/utils/connectionUtils.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/copilotUtils.ts b/frontend/components/editors/graph-builder/utils/copilotUtils.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/copilotUtils.ts
rename to frontend/components/editors/graph-builder/utils/copilotUtils.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/edgeStyles.ts b/frontend/components/editors/graph-builder/utils/edgeStyles.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/edgeStyles.ts
rename to frontend/components/editors/graph-builder/utils/edgeStyles.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/graphImportExport.ts b/frontend/components/editors/graph-builder/utils/graphImportExport.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/graphImportExport.ts
rename to frontend/components/editors/graph-builder/utils/graphImportExport.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/nodeNameUtils.ts b/frontend/components/editors/graph-builder/utils/nodeNameUtils.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/nodeNameUtils.ts
rename to frontend/components/editors/graph-builder/utils/nodeNameUtils.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/reactFlowConfig.ts b/frontend/components/editors/graph-builder/utils/reactFlowConfig.ts
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/reactFlowConfig.ts
rename to frontend/components/editors/graph-builder/utils/reactFlowConfig.ts
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/utils/saveManager.ts b/frontend/components/editors/graph-builder/utils/saveManager.ts
similarity index 73%
rename from frontend/app/workspace/[workspaceId]/[agentId]/utils/saveManager.ts
rename to frontend/components/editors/graph-builder/utils/saveManager.ts
index 5e87e71fa..9548e82f6 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/utils/saveManager.ts
+++ b/frontend/components/editors/graph-builder/utils/saveManager.ts
@@ -8,16 +8,19 @@
 
 import type { Node, Edge } from 'reactflow'
 
-import type { StateField } from '@/app/workspace/[workspaceId]/[agentId]/types/graph'
+import type { StateField } from '../types/graph'
 import { computeGraphStateHash } from '@/lib/utils/graphStateHash'
 
-import { agentService } from '../services/agentService'
+import { visualDefinitionAdapter } from '../services/visualDefinitionAdapter'
 
 export type SaveSource = 'manual' | 'auto' | 'debounce'
 
 export interface GraphState {
   graphId: string | null
   graphName: string | null
+  agentId?: string | null
+  versionId?: string | null
+  workspaceId?: string | null
   nodes: Node[]
   edges: Edge[]
   viewport?: { x: number; y: number; zoom: number }
@@ -28,6 +31,7 @@ export interface GraphState {
 export interface SaveManagerCallbacks {
   onSaveSuccess: (hash: string, savedGraphId: string) => void
   onSaveError: (error: string) => void
+  onVersionForked?: (oldVersionId: string, newVersionId: string) => void
 }
 
 export class SaveManager {
@@ -43,7 +47,7 @@ export class SaveManager {
   async save(source: SaveSource): Promise<void> {
     const state = this.getState()
 
-    if (!state.graphId) return
+    if (!state.agentId || !state.versionId || !state.workspaceId) return
 
     if (typeof navigator !== 'undefined' && !navigator.onLine) {
       this.callbacks.onSaveError('offline')
@@ -59,18 +63,22 @@ export class SaveManager {
         return true
       })
 
-      await agentService.saveGraphState({
-        graphId: state.graphId,
-        nodes: state.nodes,
-        edges: deduplicatedEdges,
-        viewport: state.viewport,
-        variables: {
-          state_fields: state.graphStateFields,
-          ...(state.fallbackNodeId != null && state.fallbackNodeId !== ''
-            ? { fallback_node_id: state.fallbackNodeId }
-            : {}),
+      const result = await visualDefinitionAdapter.save(
+        state.agentId,
+        state.versionId,
+        state.workspaceId,
+        {
+          nodes: state.nodes,
+          edges: deduplicatedEdges,
+          viewport: state.viewport,
+          graphStateFields: state.graphStateFields,
+          fallbackNodeId: state.fallbackNodeId,
         },
-      })
+      )
+
+      if (result.versionId !== state.versionId) {
+        this.callbacks.onVersionForked?.(state.versionId, result.versionId)
+      }
 
       const savedHash = computeGraphStateHash(
         state.nodes,
@@ -79,7 +87,7 @@ export class SaveManager {
         state.fallbackNodeId,
       )
       this.saveRetryCount = 0
-      this.callbacks.onSaveSuccess(savedHash, state.graphId)
+      this.callbacks.onSaveSuccess(savedHash, state.agentId)
     } catch (error) {
       this.handleSaveError(error, source)
     }
@@ -109,7 +117,8 @@ export class SaveManager {
     if (this.saveRetryCount < this.maxRetries) {
       const delay = Math.pow(2, this.saveRetryCount) * 1000
       setTimeout(() => {
-        if (this.getState().graphId) this.save(source)
+        const s = this.getState()
+        if (s.agentId && s.versionId && s.workspaceId) this.save(source)
       }, delay)
       this.saveRetryCount++
       this.callbacks.onSaveError(errorMessage)
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionDetailPanel.tsx b/frontend/components/execution/ExecutionDetailPanel.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionDetailPanel.tsx
rename to frontend/components/execution/ExecutionDetailPanel.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionPanelNew.tsx b/frontend/components/execution/ExecutionPanelNew.tsx
similarity index 87%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionPanelNew.tsx
rename to frontend/components/execution/ExecutionPanelNew.tsx
index fb034e2e2..0012b4af1 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionPanelNew.tsx
+++ b/frontend/components/execution/ExecutionPanelNew.tsx
@@ -18,8 +18,8 @@ import { PanelGroup, Panel, PanelResizeHandle } from 'react-resizable-panels'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
 
-import { useExecutionStore } from '../../stores/executionStore'
-import { InterruptPanel } from '../InterruptPanel'
+import { useExecutionStore } from '@/components/editors/graph-builder/stores/execution/executionStore'
+import { InterruptPanel } from '@/components/editors/graph-builder/components/InterruptPanel'
 
 import { ExecutionDataProvider, useExecutionData } from './contexts/ExecutionDataContext'
 import {
@@ -35,7 +35,11 @@ type NavigationView = 'tree' | 'timeline'
 
 // ============ Inner Content (has access to contexts) ============
 
-function ExecutionPanelContent() {
+interface ExecutionPanelContentProps {
+  embedded?: boolean
+}
+
+function ExecutionPanelContent({ embedded = false }: ExecutionPanelContentProps) {
   const { t } = useTranslation()
   const {
     steps: executionSteps,
@@ -117,7 +121,10 @@ function ExecutionPanelContent() {
 
   return (
     <div
-      className="z-40 flex h-[320px] w-[calc(100%-320px)] shrink-0 flex-col border-t border-[var(--border)] bg-[var(--surface-elevated)] font-sans shadow-[0_-4px_20px_rgba(0,0,0,0.05)] duration-300 animate-in slide-in-from-bottom-10"
+      className={cn(
+        'z-40 flex shrink-0 flex-col border-t border-[var(--border)] bg-[var(--surface-elevated)] font-sans shadow-[0_-4px_20px_rgba(0,0,0,0.05)] duration-300 animate-in slide-in-from-bottom-10',
+        embedded ? 'h-full w-full' : 'h-[320px] w-[calc(100%-320px)]',
+      )}
       onKeyDown={handleKeyDown}
       tabIndex={0}
     >
@@ -197,16 +204,18 @@ function ExecutionPanelContent() {
                 >
                   <Trash2 size={12} />
                 </button>
-                <button
-                  onClick={() => toggleExecutionPanel(false)}
-                  className="flex items-center gap-0.5 rounded border border-transparent px-1.5 py-0.5 text-[var(--text-muted)] transition-colors hover:border-[var(--status-error-border)] hover:bg-[var(--status-error-bg)] hover:text-[var(--status-error)]"
-                  title={t('workspace.closePanel', { defaultValue: 'Close Panel' })}
-                >
-                  <ChevronDown size={12} />
-                  <span className="text-xs font-medium">
-                    {t('workspace.close', { defaultValue: 'Close' })}
-                  </span>
-                </button>
+                {!embedded && (
+                  <button
+                    onClick={() => toggleExecutionPanel(false)}
+                    className="flex items-center gap-0.5 rounded border border-transparent px-1.5 py-0.5 text-[var(--text-muted)] transition-colors hover:border-[var(--status-error-border)] hover:bg-[var(--status-error-bg)] hover:text-[var(--status-error)]"
+                    title={t('workspace.closePanel', { defaultValue: 'Close Panel' })}
+                  >
+                    <ChevronDown size={12} />
+                    <span className="text-xs font-medium">
+                      {t('workspace.close', { defaultValue: 'Close' })}
+                    </span>
+                  </button>
+                )}
               </div>
             </div>
 
@@ -273,12 +282,17 @@ function ExecutionPanelContent() {
 
 // ============ Main Exported Component ============
 
-export function ExecutionPanelNew() {
+interface ExecutionPanelNewProps {
+  embedded?: boolean
+}
+
+export function ExecutionPanelNew({ embedded = false }: ExecutionPanelNewProps) {
   const { steps, isExecuting, treeRoots, treeNodeMap } = useExecutionStore()
 
   return (
     <ExecutionSelectionProvider>
       <ExecutionSelectionConsumerWrapper
+        embedded={embedded}
         steps={steps}
         isExecuting={isExecuting}
         treeRoots={treeRoots}
@@ -293,11 +307,13 @@ export function ExecutionPanelNew() {
  * to pass into DataProvider.
  */
 function ExecutionSelectionConsumerWrapper({
+  embedded = false,
   steps,
   isExecuting,
   treeRoots,
   treeNodeMap,
 }: {
+  embedded?: boolean
   steps: any[]
   isExecuting: boolean
   treeRoots: any[]
@@ -314,7 +330,7 @@ function ExecutionSelectionConsumerWrapper({
       collapsedIds={collapsedIds}
     >
       <ExecutionViewPreferencesProvider>
-        <ExecutionPanelContent />
+        <ExecutionPanelContent embedded={embedded} />
       </ExecutionViewPreferencesProvider>
     </ExecutionDataProvider>
   )
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTimeline.tsx b/frontend/components/execution/ExecutionTimeline.tsx
similarity index 98%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTimeline.tsx
rename to frontend/components/execution/ExecutionTimeline.tsx
index 229422931..7d7cf9468 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTimeline.tsx
+++ b/frontend/components/execution/ExecutionTimeline.tsx
@@ -17,7 +17,7 @@ import { useRef, useMemo, useEffect } from 'react'
 
 import { cn } from '@/lib/utils'
 
-import { getTraceDuration } from '../../lib/tree-building'
+import { getTraceDuration } from '@/components/editors/graph-builder/lib/execution-tree-building'
 
 import { useExecutionData } from './contexts/ExecutionDataContext'
 import { useExecutionSelection } from './contexts/ExecutionSelectionContext'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTree.tsx b/frontend/components/execution/ExecutionTree.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTree.tsx
rename to frontend/components/execution/ExecutionTree.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTreeNodeContent.tsx b/frontend/components/execution/ExecutionTreeNodeContent.tsx
similarity index 82%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTreeNodeContent.tsx
rename to frontend/components/execution/ExecutionTreeNodeContent.tsx
index ad4e441d7..9a6b3f68e 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/ExecutionTreeNodeContent.tsx
+++ b/frontend/components/execution/ExecutionTreeNodeContent.tsx
@@ -37,7 +37,12 @@ interface ExecutionTreeNodeContentProps {
 
 function getNodeIcon(node: ExecutionTreeNode) {
   if (node.status === 'running') {
-    return <Zap size={13} className="animate-pulse fill-[color-mix(in_srgb,var(--brand-secondary)_10%,transparent)] text-[var(--brand-secondary)]" />
+    return (
+      <Zap
+        size={13}
+        className="animate-pulse fill-[color-mix(in_srgb,var(--brand-secondary)_10%,transparent)] text-[var(--brand-secondary)]"
+      />
+    )
   }
 
   const stepType = node.step?.stepType
@@ -46,7 +51,9 @@ function getNodeIcon(node: ExecutionTreeNode) {
       return (
         <Cpu
           size={13}
-          className={node.status === 'success' ? 'text-[var(--status-success)]' : 'text-[var(--brand-500)]'}
+          className={
+            node.status === 'success' ? 'text-[var(--status-success)]' : 'text-[var(--brand-500)]'
+          }
         />
       )
     case 'agent_thought':
@@ -75,13 +82,17 @@ function getNodeIcon(node: ExecutionTreeNode) {
 function getStatusDot(status: string) {
   switch (status) {
     case 'running':
-      return <span className="h-1.5 w-1.5 shrink-0 animate-pulse rounded-full bg-[var(--brand-secondary)]" />
+      return (
+        <span className="h-1.5 w-1.5 shrink-0 animate-pulse rounded-full bg-[var(--brand-secondary)]" />
+      )
     case 'success':
       return <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-[var(--status-success)]" />
     case 'error':
       return <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-[var(--status-error)]" />
     case 'waiting':
-      return <span className="h-1.5 w-1.5 shrink-0 animate-pulse rounded-full bg-[var(--status-warning)]" />
+      return (
+        <span className="h-1.5 w-1.5 shrink-0 animate-pulse rounded-full bg-[var(--status-warning)]" />
+      )
     default:
       return <span className="h-1.5 w-1.5 shrink-0 rounded-full bg-[var(--text-subtle)]" />
   }
@@ -114,7 +125,9 @@ export function ExecutionTreeNodeContent({
       <div
         className={cn(
           'flex h-5 w-5 shrink-0 items-center justify-center rounded',
-          isParentNode ? 'border border-[var(--border)] bg-[var(--surface-3)]' : 'border border-[var(--border-muted)] bg-[var(--surface-elevated)]',
+          isParentNode
+            ? 'border border-[var(--border)] bg-[var(--surface-3)]'
+            : 'border border-[var(--border-muted)] bg-[var(--surface-elevated)]',
         )}
       >
         {getNodeIcon(node)}
@@ -124,7 +137,9 @@ export function ExecutionTreeNodeContent({
       <span
         className={cn(
           'min-w-0 flex-1 truncate text-sm font-medium',
-          isParentNode ? 'font-semibold text-[var(--text-primary)]' : 'text-[var(--text-secondary)]',
+          isParentNode
+            ? 'font-semibold text-[var(--text-primary)]'
+            : 'text-[var(--text-secondary)]',
           isSelected && 'text-primary',
         )}
       >
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/JsonView.tsx b/frontend/components/execution/JsonView.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/JsonView.tsx
rename to frontend/components/execution/JsonView.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/MetadataTab.tsx b/frontend/components/execution/MetadataTab.tsx
similarity index 93%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/MetadataTab.tsx
rename to frontend/components/execution/MetadataTab.tsx
index 236222aba..faabff8e4 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/MetadataTab.tsx
+++ b/frontend/components/execution/MetadataTab.tsx
@@ -51,7 +51,11 @@ export const MetadataTab = React.memo(function MetadataTab() {
               {key}
             </span>
             <span className="break-all font-mono text-sm text-[var(--text-secondary)]">
-              {value === null ? <span className="italic text-[var(--text-subtle)]">null</span> : String(value)}
+              {value === null ? (
+                <span className="italic text-[var(--text-subtle)]">null</span>
+              ) : (
+                String(value)
+              )}
             </span>
           </div>
         ))}
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/OutputTab.tsx b/frontend/components/execution/OutputTab.tsx
similarity index 91%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/OutputTab.tsx
rename to frontend/components/execution/OutputTab.tsx
index 83ab19279..003203532 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/OutputTab.tsx
+++ b/frontend/components/execution/OutputTab.tsx
@@ -41,7 +41,10 @@ export const OutputTab = React.memo(function OutputTab() {
       return (
         <div className="space-y-3 p-4">
           {(step.data as Record<string, unknown>)?.output ? (
-            <ViewComponent data={(step.data as Record<string, unknown>).output} label="Model Output" />
+            <ViewComponent
+              data={(step.data as Record<string, unknown>).output}
+              label="Model Output"
+            />
           ) : step.data?.response ? (
             <ViewComponent data={step.data.response} label="Model Output" />
           ) : (
@@ -62,7 +65,10 @@ export const OutputTab = React.memo(function OutputTab() {
       return (
         <div className="space-y-3 p-4">
           {(step.data as Record<string, unknown>)?.output ? (
-            <ViewComponent data={(step.data as Record<string, unknown>).output} label="Node Output" />
+            <ViewComponent
+              data={(step.data as Record<string, unknown>).output}
+              label="Node Output"
+            />
           ) : step.endTime ? (
             <div className="space-y-2">
               <FormattedView
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/PreviewTab.tsx b/frontend/components/execution/PreviewTab.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/PreviewTab.tsx
rename to frontend/components/execution/PreviewTab.tsx
index fc59e3738..57de2946b 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/PreviewTab.tsx
+++ b/frontend/components/execution/PreviewTab.tsx
@@ -6,9 +6,9 @@ import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism'
 
 import { cn } from '@/lib/utils'
 
-import { ModelIOCard } from '../ModelIOCard'
-import { ThoughtContent } from '../ThoughtContent'
-import { ToolCallCard } from '../ToolCallCard'
+import { ModelIOCard } from '@/components/editors/graph-builder/components/ModelIOCard'
+import { ThoughtContent } from '@/components/editors/graph-builder/components/ThoughtContent'
+import { ToolCallCard } from '@/components/editors/graph-builder/components/ToolCallCard'
 
 import { useExecutionData } from './contexts/ExecutionDataContext'
 import { useExecutionSelection } from './contexts/ExecutionSelectionContext'
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionDataContext.tsx b/frontend/components/execution/contexts/ExecutionDataContext.tsx
similarity index 94%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionDataContext.tsx
rename to frontend/components/execution/contexts/ExecutionDataContext.tsx
index a49c849bd..da71d82f4 100644
--- a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionDataContext.tsx
+++ b/frontend/components/execution/contexts/ExecutionDataContext.tsx
@@ -13,7 +13,7 @@ import React, { createContext, useContext, useMemo } from 'react'
 
 import type { ExecutionStep, ExecutionTreeNode, ExecutionTreeFlatItem } from '@/types'
 
-import { flattenTree } from '../../../lib/tree-building'
+import { flattenTree } from '@/components/editors/graph-builder/lib/execution-tree-building'
 
 interface ExecutionDataContextValue {
   steps: ExecutionStep[]
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionSelectionContext.tsx b/frontend/components/execution/contexts/ExecutionSelectionContext.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionSelectionContext.tsx
rename to frontend/components/execution/contexts/ExecutionSelectionContext.tsx
diff --git a/frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionViewPreferencesContext.tsx b/frontend/components/execution/contexts/ExecutionViewPreferencesContext.tsx
similarity index 100%
rename from frontend/app/workspace/[workspaceId]/[agentId]/components/execution/contexts/ExecutionViewPreferencesContext.tsx
rename to frontend/components/execution/contexts/ExecutionViewPreferencesContext.tsx
diff --git a/frontend/components/execution/index.ts b/frontend/components/execution/index.ts
new file mode 100644
index 000000000..3974aa8b7
--- /dev/null
+++ b/frontend/components/execution/index.ts
@@ -0,0 +1,8 @@
+export { ExecutionTree } from './ExecutionTree'
+export { ExecutionTimelineView as ExecutionTimeline } from './ExecutionTimeline'
+export { ExecutionDetailPanel } from './ExecutionDetailPanel'
+export { JsonView } from './JsonView'
+export { MetadataTab } from './MetadataTab'
+export { OutputTab } from './OutputTab'
+export { PreviewTab } from './PreviewTab'
+export { ExecutionTreeNodeContent } from './ExecutionTreeNodeContent'
diff --git a/frontend/components/executions/execution-event.tsx b/frontend/components/executions/execution-event.tsx
new file mode 100644
index 000000000..cbdbe29c3
--- /dev/null
+++ b/frontend/components/executions/execution-event.tsx
@@ -0,0 +1,275 @@
+'use client'
+
+import {
+  AlertTriangle,
+  CheckCircle,
+  ChevronDown,
+  ChevronRight,
+  FileText,
+  Info,
+  MessageSquare,
+  Paperclip,
+  Wrench,
+  XCircle,
+} from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { cn } from '@/lib/utils'
+import type { ExecutionEvent, ExecutionEventType } from '@/types/agent-run'
+
+const TEXT_CFG = { icon: FileText, label: 'Text', style: '' } as const
+const TOOL_CFG = { icon: Wrench, label: 'Tool', style: '' } as const
+const RESULT_CFG = { icon: Wrench, label: 'Result', style: '' } as const
+const APPROVAL_CFG = {
+  icon: AlertTriangle,
+  label: 'Approval Required',
+  style: 'border-l-2 border-l-[var(--status-warning)] bg-[var(--status-warning-bg)]',
+} as const
+const ARTIFACT_CFG = { icon: Paperclip, label: 'Artifact', style: '' } as const
+
+const EVENT_CONFIG: Partial<
+  Record<ExecutionEventType, { icon: React.ElementType; label: string; style: string }>
+> = {
+  assistant_text: TEXT_CFG,
+  thinking: { icon: MessageSquare, label: 'Thinking', style: 'bg-[var(--surface-3)] italic' },
+  tool_use_start: TOOL_CFG,
+  tool_use_end: RESULT_CFG,
+  error: {
+    icon: XCircle,
+    label: 'Error',
+    style: 'border-l-2 border-l-[var(--status-error)] text-[var(--status-error)]',
+  },
+  approval_requested: APPROVAL_CFG,
+  user_message: { icon: MessageSquare, label: 'User', style: 'bg-[var(--surface-3)]' },
+  artifact_created: ARTIFACT_CFG,
+  execution_status_change: { icon: Info, label: 'Status', style: '' },
+  execution_started: { icon: Info, label: 'Started', style: '' },
+  execution_completed: { icon: Info, label: 'Completed', style: '' },
+  approval_resolved: { icon: CheckCircle, label: 'Resolved', style: '' },
+}
+
+interface ExecutionEventItemProps {
+  event: ExecutionEvent
+  onApprove?: (eventId: string) => void
+  onReject?: (eventId: string) => void
+  disabled?: boolean
+  isPendingApproval?: boolean
+}
+
+export function ExecutionEventItem({
+  event,
+  onApprove,
+  onReject,
+  disabled,
+  isPendingApproval,
+}: ExecutionEventItemProps) {
+  const [expanded, setExpanded] = useState(false)
+  const defaultConfig = { icon: Info, label: event.event_type, style: '' }
+  const config = EVENT_CONFIG[event.event_type] ?? defaultConfig
+  const Icon = config.icon
+  const payload = event.payload ?? {}
+
+  const timestamp = new Date(event.created_at).toLocaleTimeString(undefined, {
+    hour: '2-digit',
+    minute: '2-digit',
+  })
+
+  const renderContent = () => {
+    switch (event.event_type) {
+      case 'assistant_text':
+        return (
+          <p className="whitespace-pre-wrap text-sm text-[var(--text-primary)]">
+            {String(payload.content ?? payload.text ?? '')}
+          </p>
+        )
+
+      case 'thinking':
+        return (
+          <div>
+            <button
+              type="button"
+              onClick={() => setExpanded(!expanded)}
+              className="flex items-center gap-1 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+            >
+              {expanded ? (
+                <ChevronDown className="h-3 w-3" />
+              ) : (
+                <ChevronRight className="h-3 w-3" />
+              )}
+              Thinking...
+            </button>
+            {expanded && (
+              <p className="mt-1 whitespace-pre-wrap text-sm italic text-[var(--text-secondary)]">
+                {String(payload.content ?? payload.text ?? '')}
+              </p>
+            )}
+          </div>
+        )
+
+      case 'tool_use_start': {
+        const tool = (payload.tool as Record<string, unknown>) ?? {}
+        const toolName = String(tool.name ?? payload.tool_name ?? payload.name ?? 'tool')
+        const toolInput = tool.input ?? payload.input ?? payload.arguments ?? {}
+        return (
+          <div>
+            <p className="text-sm font-medium text-[var(--text-primary)]">{toolName}</p>
+            <button
+              type="button"
+              onClick={() => setExpanded(!expanded)}
+              className="mt-0.5 flex items-center gap-1 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+            >
+              {expanded ? (
+                <ChevronDown className="h-3 w-3" />
+              ) : (
+                <ChevronRight className="h-3 w-3" />
+              )}
+              Input
+            </button>
+            {expanded && (
+              <pre className="mt-1 max-h-48 overflow-auto rounded bg-[var(--surface-3)] p-2 text-xs text-[var(--text-secondary)]">
+                {JSON.stringify(toolInput, null, 2)}
+              </pre>
+            )}
+          </div>
+        )
+      }
+
+      case 'tool_use_end':
+        return (
+          <div>
+            <button
+              type="button"
+              onClick={() => setExpanded(!expanded)}
+              className="flex items-center gap-1 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+            >
+              {expanded ? (
+                <ChevronDown className="h-3 w-3" />
+              ) : (
+                <ChevronRight className="h-3 w-3" />
+              )}
+              Output
+            </button>
+            {expanded && (
+              <pre className="mt-1 max-h-48 overflow-auto rounded bg-[var(--surface-3)] p-2 text-xs text-[var(--text-secondary)]">
+                {typeof payload.output === 'string'
+                  ? payload.output
+                  : JSON.stringify(payload.output ?? payload.content ?? {}, null, 2)}
+              </pre>
+            )}
+          </div>
+        )
+
+      case 'error':
+        return (
+          <p className="text-sm text-[var(--status-error)]">
+            {String(payload.message ?? payload.error ?? 'Unknown error')}
+          </p>
+        )
+
+      case 'approval_requested': {
+        const toolName = String(payload.tool_name ?? '')
+        const toolInput = payload.input ?? {}
+        return (
+          <div>
+            <p className="text-sm font-medium text-[var(--text-primary)]">
+              {String(payload.message ?? `Agent wants to use: ${toolName || 'unknown tool'}`)}
+            </p>
+            {toolName && (
+              <div className="mt-1">
+                <button
+                  type="button"
+                  onClick={() => setExpanded(!expanded)}
+                  className="flex items-center gap-1 text-xs text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+                >
+                  {expanded ? (
+                    <ChevronDown className="h-3 w-3" />
+                  ) : (
+                    <ChevronRight className="h-3 w-3" />
+                  )}
+                  {toolName} input
+                </button>
+                {expanded && (
+                  <pre className="mt-1 max-h-48 overflow-auto rounded bg-[var(--surface-3)] p-2 text-xs text-[var(--text-secondary)]">
+                    {JSON.stringify(toolInput, null, 2)}
+                  </pre>
+                )}
+              </div>
+            )}
+            <div className="mt-2 flex gap-2">
+              {isPendingApproval ? (
+                <>
+                  <Button size="sm" onClick={() => onApprove?.(event.id)} disabled={disabled}>
+                    Approve
+                  </Button>
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    onClick={() => onReject?.(event.id)}
+                    disabled={disabled}
+                  >
+                    Reject
+                  </Button>
+                </>
+              ) : (
+                <span className="text-xs text-[var(--text-muted)]">Resolved</span>
+              )}
+            </div>
+          </div>
+        )
+      }
+
+      case 'approval_resolved':
+        return (
+          <p className="text-xs text-[var(--text-muted)]">
+            {payload.decision === 'auto_approved'
+              ? 'Auto-approved'
+              : payload.decision === 'approved'
+                ? 'Approved'
+                : 'Rejected'}
+          </p>
+        )
+
+      case 'user_message':
+        return (
+          <p className="text-sm text-[var(--text-primary)]">
+            {String(payload.content ?? payload.text ?? '')}
+          </p>
+        )
+
+      case 'artifact_created':
+        return (
+          <p className="text-sm text-[var(--text-secondary)]">
+            {String(payload.title ?? payload.name ?? 'Artifact')}
+            {payload.type ? ` (${String(payload.type)})` : ''}
+          </p>
+        )
+
+      case 'execution_status_change':
+      case 'execution_started':
+      case 'execution_completed':
+        return (
+          <p className="text-sm text-[var(--text-muted)]">
+            {String(payload.message ?? payload.status ?? config.label)}
+          </p>
+        )
+
+      default:
+        return (
+          <pre className="text-xs text-[var(--text-secondary)]">
+            {JSON.stringify(payload, null, 2)}
+          </pre>
+        )
+    }
+  }
+
+  return (
+    <div className={cn('flex gap-3 rounded-md px-3 py-2', config.style)}>
+      <div className="flex flex-col items-center gap-1 pt-0.5">
+        <span className="text-[10px] tabular-nums text-[var(--text-muted)]">{timestamp}</span>
+        <Icon className="h-4 w-4 shrink-0 text-[var(--text-muted)]" />
+      </div>
+      <div className="min-w-0 flex-1">{renderContent()}</div>
+    </div>
+  )
+}
diff --git a/frontend/components/executions/execution-row.tsx b/frontend/components/executions/execution-row.tsx
new file mode 100644
index 000000000..5a4e28acf
--- /dev/null
+++ b/frontend/components/executions/execution-row.tsx
@@ -0,0 +1,122 @@
+'use client'
+
+import { Bot, Clock3, Loader2, Square } from 'lucide-react'
+import Link from 'next/link'
+import { useMemo } from 'react'
+
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { formatDuration, formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { AgentRun } from '@/types/agent-run'
+import { ACTIVE_RUN_STATUSES, RUN_STATUS_STYLES, RUN_STATUS_I18N } from '@/types/agent-run'
+
+interface RunRowProps {
+  run: AgentRun
+  taskTitle?: string
+  agentName?: string
+  onSelect: (runId: string) => void
+  onCancel: (runId: string) => void
+  isCancelling: boolean
+  isSelected: boolean
+}
+
+export function ExecutionRow({
+  run,
+  taskTitle,
+  agentName,
+  onSelect,
+  onCancel,
+  isCancelling,
+  isSelected,
+}: RunRowProps) {
+  const { t } = useTranslation()
+  const isActive = ACTIVE_RUN_STATUSES.includes(run.status)
+
+  const duration = useMemo(
+    () => formatDuration(run.started_at, run.ended_at),
+    [run.started_at, run.ended_at],
+  )
+
+  return (
+    <Card
+      className={cn(
+        'cursor-pointer border-[var(--border)] bg-[var(--surface-1)] p-4 transition-colors hover:bg-[var(--surface-2)]',
+        isSelected && 'ring-2 ring-[var(--brand-400)]',
+      )}
+      onClick={() => onSelect(run.id)}
+    >
+      <div className="flex flex-col gap-3 lg:flex-row lg:items-center lg:justify-between">
+        <div className="min-w-0 flex-1">
+          <div className="mb-2 flex flex-wrap items-center gap-2">
+            <Badge variant="outline" className={cn('text-xs', RUN_STATUS_STYLES[run.status])}>
+              {t(RUN_STATUS_I18N[run.status])}
+            </Badge>
+            {taskTitle && run.task_id && (
+              <Link
+                href={`/tasks?task=${run.task_id}`}
+                onClick={(e) => e.stopPropagation()}
+                className="truncate text-sm font-medium text-[var(--text-primary)] hover:underline"
+              >
+                {taskTitle}
+              </Link>
+            )}
+            {!taskTitle && (
+              <span className="truncate text-sm font-medium text-[var(--text-primary)]">
+                {run.goal || `Run ${run.id.slice(0, 8)}`}
+              </span>
+            )}
+            {agentName && (
+              <Badge
+                variant="outline"
+                className="border-[var(--border)] bg-[var(--surface-2)] text-xs text-[var(--text-secondary)]"
+              >
+                <Bot className="mr-1 h-3 w-3" />
+                {agentName}
+              </Badge>
+            )}
+          </div>
+
+          <div className="flex flex-wrap items-center gap-4 text-xs text-[var(--text-muted)]">
+            {run.started_at && (
+              <span className="flex items-center gap-1">
+                <Clock3 className="h-3.5 w-3.5" />
+                {t('execution.startedAt')} {formatRelativeTime(run.started_at, t)}
+              </span>
+            )}
+            {duration && (
+              <span className="flex items-center gap-1">
+                <Clock3 className="h-3.5 w-3.5" />
+                {duration}
+              </span>
+            )}
+          </div>
+        </div>
+
+        <div className="flex items-center gap-2">
+          {isActive && (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={(e) => {
+                e.stopPropagation()
+                onCancel(run.id)
+              }}
+              disabled={isCancelling}
+              className="gap-1.5"
+            >
+              {isCancelling ? (
+                <Loader2 className="h-4 w-4 animate-spin" />
+              ) : (
+                <Square className="h-3.5 w-3.5" />
+              )}
+              {t('execution.cancel')}
+            </Button>
+          )}
+        </div>
+      </div>
+    </Card>
+  )
+}
diff --git a/frontend/components/executions/execution-timeline.tsx b/frontend/components/executions/execution-timeline.tsx
new file mode 100644
index 000000000..074508f86
--- /dev/null
+++ b/frontend/components/executions/execution-timeline.tsx
@@ -0,0 +1,250 @@
+'use client'
+
+import { AlertCircle, CheckCircle, Loader2, Pause, Play, RefreshCw, XCircle } from 'lucide-react'
+import { useEffect, useMemo, useRef } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { useExecution, useExecutionEvents } from '@/hooks/queries/agentRuns'
+import { useExecutionStream } from '@/hooks/use-execution-stream'
+import { cn } from '@/lib/utils'
+import { formatDuration } from '@/lib/utils/dateHelpers'
+import { ACTIVE_EXECUTION_STATUSES } from '@/types/agent-run'
+
+import { taskService } from '@/services/taskService'
+
+import { ExecutionEventItem } from './execution-event'
+import { MessageInput } from './message-input'
+
+const STATUS_CONFIG: Record<string, { icon: React.ElementType; label: string; color: string }> = {
+  pending: { icon: Pause, label: 'Pending', color: 'text-[var(--text-muted)]' },
+  dispatched: { icon: Play, label: 'Dispatched', color: 'text-[var(--brand-400)]' },
+  running: { icon: Loader2, label: 'Running', color: 'text-[var(--status-success)]' },
+  approval_wait: { icon: Pause, label: 'Approval Wait', color: 'text-[var(--status-warning)]' },
+  succeeded: { icon: CheckCircle, label: 'Succeeded', color: 'text-[var(--status-success)]' },
+  failed: { icon: XCircle, label: 'Failed', color: 'text-[var(--status-error)]' },
+  cancelled: { icon: XCircle, label: 'Cancelled', color: 'text-[var(--text-muted)]' },
+}
+
+interface ExecutionTimelineProps {
+  executionId: string
+  workspaceId: string
+  compact?: boolean
+  /** Set to false for terminal executions to skip WebSocket and polling. Defaults to true. */
+  isLive?: boolean
+  /** When set, write operations (message/approve) use task-scoped endpoints. */
+  taskId?: string
+}
+
+export function ExecutionTimeline({
+  executionId,
+  workspaceId,
+  compact,
+  isLive = true,
+  taskId,
+}: ExecutionTimelineProps) {
+  const {
+    data: execution,
+    isLoading: isExecLoading,
+    error: execError,
+    refetch: refetchExec,
+  } = useExecution(executionId)
+  const isActive = execution ? ACTIVE_EXECUTION_STATUSES.includes(execution.status) : false
+  const shouldStream = isLive && isActive && Boolean(executionId)
+
+  // WebSocket stream — primary data source (disabled for terminal executions)
+  const {
+    events: wsEvents,
+    status: wsStatus,
+    isConnected,
+    wsFailed,
+  } = useExecutionStream({ executionId, enabled: shouldStream })
+
+  // Polling fallback — only enabled when WS fails and execution is live
+  const {
+    data: polledEvents,
+    isLoading: isEventsLoading,
+    error: eventsError,
+    refetch: refetchEvents,
+  } = useExecutionEvents(executionId, {
+    enabled: Boolean(executionId) && (shouldStream ? wsFailed : true),
+  })
+
+  // Use WS events when connected, fall back to polling data
+  const events = useMemo(() => {
+    if (!wsFailed && wsEvents.length > 0) return wsEvents
+    return polledEvents ?? wsEvents
+  }, [wsFailed, wsEvents, polledEvents])
+
+  const currentStatus = wsStatus ?? execution?.status ?? 'pending'
+
+  const pendingApprovalEventId = useMemo(() => {
+    if (currentStatus !== 'approval_wait') return null
+    for (let i = events.length - 1; i >= 0; i--) {
+      const et = events[i].event_type
+      if (et === 'approval_requested') return events[i].id
+    }
+    return null
+  }, [currentStatus, events])
+
+  const scrollRef = useRef<HTMLDivElement>(null)
+
+  // Auto-scroll to bottom on new events
+  useEffect(() => {
+    const el = scrollRef.current
+    if (el) {
+      el.scrollTop = el.scrollHeight
+    }
+  }, [events.length])
+
+  const statusConfig = STATUS_CONFIG[currentStatus] ?? STATUS_CONFIG.pending
+  const StatusIcon = statusConfig.icon
+
+  const duration = useMemo(
+    () => formatDuration(execution?.started_at, execution?.ended_at),
+    [execution?.started_at, execution?.ended_at],
+  )
+
+  const toolCount = useMemo(
+    () => events.filter((e) => e.event_type === 'tool_use_start').length,
+    [events],
+  )
+
+  const tokenDisplay = useMemo(() => {
+    const summary = execution?.metrics as Record<string, number> | undefined
+    if (!summary) return null
+    const input = summary.input_tokens ?? 0
+    const output = summary.output_tokens ?? 0
+    if (!input && !output) return null
+    const fmt = (n: number) => (n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n))
+    return `${fmt(input)} in / ${fmt(output)} out`
+  }, [execution?.metrics])
+
+  const effectiveId = taskId
+
+  const handleSendMessage = async (message: string) => {
+    if (!effectiveId) return
+    try {
+      await taskService.injectExecutionMessage(effectiveId, workspaceId, message)
+    } catch (err) {
+      console.error('Failed to inject message', err)
+    }
+  }
+
+  const handleApproveOrReject = async (_eventId: string, approved: boolean) => {
+    if (!effectiveId) return
+    try {
+      await taskService.approveExecutionAction(effectiveId, workspaceId, approved)
+    } catch (err) {
+      console.error(`Failed to ${approved ? 'approve' : 'reject'} action`, err)
+    }
+  }
+
+  const actionsDisabled = !effectiveId
+
+  const handleRetry = () => {
+    void refetchExec()
+    void refetchEvents()
+  }
+
+  // Error state
+  if (execError || eventsError) {
+    return (
+      <div
+        className={cn(
+          'flex flex-col items-center justify-center gap-3',
+          compact ? 'h-80' : 'h-full',
+        )}
+      >
+        <AlertCircle className="h-8 w-8 text-[var(--status-error)]" />
+        <p className="text-sm text-[var(--text-secondary)]">Failed to load execution data</p>
+        <Button variant="outline" size="sm" onClick={handleRetry} className="gap-1.5">
+          <RefreshCw className="h-3.5 w-3.5" />
+          Retry
+        </Button>
+      </div>
+    )
+  }
+
+  // Loading state
+  if (isExecLoading && !execution) {
+    return (
+      <div
+        className={cn(
+          'flex flex-col items-center justify-center gap-2',
+          compact ? 'h-80' : 'h-full',
+        )}
+      >
+        <Loader2 className="h-6 w-6 animate-spin text-[var(--text-muted)]" />
+        <p className="text-sm text-[var(--text-muted)]">Loading execution...</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className={cn('flex flex-col', compact ? 'h-80' : 'h-full')}>
+      {/* Status header */}
+      <div className="flex items-center justify-between border-b border-[var(--border)] px-4 py-2.5">
+        <div className="flex items-center gap-2">
+          <StatusIcon
+            className={cn(
+              'h-4 w-4',
+              statusConfig.color,
+              currentStatus === 'running' && 'animate-spin',
+            )}
+          />
+          <span className={cn('text-sm font-medium', statusConfig.color)}>
+            {statusConfig.label}
+          </span>
+          {duration && (
+            <span className="text-xs text-[var(--text-muted)]">Duration: {duration}</span>
+          )}
+        </div>
+        <div className="flex items-center gap-2">
+          {toolCount > 0 && (
+            <span className="text-xs text-[var(--text-muted)]">
+              Tools: {toolCount} call{toolCount !== 1 ? 's' : ''}
+            </span>
+          )}
+          {tokenDisplay && (
+            <span className="text-xs text-[var(--text-muted)]">Tokens: {tokenDisplay}</span>
+          )}
+          {/* Connection indicator */}
+          <span
+            className={cn(
+              'inline-flex h-1.5 w-1.5 rounded-full',
+              isConnected ? 'bg-[var(--status-success)]' : 'bg-[var(--text-muted)]',
+            )}
+            title={isConnected ? 'Live (WebSocket)' : wsFailed ? 'Polling' : 'Connecting...'}
+          />
+        </div>
+      </div>
+
+      {/* Events list */}
+      <div ref={scrollRef} className="flex-1 space-y-1 overflow-y-auto py-2">
+        {events.length === 0 && !isEventsLoading ? (
+          <p className="py-8 text-center text-sm text-[var(--text-muted)]">
+            {isActive ? 'Waiting for events...' : 'No events'}
+          </p>
+        ) : events.length === 0 && isEventsLoading ? (
+          <div className="flex items-center justify-center py-8">
+            <Loader2 className="h-5 w-5 animate-spin text-[var(--text-muted)]" />
+          </div>
+        ) : (
+          events.map((event) => (
+            <ExecutionEventItem
+              key={`${event.execution_id}-${event.seq}`}
+              event={event}
+              onApprove={(id) => handleApproveOrReject(id, true)}
+              onReject={(id) => handleApproveOrReject(id, false)}
+              disabled={actionsDisabled}
+              isPendingApproval={event.id === pendingApprovalEventId}
+            />
+          ))
+        )}
+      </div>
+
+      {/* Message input */}
+      <MessageInput disabled={!isActive || actionsDisabled} onSend={handleSendMessage} />
+    </div>
+  )
+}
diff --git a/frontend/components/executions/execution-viewer.tsx b/frontend/components/executions/execution-viewer.tsx
new file mode 100644
index 000000000..9401b334d
--- /dev/null
+++ b/frontend/components/executions/execution-viewer.tsx
@@ -0,0 +1,293 @@
+'use client'
+
+import {
+  AlertCircle,
+  CheckCircle,
+  ChevronDown,
+  ChevronUp,
+  Loader2,
+  Pause,
+  Play,
+  RefreshCw,
+  XCircle,
+} from 'lucide-react'
+import { useEffect, useMemo, useRef, useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { useExecution, useExecutionEvents } from '@/hooks/queries/agentRuns'
+import { useExecutionStream } from '@/hooks/use-execution-stream'
+import { cn } from '@/lib/utils'
+import { formatDuration } from '@/lib/utils/dateHelpers'
+import { ACTIVE_EXECUTION_STATUSES } from '@/types/agent-run'
+import type { ExecutionEvent } from '@/types/agent-run'
+
+import { ExecutionEventItem } from './execution-event'
+import { MessageInput } from './message-input'
+
+const STATUS_CONFIG: Record<string, { icon: React.ElementType; label: string; color: string }> = {
+  pending: { icon: Pause, label: 'Pending', color: 'text-[var(--text-muted)]' },
+  dispatched: { icon: Play, label: 'Dispatched', color: 'text-[var(--brand-400)]' },
+  running: { icon: Loader2, label: 'Running', color: 'text-[var(--status-success)]' },
+  approval_wait: { icon: Pause, label: 'Approval Wait', color: 'text-[var(--status-warning)]' },
+  succeeded: { icon: CheckCircle, label: 'Succeeded', color: 'text-[var(--status-success)]' },
+  failed: { icon: XCircle, label: 'Failed', color: 'text-[var(--status-error)]' },
+  cancelled: { icon: XCircle, label: 'Cancelled', color: 'text-[var(--text-muted)]' },
+}
+
+interface ExecutionViewerProps {
+  executionId: string
+  workspaceId: string
+  compact?: boolean
+  isLive?: boolean
+  showArtifacts?: boolean
+  /** Callback for sending messages into the execution. If omitted, input is hidden. */
+  onSendMessage?: (message: string) => void
+  /** Callback for approve/reject actions. If omitted, action buttons are disabled. */
+  onApprove?: (eventId: string, approved: boolean) => void
+}
+
+export function ExecutionViewer({
+  executionId,
+  workspaceId,
+  compact,
+  isLive = true,
+  showArtifacts = true,
+  onSendMessage,
+  onApprove,
+}: ExecutionViewerProps) {
+  const {
+    data: execution,
+    isLoading: isExecLoading,
+    error: execError,
+    refetch: refetchExec,
+  } = useExecution(executionId)
+
+  const shouldStream =
+    isLive && ACTIVE_EXECUTION_STATUSES.includes((execution?.status ?? 'pending') as never)
+
+  const {
+    events: wsEvents,
+    status: wsStatus,
+    isConnected,
+    wsFailed,
+  } = useExecutionStream({
+    executionId,
+    enabled: shouldStream,
+  })
+
+  const {
+    data: polledEventsPage,
+    isLoading: isEventsLoading,
+    error: eventsError,
+    refetch: refetchEvents,
+  } = useExecutionEvents(executionId, {
+    enabled: (!shouldStream || wsFailed) && Boolean(executionId),
+  })
+
+  const events: ExecutionEvent[] = shouldStream && !wsFailed ? wsEvents : (polledEventsPage ?? [])
+  const currentStatus =
+    (shouldStream && !wsFailed ? wsStatus : null) ?? execution?.status ?? 'pending'
+  const isActive = ACTIVE_EXECUTION_STATUSES.includes(currentStatus as never)
+
+  // Artifacts from event stream
+  const artifacts = useMemo(() => {
+    if (!showArtifacts) return []
+    return events
+      .filter((e) => e.event_type === 'artifact_created')
+      .map((e) => ({
+        type: 'file' as const,
+        title:
+          (e.payload as Record<string, string>)?.uri ||
+          (e.payload as Record<string, string>)?.name ||
+          'artifact',
+        content: (e.payload as Record<string, string>)?.content || '',
+        language: (e.payload as Record<string, string>)?.language,
+      }))
+  }, [events, showArtifacts])
+
+  const pendingApprovalEventId = useMemo(() => {
+    if (currentStatus !== 'approval_wait') return null
+    for (let i = events.length - 1; i >= 0; i--) {
+      const et = events[i].event_type
+      if (et === 'approval_requested') return events[i].id
+    }
+    return null
+  }, [currentStatus, events])
+
+  const scrollRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    const el = scrollRef.current
+    if (el) el.scrollTop = el.scrollHeight
+  }, [events.length])
+
+  const statusConfig = STATUS_CONFIG[currentStatus] ?? STATUS_CONFIG.pending
+  const StatusIcon = statusConfig.icon
+
+  const duration = useMemo(
+    () => formatDuration(execution?.started_at, execution?.ended_at),
+    [execution?.started_at, execution?.ended_at],
+  )
+
+  const toolCount = useMemo(
+    () => events.filter((e) => e.event_type === 'tool_use_start').length,
+    [events],
+  )
+
+  const tokenDisplay = useMemo(() => {
+    const summary = execution?.metrics as Record<string, number> | undefined
+    if (!summary) return null
+    const input = summary.input_tokens ?? 0
+    const output = summary.output_tokens ?? 0
+    if (!input && !output) return null
+    const fmt = (n: number) => (n >= 1000 ? `${(n / 1000).toFixed(1)}k` : String(n))
+    return `${fmt(input)} in / ${fmt(output)} out`
+  }, [execution?.metrics])
+
+  const handleApproveOrReject = (eventId: string, approved: boolean) => {
+    onApprove?.(eventId, approved)
+  }
+
+  const handleRetry = () => {
+    void refetchExec()
+    void refetchEvents()
+  }
+
+  if (execError || eventsError) {
+    return (
+      <div
+        className={cn(
+          'flex flex-col items-center justify-center gap-3',
+          compact ? 'h-80' : 'h-full',
+        )}
+      >
+        <AlertCircle className="h-8 w-8 text-[var(--status-error)]" />
+        <p className="text-sm text-[var(--text-secondary)]">Failed to load execution data</p>
+        <Button variant="outline" size="sm" onClick={handleRetry} className="gap-1.5">
+          <RefreshCw className="h-3.5 w-3.5" />
+          Retry
+        </Button>
+      </div>
+    )
+  }
+
+  if (isExecLoading && !execution) {
+    return (
+      <div
+        className={cn(
+          'flex flex-col items-center justify-center gap-2',
+          compact ? 'h-80' : 'h-full',
+        )}
+      >
+        <Loader2 className="h-6 w-6 animate-spin text-[var(--text-muted)]" />
+        <p className="text-sm text-[var(--text-muted)]">Loading execution...</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className={cn('flex flex-col', compact ? 'h-80' : 'h-full')}>
+      {/* Status header */}
+      <div className="flex items-center justify-between border-b border-[var(--border)] px-4 py-2.5">
+        <div className="flex items-center gap-2">
+          <StatusIcon
+            className={cn(
+              'h-4 w-4',
+              statusConfig.color,
+              currentStatus === 'running' && 'animate-spin',
+            )}
+          />
+          <span className={cn('text-sm font-medium', statusConfig.color)}>
+            {statusConfig.label}
+          </span>
+          {duration && <span className="text-xs text-[var(--text-muted)]">{duration}</span>}
+        </div>
+        <div className="flex items-center gap-2">
+          {toolCount > 0 && (
+            <span className="text-xs text-[var(--text-muted)]">
+              Tools: {toolCount} call{toolCount !== 1 ? 's' : ''}
+            </span>
+          )}
+          {tokenDisplay && <span className="text-xs text-[var(--text-muted)]">{tokenDisplay}</span>}
+          <span
+            className={cn(
+              'inline-flex h-1.5 w-1.5 rounded-full',
+              isConnected ? 'bg-[var(--status-success)]' : 'bg-[var(--text-muted)]',
+            )}
+            title={isConnected ? 'Live (WebSocket)' : wsFailed ? 'Polling' : 'Connecting...'}
+          />
+        </div>
+      </div>
+
+      {/* Events list */}
+      <div ref={scrollRef} className="flex-1 space-y-1 overflow-y-auto py-2">
+        {events.length === 0 && !isEventsLoading ? (
+          <p className="py-8 text-center text-sm text-[var(--text-muted)]">
+            {isActive ? 'Waiting for events...' : 'No events'}
+          </p>
+        ) : events.length === 0 && isEventsLoading ? (
+          <div className="flex items-center justify-center py-8">
+            <Loader2 className="h-5 w-5 animate-spin text-[var(--text-muted)]" />
+          </div>
+        ) : (
+          events.map((event) => (
+            <ExecutionEventItem
+              key={`${event.execution_id}-${event.seq}`}
+              event={event}
+              onApprove={(id) => handleApproveOrReject(id, true)}
+              onReject={(id) => handleApproveOrReject(id, false)}
+              disabled={!onApprove}
+              isPendingApproval={event.id === pendingApprovalEventId}
+            />
+          ))
+        )}
+      </div>
+
+      {/* Artifact panel */}
+      {showArtifacts && artifacts.length > 0 && (
+        <div className="border-t border-[var(--border)]">
+          <ArtifactSection artifacts={artifacts} />
+        </div>
+      )}
+
+      {/* Message input — only shown when callback is provided */}
+      {onSendMessage && <MessageInput disabled={!isActive} onSend={onSendMessage} />}
+    </div>
+  )
+}
+
+/** Collapsible artifact section */
+function ArtifactSection({
+  artifacts,
+}: {
+  artifacts: Array<{ type: string; title: string; content: string; language?: string }>
+}) {
+  const [expanded, setExpanded] = useState(false)
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => setExpanded(!expanded)}
+        className="flex w-full items-center justify-between px-4 py-2 text-xs font-medium text-[var(--text-secondary)] hover:bg-[var(--surface-2)]"
+      >
+        <span>Artifacts ({artifacts.length})</span>
+        {expanded ? <ChevronUp className="h-3.5 w-3.5" /> : <ChevronDown className="h-3.5 w-3.5" />}
+      </button>
+      {expanded && (
+        <div className="max-h-48 overflow-y-auto">
+          {artifacts.map((a, i) => (
+            <div key={i} className="border-t border-[var(--border)] px-4 py-2">
+              <p className="mb-1 text-xs font-medium text-[var(--text-secondary)]">{a.title}</p>
+              {a.content && (
+                <pre className="max-h-32 overflow-auto rounded bg-[var(--surface-3)] p-2 text-xs">
+                  <code>{a.content}</code>
+                </pre>
+              )}
+            </div>
+          ))}
+        </div>
+      )}
+    </>
+  )
+}
diff --git a/frontend/components/executions/executions-tab.tsx b/frontend/components/executions/executions-tab.tsx
new file mode 100644
index 000000000..a12ac4243
--- /dev/null
+++ b/frontend/components/executions/executions-tab.tsx
@@ -0,0 +1,160 @@
+'use client'
+
+import { Activity, Loader2, X } from 'lucide-react'
+import { useRouter, useSearchParams } from 'next/navigation'
+import { useMemo, useState } from 'react'
+
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { useAgentRuns, useCancelAgentRun } from '@/hooks/queries/agentRuns'
+import { useTasks } from '@/hooks/queries/tasks'
+import { useReleaseAgentNameMap } from '@/hooks/queries/agents'
+import { useTranslation } from '@/lib/i18n'
+import { cn } from '@/lib/utils'
+import { useCurrentWorkspace } from '@/providers/workspace-provider'
+import type { AgentRunStatus } from '@/types/agent-run'
+import { RUN_STATUS_I18N } from '@/types/agent-run'
+
+import { ExecutionRow } from './execution-row'
+import { ExecutionTimeline } from './execution-timeline'
+
+const STATUS_OPTIONS: Array<AgentRunStatus | 'all'> = [
+  'all',
+  'pending',
+  'running',
+  'succeeded',
+  'failed',
+  'cancelled',
+]
+
+export function ExecutionsTab() {
+  const { t } = useTranslation()
+  const router = useRouter()
+  const searchParams = useSearchParams()
+  const taskFilter = searchParams.get('task') || undefined
+
+  const { workspaceId } = useCurrentWorkspace()
+
+  const [statusFilter, setStatusFilter] = useState<AgentRunStatus | 'all'>('all')
+  const [selectedRunId, setSelectedRunId] = useState<string | null>(null)
+
+  const { data: runs = [], isLoading } = useAgentRuns(
+    {
+      workspace_id: workspaceId || undefined,
+      task_id: taskFilter,
+    },
+    { enabled: Boolean(workspaceId) },
+  )
+
+  const { data: tasks = [] } = useTasks(workspaceId, undefined, {
+    enabled: Boolean(workspaceId),
+  })
+  const agentNameMap = useReleaseAgentNameMap(workspaceId)
+
+  const taskTitleMap = useMemo(() => Object.fromEntries(tasks.map((m) => [m.id, m.title])), [tasks])
+
+  const cancelMutation = useCancelAgentRun()
+
+  const filteredRuns = useMemo(
+    () => (statusFilter === 'all' ? runs : runs.filter((r) => r.status === statusFilter)),
+    [runs, statusFilter],
+  )
+
+  function clearTaskFilter() {
+    const next = new URLSearchParams(searchParams.toString())
+    next.delete('task')
+    const qs = next.toString()
+    router.replace(qs ? `/tasks?${qs}` : '/tasks')
+  }
+
+  const selectedRun = useMemo(() => runs.find((r) => r.id === selectedRunId), [runs, selectedRunId])
+
+  return (
+    <div className="flex h-full">
+      <div
+        className={cn(
+          'flex flex-1 flex-col overflow-hidden',
+          selectedRunId && 'border-r border-[var(--border)]',
+        )}
+      >
+        <div className="flex flex-wrap items-center gap-2 border-b border-[var(--border)] px-6 py-3">
+          {STATUS_OPTIONS.map((status) => (
+            <Button
+              key={status}
+              variant={statusFilter === status ? 'default' : 'outline'}
+              size="sm"
+              onClick={() => setStatusFilter(status)}
+            >
+              {t(status === 'all' ? 'execution.filterAll' : RUN_STATUS_I18N[status])}
+            </Button>
+          ))}
+        </div>
+
+        {taskFilter && (
+          <div className="flex items-center gap-2 border-b border-[var(--border)] px-6 py-2">
+            <span className="text-xs text-[var(--text-muted)]">
+              {t('execution.filteredByTask')}:
+            </span>
+            <Badge variant="secondary" className="gap-1 pr-1">
+              {taskTitleMap[taskFilter] || taskFilter.slice(0, 8)}
+              <button
+                type="button"
+                onClick={clearTaskFilter}
+                className="ml-0.5 rounded-full p-0.5 hover:bg-[var(--surface-5)]"
+              >
+                <X className="h-2.5 w-2.5" />
+              </button>
+            </Badge>
+          </div>
+        )}
+
+        <div className="flex-1 overflow-y-auto px-6 py-4">
+          {isLoading ? (
+            <div className="flex items-center gap-2 text-sm text-[var(--text-muted)]">
+              <Loader2 className="h-4 w-4 animate-spin" />
+              {t('execution.loading')}
+            </div>
+          ) : filteredRuns.length === 0 ? (
+            <Card className="border-dashed border-[var(--border)] bg-[var(--surface-1)] p-8 text-center">
+              <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-2xl bg-[var(--surface-3)] text-[var(--text-muted)]">
+                <Activity className="h-5 w-5" />
+              </div>
+              <h2 className="mt-4 text-sm font-semibold text-[var(--text-primary)]">
+                {t('execution.executionEmpty')}
+              </h2>
+              <p className="mt-1 text-sm text-[var(--text-muted)]">
+                {t('execution.executionEmptyDesc')}
+              </p>
+            </Card>
+          ) : (
+            <div className="space-y-3">
+              {filteredRuns.map((run) => (
+                <ExecutionRow
+                  key={run.id}
+                  run={run}
+                  taskTitle={run.task_id ? taskTitleMap[run.task_id] : undefined}
+                  agentName={agentNameMap[run.release_id]}
+                  onSelect={setSelectedRunId}
+                  onCancel={(id) => cancelMutation.mutate(id)}
+                  isCancelling={cancelMutation.isPending && cancelMutation.variables === run.id}
+                  isSelected={run.id === selectedRunId}
+                />
+              ))}
+            </div>
+          )}
+        </div>
+      </div>
+
+      {selectedRunId && workspaceId && selectedRun?.current_execution_id && (
+        <div className="w-[480px] flex-shrink-0 overflow-hidden">
+          <ExecutionTimeline
+            executionId={selectedRun.current_execution_id}
+            workspaceId={workspaceId}
+            taskId={selectedRun.task_id ?? undefined}
+          />
+        </div>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/executions/message-input.tsx b/frontend/components/executions/message-input.tsx
new file mode 100644
index 000000000..244d84556
--- /dev/null
+++ b/frontend/components/executions/message-input.tsx
@@ -0,0 +1,42 @@
+'use client'
+
+import { Send } from 'lucide-react'
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+
+interface MessageInputProps {
+  disabled?: boolean
+  onSend: (message: string) => void
+}
+
+export function MessageInput({ disabled, onSend }: MessageInputProps) {
+  const [value, setValue] = useState('')
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault()
+    const trimmed = value.trim()
+    if (!trimmed) return
+    onSend(trimmed)
+    setValue('')
+  }
+
+  return (
+    <form
+      onSubmit={handleSubmit}
+      className="flex items-center gap-2 border-t border-[var(--border)] px-4 py-3"
+    >
+      <Input
+        value={value}
+        onChange={(e) => setValue(e.target.value)}
+        placeholder="Send message to agent..."
+        disabled={disabled}
+        className="flex-1"
+      />
+      <Button type="submit" size="icon" disabled={disabled || !value.trim()}>
+        <Send className="h-4 w-4" />
+      </Button>
+    </form>
+  )
+}
diff --git a/frontend/components/observation/ObservationPanel.tsx b/frontend/components/observation/ObservationPanel.tsx
new file mode 100644
index 000000000..c4d1ccfc1
--- /dev/null
+++ b/frontend/components/observation/ObservationPanel.tsx
@@ -0,0 +1,102 @@
+'use client'
+
+import { PanelGroup, Panel, PanelResizeHandle } from 'react-resizable-panels'
+import { Search, TreePine, GanttChart, X } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { useObservationData } from './contexts/ObservationDataContext'
+import { useObservationSelection } from './contexts/ObservationSelectionContext'
+import { ObservationNavigation } from './components/ObservationNavigation'
+import { ObservationDetailPanel } from './components/ObservationDetailPanel'
+import { ObservationProviders } from './components/ObservationProviders'
+import { usdFormatter, formatTokenCounts } from './lib/helpers'
+
+export function Toolbar() {
+  const { roots, isExecuting } = useObservationData()
+  const { searchInputValue, setSearchInputValue, setSearchQueryImmediate, viewMode, setViewMode } =
+    useObservationSelection()
+
+  const totalCost = roots.reduce((sum, r) => sum + r.totalCost, 0)
+  const totalTokens = roots.reduce((sum, r) => sum + (r.totalUsage ?? 0), 0)
+
+  return (
+    <div className="flex items-center gap-2 border-b px-3 py-1.5">
+      <div className="relative flex-1">
+        <Search className="absolute left-2 top-1/2 h-3.5 w-3.5 -translate-y-1/2 text-muted-foreground" />
+        <input
+          type="text"
+          placeholder="Search observations..."
+          value={searchInputValue}
+          onChange={(e) => setSearchInputValue(e.target.value)}
+          className="focus:ring-primary-accent h-7 w-full rounded-sm border bg-transparent pl-7 pr-7 text-xs placeholder:text-muted-foreground focus:outline-none focus:ring-1"
+        />
+        {searchInputValue && (
+          <button
+            className="absolute right-2 top-1/2 -translate-y-1/2"
+            onClick={() => setSearchQueryImmediate('')}
+          >
+            <X className="h-3 w-3 text-muted-foreground" />
+          </button>
+        )}
+      </div>
+
+      <div className="flex rounded-sm border">
+        <button
+          className={cn(
+            'flex items-center gap-1 px-2 py-1 text-xs',
+            viewMode === 'tree' && 'bg-muted',
+          )}
+          onClick={() => setViewMode('tree')}
+        >
+          <TreePine className="h-3 w-3" />
+          Tree
+        </button>
+        <button
+          className={cn(
+            'flex items-center gap-1 px-2 py-1 text-xs',
+            viewMode === 'timeline' && 'bg-muted',
+          )}
+          onClick={() => setViewMode('timeline')}
+        >
+          <GanttChart className="h-3 w-3" />
+          Timeline
+        </button>
+      </div>
+
+      {totalTokens > 0 && (
+        <span className="text-xs text-muted-foreground">
+          {formatTokenCounts(null, null, totalTokens)} tokens
+        </span>
+      )}
+      {totalCost > 0 && (
+        <span className="text-xs text-muted-foreground">{usdFormatter(totalCost)}</span>
+      )}
+
+      {isExecuting && <span className="h-2 w-2 animate-pulse rounded-full bg-green-500" />}
+    </div>
+  )
+}
+
+function ObservationPanelContent() {
+  return (
+    <div className="flex h-full flex-col">
+      <Toolbar />
+      <PanelGroup direction="horizontal" className="flex-1">
+        <Panel defaultSize={40} minSize={20} collapsible collapsedSize={3}>
+          <ObservationNavigation />
+        </Panel>
+        <PanelResizeHandle className="hover:bg-primary-accent/50 w-px bg-border transition-colors" />
+        <Panel defaultSize={60} minSize={30}>
+          <ObservationDetailPanel />
+        </Panel>
+      </PanelGroup>
+    </div>
+  )
+}
+
+export function ObservationPanel() {
+  return (
+    <ObservationProviders>
+      <ObservationPanelContent />
+    </ObservationProviders>
+  )
+}
diff --git a/frontend/components/observation/components/DebugPanel.tsx b/frontend/components/observation/components/DebugPanel.tsx
new file mode 100644
index 000000000..4c3e88461
--- /dev/null
+++ b/frontend/components/observation/components/DebugPanel.tsx
@@ -0,0 +1,130 @@
+'use client'
+
+import { useCallback, useEffect, useState } from 'react'
+import { useQuery } from '@tanstack/react-query'
+import { PanelGroup, Panel, PanelResizeHandle } from 'react-resizable-panels'
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useObservationStream } from '../hooks/useObservationStream'
+import { DebugToolbar } from './DebugToolbar'
+import { ObservationNavigation } from './ObservationNavigation'
+import { ObservationDetailPanel } from './ObservationDetailPanel'
+import { ObservationProviders } from './ObservationProviders'
+import { normalizeObservation } from '../lib/normalize'
+import { Toolbar } from '../ObservationPanel'
+import { apiGet, apiPost } from '@/lib/api-client'
+
+interface DebugPanelProps {
+  agentId: string
+  agentVersionId: string
+  workspaceId: string
+}
+
+function DebugPanelInner({ agentId, agentVersionId, workspaceId }: DebugPanelProps) {
+  const [executionId, setExecutionId] = useState<string | null>(null)
+  const [runId, setRunId] = useState<string | null>(null)
+  const [mode, setMode] = useState<'idle' | 'live' | 'replay'>('idle')
+  const [replayTraceId, setReplayTraceId] = useState<string | null>(null)
+
+  const { dispatch, loadTrace, isExecuting } = useObservationData()
+  useObservationStream(mode === 'live' ? executionId : null)
+
+  const { data: traces = [] } = useQuery({
+    queryKey: ['traces', agentVersionId, workspaceId],
+    queryFn: async () => {
+      const data = await apiGet<Array<{ id: string; created_at: string }>>(
+        `/traces?workspace_id=${workspaceId}&agent_version_id=${agentVersionId}&page_size=20`,
+      )
+      return data.map((t) => ({ id: t.id, createdAt: t.created_at }))
+    },
+    enabled: !!agentVersionId && !!workspaceId,
+  })
+
+  const { data: replayObservations } = useQuery({
+    queryKey: ['trace-observations', replayTraceId],
+    queryFn: async () => {
+      const rawList = await apiGet<Record<string, unknown>[]>(
+        `/traces/${replayTraceId}/observations`,
+      )
+      return rawList.map(normalizeObservation)
+    },
+    enabled: mode === 'replay' && !!replayTraceId,
+    staleTime: Infinity,
+    refetchOnWindowFocus: false,
+    gcTime: 0,
+  })
+
+  useEffect(() => {
+    if (!replayObservations || replayObservations.length === 0) return
+    const traceStart = new Date(
+      Math.min(...replayObservations.map((o) => new Date(o.startTime).getTime())),
+    )
+    loadTrace(replayObservations, traceStart)
+  }, [replayObservations, loadTrace])
+
+  const handleStartDebug = useCallback(
+    async (prompt: string) => {
+      dispatch({ type: 'RESET' })
+      try {
+        const data = await apiPost<{ execution_id: string; run_id: string }>('/executions/debug', {
+          agent_id: agentId,
+          agent_version_id: agentVersionId,
+          prompt,
+          workspace_id: workspaceId,
+        })
+        setExecutionId(data.execution_id)
+        setRunId(data.run_id)
+        setMode('live')
+      } catch (err) {
+        console.error('Debug start failed:', err)
+      }
+    },
+    [agentId, agentVersionId, workspaceId, dispatch],
+  )
+
+  const handleStop = useCallback(async () => {
+    if (!runId) return
+    await apiPost(`/agent-runs/${runId}/cancel`)
+  }, [runId])
+
+  const handleSelectTrace = useCallback(
+    (traceId: string) => {
+      dispatch({ type: 'RESET' })
+      setReplayTraceId(traceId)
+      setMode('replay')
+    },
+    [dispatch],
+  )
+
+  return (
+    <div className="flex h-full flex-col">
+      <DebugToolbar
+        agentId={agentId}
+        agentVersionId={agentVersionId}
+        workspaceId={workspaceId}
+        isExecuting={isExecuting}
+        onStartDebug={handleStartDebug}
+        onStop={handleStop}
+        onSelectTrace={handleSelectTrace}
+        traces={traces}
+      />
+      <Toolbar />
+      <PanelGroup direction="horizontal" className="flex-1">
+        <Panel defaultSize={40} minSize={20} collapsible collapsedSize={3}>
+          <ObservationNavigation />
+        </Panel>
+        <PanelResizeHandle className="hover:bg-primary-accent/50 w-px bg-border transition-colors" />
+        <Panel defaultSize={60} minSize={30}>
+          <ObservationDetailPanel />
+        </Panel>
+      </PanelGroup>
+    </div>
+  )
+}
+
+export function DebugPanel(props: DebugPanelProps) {
+  return (
+    <ObservationProviders>
+      <DebugPanelInner {...props} />
+    </ObservationProviders>
+  )
+}
diff --git a/frontend/components/observation/components/DebugToolbar.tsx b/frontend/components/observation/components/DebugToolbar.tsx
new file mode 100644
index 000000000..4838c2882
--- /dev/null
+++ b/frontend/components/observation/components/DebugToolbar.tsx
@@ -0,0 +1,87 @@
+'use client'
+
+import { useState } from 'react'
+import { Play, Square } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Textarea } from '@/components/ui/textarea'
+
+interface DebugToolbarProps {
+  agentId: string
+  agentVersionId: string
+  workspaceId: string
+  isExecuting: boolean
+  onStartDebug: (prompt: string, variables?: Record<string, string>) => void
+  onStop: () => void
+  onSelectTrace: (traceId: string) => void
+  traces: Array<{ id: string; createdAt: string }>
+}
+
+export function DebugToolbar({
+  agentId,
+  agentVersionId,
+  workspaceId,
+  isExecuting,
+  onStartDebug,
+  onStop,
+  onSelectTrace,
+  traces,
+}: DebugToolbarProps) {
+  const [prompt, setPrompt] = useState('')
+  const [showPrompt, setShowPrompt] = useState(true)
+
+  const handleStart = () => {
+    if (!prompt.trim()) return
+    onStartDebug(prompt.trim())
+  }
+
+  return (
+    <div className="space-y-2 border-b px-3 py-2">
+      <div className="flex items-center gap-2">
+        {isExecuting ? (
+          <Button size="sm" variant="destructive" onClick={onStop}>
+            <Square className="mr-1 h-3 w-3" />
+            Stop
+          </Button>
+        ) : (
+          <Button size="sm" onClick={handleStart} disabled={!prompt.trim()}>
+            <Play className="mr-1 h-3 w-3" />
+            Debug
+          </Button>
+        )}
+
+        {traces.length > 0 && (
+          <select
+            className="h-8 rounded-sm border bg-transparent px-2 text-xs"
+            onChange={(e) => e.target.value && onSelectTrace(e.target.value)}
+            defaultValue=""
+          >
+            <option value="" disabled>
+              History...
+            </option>
+            {traces.map((t) => (
+              <option key={t.id} value={t.id}>
+                {new Date(t.createdAt).toLocaleString()}
+              </option>
+            ))}
+          </select>
+        )}
+      </div>
+
+      {showPrompt && (
+        <Textarea
+          placeholder="Enter test prompt..."
+          value={prompt}
+          onChange={(e) => setPrompt(e.target.value)}
+          rows={2}
+          className="resize-none text-sm"
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' && (e.metaKey || e.ctrlKey)) {
+              e.preventDefault()
+              handleStart()
+            }
+          }}
+        />
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/IOPreview.tsx b/frontend/components/observation/components/IOPreview.tsx
new file mode 100644
index 000000000..5b5ab4dc7
--- /dev/null
+++ b/frontend/components/observation/components/IOPreview.tsx
@@ -0,0 +1,16 @@
+import { IOPreviewPretty } from './IOPreviewPretty'
+import { IOPreviewJSON } from './IOPreviewJSON'
+
+interface IOPreviewProps {
+  input: unknown
+  output: unknown
+  metadata?: Record<string, unknown> | null
+  currentView: 'pretty' | 'json'
+}
+
+export function IOPreview({ input, output, metadata, currentView }: IOPreviewProps) {
+  if (currentView === 'json') {
+    return <IOPreviewJSON input={input} output={output} metadata={metadata} />
+  }
+  return <IOPreviewPretty input={input} output={output} metadata={metadata} />
+}
diff --git a/frontend/components/observation/components/IOPreviewJSON.tsx b/frontend/components/observation/components/IOPreviewJSON.tsx
new file mode 100644
index 000000000..80560c318
--- /dev/null
+++ b/frontend/components/observation/components/IOPreviewJSON.tsx
@@ -0,0 +1,99 @@
+import { Copy, Check, ChevronRight, ChevronDown } from 'lucide-react'
+import { JsonView } from '@/components/execution/JsonView'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+import { useObservationJsonExpansion } from '../contexts/ObservationJsonExpansionContext'
+
+interface IOPreviewJSONProps {
+  input: unknown
+  output: unknown
+  metadata?: Record<string, unknown> | null
+}
+
+function JsonSection({
+  label,
+  data,
+  expanded,
+  onToggle,
+}: {
+  label: string
+  data: unknown
+  expanded: boolean
+  onToggle: () => void
+}) {
+  const { copied, handleCopy } = useCopyToClipboard(1500)
+  if (data == null) return null
+
+  const onCopy = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    handleCopy(JSON.stringify(data, null, 2))
+  }
+
+  return (
+    <div className="border-b last:border-b-0">
+      <button
+        className="group flex w-full items-center justify-between px-3 py-2 text-left text-sm font-medium text-foreground hover:bg-muted/50"
+        onClick={onToggle}
+      >
+        <div className="flex items-center gap-1.5">
+          {expanded ? (
+            <ChevronDown className="h-3.5 w-3.5 text-muted-foreground" />
+          ) : (
+            <ChevronRight className="h-3.5 w-3.5 text-muted-foreground" />
+          )}
+          {label}
+        </div>
+        <div
+          role="button"
+          tabIndex={0}
+          className="flex h-6 w-6 items-center justify-center rounded opacity-0 transition-opacity hover:bg-muted group-hover:opacity-100"
+          onClick={onCopy}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault()
+              onCopy(e as unknown as React.MouseEvent)
+            }
+          }}
+          title="Copy section"
+        >
+          {copied ? (
+            <Check className="h-3.5 w-3.5 text-green-600" />
+          ) : (
+            <Copy className="h-3.5 w-3.5 text-muted-foreground" />
+          )}
+        </div>
+      </button>
+      {expanded && (
+        <div className="px-3 pb-3">
+          <JsonView data={data} />
+        </div>
+      )}
+    </div>
+  )
+}
+
+export function IOPreviewJSON({ input, output, metadata }: IOPreviewJSONProps) {
+  const { jsonExpansion, setJsonFieldExpansion } = useObservationJsonExpansion()
+
+  return (
+    <div>
+      <JsonSection
+        label="Input"
+        data={input}
+        expanded={jsonExpansion.input}
+        onToggle={() => setJsonFieldExpansion('input', !jsonExpansion.input)}
+      />
+      <JsonSection
+        label="Output"
+        data={output}
+        expanded={jsonExpansion.output}
+        onToggle={() => setJsonFieldExpansion('output', !jsonExpansion.output)}
+      />
+      <JsonSection
+        label="Metadata"
+        data={metadata}
+        expanded={jsonExpansion.metadata}
+        onToggle={() => setJsonFieldExpansion('metadata', !jsonExpansion.metadata)}
+      />
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/IOPreviewPretty.tsx b/frontend/components/observation/components/IOPreviewPretty.tsx
new file mode 100644
index 000000000..4774feea3
--- /dev/null
+++ b/frontend/components/observation/components/IOPreviewPretty.tsx
@@ -0,0 +1,19 @@
+import { PrettyJsonView } from './PrettyJsonView'
+
+interface IOPreviewPrettyProps {
+  input: unknown
+  output: unknown
+  metadata?: Record<string, unknown> | null
+}
+
+export function IOPreviewPretty({ input, output, metadata }: IOPreviewPrettyProps) {
+  return (
+    <div>
+      {input != null && <PrettyJsonView data={input} title="Input" section="input" />}
+      {output != null && <PrettyJsonView data={output} title="Output" section="output" />}
+      {metadata != null && Object.keys(metadata).length > 0 && (
+        <PrettyJsonView data={metadata} title="Metadata" section="metadata" />
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ItemBadge.tsx b/frontend/components/observation/components/ItemBadge.tsx
new file mode 100644
index 000000000..0b2e08fd3
--- /dev/null
+++ b/frontend/components/observation/components/ItemBadge.tsx
@@ -0,0 +1,23 @@
+import { cn } from '@/lib/utils'
+import { OBSERVATION_ICON_MAP, OBSERVATION_COLOR_MAP } from '../lib/constants'
+import type { ObservationType } from '../lib/types'
+import { ListTree } from 'lucide-react'
+
+interface ItemBadgeProps {
+  type: ObservationType
+  isSmall?: boolean
+  showLabel?: boolean
+  className?: string
+}
+
+export function ItemBadge({ type, isSmall, showLabel, className }: ItemBadgeProps) {
+  const Icon = OBSERVATION_ICON_MAP[type] ?? ListTree
+  const color = OBSERVATION_COLOR_MAP[type] ?? 'text-muted-foreground'
+
+  return (
+    <span className={cn('inline-flex items-center gap-1', className)}>
+      <Icon className={cn(color, isSmall ? 'h-3 w-3' : 'h-4 w-4')} />
+      {showLabel && <span className="text-xs text-muted-foreground">{type}</span>}
+    </span>
+  )
+}
diff --git a/frontend/components/observation/components/JsonSectionHeader.tsx b/frontend/components/observation/components/JsonSectionHeader.tsx
new file mode 100644
index 000000000..faf418e08
--- /dev/null
+++ b/frontend/components/observation/components/JsonSectionHeader.tsx
@@ -0,0 +1,57 @@
+import { Copy, Check, UnfoldVertical, FoldVertical } from 'lucide-react'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+
+interface JsonSectionHeaderProps {
+  title: string
+  data: unknown
+  allExpanded: boolean
+  onToggleExpandAll: () => void
+  showExpandButton?: boolean
+}
+
+export function JsonSectionHeader({
+  title,
+  data,
+  allExpanded,
+  onToggleExpandAll,
+  showExpandButton = true,
+}: JsonSectionHeaderProps) {
+  const { copied, handleCopy } = useCopyToClipboard(1500)
+
+  const onCopy = () => {
+    const text = typeof data === 'string' ? data : JSON.stringify(data, null, 2)
+    handleCopy(text)
+  }
+
+  return (
+    <div className="group flex items-center justify-between px-3 py-1.5 text-sm font-medium capitalize">
+      <span>{title}</span>
+      <div className="flex items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100">
+        {showExpandButton && (
+          <button
+            className="flex h-6 w-6 items-center justify-center rounded hover:bg-muted"
+            onClick={onToggleExpandAll}
+            title={allExpanded ? 'Collapse all rows' : 'Expand all rows'}
+          >
+            {allExpanded ? (
+              <FoldVertical className="h-3.5 w-3.5 text-muted-foreground" />
+            ) : (
+              <UnfoldVertical className="h-3.5 w-3.5 text-muted-foreground" />
+            )}
+          </button>
+        )}
+        <button
+          className="flex h-6 w-6 items-center justify-center rounded hover:bg-muted"
+          onClick={onCopy}
+          title="Copy section"
+        >
+          {copied ? (
+            <Check className="h-3.5 w-3.5 text-green-600" />
+          ) : (
+            <Copy className="h-3.5 w-3.5 text-muted-foreground" />
+          )}
+        </button>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/JsonValueCell.tsx b/frontend/components/observation/components/JsonValueCell.tsx
new file mode 100644
index 000000000..dd6f16930
--- /dev/null
+++ b/frontend/components/observation/components/JsonValueCell.tsx
@@ -0,0 +1,218 @@
+import { memo, type FC } from 'react'
+import ReactMarkdown, { type Options } from 'react-markdown'
+import remarkGfm from 'remark-gfm'
+import { Copy, Check } from 'lucide-react'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+import type { JsonTableRow } from '../lib/jsonTable'
+
+const MAX_DISPLAY_CHARS = 2000
+const SMALL_ARRAY_THRESHOLD = 5
+const ARRAY_PREVIEW_ITEMS = 3
+
+const PREVIEW_CLASSES = 'italic text-gray-500 dark:text-gray-400'
+
+const MemoizedReactMarkdown: FC<Options> = memo(ReactMarkdown)
+
+const REMARK_PLUGINS: Options['remarkPlugins'] = [remarkGfm]
+
+const smallHeading = ({ children }: { children?: React.ReactNode }) => (
+  <span className="block text-xs font-bold">{children}</span>
+)
+
+const MARKDOWN_COMPONENTS: Options['components'] = {
+  p({ children }) {
+    return <span className="whitespace-pre-wrap">{children}</span>
+  },
+  ul({ children }) {
+    return <ul className="list-inside list-disc">{children}</ul>
+  },
+  ol({ children }) {
+    return <ol className="list-inside list-decimal">{children}</ol>
+  },
+  li({ children }) {
+    return <li className="mt-0.5 [&>ol]:pl-4 [&>ul]:pl-4">{children}</li>
+  },
+  code({ children }) {
+    return <code className="rounded border bg-muted px-1 py-0.5">{children}</code>
+  },
+  pre({ children }) {
+    return (
+      <pre className="my-1 overflow-auto rounded bg-black/10 p-2 dark:bg-white/10">{children}</pre>
+    )
+  },
+  a({ children, href }) {
+    return (
+      <a href={href ?? undefined} className="underline" target="_blank" rel="noopener noreferrer">
+        {children}
+      </a>
+    )
+  },
+  h1({ children }) {
+    return <span className="block text-base font-bold">{children}</span>
+  },
+  h2({ children }) {
+    return <span className="block text-sm font-bold">{children}</span>
+  },
+  h3: smallHeading,
+  h4: smallHeading,
+  h5: smallHeading,
+  h6: smallHeading,
+  blockquote({ children }) {
+    return <blockquote className="border-l-2 pl-2 italic">{children}</blockquote>
+  },
+  table({ children }) {
+    return (
+      <div className="overflow-x-auto rounded border">
+        <table className="min-w-full divide-y">{children}</table>
+      </div>
+    )
+  },
+  thead({ children }) {
+    return <thead>{children}</thead>
+  },
+  tbody({ children }) {
+    return <tbody className="divide-y">{children}</tbody>
+  },
+  tr({ children }) {
+    return <tr>{children}</tr>
+  },
+  th({ children }) {
+    return <th className="px-2 py-1 text-left font-medium">{children}</th>
+  },
+  td({ children }) {
+    return <td className="px-2 py-1">{children}</td>
+  },
+}
+
+function getCopyValue(value: unknown): string {
+  if (typeof value === 'string') return value
+  if (value === null) return 'null'
+  if (value === undefined) return 'undefined'
+  try {
+    return JSON.stringify(value, null, 2)
+  } catch {
+    return String(value)
+  }
+}
+
+function renderArrayPreview(arr: unknown[]) {
+  if (arr.length === 0) return <span className={PREVIEW_CLASSES}>empty list</span>
+  if (arr.length <= SMALL_ARRAY_THRESHOLD) {
+    const items = arr.map((item) => {
+      if (typeof item === 'string') return `"${item}"`
+      if (typeof item === 'object' && item !== null) return Array.isArray(item) ? '[...]' : '{...}'
+      return String(item)
+    })
+    return <span className={PREVIEW_CLASSES}>[{items.join(', ')}]</span>
+  }
+  const preview = arr.slice(0, ARRAY_PREVIEW_ITEMS).map((item) => {
+    if (typeof item === 'string') return `"${item}"`
+    if (typeof item === 'object' || Array.isArray(item)) return '...'
+    return String(item)
+  })
+  return (
+    <span className={PREVIEW_CLASSES}>
+      [{preview.join(', ')}, ...{arr.length - ARRAY_PREVIEW_ITEMS} more]
+    </span>
+  )
+}
+
+function renderObjectPreview(obj: Record<string, unknown>) {
+  const keys = Object.keys(obj)
+  if (keys.length === 0) return <span className={PREVIEW_CLASSES}>empty object</span>
+  return <span className={PREVIEW_CLASSES}>{keys.length} items</span>
+}
+
+interface JsonValueCellProps {
+  row: JsonTableRow
+  expandedCells: Set<string>
+  toggleCellExpansion: (cellId: string) => void
+}
+
+export const JsonValueCell = memo(function JsonValueCell({
+  row,
+  expandedCells,
+  toggleCellExpansion,
+}: JsonValueCellProps) {
+  const { value, type } = row
+  const cellId = `${row.id}-value`
+  const isCellExpanded = expandedCells.has(cellId)
+  const { copied, handleCopy } = useCopyToClipboard(1500)
+
+  const onCopy = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    handleCopy(getCopyValue(value))
+  }
+
+  let content: React.ReactNode
+  let needsTruncation = false
+
+  switch (type) {
+    case 'string': {
+      const str = String(value)
+      needsTruncation = str.length > MAX_DISPLAY_CHARS
+      const display =
+        needsTruncation && !isCellExpanded ? str.substring(0, MAX_DISPLAY_CHARS) + '...' : str
+      content = (
+        <span className="text-green-600 dark:text-green-400">
+          &quot;
+          <MemoizedReactMarkdown remarkPlugins={REMARK_PLUGINS} components={MARKDOWN_COMPONENTS}>
+            {display}
+          </MemoizedReactMarkdown>
+          &quot;
+        </span>
+      )
+      break
+    }
+    case 'number':
+      content = <span className="text-blue-600 dark:text-blue-400">{String(value)}</span>
+      break
+    case 'boolean':
+      content = <span className="text-orange-600 dark:text-orange-400">{String(value)}</span>
+      break
+    case 'null':
+      content = <span className="italic text-gray-500 dark:text-gray-400">null</span>
+      break
+    case 'undefined':
+      content = <span className="text-gray-500 dark:text-gray-400">undefined</span>
+      break
+    case 'array':
+      content = renderArrayPreview(value as unknown[])
+      break
+    case 'object':
+      content = renderObjectPreview(value as Record<string, unknown>)
+      break
+    default:
+      content = <span className="text-gray-600">{String(value)}</span>
+  }
+
+  return (
+    <div className="group relative max-w-full break-words font-mono text-xs">
+      <span className="cursor-text">{content}</span>
+      {needsTruncation && !row.hasChildren && (
+        <span
+          className="inline cursor-pointer opacity-50"
+          onClick={(e) => {
+            e.stopPropagation()
+            toggleCellExpansion(cellId)
+          }}
+        >
+          {isCellExpanded
+            ? '\n...collapse'
+            : `\n...expand (${String(value).length - MAX_DISPLAY_CHARS} more characters)`}
+        </span>
+      )}
+      <button
+        className="absolute right-0 top-0 flex h-5 w-5 items-center justify-center rounded border bg-background/80 p-0.5 opacity-0 shadow-sm transition-opacity group-hover:opacity-100"
+        onClick={onCopy}
+        title="Copy value"
+      >
+        {copied ? (
+          <Check className="h-2.5 w-2.5 text-green-600" />
+        ) : (
+          <Copy className="h-2.5 w-2.5 text-muted-foreground" />
+        )}
+      </button>
+    </div>
+  )
+})
diff --git a/frontend/components/observation/components/ObservationDetailHeader.tsx b/frontend/components/observation/components/ObservationDetailHeader.tsx
new file mode 100644
index 000000000..db38758ba
--- /dev/null
+++ b/frontend/components/observation/components/ObservationDetailHeader.tsx
@@ -0,0 +1,214 @@
+'use client'
+
+import { Copy, Check } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import { Badge } from '@/components/ui/badge'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
+import { ItemBadge } from './ItemBadge'
+import {
+  formatIntervalSeconds,
+  usdFormatter,
+  formatTokenCounts,
+  formatLocalIsoMs,
+} from '../lib/helpers'
+import type { ObservationNode } from '../lib/types'
+
+interface ObservationDetailHeaderProps {
+  node: ObservationNode
+}
+
+function CopyIdButton({ id }: { id: string }) {
+  const { copied, handleCopy } = useCopyToClipboard(1500)
+
+  return (
+    <button
+      className="flex h-5 w-5 shrink-0 items-center justify-center rounded opacity-50 transition-opacity hover:bg-muted hover:opacity-100"
+      onClick={() => handleCopy(id)}
+      title="Copy observation ID"
+    >
+      {copied ? (
+        <Check className="h-3 w-3 text-green-600" />
+      ) : (
+        <Copy className="h-3 w-3 text-muted-foreground" />
+      )}
+    </button>
+  )
+}
+
+function UsageTooltipContent({ node }: { node: ObservationNode }) {
+  const details = node.usageDetails
+  if (!details) return null
+
+  return (
+    <div className="space-y-1 text-xs">
+      {details.input != null && (
+        <div className="flex justify-between gap-4">
+          <span className="text-muted-foreground">Input</span>
+          <span>{details.input.toLocaleString()}</span>
+        </div>
+      )}
+      {details.output != null && (
+        <div className="flex justify-between gap-4">
+          <span className="text-muted-foreground">Output</span>
+          <span>{details.output.toLocaleString()}</span>
+        </div>
+      )}
+      {details.total != null && (
+        <div className="flex justify-between gap-4 border-t pt-1">
+          <span className="text-muted-foreground">Total</span>
+          <span className="font-medium">{details.total.toLocaleString()}</span>
+        </div>
+      )}
+    </div>
+  )
+}
+
+function CostTooltipContent({ node }: { node: ObservationNode }) {
+  const hasBreakdown = node.calculatedInputCost != null || node.calculatedOutputCost != null
+
+  if (!hasBreakdown) return null
+
+  return (
+    <div className="space-y-1 text-xs">
+      {node.calculatedInputCost != null && (
+        <div className="flex justify-between gap-4">
+          <span className="text-muted-foreground">Input</span>
+          <span>{usdFormatter(node.calculatedInputCost)}</span>
+        </div>
+      )}
+      {node.calculatedOutputCost != null && (
+        <div className="flex justify-between gap-4">
+          <span className="text-muted-foreground">Output</span>
+          <span>{usdFormatter(node.calculatedOutputCost)}</span>
+        </div>
+      )}
+      {node.calculatedTotalCost != null && (
+        <div className="flex justify-between gap-4 border-t pt-1">
+          <span className="text-muted-foreground">Total</span>
+          <span className="font-medium">{usdFormatter(node.calculatedTotalCost)}</span>
+        </div>
+      )}
+    </div>
+  )
+}
+
+export function ObservationDetailHeader({ node }: ObservationDetailHeaderProps) {
+  const ttft =
+    node.completionStartTime && node.startTime
+      ? (node.completionStartTime.getTime() - node.startTime.getTime()) / 1000
+      : null
+
+  return (
+    <div className="space-y-1.5 border-b px-4 py-3">
+      <div className="flex items-center gap-2">
+        <ItemBadge type={node.type} showLabel />
+        <span className="truncate text-sm font-medium">{node.name}</span>
+        <CopyIdButton id={node.id} />
+      </div>
+
+      <div className="text-xs text-muted-foreground">{formatLocalIsoMs(node.startTime)}</div>
+
+      <div className="flex flex-wrap gap-1.5">
+        {node.latency != null && (
+          <Badge variant="secondary" className="text-[10px] font-normal">
+            {formatIntervalSeconds(node.latency)}
+          </Badge>
+        )}
+
+        {ttft != null && (
+          <Badge variant="secondary" className="text-[10px] font-normal">
+            TTFT {formatIntervalSeconds(ttft)}
+          </Badge>
+        )}
+
+        <TooltipProvider delayDuration={200}>
+          {node.totalCost > 0 && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Badge variant="secondary" className="cursor-default text-[10px] font-normal">
+                  {node.children.length > 0 ? '∑ ' : ''}
+                  {usdFormatter(node.totalCost)}
+                </Badge>
+              </TooltipTrigger>
+              <TooltipContent>
+                <CostTooltipContent node={node} />
+              </TooltipContent>
+            </Tooltip>
+          )}
+
+          {(node.totalUsage ?? node.inputUsage ?? node.outputUsage) != null && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Badge variant="secondary" className="cursor-default text-[10px] font-normal">
+                  {formatTokenCounts(node.inputUsage, node.outputUsage, node.totalUsage)} tokens
+                </Badge>
+              </TooltipTrigger>
+              <TooltipContent>
+                <UsageTooltipContent node={node} />
+              </TooltipContent>
+            </Tooltip>
+          )}
+
+          {node.model && (
+            <Tooltip>
+              <TooltipTrigger asChild>
+                <Badge variant="secondary" className="cursor-default text-[10px] font-normal">
+                  {node.model}
+                </Badge>
+              </TooltipTrigger>
+              {node.modelParameters && Object.keys(node.modelParameters).length > 0 && (
+                <TooltipContent>
+                  <div className="space-y-1 text-xs">
+                    {Object.entries(node.modelParameters).map(([k, v]) => (
+                      <div key={k} className="flex justify-between gap-4">
+                        <span className="text-muted-foreground">{k}</span>
+                        <span>{String(v)}</span>
+                      </div>
+                    ))}
+                  </div>
+                </TooltipContent>
+              )}
+            </Tooltip>
+          )}
+        </TooltipProvider>
+
+        {node.environment && (
+          <Badge variant="secondary" className="text-[10px] font-normal">
+            {node.environment}
+          </Badge>
+        )}
+
+        {node.promptName && (
+          <Badge variant="secondary" className="text-[10px] font-normal">
+            {node.promptName}
+            {node.promptVersion != null ? ` v${node.promptVersion}` : ''}
+          </Badge>
+        )}
+
+        {node.level !== 'DEFAULT' && (
+          <Badge
+            variant={node.level === 'ERROR' ? 'destructive' : 'secondary'}
+            className={cn(
+              'text-[10px] font-normal',
+              node.level === 'WARNING' && 'bg-yellow-100 text-yellow-700 hover:bg-yellow-100/80',
+              node.level === 'DEBUG' && 'bg-gray-100 text-gray-600 hover:bg-gray-100/80',
+            )}
+          >
+            {node.level}
+          </Badge>
+        )}
+
+        {node.statusMessage && (
+          <Badge
+            variant={node.level === 'ERROR' ? 'destructive' : 'secondary'}
+            className="max-w-[200px] truncate text-[10px] font-normal"
+            title={node.statusMessage}
+          >
+            {node.statusMessage}
+          </Badge>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationDetailPanel.tsx b/frontend/components/observation/components/ObservationDetailPanel.tsx
new file mode 100644
index 000000000..ae2be0a9f
--- /dev/null
+++ b/frontend/components/observation/components/ObservationDetailPanel.tsx
@@ -0,0 +1,125 @@
+'use client'
+
+import { cn } from '@/lib/utils'
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useObservationSelection } from '../contexts/ObservationSelectionContext'
+import { useStreamingText } from '../contexts/StreamingTextContext'
+import { ObservationDetailHeader } from './ObservationDetailHeader'
+import { IOPreview } from './IOPreview'
+import { PrettyJsonView } from './PrettyJsonView'
+import { formatIntervalSeconds, usdFormatter } from '../lib/helpers'
+import type { ObservationNode } from '../lib/types'
+
+function TraceSummaryView() {
+  const { roots } = useObservationData()
+
+  if (roots.length === 0) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+        No trace data. Run a debug execution or select a historical trace.
+      </div>
+    )
+  }
+
+  const totalCost = roots.reduce((sum, r) => sum + r.totalCost, 0)
+  const totalDuration = Math.max(...roots.map((r) => r.latency ?? 0))
+
+  return (
+    <div className="space-y-2 p-4">
+      <h3 className="text-sm font-medium">Trace Summary</h3>
+      <div className="grid grid-cols-2 gap-2 text-sm">
+        <div className="text-muted-foreground">Duration</div>
+        <div>{formatIntervalSeconds(totalDuration)}</div>
+        <div className="text-muted-foreground">Total Cost</div>
+        <div>{usdFormatter(totalCost)}</div>
+      </div>
+    </div>
+  )
+}
+
+function StreamingTextView({ text }: { text: string }) {
+  return (
+    <div className="space-y-2 px-4 py-3">
+      <div className="flex items-center gap-2">
+        <span className="h-1.5 w-1.5 animate-pulse rounded-full bg-green-500" />
+        <span className="text-xs font-medium text-muted-foreground">Streaming</span>
+      </div>
+      <div className="whitespace-pre-wrap rounded-sm bg-muted/30 p-3 font-mono text-xs leading-relaxed">
+        {text}
+        <span className="ml-0.5 inline-block h-3 w-1.5 animate-pulse bg-foreground align-middle" />
+      </div>
+    </div>
+  )
+}
+
+function ViewPrefToggle() {
+  const { viewPref, setViewPref } = useObservationSelection()
+
+  return (
+    <div className="ml-auto flex items-center gap-0.5 rounded-md bg-muted p-0.5">
+      <button
+        className={cn(
+          'rounded px-2 py-0.5 text-xs transition-colors',
+          viewPref === 'formatted' && 'bg-background shadow-sm',
+        )}
+        onClick={() => setViewPref('formatted')}
+      >
+        Formatted
+      </button>
+      <button
+        className={cn(
+          'rounded px-2 py-0.5 text-xs transition-colors',
+          viewPref === 'json' && 'bg-background shadow-sm',
+        )}
+        onClick={() => setViewPref('json')}
+      >
+        JSON
+      </button>
+    </div>
+  )
+}
+
+function ObservationDetail({ node }: { node: ObservationNode }) {
+  const { viewPref } = useObservationSelection()
+  const streamingText = useStreamingText(node.id)
+  const isStreaming = streamingText !== undefined && node.endTime === null
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      <ObservationDetailHeader node={node} />
+
+      <div className="flex h-9 shrink-0 items-center border-b px-3">
+        <span className="text-xs font-medium text-foreground">Preview</span>
+        <ViewPrefToggle />
+      </div>
+
+      <div className="flex-1 overflow-auto">
+        {isStreaming ? (
+          <>
+            {node.input != null && (
+              <PrettyJsonView data={node.input} title="Input" section="input" />
+            )}
+            <StreamingTextView text={streamingText ?? ''} />
+          </>
+        ) : (
+          <IOPreview
+            input={node.input}
+            output={node.output}
+            metadata={node.metadata}
+            currentView={viewPref === 'formatted' ? 'pretty' : 'json'}
+          />
+        )}
+      </div>
+    </div>
+  )
+}
+
+export function ObservationDetailPanel() {
+  const { nodeMap } = useObservationData()
+  const { selectedNodeId } = useObservationSelection()
+
+  const selectedNode = selectedNodeId ? nodeMap.get(selectedNodeId) : null
+
+  if (!selectedNode) return <TraceSummaryView />
+  return <ObservationDetail node={selectedNode} />
+}
diff --git a/frontend/components/observation/components/ObservationNavigation.tsx b/frontend/components/observation/components/ObservationNavigation.tsx
new file mode 100644
index 000000000..6c79714d7
--- /dev/null
+++ b/frontend/components/observation/components/ObservationNavigation.tsx
@@ -0,0 +1,16 @@
+'use client'
+
+import { useObservationSelection } from '../contexts/ObservationSelectionContext'
+import { ObservationTree } from './ObservationTree'
+import { ObservationTimeline } from './ObservationTimeline'
+import { ObservationSearchList } from './ObservationSearchList'
+
+export function ObservationNavigation() {
+  const { searchQuery, viewMode } = useObservationSelection()
+
+  const hasQuery = searchQuery.trim().length > 0
+
+  if (hasQuery) return <ObservationSearchList />
+  if (viewMode === 'timeline') return <ObservationTimeline />
+  return <ObservationTree />
+}
diff --git a/frontend/components/observation/components/ObservationNodeWrapper.tsx b/frontend/components/observation/components/ObservationNodeWrapper.tsx
new file mode 100644
index 000000000..3e3b2b925
--- /dev/null
+++ b/frontend/components/observation/components/ObservationNodeWrapper.tsx
@@ -0,0 +1,86 @@
+import { cn } from '@/lib/utils'
+import { ChevronRight } from 'lucide-react'
+import { ItemBadge } from './ItemBadge'
+import type { ObservationFlatItem, ObservationType } from '../lib/types'
+import type { ReactNode } from 'react'
+
+interface ObservationNodeWrapperProps {
+  metadata: ObservationFlatItem
+  nodeType: ObservationType
+  hasChildren: boolean
+  isCollapsed: boolean
+  onToggleCollapse: () => void
+  isSelected: boolean
+  onSelect: () => void
+  isError: boolean
+  children: ReactNode
+}
+
+export function ObservationNodeWrapper({
+  metadata,
+  nodeType,
+  hasChildren,
+  isCollapsed,
+  onToggleCollapse,
+  isSelected,
+  onSelect,
+  isError,
+  children,
+}: ObservationNodeWrapperProps) {
+  const { depth, treeLines, isLastSibling } = metadata
+
+  return (
+    <div
+      className={cn(
+        'flex w-full cursor-pointer items-center pr-1',
+        isSelected && 'ring-primary-accent rounded-sm bg-muted/50 ring-2',
+        isError && 'border-l-2 border-red-500',
+      )}
+      onClick={onSelect}
+    >
+      {treeLines.map((hasLine, i) => (
+        <div key={i} className="relative w-5 shrink-0 self-stretch">
+          {hasLine && <div className="absolute bottom-0 left-3 top-0 w-px bg-border" />}
+        </div>
+      ))}
+
+      {depth > 0 && (
+        <div className="relative w-[5px] shrink-0 self-stretch">
+          <div
+            className={cn(
+              'absolute left-3 top-0 w-px bg-border',
+              isLastSibling ? 'h-3' : 'bottom-0',
+            )}
+          />
+          <div className="absolute left-3 top-3 h-px w-2 bg-border" />
+        </div>
+      )}
+
+      <div className="relative flex w-6 shrink-0 items-center justify-center self-stretch">
+        <ItemBadge type={nodeType} />
+        {hasChildren && !isCollapsed && (
+          <div className="absolute bottom-0 left-1/2 top-3 w-px bg-border" />
+        )}
+      </div>
+
+      <div className="min-w-0 flex-1 py-1">{children}</div>
+
+      {hasChildren && (
+        <button
+          className="flex h-6 w-6 shrink-0 items-center justify-center rounded-sm hover:bg-muted"
+          onClick={(e) => {
+            e.stopPropagation()
+            onToggleCollapse()
+          }}
+        >
+          <ChevronRight
+            className={cn(
+              'h-4 w-4 text-muted-foreground transition-transform duration-200 ease-in-out',
+              !isCollapsed && 'rotate-90',
+            )}
+          />
+        </button>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationProviders.tsx b/frontend/components/observation/components/ObservationProviders.tsx
new file mode 100644
index 000000000..71785afdb
--- /dev/null
+++ b/frontend/components/observation/components/ObservationProviders.tsx
@@ -0,0 +1,24 @@
+'use client'
+
+import { Suspense } from 'react'
+import { ObservationViewPrefsProvider } from '../contexts/ObservationViewPrefsContext'
+import { ObservationDataProvider } from '../contexts/ObservationDataContext'
+import { ObservationSelectionProvider } from '../contexts/ObservationSelectionContext'
+import { ObservationJsonExpansionProvider } from '../contexts/ObservationJsonExpansionContext'
+import { StreamingTextProvider } from '../contexts/StreamingTextContext'
+
+export function ObservationProviders({ children }: { children: React.ReactNode }) {
+  return (
+    <ObservationViewPrefsProvider>
+      <ObservationDataProvider>
+        <StreamingTextProvider>
+          <Suspense fallback={null}>
+            <ObservationSelectionProvider>
+              <ObservationJsonExpansionProvider>{children}</ObservationJsonExpansionProvider>
+            </ObservationSelectionProvider>
+          </Suspense>
+        </StreamingTextProvider>
+      </ObservationDataProvider>
+    </ObservationViewPrefsProvider>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationSearchList.tsx b/frontend/components/observation/components/ObservationSearchList.tsx
new file mode 100644
index 000000000..ded8fc0dd
--- /dev/null
+++ b/frontend/components/observation/components/ObservationSearchList.tsx
@@ -0,0 +1,59 @@
+'use client'
+
+import { useMemo } from 'react'
+import { cn } from '@/lib/utils'
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useObservationSelection } from '../contexts/ObservationSelectionContext'
+import { ItemBadge } from './ItemBadge'
+import { formatIntervalSeconds } from '../lib/helpers'
+
+export function ObservationSearchList() {
+  const { searchItems } = useObservationData()
+  const { searchQuery, selectedNodeId, selectNode, setSearchQueryImmediate } =
+    useObservationSelection()
+
+  const results = useMemo(() => {
+    if (!searchQuery.trim()) return []
+    const q = searchQuery.toLowerCase()
+    return searchItems.filter(
+      (item) =>
+        item.node.type.toLowerCase().includes(q) ||
+        item.node.name.toLowerCase().includes(q) ||
+        item.node.id.toLowerCase().includes(q),
+    )
+  }, [searchItems, searchQuery])
+
+  if (results.length === 0) {
+    return (
+      <div className="flex h-full items-center justify-center text-sm text-muted-foreground">
+        No results for &quot;{searchQuery}&quot;
+      </div>
+    )
+  }
+
+  return (
+    <div className="h-full overflow-auto">
+      {results.map((item) => (
+        <div
+          key={item.observationId}
+          className={cn(
+            'flex cursor-pointer items-center gap-2 px-3 py-2 hover:bg-muted/50',
+            item.observationId === selectedNodeId && 'bg-muted',
+          )}
+          onClick={() => {
+            selectNode(item.observationId)
+            setSearchQueryImmediate('')
+          }}
+        >
+          <ItemBadge type={item.node.type} />
+          <span className="truncate text-sm">{item.node.name}</span>
+          {item.node.latency != null && (
+            <span className="shrink-0 text-xs text-muted-foreground">
+              {formatIntervalSeconds(item.node.latency)}
+            </span>
+          )}
+        </div>
+      ))}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationSpanContent.tsx b/frontend/components/observation/components/ObservationSpanContent.tsx
new file mode 100644
index 000000000..5fdb01346
--- /dev/null
+++ b/frontend/components/observation/components/ObservationSpanContent.tsx
@@ -0,0 +1,77 @@
+import { cn } from '@/lib/utils'
+import { useObservationViewPrefs } from '../contexts/ObservationViewPrefsContext'
+import {
+  heatMapTextColor,
+  formatIntervalSeconds,
+  formatTokenCounts,
+  usdFormatter,
+} from '../lib/helpers'
+import type { ObservationNode } from '../lib/types'
+
+interface ObservationSpanContentProps {
+  node: ObservationNode
+  parentTotalCost?: number
+  parentTotalDuration?: number
+}
+
+export function ObservationSpanContent({
+  node,
+  parentTotalCost,
+  parentTotalDuration,
+}: ObservationSpanContentProps) {
+  const { showDuration, showCostTokens, colorCodeMetrics } = useObservationViewPrefs()
+
+  return (
+    <div className="flex min-w-0 items-center gap-2">
+      {node.endTime === null && (
+        <span className="h-1.5 w-1.5 shrink-0 animate-pulse rounded-full bg-green-500" />
+      )}
+      <span className="truncate text-sm">{node.name}</span>
+
+      {node.model && (
+        <span className="shrink-0 rounded bg-muted px-1.5 py-0.5 text-2xs text-muted-foreground">
+          {node.model}
+        </span>
+      )}
+
+      {showDuration && node.latency != null && (
+        <span
+          className={cn(
+            'shrink-0 text-xs text-muted-foreground',
+            colorCodeMetrics &&
+              parentTotalDuration &&
+              heatMapTextColor({
+                max: parentTotalDuration,
+                value: node.latency,
+              }),
+          )}
+        >
+          {formatIntervalSeconds(node.latency)}
+        </span>
+      )}
+
+      {showCostTokens && node.totalCost > 0 && (
+        <span
+          className={cn(
+            'shrink-0 text-xs text-muted-foreground',
+            colorCodeMetrics &&
+              parentTotalCost &&
+              heatMapTextColor({
+                max: parentTotalCost,
+                value: node.totalCost,
+              }),
+          )}
+        >
+          {node.children.length > 0 ? '∑ ' : ''}
+          {usdFormatter(node.totalCost)}
+        </span>
+      )}
+
+      {showCostTokens && (node.totalUsage ?? node.inputUsage ?? node.outputUsage) != null && (
+        <span className="shrink-0 text-xs text-muted-foreground">
+          {formatTokenCounts(node.inputUsage, node.outputUsage, node.totalUsage)}
+        </span>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationTimeline.tsx b/frontend/components/observation/components/ObservationTimeline.tsx
new file mode 100644
index 000000000..8637cc258
--- /dev/null
+++ b/frontend/components/observation/components/ObservationTimeline.tsx
@@ -0,0 +1,121 @@
+'use client'
+
+import { useMemo, useRef } from 'react'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { flattenTreeWithTimelineMetrics } from '../lib/timeline-flattening'
+import { calculateStepSize, SCALE_WIDTH } from '../lib/timeline-calculations'
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useObservationSelection } from '../contexts/ObservationSelectionContext'
+import { useObservationViewPrefs } from '../contexts/ObservationViewPrefsContext'
+import { ObservationNodeWrapper } from './ObservationNodeWrapper'
+import { TimelineBar } from './TimelineBar'
+import { TimelineScale } from './TimelineScale'
+
+export function ObservationTimeline() {
+  const { roots } = useObservationData()
+  const { selectedNodeId, selectNode, collapsedNodes, toggleCollapse } = useObservationSelection()
+  const { showCostTokens, colorCodeMetrics } = useObservationViewPrefs()
+
+  const scrollRef = useRef<HTMLDivElement>(null)
+  const timeIndexRef = useRef<HTMLDivElement>(null)
+  const contentRef = useRef<HTMLDivElement>(null)
+
+  const traceDuration = useMemo(() => Math.max(...roots.map((r) => r.latency ?? 0), 0.01), [roots])
+  const traceStartTime = useMemo(
+    () =>
+      roots.length > 0
+        ? new Date(Math.min(...roots.map((r) => r.startTime.getTime())))
+        : new Date(),
+    [roots],
+  )
+  const stepSize = useMemo(() => calculateStepSize(traceDuration), [traceDuration])
+
+  const flatItems = useMemo(
+    () =>
+      flattenTreeWithTimelineMetrics(
+        roots,
+        collapsedNodes,
+        traceStartTime,
+        traceDuration,
+        SCALE_WIDTH,
+      ),
+    [roots, collapsedNodes, traceStartTime, traceDuration],
+  )
+
+  const rowVirtualizer = useVirtualizer({
+    count: flatItems.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 42,
+    overscan: 500,
+  })
+
+  const rootTotalCost = roots.length > 0 ? roots[0].totalCost : undefined
+
+  const handleTimeIndexScroll = (e: React.UIEvent<HTMLDivElement>) => {
+    if (contentRef.current) contentRef.current.scrollLeft = e.currentTarget.scrollLeft
+  }
+  const handleContentScroll = (e: React.UIEvent<HTMLDivElement>) => {
+    if (timeIndexRef.current) timeIndexRef.current.scrollLeft = e.currentTarget.scrollLeft
+  }
+
+  return (
+    <div className="flex h-full flex-col">
+      <div ref={timeIndexRef} className="shrink-0 overflow-x-auto" onScroll={handleTimeIndexScroll}>
+        <TimelineScale traceDuration={traceDuration} scaleWidth={SCALE_WIDTH} stepSize={stepSize} />
+      </div>
+
+      <div ref={scrollRef} className="flex-1 overflow-auto" onScroll={handleContentScroll}>
+        <div
+          ref={contentRef}
+          style={{
+            height: `${rowVirtualizer.getTotalSize()}px`,
+            width: `${SCALE_WIDTH + 200}px`,
+          }}
+          className="relative"
+        >
+          {rowVirtualizer.getVirtualItems().map((virtualItem) => {
+            const item = flatItems[virtualItem.index]
+            const isSelected = item.node.id === selectedNodeId
+
+            return (
+              <div
+                key={item.node.id}
+                className="absolute left-0 top-0 flex w-full items-center"
+                style={{
+                  height: `${virtualItem.size}px`,
+                  transform: `translateY(${virtualItem.start}px)`,
+                }}
+              >
+                <div className="w-[200px] shrink-0">
+                  <ObservationNodeWrapper
+                    metadata={item}
+                    nodeType={item.node.type}
+                    hasChildren={item.node.children.length > 0}
+                    isCollapsed={collapsedNodes.has(item.node.id)}
+                    onToggleCollapse={() => toggleCollapse(item.node.id)}
+                    isSelected={isSelected}
+                    onSelect={() => selectNode(item.node.id)}
+                    isError={item.node.level === 'ERROR'}
+                  >
+                    <span className="truncate text-xs">{item.node.name}</span>
+                  </ObservationNodeWrapper>
+                </div>
+                <div className="flex-1">
+                  <TimelineBar
+                    node={item.node}
+                    metrics={item.metrics}
+                    isSelected={isSelected}
+                    onSelect={() => selectNode(item.node.id)}
+                    showCostTokens={showCostTokens}
+                    colorCodeMetrics={colorCodeMetrics}
+                    parentTotalCost={rootTotalCost}
+                  />
+                </div>
+              </div>
+            )
+          })}
+        </div>
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/ObservationTree.tsx b/frontend/components/observation/components/ObservationTree.tsx
new file mode 100644
index 000000000..63013206a
--- /dev/null
+++ b/frontend/components/observation/components/ObservationTree.tsx
@@ -0,0 +1,91 @@
+'use client'
+
+import { useEffect, useLayoutEffect, useMemo, useRef } from 'react'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { flattenTree } from '../lib/tree-flattening'
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useObservationSelection } from '../contexts/ObservationSelectionContext'
+import { ObservationNodeWrapper } from './ObservationNodeWrapper'
+import { ObservationSpanContent } from './ObservationSpanContent'
+
+export function ObservationTree() {
+  const { roots, isExecuting } = useObservationData()
+  const { selectedNodeId, selectNode, collapsedNodes, toggleCollapse } = useObservationSelection()
+
+  const scrollRef = useRef<HTMLDivElement>(null)
+
+  const flatItems = useMemo(() => flattenTree(roots, collapsedNodes), [roots, collapsedNodes])
+
+  const rowVirtualizer = useVirtualizer({
+    count: flatItems.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 37,
+    overscan: 500,
+    measureElement: (el) => el.getBoundingClientRect().height,
+  })
+
+  const initialNodeIdRef = useRef(selectedNodeId)
+  const hasScrolledRef = useRef(false)
+
+  useLayoutEffect(() => {
+    if (selectedNodeId && !hasScrolledRef.current && selectedNodeId === initialNodeIdRef.current) {
+      const index = flatItems.findIndex((item) => item.node.id === selectedNodeId)
+      if (index !== -1) {
+        rowVirtualizer.scrollToIndex(index, {
+          align: 'center',
+          behavior: 'auto',
+        })
+        hasScrolledRef.current = true
+      }
+    }
+  }, [selectedNodeId, flatItems, rowVirtualizer])
+
+  useEffect(() => {
+    if (isExecuting && flatItems.length > 0) {
+      rowVirtualizer.scrollToIndex(flatItems.length - 1, { align: 'end' })
+    }
+  }, [isExecuting, flatItems.length, rowVirtualizer])
+
+  const rootTotalCost = roots.length > 0 ? roots[0].totalCost : undefined
+  const rootTotalDuration = roots.length > 0 ? (roots[0].latency ?? undefined) : undefined
+
+  return (
+    <div ref={scrollRef} className="h-full overflow-auto">
+      <div style={{ height: `${rowVirtualizer.getTotalSize()}px` }} className="relative w-full">
+        {rowVirtualizer.getVirtualItems().map((virtualItem) => {
+          const item = flatItems[virtualItem.index]
+          const isSelected = item.node.id === selectedNodeId
+
+          return (
+            <div
+              key={item.node.id}
+              ref={rowVirtualizer.measureElement}
+              data-index={virtualItem.index}
+              className="absolute left-0 top-0 w-full"
+              style={{
+                transform: `translateY(${virtualItem.start}px)`,
+              }}
+            >
+              <ObservationNodeWrapper
+                metadata={item}
+                nodeType={item.node.type}
+                hasChildren={item.node.children.length > 0}
+                isCollapsed={collapsedNodes.has(item.node.id)}
+                onToggleCollapse={() => toggleCollapse(item.node.id)}
+                isSelected={isSelected}
+                onSelect={() => selectNode(item.node.id)}
+                isError={item.node.level === 'ERROR'}
+              >
+                <ObservationSpanContent
+                  node={item.node}
+                  parentTotalCost={rootTotalCost}
+                  parentTotalDuration={rootTotalDuration}
+                />
+              </ObservationNodeWrapper>
+            </div>
+          )
+        })}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/PrettyJsonView.tsx b/frontend/components/observation/components/PrettyJsonView.tsx
new file mode 100644
index 000000000..831bb1105
--- /dev/null
+++ b/frontend/components/observation/components/PrettyJsonView.tsx
@@ -0,0 +1,272 @@
+'use client'
+
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  useReactTable,
+  getCoreRowModel,
+  getExpandedRowModel,
+  flexRender,
+  type ExpandedState,
+} from '@tanstack/react-table'
+import { ChevronRight, ChevronDown } from 'lucide-react'
+import { cn } from '@/lib/utils'
+import {
+  transformJsonToTableData,
+  getRowChildren,
+  getEmptyValueDisplay,
+  findOptimalExpansionLevel,
+  type JsonTableRow,
+} from '../lib/jsonTable'
+import { JsonValueCell } from './JsonValueCell'
+import { JsonSectionHeader } from './JsonSectionHeader'
+import { useObservationJsonExpansion } from '../contexts/ObservationJsonExpansionContext'
+
+interface PrettyJsonViewProps {
+  data: unknown
+  title: string
+  section: 'input' | 'output' | 'metadata'
+}
+
+export function PrettyJsonView({ data, title, section }: PrettyJsonViewProps) {
+  const emptyDisplay = getEmptyValueDisplay(data)
+  const { formattedExpansion, setFormattedFieldExpansion } = useObservationJsonExpansion()
+
+  const [rows, setRows] = useState<JsonTableRow[]>(() =>
+    emptyDisplay ? [] : transformJsonToTableData(data, '', 0, '', true),
+  )
+
+  const externalExpansion = formattedExpansion[section]
+
+  const [expanded, setExpanded] = useState<ExpandedState>(() => {
+    if (Object.keys(externalExpansion).length > 0) return externalExpansion
+    const optimalLevel = findOptimalExpansionLevel(rows)
+    return buildDefaultExpansion(rows, optimalLevel)
+  })
+
+  const [expandedCells, setExpandedCells] = useState<Set<string>>(new Set())
+  const toggleCellExpansion = useCallback((cellId: string) => {
+    setExpandedCells((prev) => {
+      const next = new Set(prev)
+      if (next.has(cellId)) next.delete(cellId)
+      else next.add(cellId)
+      return next
+    })
+  }, [])
+
+  const persistExpansion = useRef(expanded)
+  persistExpansion.current = expanded
+  useEffect(() => {
+    return () => {
+      if (persistExpansion.current !== true) {
+        setFormattedFieldExpansion(section, persistExpansion.current as Record<string, boolean>)
+      }
+    }
+  }, [section, setFormattedFieldExpansion])
+
+  const handleLazyLoad = useCallback((rowId: string) => {
+    setRows((prev) => loadChildren(prev, rowId))
+  }, [])
+
+  const columns = useMemo(
+    () => [
+      {
+        accessorKey: 'key' as const,
+        header: 'Path',
+        size: 35,
+        cell: ({
+          row,
+        }: {
+          row: {
+            original: JsonTableRow
+            getIsExpanded: () => boolean
+            toggleExpanded: () => void
+            depth: number
+          }
+        }) => {
+          const indent = row.original.level * 16 + 8
+          return (
+            <div className="flex items-center font-mono text-xs" style={{ paddingLeft: indent }}>
+              {row.original.hasChildren ? (
+                <button
+                  className="mr-1 flex h-4 w-4 shrink-0 items-center justify-center rounded hover:bg-muted"
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    if (row.original.rawChildData && !row.original.childrenGenerated) {
+                      handleLazyLoad(row.original.id)
+                    }
+                    row.toggleExpanded()
+                  }}
+                >
+                  {row.getIsExpanded() ? (
+                    <ChevronDown className="h-3 w-3" />
+                  ) : (
+                    <ChevronRight className="h-3 w-3" />
+                  )}
+                </button>
+              ) : (
+                <span className="mr-1 w-4 shrink-0" />
+              )}
+              <span className="font-medium">{row.original.key}</span>
+            </div>
+          )
+        },
+      },
+      {
+        accessorKey: 'value' as const,
+        header: 'Value',
+        size: 65,
+        cell: ({ row }: { row: { original: JsonTableRow } }) => (
+          <JsonValueCell
+            row={row.original}
+            expandedCells={expandedCells}
+            toggleCellExpansion={toggleCellExpansion}
+          />
+        ),
+      },
+    ],
+    [toggleCellExpansion, handleLazyLoad],
+  )
+
+  const table = useReactTable({
+    data: rows,
+    columns,
+    state: { expanded },
+    onExpandedChange: setExpanded,
+    getSubRows: (row) => row.subRows,
+    getCoreRowModel: getCoreRowModel(),
+    getExpandedRowModel: getExpandedRowModel(),
+    getRowId: (row) => row.id,
+  })
+
+  const allExpanded = useMemo(() => {
+    const flatRows = table.getRowModel().flatRows
+    return (
+      flatRows.length > 0 &&
+      flatRows.filter((r) => r.original.hasChildren).every((r) => r.getIsExpanded())
+    )
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- table ref changes when expanded changes
+  }, [table])
+
+  const handleToggleExpandAll = useCallback(() => {
+    if (allExpanded) {
+      setExpanded({})
+    } else {
+      setRows((prev) => loadAllChildren(prev))
+      const newExpanded: Record<string, boolean> = {}
+      table.getRowModel().flatRows.forEach((row) => {
+        if (row.original.hasChildren) newExpanded[row.id] = true
+      })
+      setExpanded(newExpanded)
+    }
+  }, [allExpanded, table])
+
+  if (emptyDisplay) {
+    return (
+      <div className="border-b last:border-b-0">
+        <JsonSectionHeader
+          title={title}
+          data={data}
+          allExpanded={false}
+          onToggleExpandAll={() => {}}
+          showExpandButton={false}
+        />
+        <div className="px-3 pb-3 text-xs italic text-muted-foreground">{emptyDisplay}</div>
+      </div>
+    )
+  }
+
+  if (data == null) return null
+
+  return (
+    <div className="border-b last:border-b-0">
+      <JsonSectionHeader
+        title={title}
+        data={data}
+        allExpanded={allExpanded}
+        onToggleExpandAll={handleToggleExpandAll}
+      />
+      <div className="overflow-x-auto">
+        <table className="w-full border-collapse text-xs">
+          <thead>
+            <tr className="border-b bg-muted/30">
+              <th className="w-[35%] px-3 py-1.5 text-left font-medium text-muted-foreground">
+                Path
+              </th>
+              <th className="px-3 py-1.5 text-left font-medium text-muted-foreground">Value</th>
+            </tr>
+          </thead>
+          <tbody>
+            {table.getRowModel().rows.map((row) => (
+              <tr
+                key={row.id}
+                className={cn(
+                  'border-border/50 border-b transition-colors hover:bg-muted/30',
+                  row.original.hasChildren && 'cursor-pointer',
+                )}
+                onClick={() => {
+                  if (row.original.hasChildren) {
+                    if (row.original.rawChildData && !row.original.childrenGenerated) {
+                      handleLazyLoad(row.original.id)
+                    }
+                    row.toggleExpanded()
+                  }
+                }}
+              >
+                {row.getVisibleCells().map((cell) => (
+                  <td key={cell.id} className="px-3 py-1.5 align-top">
+                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                  </td>
+                ))}
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  )
+}
+
+function buildDefaultExpansion(rows: JsonTableRow[], maxLevel: number): Record<string, boolean> {
+  const expansion: Record<string, boolean> = {}
+  const stack = [...rows]
+  while (stack.length > 0) {
+    const row = stack.pop()!
+    if (row.hasChildren && row.level < maxLevel) {
+      expansion[row.id] = true
+      if (row.subRows) stack.push(...row.subRows)
+    }
+  }
+  return expansion
+}
+
+function loadChildren(rows: JsonTableRow[], targetId: string): JsonTableRow[] {
+  return rows.map((row) => {
+    if (row.id === targetId && row.rawChildData && !row.childrenGenerated) {
+      return { ...row, subRows: getRowChildren(row), childrenGenerated: true }
+    }
+    if (row.subRows) {
+      const updated = loadChildren(row.subRows, targetId)
+      if (updated !== row.subRows) return { ...row, subRows: updated }
+    }
+    return row
+  })
+}
+
+function loadAllChildren(rows: JsonTableRow[]): JsonTableRow[] {
+  return rows.map((row) => {
+    let updated = row
+    if (row.hasChildren && row.rawChildData && !row.childrenGenerated) {
+      updated = { ...row, subRows: getRowChildren(row), childrenGenerated: true }
+    }
+    if (updated.subRows) {
+      const childrenUpdated = loadAllChildren(updated.subRows)
+      if (childrenUpdated !== updated.subRows) {
+        updated =
+          updated === row
+            ? { ...row, subRows: childrenUpdated }
+            : { ...updated, subRows: childrenUpdated }
+      }
+    }
+    return updated
+  })
+}
diff --git a/frontend/components/observation/components/TimelineBar.tsx b/frontend/components/observation/components/TimelineBar.tsx
new file mode 100644
index 000000000..e4f5bba8f
--- /dev/null
+++ b/frontend/components/observation/components/TimelineBar.tsx
@@ -0,0 +1,89 @@
+import { cn } from '@/lib/utils'
+import { ItemBadge } from './ItemBadge'
+import { formatIntervalSeconds, usdFormatter, heatMapTextColor } from '../lib/helpers'
+import type { ObservationNode, TimelineMetrics } from '../lib/types'
+
+interface TimelineBarProps {
+  node: ObservationNode
+  metrics: TimelineMetrics
+  isSelected: boolean
+  onSelect: () => void
+  showCostTokens: boolean
+  colorCodeMetrics: boolean
+  parentTotalCost?: number
+}
+
+export function TimelineBar({
+  node,
+  metrics,
+  isSelected,
+  onSelect,
+  showCostTokens,
+  colorCodeMetrics,
+  parentTotalCost,
+}: TimelineBarProps) {
+  const { startOffset, itemWidth, firstTokenTimeOffset } = metrics
+
+  if (firstTokenTimeOffset != null && itemWidth > 0) {
+    const firstTokenWidth = firstTokenTimeOffset - startOffset
+    const completionWidth = itemWidth - firstTokenWidth
+
+    return (
+      <div
+        className={cn('flex cursor-pointer', isSelected && 'ring-3 ring-primary-accent rounded-sm')}
+        style={{ marginLeft: `${startOffset}px` }}
+        onClick={onSelect}
+      >
+        <div
+          className="flex h-8 items-center rounded-l-sm border-r border-gray-400 bg-muted opacity-60"
+          style={{ width: `${Math.max(firstTokenWidth, 2)}px` }}
+        />
+        <div
+          className="flex h-8 items-center gap-1 overflow-hidden rounded-r-sm bg-muted px-1"
+          style={{ width: `${Math.max(completionWidth, 2)}px` }}
+        >
+          <ItemBadge type={node.type} isSmall />
+          <span className="truncate text-xs">{node.name}</span>
+        </div>
+      </div>
+    )
+  }
+
+  const barWidth = itemWidth || 10
+  const isDashed = !itemWidth
+
+  return (
+    <div
+      className={cn(
+        'flex h-8 cursor-pointer items-center gap-1 overflow-hidden rounded-sm bg-muted px-1',
+        isDashed && 'border border-dashed',
+        isSelected && 'ring-3 ring-primary-accent',
+      )}
+      style={{
+        marginLeft: `${startOffset}px`,
+        width: `${barWidth}px`,
+      }}
+      onClick={onSelect}
+    >
+      <ItemBadge type={node.type} isSmall />
+      <span className="truncate text-xs">{node.name}</span>
+      {metrics.latency != null && (
+        <span className="shrink-0 text-xs text-muted-foreground">
+          {formatIntervalSeconds(metrics.latency)}
+        </span>
+      )}
+      {showCostTokens && node.totalCost > 0 && (
+        <span
+          className={cn(
+            'shrink-0 text-xs text-muted-foreground',
+            colorCodeMetrics &&
+              parentTotalCost &&
+              heatMapTextColor({ max: parentTotalCost, value: node.totalCost }),
+          )}
+        >
+          {usdFormatter(node.totalCost)}
+        </span>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/observation/components/TimelineScale.tsx b/frontend/components/observation/components/TimelineScale.tsx
new file mode 100644
index 000000000..1bc4cfc03
--- /dev/null
+++ b/frontend/components/observation/components/TimelineScale.tsx
@@ -0,0 +1,50 @@
+import { STEP_SIZE } from '../lib/timeline-calculations'
+
+interface TimelineScaleProps {
+  traceDuration: number
+  scaleWidth: number
+  stepSize: number
+}
+
+export function TimelineScale({ traceDuration, scaleWidth, stepSize }: TimelineScaleProps) {
+  const numMarkers = Math.ceil(scaleWidth / STEP_SIZE) + 1
+
+  return (
+    <div className="mb-2 ml-2">
+      <div className="relative mr-2 h-8" style={{ width: `${scaleWidth}px` }}>
+        {Array.from({ length: numMarkers }).map((_, i) => {
+          const timeValue = stepSize * i
+          if (timeValue > traceDuration) return null
+
+          return (
+            <div
+              key={i}
+              className="absolute h-full border-l text-xs"
+              style={{ left: `${i * STEP_SIZE}px` }}
+            >
+              <span
+                className="absolute left-2 text-xs text-muted-foreground"
+                title={`${timeValue.toFixed(2)}s`}
+              >
+                {timeValue.toFixed(2)}s
+              </span>
+            </div>
+          )
+        })}
+
+        {Array.from({ length: numMarkers }).map((_, i) => {
+          const timeValue = stepSize * i
+          if (timeValue > traceDuration || i === 0) return null
+
+          return (
+            <div
+              key={`grid-${i}`}
+              className="border-border/30 pointer-events-none absolute h-full border-l"
+              style={{ left: `${i * STEP_SIZE}px` }}
+            />
+          )
+        })}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/observation/contexts/ObservationDataContext.tsx b/frontend/components/observation/contexts/ObservationDataContext.tsx
new file mode 100644
index 000000000..46ff80535
--- /dev/null
+++ b/frontend/components/observation/contexts/ObservationDataContext.tsx
@@ -0,0 +1,245 @@
+'use client'
+
+import React, { createContext, useCallback, useContext, useMemo, useReducer, useState } from 'react'
+import { buildTraceTree } from '../lib/tree-building'
+import type { ObservationNode, RawObservation, SearchItem, TraceTreeResult } from '../lib/types'
+
+interface ObservationDataState {
+  nodeMap: Map<string, ObservationNode>
+  roots: ObservationNode[]
+  searchItems: SearchItem[]
+  traceStartTime: Date | null
+}
+
+const initialState: ObservationDataState = {
+  nodeMap: new Map(),
+  roots: [],
+  searchItems: [],
+  traceStartTime: null,
+}
+
+type ObservationAction =
+  | { type: 'SET_TREE'; result: TraceTreeResult; traceStartTime: Date }
+  | { type: 'INSERT_NODE'; observation: RawObservation }
+  | { type: 'UPDATE_NODE'; observation: RawObservation; data?: Record<string, unknown> }
+  | { type: 'CLOSE_NODE'; observation: RawObservation }
+  | { type: 'RESET' }
+
+function parseRawToNode(
+  raw: RawObservation,
+  traceStartTime: Date,
+  parentNode?: ObservationNode,
+): ObservationNode {
+  const startTime = new Date(raw.startTime)
+  const endTime = raw.endTime ? new Date(raw.endTime) : null
+  return {
+    id: raw.id,
+    parentObservationId: raw.parentObservationId,
+    traceId: raw.traceId,
+    type: raw.type ?? 'SPAN',
+    name: raw.name ?? '',
+    level: raw.level ?? 'DEFAULT',
+    statusMessage: raw.statusMessage,
+    startTime,
+    endTime,
+    completionStartTime: raw.completionStartTime ? new Date(raw.completionStartTime) : null,
+    input: raw.input ?? null,
+    output: raw.output ?? null,
+    metadata: raw.metadata ?? null,
+    model: raw.model,
+    modelParameters: raw.modelParameters ?? null,
+    usageDetails: raw.usageDetails,
+    calculatedInputCost: raw.calculatedInputCost ?? null,
+    calculatedOutputCost: raw.calculatedOutputCost ?? null,
+    calculatedTotalCost: raw.calculatedTotalCost ?? null,
+    environment: raw.environment ?? null,
+    promptName: raw.promptName ?? null,
+    promptVersion: raw.promptVersion ?? null,
+    children: [],
+    depth: parentNode ? parentNode.depth + 1 : 0,
+    childrenDepth: 0,
+    totalCost: raw.calculatedTotalCost ?? 0,
+    inputUsage: raw.usageDetails?.input ?? null,
+    outputUsage: raw.usageDetails?.output ?? null,
+    totalUsage:
+      raw.usageDetails?.total ??
+      (raw.usageDetails?.input != null || raw.usageDetails?.output != null
+        ? (raw.usageDetails?.input ?? 0) + (raw.usageDetails?.output ?? 0)
+        : null),
+    latency: endTime ? (endTime.getTime() - startTime.getTime()) / 1000 : null,
+    startTimeSinceTrace: startTime.getTime() - traceStartTime.getTime(),
+    startTimeSinceParentStart: parentNode
+      ? startTime.getTime() - parentNode.startTime.getTime()
+      : null,
+  }
+}
+
+function rebuildRootsAndSearch(nodeMap: Map<string, ObservationNode>): {
+  roots: ObservationNode[]
+  searchItems: SearchItem[]
+} {
+  const roots = [...nodeMap.values()]
+    .filter((n) => !n.parentObservationId)
+    .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+  const searchItems: SearchItem[] = []
+  const stack = [...roots].reverse()
+  while (stack.length > 0) {
+    const node = stack.pop()!
+    searchItems.push({ node, observationId: node.id })
+    for (let i = node.children.length - 1; i >= 0; i--) {
+      stack.push(node.children[i])
+    }
+  }
+  return { roots, searchItems }
+}
+
+function propagateAggregates(nodeMap: Map<string, ObservationNode>, nodeId: string): void {
+  let current = nodeMap.get(nodeId)
+  while (current) {
+    const nodeCost =
+      current.calculatedTotalCost ??
+      (current.calculatedInputCost ?? 0) + (current.calculatedOutputCost ?? 0)
+    current.totalCost = nodeCost + current.children.reduce((sum, c) => sum + c.totalCost, 0)
+    if (!current.parentObservationId) break
+    current = nodeMap.get(current.parentObservationId)
+  }
+}
+
+function reducer(state: ObservationDataState, action: ObservationAction): ObservationDataState {
+  switch (action.type) {
+    case 'SET_TREE': {
+      return {
+        ...state,
+        nodeMap: action.result.nodeMap,
+        roots: action.result.roots,
+        searchItems: action.result.searchItems,
+        traceStartTime: action.traceStartTime,
+      }
+    }
+    case 'INSERT_NODE': {
+      const traceStartTime = state.traceStartTime ?? new Date()
+      const parentNode = action.observation.parentObservationId
+        ? state.nodeMap.get(action.observation.parentObservationId)
+        : undefined
+      const node = parseRawToNode(action.observation, traceStartTime, parentNode)
+      const newMap = new Map(state.nodeMap)
+      newMap.set(node.id, node)
+      if (parentNode) {
+        const newChildren = [...parentNode.children]
+        const insertIdx = newChildren.findIndex(
+          (c) => c.startTime.getTime() > node.startTime.getTime(),
+        )
+        if (insertIdx === -1) newChildren.push(node)
+        else newChildren.splice(insertIdx, 0, node)
+        const updatedParent = { ...parentNode, children: newChildren }
+        newMap.set(updatedParent.id, updatedParent)
+      }
+      const { roots, searchItems } = rebuildRootsAndSearch(newMap)
+      return { ...state, nodeMap: newMap, roots, searchItems, traceStartTime }
+    }
+    case 'UPDATE_NODE': {
+      const existing = state.nodeMap.get(action.observation.id)
+      if (!existing) return state
+      const updated = { ...existing }
+      if (action.observation.model !== undefined) updated.model = action.observation.model
+      if (action.observation.metadata !== undefined) updated.metadata = action.observation.metadata
+      if (action.data && Object.keys(action.data).length > 0) {
+        const prev = (updated.metadata as Record<string, unknown>) ?? {}
+        const prevUpdates = (prev._intermediateUpdates as unknown[]) ?? []
+        updated.metadata = {
+          ...prev,
+          _intermediateUpdates: [...prevUpdates, action.data],
+        }
+      }
+      const newMap = new Map(state.nodeMap)
+      newMap.set(updated.id, updated)
+      return { ...state, nodeMap: newMap }
+    }
+    case 'CLOSE_NODE': {
+      const existing = state.nodeMap.get(action.observation.id)
+      if (!existing) return state
+      const updated = { ...existing }
+      if (action.observation.endTime) updated.endTime = new Date(action.observation.endTime)
+      if (action.observation.completionStartTime)
+        updated.completionStartTime = new Date(action.observation.completionStartTime)
+      if (action.observation.input !== undefined) updated.input = action.observation.input
+      if (action.observation.output !== undefined) updated.output = action.observation.output
+      if (action.observation.model !== undefined) updated.model = action.observation.model
+      if (action.observation.metadata !== undefined) updated.metadata = action.observation.metadata
+      if (action.observation.statusMessage !== undefined)
+        updated.statusMessage = action.observation.statusMessage
+      if (action.observation.modelParameters !== undefined)
+        updated.modelParameters = action.observation.modelParameters
+      if (action.observation.environment !== undefined)
+        updated.environment = action.observation.environment
+      if (action.observation.promptName !== undefined)
+        updated.promptName = action.observation.promptName
+      if (action.observation.promptVersion !== undefined)
+        updated.promptVersion = action.observation.promptVersion
+      if (action.observation.calculatedTotalCost !== undefined)
+        updated.calculatedTotalCost = action.observation.calculatedTotalCost as number
+      if (action.observation.calculatedInputCost !== undefined)
+        updated.calculatedInputCost = action.observation.calculatedInputCost as number
+      if (action.observation.calculatedOutputCost !== undefined)
+        updated.calculatedOutputCost = action.observation.calculatedOutputCost as number
+      if (action.observation.usageDetails !== undefined) {
+        updated.usageDetails = action.observation.usageDetails
+        updated.inputUsage = updated.usageDetails?.input ?? null
+        updated.outputUsage = updated.usageDetails?.output ?? null
+        updated.totalUsage =
+          updated.usageDetails?.total ??
+          (updated.inputUsage != null || updated.outputUsage != null
+            ? (updated.inputUsage ?? 0) + (updated.outputUsage ?? 0)
+            : null)
+      }
+      updated.latency = updated.endTime
+        ? (updated.endTime.getTime() - updated.startTime.getTime()) / 1000
+        : null
+      const newMap = new Map(state.nodeMap)
+      newMap.set(updated.id, updated)
+      propagateAggregates(newMap, updated.id)
+      return { ...state, nodeMap: newMap }
+    }
+    case 'RESET':
+      return initialState
+    default:
+      return state
+  }
+}
+
+interface ObservationDataContextValue {
+  roots: ObservationNode[]
+  nodeMap: Map<string, ObservationNode>
+  searchItems: SearchItem[]
+  isExecuting: boolean
+  traceStartTime: Date | null
+  dispatch: React.Dispatch<ObservationAction>
+  loadTrace: (observations: RawObservation[], traceStartTime: Date) => void
+  setIsExecuting: (v: boolean) => void
+}
+
+const ObservationDataCtx = createContext<ObservationDataContextValue | null>(null)
+
+export function ObservationDataProvider({ children }: { children: React.ReactNode }) {
+  const [state, dispatch] = useReducer(reducer, initialState)
+  const [isExecuting, setIsExecuting] = useState(false)
+
+  const loadTrace = useCallback((observations: RawObservation[], traceStartTime: Date) => {
+    const result = buildTraceTree(observations, traceStartTime)
+    dispatch({ type: 'SET_TREE', result, traceStartTime })
+  }, [])
+
+  const value = useMemo(
+    () => ({ ...state, isExecuting, dispatch, loadTrace, setIsExecuting }),
+    [state, isExecuting, dispatch, loadTrace],
+  )
+
+  return <ObservationDataCtx.Provider value={value}>{children}</ObservationDataCtx.Provider>
+}
+
+export function useObservationData() {
+  const ctx = useContext(ObservationDataCtx)
+  if (!ctx) throw new Error('useObservationData must be used within ObservationDataProvider')
+  return ctx
+}
diff --git a/frontend/components/observation/contexts/ObservationJsonExpansionContext.tsx b/frontend/components/observation/contexts/ObservationJsonExpansionContext.tsx
new file mode 100644
index 000000000..2bd18ba94
--- /dev/null
+++ b/frontend/components/observation/contexts/ObservationJsonExpansionContext.tsx
@@ -0,0 +1,93 @@
+'use client'
+
+import React, { createContext, useCallback, useContext, useMemo, useState } from 'react'
+
+type Field = 'input' | 'output' | 'metadata'
+
+interface ObservationJsonExpansionValue {
+  formattedExpansion: Record<Field, Record<string, boolean>>
+  setFormattedFieldExpansion: (field: Field, expansion: Record<string, boolean>) => void
+  jsonExpansion: Record<Field, boolean>
+  setJsonFieldExpansion: (field: Field, expanded: boolean) => void
+}
+
+const STORAGE_KEY = 'obs-json-expansion'
+
+function readSession(): {
+  formatted: Record<Field, Record<string, boolean>>
+  json: Record<Field, boolean>
+} {
+  if (typeof window === 'undefined')
+    return {
+      formatted: { input: {}, output: {}, metadata: {} },
+      json: { input: true, output: true, metadata: true },
+    }
+  try {
+    const raw = sessionStorage.getItem(STORAGE_KEY)
+    if (raw) return JSON.parse(raw)
+  } catch {}
+  return {
+    formatted: { input: {}, output: {}, metadata: {} },
+    json: { input: true, output: true, metadata: true },
+  }
+}
+
+const ObservationJsonExpansionCtx = createContext<ObservationJsonExpansionValue | null>(null)
+
+export function ObservationJsonExpansionProvider({ children }: { children: React.ReactNode }) {
+  const [state, setState] = useState(readSession)
+
+  const setFormattedFieldExpansion = useCallback(
+    (field: Field, expansion: Record<string, boolean>) => {
+      setState((prev) => {
+        const next = {
+          ...prev,
+          formatted: { ...prev.formatted, [field]: expansion },
+        }
+        try {
+          sessionStorage.setItem(STORAGE_KEY, JSON.stringify(next))
+        } catch {}
+        return next
+      })
+    },
+    [],
+  )
+
+  const setJsonFieldExpansion = useCallback((field: Field, expanded: boolean) => {
+    setState((prev) => {
+      const next = {
+        ...prev,
+        json: { ...prev.json, [field]: expanded },
+      }
+      try {
+        sessionStorage.setItem(STORAGE_KEY, JSON.stringify(next))
+      } catch {}
+      return next
+    })
+  }, [])
+
+  const value = useMemo(
+    () => ({
+      formattedExpansion: state.formatted,
+      setFormattedFieldExpansion,
+      jsonExpansion: state.json,
+      setJsonFieldExpansion,
+    }),
+    [state, setFormattedFieldExpansion, setJsonFieldExpansion],
+  )
+
+  return (
+    <ObservationJsonExpansionCtx.Provider value={value}>
+      {children}
+    </ObservationJsonExpansionCtx.Provider>
+  )
+}
+
+export function useObservationJsonExpansion() {
+  const ctx = useContext(ObservationJsonExpansionCtx)
+  if (!ctx)
+    throw new Error(
+      'useObservationJsonExpansion must be used within ObservationJsonExpansionProvider',
+    )
+  return ctx
+}
diff --git a/frontend/components/observation/contexts/ObservationSelectionContext.tsx b/frontend/components/observation/contexts/ObservationSelectionContext.tsx
new file mode 100644
index 000000000..d10547a58
--- /dev/null
+++ b/frontend/components/observation/contexts/ObservationSelectionContext.tsx
@@ -0,0 +1,141 @@
+'use client'
+
+import React, { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react'
+import { useSearchParams, useRouter, usePathname } from 'next/navigation'
+
+interface ObservationSelectionValue {
+  selectedNodeId: string | null
+  selectNode: (id: string | null) => void
+  collapsedNodes: Set<string>
+  toggleCollapse: (id: string) => void
+  expandAll: () => void
+  collapseAll: (ids: string[]) => void
+  searchInputValue: string
+  searchQuery: string
+  setSearchInputValue: (v: string) => void
+  setSearchQueryImmediate: (v: string) => void
+  viewMode: 'tree' | 'timeline'
+  setViewMode: (mode: 'tree' | 'timeline') => void
+  selectedTab: 'preview' | 'scores'
+  setSelectedTab: (tab: 'preview' | 'scores') => void
+  viewPref: 'formatted' | 'json'
+  setViewPref: (pref: 'formatted' | 'json') => void
+}
+
+const ObservationSelectionCtx = createContext<ObservationSelectionValue | null>(null)
+
+export function ObservationSelectionProvider({ children }: { children: React.ReactNode }) {
+  const router = useRouter()
+  const pathname = usePathname()
+  const searchParams = useSearchParams()
+
+  const selectedNodeId = searchParams.get('observation') ?? null
+  const selectNode = useCallback(
+    (id: string | null) => {
+      const params = new URLSearchParams(searchParams.toString())
+      if (id) params.set('observation', id)
+      else params.delete('observation')
+      router.replace(`${pathname}?${params.toString()}`, { scroll: false })
+    },
+    [router, pathname, searchParams],
+  )
+
+  const viewMode = (searchParams.get('view') as 'tree' | 'timeline') ?? 'tree'
+  const setViewMode = useCallback(
+    (mode: 'tree' | 'timeline') => {
+      const params = new URLSearchParams(searchParams.toString())
+      if (mode === 'timeline') params.set('view', 'timeline')
+      else params.delete('view')
+      router.replace(`${pathname}?${params.toString()}`, { scroll: false })
+    },
+    [router, pathname, searchParams],
+  )
+
+  const [collapsedNodes, setCollapsedNodes] = useState<Set<string>>(new Set())
+  const toggleCollapse = useCallback((id: string) => {
+    setCollapsedNodes((prev) => {
+      const next = new Set(prev)
+      if (next.has(id)) next.delete(id)
+      else next.add(id)
+      return next
+    })
+  }, [])
+  const expandAll = useCallback(() => setCollapsedNodes(new Set()), [])
+  const collapseAll = useCallback((ids: string[]) => setCollapsedNodes(new Set(ids)), [])
+
+  const [searchInputValue, setSearchInputValue] = useState('')
+  const [searchQuery, setSearchQuery] = useState('')
+  const debounceRef = useRef<ReturnType<typeof setTimeout>>(undefined)
+
+  const handleSearchInput = useCallback((v: string) => {
+    setSearchInputValue(v)
+    clearTimeout(debounceRef.current)
+    debounceRef.current = setTimeout(() => setSearchQuery(v), 500)
+  }, [])
+
+  const setSearchQueryImmediate = useCallback((v: string) => {
+    clearTimeout(debounceRef.current)
+    setSearchInputValue(v)
+    setSearchQuery(v)
+  }, [])
+
+  const [selectedTab, setSelectedTab] = useState<'preview' | 'scores'>('preview')
+  const [viewPref, _setViewPref] = useState<'formatted' | 'json'>(() => {
+    if (typeof window === 'undefined') return 'formatted'
+    return (localStorage.getItem('obs-view-pref') as 'formatted' | 'json') ?? 'formatted'
+  })
+  const setViewPref = useCallback((v: 'formatted' | 'json') => {
+    localStorage.setItem('obs-view-pref', v)
+    _setViewPref(v)
+  }, [])
+
+  const value = useMemo(
+    () => ({
+      selectedNodeId,
+      selectNode,
+      collapsedNodes,
+      toggleCollapse,
+      expandAll,
+      collapseAll,
+      searchInputValue,
+      searchQuery,
+      setSearchInputValue: handleSearchInput,
+      setSearchQueryImmediate,
+      viewMode,
+      setViewMode,
+      selectedTab,
+      setSelectedTab,
+      viewPref,
+      setViewPref,
+    }),
+    [
+      selectedNodeId,
+      selectNode,
+      collapsedNodes,
+      toggleCollapse,
+      expandAll,
+      collapseAll,
+      searchInputValue,
+      searchQuery,
+      handleSearchInput,
+      setSearchQueryImmediate,
+      viewMode,
+      setViewMode,
+      selectedTab,
+      setSelectedTab,
+      viewPref,
+      setViewPref,
+    ],
+  )
+
+  return (
+    <ObservationSelectionCtx.Provider value={value}>{children}</ObservationSelectionCtx.Provider>
+  )
+}
+
+export function useObservationSelection() {
+  const ctx = useContext(ObservationSelectionCtx)
+  if (!ctx)
+    throw new Error('useObservationSelection must be used within ObservationSelectionProvider')
+  return ctx
+}
diff --git a/frontend/components/observation/contexts/ObservationViewPrefsContext.tsx b/frontend/components/observation/contexts/ObservationViewPrefsContext.tsx
new file mode 100644
index 000000000..549b1dd3e
--- /dev/null
+++ b/frontend/components/observation/contexts/ObservationViewPrefsContext.tsx
@@ -0,0 +1,73 @@
+'use client'
+
+import React, { createContext, useCallback, useContext, useMemo, useState } from 'react'
+
+interface ObservationViewPrefsValue {
+  showDuration: boolean
+  showCostTokens: boolean
+  colorCodeMetrics: boolean
+  setShowDuration: (v: boolean) => void
+  setShowCostTokens: (v: boolean) => void
+  setColorCodeMetrics: (v: boolean) => void
+}
+
+const ObservationViewPrefsCtx = createContext<ObservationViewPrefsValue | null>(null)
+
+function readBool(key: string, fallback: boolean): boolean {
+  if (typeof window === 'undefined') return fallback
+  const v = localStorage.getItem(key)
+  return v === null ? fallback : v === 'true'
+}
+
+export function ObservationViewPrefsProvider({ children }: { children: React.ReactNode }) {
+  const [showDuration, _setShowDuration] = useState(() => readBool('obs-show-duration', true))
+  const [showCostTokens, _setShowCostTokens] = useState(() =>
+    readBool('obs-show-cost-tokens', true),
+  )
+  const [colorCodeMetrics, _setColorCodeMetrics] = useState(() =>
+    readBool('obs-color-code-metrics', true),
+  )
+
+  const setShowDuration = useCallback((v: boolean) => {
+    localStorage.setItem('obs-show-duration', String(v))
+    _setShowDuration(v)
+  }, [])
+  const setShowCostTokens = useCallback((v: boolean) => {
+    localStorage.setItem('obs-show-cost-tokens', String(v))
+    _setShowCostTokens(v)
+  }, [])
+  const setColorCodeMetrics = useCallback((v: boolean) => {
+    localStorage.setItem('obs-color-code-metrics', String(v))
+    _setColorCodeMetrics(v)
+  }, [])
+
+  const value = useMemo(
+    () => ({
+      showDuration,
+      showCostTokens,
+      colorCodeMetrics,
+      setShowDuration,
+      setShowCostTokens,
+      setColorCodeMetrics,
+    }),
+    [
+      showDuration,
+      showCostTokens,
+      colorCodeMetrics,
+      setShowDuration,
+      setShowCostTokens,
+      setColorCodeMetrics,
+    ],
+  )
+
+  return (
+    <ObservationViewPrefsCtx.Provider value={value}>{children}</ObservationViewPrefsCtx.Provider>
+  )
+}
+
+export function useObservationViewPrefs() {
+  const ctx = useContext(ObservationViewPrefsCtx)
+  if (!ctx)
+    throw new Error('useObservationViewPrefs must be used within ObservationViewPrefsProvider')
+  return ctx
+}
diff --git a/frontend/components/observation/contexts/StreamingTextContext.tsx b/frontend/components/observation/contexts/StreamingTextContext.tsx
new file mode 100644
index 000000000..89c20e906
--- /dev/null
+++ b/frontend/components/observation/contexts/StreamingTextContext.tsx
@@ -0,0 +1,83 @@
+'use client'
+
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useRef,
+  useSyncExternalStore,
+} from 'react'
+
+interface StreamingTextStore {
+  setText: (id: string, text: string) => void
+  clearText: (id: string) => void
+  reset: () => void
+  subscribe: (id: string, listener: () => void) => () => void
+  getText: (id: string) => string | undefined
+}
+
+const StreamingTextCtx = createContext<StreamingTextStore | null>(null)
+
+export function StreamingTextProvider({ children }: { children: React.ReactNode }) {
+  const textsRef = useRef<Map<string, string>>(new Map())
+  const listenersRef = useRef<Map<string, Set<() => void>>>(new Map())
+
+  const notify = useCallback((id: string) => {
+    const set = listenersRef.current.get(id)
+    if (!set) return
+    for (const listener of set) listener()
+  }, [])
+
+  const store = useMemo<StreamingTextStore>(
+    () => ({
+      setText: (id, text) => {
+        if (textsRef.current.get(id) === text) return
+        textsRef.current.set(id, text)
+        notify(id)
+      },
+      clearText: (id) => {
+        if (!textsRef.current.has(id)) return
+        textsRef.current.delete(id)
+        notify(id)
+      },
+      reset: () => {
+        const ids = [...textsRef.current.keys()]
+        textsRef.current.clear()
+        for (const id of ids) notify(id)
+      },
+      subscribe: (id, listener) => {
+        let listeners = listenersRef.current.get(id)
+        if (!listeners) {
+          listeners = new Set()
+          listenersRef.current.set(id, listeners)
+        }
+        listeners.add(listener)
+        const captured = listeners
+        return () => {
+          captured.delete(listener)
+          if (captured.size === 0) listenersRef.current.delete(id)
+        }
+      },
+      getText: (id) => textsRef.current.get(id),
+    }),
+    [notify],
+  )
+
+  return <StreamingTextCtx.Provider value={store}>{children}</StreamingTextCtx.Provider>
+}
+
+export function useStreamingTextStore() {
+  const ctx = useContext(StreamingTextCtx)
+  if (!ctx) throw new Error('useStreamingTextStore must be used within StreamingTextProvider')
+  return ctx
+}
+
+export function useStreamingText(id: string | null | undefined): string | undefined {
+  const store = useStreamingTextStore()
+  return useSyncExternalStore(
+    useCallback((listener) => (id ? store.subscribe(id, listener) : () => {}), [store, id]),
+    () => (id ? store.getText(id) : undefined),
+    () => undefined,
+  )
+}
diff --git a/frontend/components/observation/hooks/useObservationStream.ts b/frontend/components/observation/hooks/useObservationStream.ts
new file mode 100644
index 000000000..1f98a5c0f
--- /dev/null
+++ b/frontend/components/observation/hooks/useObservationStream.ts
@@ -0,0 +1,108 @@
+'use client'
+
+import { useEffect, useRef } from 'react'
+
+import { apiGet } from '@/lib/api-client'
+import { getExecutionWsClient } from '@/lib/ws/executions/executionWsClient'
+import type { ExecutionObservationFrame } from '@/lib/ws/executions/types'
+
+import { useObservationData } from '../contexts/ObservationDataContext'
+import { useStreamingTextStore } from '../contexts/StreamingTextContext'
+import { normalizeObservation } from '../lib/normalize'
+
+export function useObservationStream(executionId: string | null) {
+  const { dispatch, setIsExecuting, loadTrace } = useObservationData()
+  const streamingStore = useStreamingTextStore()
+  const dispatchRef = useRef(dispatch)
+  const setIsExecutingRef = useRef(setIsExecuting)
+  const loadTraceRef = useRef(loadTrace)
+  const storeRef = useRef(streamingStore)
+
+  useEffect(() => {
+    dispatchRef.current = dispatch
+    setIsExecutingRef.current = setIsExecuting
+    loadTraceRef.current = loadTrace
+    storeRef.current = streamingStore
+  })
+
+  useEffect(() => {
+    if (!executionId) return
+
+    setIsExecutingRef.current(true)
+    storeRef.current.reset()
+    const client = getExecutionWsClient()
+
+    client.subscribe(executionId, 0, {
+      onObservation: (frame: ExecutionObservationFrame) => {
+        switch (frame.event) {
+          case 'span_open':
+            if (frame.observation) {
+              dispatchRef.current({
+                type: 'INSERT_NODE',
+                observation: normalizeObservation(frame.observation),
+              })
+            }
+            break
+          case 'span_update':
+            if (frame.observation) {
+              dispatchRef.current({
+                type: 'UPDATE_NODE',
+                observation: normalizeObservation(frame.observation),
+                data: frame.data,
+              })
+            }
+            break
+          case 'span_close':
+            if (frame.observation) {
+              const obs = normalizeObservation(frame.observation)
+              storeRef.current.clearText(obs.id)
+              dispatchRef.current({
+                type: 'CLOSE_NODE',
+                observation: obs,
+              })
+            }
+            break
+          case 'streaming_text':
+            if (frame.observation) {
+              const id = frame.observation.id as string
+              const text = frame.data?.text as string
+              if (id && text) {
+                storeRef.current.setText(id, text)
+              }
+            }
+            break
+          case 'trace_complete': {
+            setIsExecutingRef.current(false)
+            storeRef.current.reset()
+            const traceId = frame.data?.trace_id as string | undefined
+            if (traceId) {
+              apiGet<Record<string, unknown>[]>(`/traces/${traceId}/observations`)
+                .then((rawList) => {
+                  const observations = rawList.map(normalizeObservation)
+                  if (observations.length > 0) {
+                    const traceStart = new Date(
+                      Math.min(...observations.map((o) => new Date(o.startTime).getTime())),
+                    )
+                    loadTraceRef.current(observations, traceStart)
+                  }
+                })
+                .catch((err) => console.error('Auto-reload after trace_complete failed:', err))
+            }
+            break
+          }
+        }
+      },
+      onCompleted: () => {
+        setIsExecutingRef.current(false)
+      },
+      onError: (error) => {
+        console.error('Observation stream error:', error)
+        setIsExecutingRef.current(false)
+      },
+    })
+
+    return () => {
+      client.unsubscribe(executionId)
+    }
+  }, [executionId])
+}
diff --git a/frontend/components/observation/index.ts b/frontend/components/observation/index.ts
new file mode 100644
index 000000000..40c4ccd2e
--- /dev/null
+++ b/frontend/components/observation/index.ts
@@ -0,0 +1,11 @@
+export { ObservationPanel } from './ObservationPanel'
+export { DebugPanel } from './components/DebugPanel'
+export { useObservationData } from './contexts/ObservationDataContext'
+export { useObservationStream } from './hooks/useObservationStream'
+export { normalizeObservation } from './lib/normalize'
+export type {
+  ObservationNode,
+  ObservationType,
+  ObservationLevel,
+  RawObservation,
+} from './lib/types'
diff --git a/frontend/components/observation/lib/constants.ts b/frontend/components/observation/lib/constants.ts
new file mode 100644
index 000000000..07e93aca6
--- /dev/null
+++ b/frontend/components/observation/lib/constants.ts
@@ -0,0 +1,40 @@
+import {
+  Fan,
+  Bot,
+  Wrench,
+  CircleDot,
+  MoveHorizontal,
+  Link,
+  Search,
+  Layers3,
+  ShieldCheck,
+  WandSparkles,
+} from 'lucide-react'
+import type { ObservationType } from './types'
+import type { LucideIcon } from 'lucide-react'
+
+export const OBSERVATION_ICON_MAP: Record<ObservationType, LucideIcon> = {
+  GENERATION: Fan,
+  AGENT: Bot,
+  TOOL: Wrench,
+  EVENT: CircleDot,
+  SPAN: MoveHorizontal,
+  CHAIN: Link,
+  RETRIEVER: Search,
+  EMBEDDING: Layers3,
+  GUARDRAIL: ShieldCheck,
+  EVALUATOR: WandSparkles,
+}
+
+export const OBSERVATION_COLOR_MAP: Record<ObservationType, string> = {
+  GENERATION: 'text-muted-magenta',
+  AGENT: 'text-purple-600',
+  TOOL: 'text-orange-600',
+  EVENT: 'text-muted-green',
+  SPAN: 'text-muted-blue',
+  CHAIN: 'text-pink-600',
+  RETRIEVER: 'text-teal-600',
+  EMBEDDING: 'text-amber-600',
+  GUARDRAIL: 'text-red-600',
+  EVALUATOR: 'text-primary-accent',
+}
diff --git a/frontend/components/observation/lib/helpers.ts b/frontend/components/observation/lib/helpers.ts
new file mode 100644
index 000000000..a91aed465
--- /dev/null
+++ b/frontend/components/observation/lib/helpers.ts
@@ -0,0 +1,44 @@
+export function heatMapTextColor(p: { min?: number; max: number; value: number }): string {
+  const { min = 0, max, value } = p
+  if (max === min) return ''
+  const ratio = (value - min) / (max - min)
+  if (ratio >= 0.75) return 'text-dark-red'
+  if (ratio >= 0.5) return 'text-dark-yellow'
+  return ''
+}
+
+export function formatIntervalSeconds(seconds: number): string {
+  if (seconds < 1) return `${Math.round(seconds * 1000)}ms`
+  if (seconds < 60) return `${seconds.toFixed(2)}s`
+  if (seconds < 3600) return `${Math.floor(seconds / 60)}m ${Math.round(seconds % 60)}s`
+  return `${Math.floor(seconds / 3600)}h ${Math.floor((seconds % 3600) / 60)}m`
+}
+
+export function formatTokenCounts(
+  input: number | null,
+  output: number | null,
+  total: number | null,
+): string {
+  if (total != null) return total.toLocaleString()
+  const parts: string[] = []
+  if (input != null) parts.push(`${input.toLocaleString()} in`)
+  if (output != null) parts.push(`${output.toLocaleString()} out`)
+  return parts.join(' / ') || '—'
+}
+
+export function usdFormatter(value: number): string {
+  if (value === 0) return '$0'
+  if (value < 0.01) return `$${value.toFixed(4)}`
+  return `$${value.toFixed(2)}`
+}
+
+export function formatLocalIsoMs(date: Date): string {
+  const y = date.getFullYear()
+  const mo = String(date.getMonth() + 1).padStart(2, '0')
+  const d = String(date.getDate()).padStart(2, '0')
+  const h = String(date.getHours()).padStart(2, '0')
+  const mi = String(date.getMinutes()).padStart(2, '0')
+  const s = String(date.getSeconds()).padStart(2, '0')
+  const ms = String(date.getMilliseconds()).padStart(3, '0')
+  return `${y}-${mo}-${d} ${h}:${mi}:${s}.${ms}`
+}
diff --git a/frontend/components/observation/lib/jsonTable.ts b/frontend/components/observation/lib/jsonTable.ts
new file mode 100644
index 000000000..da97626ec
--- /dev/null
+++ b/frontend/components/observation/lib/jsonTable.ts
@@ -0,0 +1,122 @@
+export interface JsonTableRow {
+  id: string
+  key: string
+  value: unknown
+  type: 'string' | 'number' | 'boolean' | 'object' | 'array' | 'null' | 'undefined'
+  hasChildren: boolean
+  level: number
+  subRows?: JsonTableRow[]
+  rawChildData?: unknown
+  childrenGenerated?: boolean
+}
+
+function getValueType(value: unknown): JsonTableRow['type'] {
+  if (value === null) return 'null'
+  if (value === undefined) return 'undefined'
+  if (Array.isArray(value)) return 'array'
+  return typeof value as JsonTableRow['type']
+}
+
+function hasChildren(value: unknown, valueType: JsonTableRow['type']): boolean {
+  return (
+    (valueType === 'object' && Object.keys(value as Record<string, unknown>).length > 0) ||
+    (valueType === 'array' && Array.isArray(value) && value.length > 0)
+  )
+}
+
+const MAX_DEPTH = 25
+
+export function transformJsonToTableData(
+  json: unknown,
+  parentKey = '',
+  level = 0,
+  parentId = '',
+  lazy = false,
+): JsonTableRow[] {
+  if (level > MAX_DEPTH) return []
+
+  if (typeof json !== 'object' || json === null) {
+    return [
+      {
+        id: parentId || '0',
+        key: parentKey || 'root',
+        value: json,
+        type: getValueType(json),
+        hasChildren: false,
+        level,
+      },
+    ]
+  }
+
+  const entries: [string, unknown][] = Array.isArray(json)
+    ? json.map((item, index) => [String(index), item])
+    : Object.entries(json)
+
+  return entries.map(([key, value]) => {
+    const id = parentId ? `${parentId}-${key}` : key
+    const valueType = getValueType(value)
+    const childrenExist = hasChildren(value, valueType)
+
+    const row: JsonTableRow = {
+      id,
+      key,
+      value,
+      type: valueType,
+      hasChildren: childrenExist,
+      level,
+      childrenGenerated: false,
+    }
+
+    if (childrenExist) {
+      if (lazy && level === 0) {
+        row.rawChildData = value
+        row.subRows = []
+      } else {
+        row.subRows = transformJsonToTableData(value, key, level + 1, id, lazy)
+        row.childrenGenerated = true
+      }
+    }
+
+    return row
+  })
+}
+
+export function getRowChildren(row: JsonTableRow): JsonTableRow[] {
+  if (row.subRows && row.subRows.length > 0) return row.subRows
+  if (row.rawChildData && row.level <= MAX_DEPTH) {
+    return transformJsonToTableData(row.rawChildData, row.key, row.level + 1, row.id, false)
+  }
+  return []
+}
+
+export function getEmptyValueDisplay(value: unknown): string | null {
+  if (value === null) return 'null'
+  if (value === undefined) return 'undefined'
+  if (value === '') return 'empty string'
+  if (typeof value === 'object' && Object.keys(value as object).length === 0)
+    return Array.isArray(value) ? 'empty list' : 'empty object'
+  return null
+}
+
+export function findOptimalExpansionLevel(rows: JsonTableRow[], maxRows = 20): number {
+  let bestLevel = 0
+  for (let level = 1; level <= 5; level++) {
+    const count = countVisibleRows(rows, level)
+    if (count <= maxRows) bestLevel = level
+    else break
+  }
+  return bestLevel
+}
+
+function countVisibleRows(rows: JsonTableRow[], maxExpandLevel: number): number {
+  let count = 0
+  const stack = [...rows]
+  while (stack.length > 0) {
+    const row = stack.pop()!
+    count++
+    if (row.hasChildren && row.level < maxExpandLevel && row.subRows) {
+      stack.push(...row.subRows)
+    }
+  }
+  return count
+}
diff --git a/frontend/components/observation/lib/normalize.ts b/frontend/components/observation/lib/normalize.ts
new file mode 100644
index 000000000..8f4f7d02b
--- /dev/null
+++ b/frontend/components/observation/lib/normalize.ts
@@ -0,0 +1,40 @@
+import type { RawObservation } from './types'
+
+export function normalizeObservation(raw: Record<string, unknown>): RawObservation {
+  const costDetails = (raw.cost_details ?? raw.costDetails) as Record<string, number> | undefined
+
+  return {
+    id: raw.id as string,
+    traceId: (raw.trace_id ?? raw.traceId) as string,
+    parentObservationId: (raw.parent_observation_id ?? raw.parentObservationId ?? null) as
+      | string
+      | null,
+    type: (raw.type as RawObservation['type']) ?? 'SPAN',
+    name: (raw.name as string) ?? '',
+    level: (raw.level as RawObservation['level']) ?? 'DEFAULT',
+    statusMessage: (raw.status_message ?? raw.statusMessage ?? null) as string | null,
+    startTime: (raw.start_time ?? raw.startTime) as string,
+    endTime: (raw.end_time ?? raw.endTime ?? null) as string | null,
+    completionStartTime: (raw.completion_start_time ?? raw.completionStartTime ?? null) as
+      | string
+      | null,
+    input: raw.input ?? null,
+    output: raw.output ?? null,
+    metadata: (raw.metadata ?? raw.meta ?? null) as Record<string, unknown> | null,
+    model: raw.model as string | undefined,
+    modelParameters: (raw.model_parameters ?? raw.modelParameters ?? null) as Record<
+      string,
+      unknown
+    > | null,
+    usageDetails: (raw.usage_details ?? raw.usageDetails) as Record<string, number> | undefined,
+    costDetails,
+    calculatedInputCost: (raw.calculatedInputCost ?? costDetails?.input ?? null) as number | null,
+    calculatedOutputCost: (raw.calculatedOutputCost ?? costDetails?.output ?? null) as
+      | number
+      | null,
+    calculatedTotalCost: (raw.calculatedTotalCost ?? costDetails?.total ?? null) as number | null,
+    environment: (raw.environment ?? null) as string | null,
+    promptName: (raw.prompt_name ?? raw.promptName ?? null) as string | null,
+    promptVersion: (raw.prompt_version ?? raw.promptVersion ?? null) as number | null,
+  }
+}
diff --git a/frontend/components/observation/lib/timeline-calculations.ts b/frontend/components/observation/lib/timeline-calculations.ts
new file mode 100644
index 000000000..ddfcc5a46
--- /dev/null
+++ b/frontend/components/observation/lib/timeline-calculations.ts
@@ -0,0 +1,33 @@
+export const SCALE_WIDTH = 900
+export const STEP_SIZE = 100
+
+export const PREDEFINED_STEP_SIZES = [
+  0.25, 0.5, 0.75, 1, 1.25, 1.5, 2, 2.5, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 35, 40, 45, 50, 100,
+  150, 200, 250, 300, 350, 400, 450, 500,
+]
+
+export function calculateTimelineOffset(
+  nodeStartTime: Date,
+  traceStartTime: Date,
+  totalScaleSpan: number,
+  scaleWidth: number = SCALE_WIDTH,
+): number {
+  const timeFromStart = (nodeStartTime.getTime() - traceStartTime.getTime()) / 1000
+  return (timeFromStart / totalScaleSpan) * scaleWidth
+}
+
+export function calculateTimelineWidth(
+  duration: number,
+  totalScaleSpan: number,
+  scaleWidth: number = SCALE_WIDTH,
+): number {
+  return (duration / totalScaleSpan) * scaleWidth
+}
+
+export function calculateStepSize(traceDuration: number, scaleWidth: number = SCALE_WIDTH): number {
+  const calculated = traceDuration / (scaleWidth / STEP_SIZE)
+  return (
+    PREDEFINED_STEP_SIZES.find((s) => s >= calculated) ??
+    PREDEFINED_STEP_SIZES[PREDEFINED_STEP_SIZES.length - 1]
+  )
+}
diff --git a/frontend/components/observation/lib/timeline-flattening.ts b/frontend/components/observation/lib/timeline-flattening.ts
new file mode 100644
index 000000000..71ded4d3c
--- /dev/null
+++ b/frontend/components/observation/lib/timeline-flattening.ts
@@ -0,0 +1,95 @@
+import type { ObservationNode, TimelineFlatItem, TimelineMetrics } from './types'
+import {
+  calculateTimelineOffset,
+  calculateTimelineWidth,
+  SCALE_WIDTH,
+} from './timeline-calculations'
+
+export function flattenTreeWithTimelineMetrics(
+  roots: ObservationNode[],
+  collapsedNodes: Set<string>,
+  traceStartTime: Date,
+  totalScaleSpan: number,
+  scaleWidth: number = SCALE_WIDTH,
+): TimelineFlatItem[] {
+  const flatList: TimelineFlatItem[] = []
+
+  const sortedRoots = roots.slice().sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+  type StackItem = {
+    node: ObservationNode
+    depth: number
+    treeLines: boolean[]
+    isLastSibling: boolean
+  }
+
+  const stack: StackItem[] = []
+
+  for (let i = sortedRoots.length - 1; i >= 0; i--) {
+    stack.push({
+      node: sortedRoots[i],
+      depth: 0,
+      treeLines: [],
+      isLastSibling: i === sortedRoots.length - 1,
+    })
+  }
+
+  while (stack.length > 0) {
+    const current = stack.pop()!
+    const { node } = current
+
+    const latency =
+      node.endTime !== null ? (node.endTime.getTime() - node.startTime.getTime()) / 1000 : undefined
+
+    const startOffset = calculateTimelineOffset(
+      node.startTime,
+      traceStartTime,
+      totalScaleSpan,
+      scaleWidth,
+    )
+
+    const itemWidth = calculateTimelineWidth(latency ?? 0, totalScaleSpan, scaleWidth)
+
+    const firstTokenTimeOffset = node.completionStartTime
+      ? calculateTimelineOffset(
+          node.completionStartTime,
+          traceStartTime,
+          totalScaleSpan,
+          scaleWidth,
+        )
+      : undefined
+
+    const metrics: TimelineMetrics = {
+      startOffset,
+      itemWidth,
+      firstTokenTimeOffset,
+      latency,
+    }
+
+    flatList.push({
+      node,
+      depth: current.depth,
+      treeLines: current.treeLines,
+      isLastSibling: current.isLastSibling,
+      metrics,
+    })
+
+    if (node.children.length > 0 && !collapsedNodes.has(node.id)) {
+      const sortedChildren = node.children
+        .slice()
+        .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+      for (let i = sortedChildren.length - 1; i >= 0; i--) {
+        const isChildLast = i === sortedChildren.length - 1
+        stack.push({
+          node: sortedChildren[i],
+          depth: current.depth + 1,
+          treeLines: [...current.treeLines, !isChildLast],
+          isLastSibling: isChildLast,
+        })
+      }
+    }
+  }
+
+  return flatList
+}
diff --git a/frontend/components/observation/lib/tree-building.ts b/frontend/components/observation/lib/tree-building.ts
new file mode 100644
index 000000000..9f1ccb6e7
--- /dev/null
+++ b/frontend/components/observation/lib/tree-building.ts
@@ -0,0 +1,213 @@
+import type {
+  RawObservation,
+  ObservationNode,
+  ProcessingNode,
+  TraceTreeResult,
+  SearchItem,
+} from './types'
+
+function prepareObservations(observations: RawObservation[]): {
+  sorted: RawObservation[]
+  orphanedCount: number
+} {
+  const idSet = new Set(observations.map((o) => o.id))
+  let orphanedCount = 0
+
+  const normalized = observations.map((o) => {
+    if (o.parentObservationId !== null && !idSet.has(o.parentObservationId)) {
+      orphanedCount++
+      return { ...o, parentObservationId: null }
+    }
+    return o
+  })
+
+  const sorted = normalized
+    .slice()
+    .sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+
+  return { sorted, orphanedCount }
+}
+
+function buildDependencyGraph(observations: RawObservation[]): {
+  processingMap: Map<string, ProcessingNode>
+  leaves: string[]
+} {
+  const processingMap = new Map<string, ProcessingNode>()
+
+  for (const obs of observations) {
+    processingMap.set(obs.id, {
+      observation: obs,
+      childrenIds: [],
+      inDegree: 0,
+      depth: 0,
+    })
+  }
+
+  for (const obs of observations) {
+    if (obs.parentObservationId !== null) {
+      const parent = processingMap.get(obs.parentObservationId)
+      if (parent) {
+        parent.childrenIds.push(obs.id)
+      }
+    }
+  }
+
+  // BFS from roots to compute depth
+  const roots = observations.filter((o) => o.parentObservationId === null).map((o) => o.id)
+
+  const queue = [...roots]
+  let qi = 0
+  while (qi < queue.length) {
+    const id = queue[qi++]
+    const node = processingMap.get(id)!
+    for (const childId of node.childrenIds) {
+      const child = processingMap.get(childId)!
+      child.depth = node.depth + 1
+      queue.push(childId)
+    }
+  }
+
+  // inDegree = number of children (used for bottom-up topo sort)
+  for (const node of processingMap.values()) {
+    node.inDegree = node.childrenIds.length
+  }
+
+  const leaves = Array.from(processingMap.values())
+    .filter((n) => n.inDegree === 0)
+    .map((n) => n.observation.id)
+
+  return { processingMap, leaves }
+}
+
+function buildTreeNodesBottomUp(
+  processingMap: Map<string, ProcessingNode>,
+  leaves: string[],
+  traceStartTime: Date,
+): Map<string, ObservationNode> {
+  const treeNodeMap = new Map<string, ObservationNode>()
+  const queue = [...leaves]
+  let qi = 0
+
+  while (qi < queue.length) {
+    const id = queue[qi++]
+    const pNode = processingMap.get(id)!
+    const obs = pNode.observation
+
+    const childTreeNodes = pNode.childrenIds
+      .map((cid) => processingMap.get(cid)?.treeNode)
+      .filter((n): n is ObservationNode => n !== undefined)
+      .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+    const nodeCost =
+      obs.calculatedTotalCost ?? (obs.calculatedInputCost ?? 0) + (obs.calculatedOutputCost ?? 0)
+    const totalCost = nodeCost + childTreeNodes.reduce((sum, c) => sum + c.totalCost, 0)
+
+    const startTime = new Date(obs.startTime)
+    const endTime = obs.endTime ? new Date(obs.endTime) : null
+    const completionStartTime = obs.completionStartTime ? new Date(obs.completionStartTime) : null
+
+    const latency = endTime !== null ? (endTime.getTime() - startTime.getTime()) / 1000 : null
+
+    const startTimeSinceTrace = startTime.getTime() - traceStartTime.getTime()
+
+    let startTimeSinceParentStart: number | null = null
+    if (obs.parentObservationId !== null) {
+      const parentPNode = processingMap.get(obs.parentObservationId)
+      if (parentPNode) {
+        const parentStart = new Date(parentPNode.observation.startTime)
+        startTimeSinceParentStart = startTime.getTime() - parentStart.getTime()
+      }
+    }
+
+    const childrenDepth =
+      childTreeNodes.length > 0 ? Math.max(...childTreeNodes.map((c) => c.childrenDepth)) + 1 : 0
+
+    const inputUsage = obs.usageDetails?.input ?? null
+    const outputUsage = obs.usageDetails?.output ?? null
+    const totalUsage =
+      obs.usageDetails?.total ??
+      (inputUsage !== null || outputUsage !== null ? (inputUsage ?? 0) + (outputUsage ?? 0) : null)
+
+    const treeNode: ObservationNode = {
+      id: obs.id,
+      parentObservationId: obs.parentObservationId,
+      traceId: obs.traceId,
+      type: obs.type,
+      name: obs.name,
+      level: obs.level,
+      statusMessage: obs.statusMessage,
+      startTime,
+      endTime,
+      completionStartTime,
+      input: obs.input,
+      output: obs.output,
+      metadata: obs.metadata,
+      model: obs.model,
+      modelParameters: obs.modelParameters,
+      usageDetails: obs.usageDetails,
+      calculatedInputCost: obs.calculatedInputCost,
+      calculatedOutputCost: obs.calculatedOutputCost,
+      calculatedTotalCost: obs.calculatedTotalCost,
+      environment: obs.environment,
+      promptName: obs.promptName,
+      promptVersion: obs.promptVersion,
+      children: childTreeNodes,
+      depth: pNode.depth,
+      childrenDepth,
+      totalCost,
+      inputUsage,
+      outputUsage,
+      totalUsage,
+      latency,
+      startTimeSinceTrace,
+      startTimeSinceParentStart,
+    }
+
+    pNode.treeNode = treeNode
+    treeNodeMap.set(id, treeNode)
+
+    if (obs.parentObservationId !== null) {
+      const parentPNode = processingMap.get(obs.parentObservationId)
+      if (parentPNode) {
+        parentPNode.inDegree--
+        if (parentPNode.inDegree === 0) {
+          queue.push(obs.parentObservationId)
+        }
+      }
+    }
+  }
+
+  return treeNodeMap
+}
+
+export function buildTraceTree(
+  observations: RawObservation[],
+  traceStartTime: Date,
+): TraceTreeResult {
+  if (observations.length === 0) {
+    return { roots: [], nodeMap: new Map(), searchItems: [] }
+  }
+
+  const { sorted } = prepareObservations(observations)
+  const { processingMap, leaves } = buildDependencyGraph(sorted)
+  const nodeMap = buildTreeNodesBottomUp(processingMap, leaves, traceStartTime)
+
+  const roots = sorted
+    .filter((o) => o.parentObservationId === null)
+    .map((o) => nodeMap.get(o.id)!)
+    .filter(Boolean)
+    .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+  // Pre-order traversal for searchItems
+  const searchItems: SearchItem[] = []
+  const stack = [...roots].reverse()
+  while (stack.length > 0) {
+    const node = stack.pop()!
+    searchItems.push({ node, observationId: node.id })
+    for (let i = node.children.length - 1; i >= 0; i--) {
+      stack.push(node.children[i])
+    }
+  }
+
+  return { roots, nodeMap, searchItems }
+}
diff --git a/frontend/components/observation/lib/tree-flattening.ts b/frontend/components/observation/lib/tree-flattening.ts
new file mode 100644
index 000000000..f9dfcd11d
--- /dev/null
+++ b/frontend/components/observation/lib/tree-flattening.ts
@@ -0,0 +1,56 @@
+import type { ObservationNode, ObservationFlatItem } from './types'
+
+export function flattenTree(
+  roots: ObservationNode[],
+  collapsedNodes: Set<string>,
+): ObservationFlatItem[] {
+  const flatList: ObservationFlatItem[] = []
+
+  const sortedRoots = roots.slice().sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+  type StackItem = {
+    node: ObservationNode
+    depth: number
+    treeLines: boolean[]
+    isLastSibling: boolean
+  }
+
+  const stack: StackItem[] = []
+
+  for (let i = sortedRoots.length - 1; i >= 0; i--) {
+    stack.push({
+      node: sortedRoots[i],
+      depth: 0,
+      treeLines: [],
+      isLastSibling: i === sortedRoots.length - 1,
+    })
+  }
+
+  while (stack.length > 0) {
+    const current = stack.pop()!
+    flatList.push({
+      node: current.node,
+      depth: current.depth,
+      isLastSibling: current.isLastSibling,
+      treeLines: current.treeLines,
+    })
+
+    if (current.node.children.length > 0 && !collapsedNodes.has(current.node.id)) {
+      const sortedChildren = current.node.children
+        .slice()
+        .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
+
+      for (let i = sortedChildren.length - 1; i >= 0; i--) {
+        const isChildLast = i === sortedChildren.length - 1
+        stack.push({
+          node: sortedChildren[i],
+          depth: current.depth + 1,
+          treeLines: [...current.treeLines, !isChildLast],
+          isLastSibling: isChildLast,
+        })
+      }
+    }
+  }
+
+  return flatList
+}
diff --git a/frontend/components/observation/lib/types.ts b/frontend/components/observation/lib/types.ts
new file mode 100644
index 000000000..657817740
--- /dev/null
+++ b/frontend/components/observation/lib/types.ts
@@ -0,0 +1,120 @@
+export type ObservationType =
+  | 'SPAN'
+  | 'EVENT'
+  | 'GENERATION'
+  | 'AGENT'
+  | 'TOOL'
+  | 'CHAIN'
+  | 'RETRIEVER'
+  | 'EMBEDDING'
+  | 'EVALUATOR'
+  | 'GUARDRAIL'
+
+export type ObservationLevel = 'DEBUG' | 'DEFAULT' | 'WARNING' | 'ERROR'
+
+export interface ObservationNode {
+  id: string
+  parentObservationId: string | null
+  traceId: string
+  type: ObservationType
+  name: string
+  level: ObservationLevel
+  statusMessage: string | null
+  startTime: Date
+  endTime: Date | null
+  completionStartTime: Date | null
+
+  input: unknown
+  output: unknown
+  metadata: Record<string, unknown> | null
+
+  model?: string
+  modelParameters?: Record<string, unknown> | null
+  usageDetails?: Record<string, number>
+  calculatedInputCost?: number | null
+  calculatedOutputCost?: number | null
+  calculatedTotalCost?: number | null
+  environment?: string | null
+  promptName?: string | null
+  promptVersion?: number | null
+
+  children: ObservationNode[]
+  depth: number
+  childrenDepth: number
+
+  totalCost: number
+  inputUsage: number | null
+  outputUsage: number | null
+  totalUsage: number | null
+
+  latency: number | null
+  startTimeSinceTrace: number
+  startTimeSinceParentStart: number | null
+}
+
+export interface ObservationFlatItem {
+  node: ObservationNode
+  depth: number
+  isLastSibling: boolean
+  treeLines: boolean[]
+}
+
+export interface TimelineMetrics {
+  startOffset: number
+  itemWidth: number
+  firstTokenTimeOffset?: number
+  latency?: number
+}
+
+export interface TimelineFlatItem {
+  node: ObservationNode
+  depth: number
+  treeLines: boolean[]
+  isLastSibling: boolean
+  metrics: TimelineMetrics
+}
+
+export interface SearchItem {
+  node: ObservationNode
+  observationId: string
+}
+
+export interface ProcessingNode {
+  observation: RawObservation
+  childrenIds: string[]
+  inDegree: number
+  depth: number
+  treeNode?: ObservationNode
+}
+
+export interface TraceTreeResult {
+  roots: ObservationNode[]
+  nodeMap: Map<string, ObservationNode>
+  searchItems: SearchItem[]
+}
+
+export interface RawObservation {
+  id: string
+  traceId: string
+  parentObservationId: string | null
+  type: ObservationType
+  name: string
+  level: ObservationLevel
+  statusMessage: string | null
+  startTime: string
+  endTime: string | null
+  completionStartTime: string | null
+  input: unknown
+  output: unknown
+  metadata: Record<string, unknown> | null
+  model?: string
+  modelParameters?: Record<string, unknown> | null
+  usageDetails?: Record<string, number>
+  costDetails?: Record<string, number>
+  calculatedInputCost?: number | null
+  calculatedOutputCost?: number | null
+  calculatedTotalCost?: number | null
+  environment?: string | null
+  promptName?: string | null
+  promptVersion?: number | null
+}
diff --git a/frontend/components/settings/add-mcp-dialog.tsx b/frontend/components/settings/add-mcp-dialog.tsx
index b89747a88..d1a22cf59 100644
--- a/frontend/components/settings/add-mcp-dialog.tsx
+++ b/frontend/components/settings/add-mcp-dialog.tsx
@@ -3,7 +3,6 @@
 import { Info, Plus, FileJson, SquarePen, Trash2, Save, Loader2 } from 'lucide-react'
 import { useState, useEffect } from 'react'
 
-
 import { Button } from '@/components/ui/button'
 import { UnifiedDialog } from '@/components/ui/unified-dialog'
 import { Input } from '@/components/ui/input'
@@ -23,10 +22,7 @@ import type { McpServer } from '@/hooks/queries/mcp'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
 
-import {
-  serverToEditData,
-  DEFAULT_MCP_FORM_CONFIG,
-} from './mcp-dialog-utils'
+import { serverToEditData, DEFAULT_MCP_FORM_CONFIG } from './mcp-dialog-utils'
 
 interface AddMcpDialogProps {
   open: boolean
@@ -226,9 +222,9 @@ export function AddMcpDialog({ open, onOpenChange, editingServer }: AddMcpDialog
       onOpenChange={onOpenChange}
       maxWidth="xl"
       title={isEditMode ? t('settings.editMcpServer') : t('settings.addMcpServer')}
-      description={isEditMode
-        ? t('settings.editMcpServerDescription')
-        : t('settings.addMcpServerDescription')}
+      description={
+        isEditMode ? t('settings.editMcpServerDescription') : t('settings.addMcpServerDescription')
+      }
       showContentBg={false}
       contentClassName="!p-0"
       footer={
@@ -314,9 +310,7 @@ export function AddMcpDialog({ open, onOpenChange, editingServer }: AddMcpDialog
                     <SelectValue placeholder={t('settings.selectType')} />
                   </SelectTrigger>
                   <SelectContent position="popper">
-                    <SelectItem value="streamable-http">
-                      {t('settings.streamableHttp')}
-                    </SelectItem>
+                    <SelectItem value="streamable-http">{t('settings.streamableHttp')}</SelectItem>
                     <SelectItem value="sse">{t('settings.sse')}</SelectItem>
                     <SelectItem value="stdio">{t('settings.stdio')}</SelectItem>
                   </SelectContent>
@@ -325,7 +319,8 @@ export function AddMcpDialog({ open, onOpenChange, editingServer }: AddMcpDialog
 
               <div className="space-y-1.5">
                 <Label className="flex items-center gap-1 text-xs font-semibold text-[var(--text-secondary)]">
-                  <span className="text-[var(--status-error)]">*</span> {t('settings.addressCommand')}
+                  <span className="text-[var(--status-error)]">*</span>{' '}
+                  {t('settings.addressCommand')}
                 </Label>
                 <Input
                   value={address}
@@ -430,7 +425,9 @@ export function AddMcpDialog({ open, onOpenChange, editingServer }: AddMcpDialog
                 <Label className="text-sm font-medium text-[var(--text-primary)]">
                   {t('settings.activeStatus')}
                 </Label>
-                <p className="text-xs text-[var(--text-muted)]">{t('settings.activeStatusDescription')}</p>
+                <p className="text-xs text-[var(--text-muted)]">
+                  {t('settings.activeStatusDescription')}
+                </p>
               </div>
               <Switch checked={statusEnabled} onCheckedChange={setStatusEnabled} />
             </div>
diff --git a/frontend/components/settings/create-token-dialog.tsx b/frontend/components/settings/create-token-dialog.tsx
index 0783b67b8..cd3d2bf8a 100644
--- a/frontend/components/settings/create-token-dialog.tsx
+++ b/frontend/components/settings/create-token-dialog.tsx
@@ -24,7 +24,12 @@ interface CreateTokenDialogProps {
   isPending: boolean
 }
 
-export function CreateTokenDialog({ open, onOpenChange, onSubmit, isPending }: CreateTokenDialogProps) {
+export function CreateTokenDialog({
+  open,
+  onOpenChange,
+  onSubmit,
+  isPending,
+}: CreateTokenDialogProps) {
   const { t } = useTranslation()
   const [name, setName] = useState('')
   const [scopes, setScopes] = useState<string[]>([])
@@ -39,9 +44,7 @@ export function CreateTokenDialog({ open, onOpenChange, onSubmit, isPending }: C
   }, [open])
 
   const handleScopeToggle = (scope: string) => {
-    setScopes((prev) =>
-      prev.includes(scope) ? prev.filter((s) => s !== scope) : [...prev, scope],
-    )
+    setScopes((prev) => (prev.includes(scope) ? prev.filter((s) => s !== scope) : [...prev, scope]))
   }
 
   const handleSubmit = async () => {
@@ -111,7 +114,7 @@ export function CreateTokenDialog({ open, onOpenChange, onSubmit, isPending }: C
                 />
                 <label
                   htmlFor={`scope-${scope.value}`}
-                  className="cursor-pointer text-sm font-medium text-[var(--text-secondary)] select-none"
+                  className="cursor-pointer select-none text-sm font-medium text-[var(--text-secondary)]"
                 >
                   {t(scope.labelKey)}
                 </label>
diff --git a/frontend/components/settings/mcp-server-card.tsx b/frontend/components/settings/mcp-server-card.tsx
index 447e11183..95e4e8210 100644
--- a/frontend/components/settings/mcp-server-card.tsx
+++ b/frontend/components/settings/mcp-server-card.tsx
@@ -7,7 +7,6 @@
 import { Server, MoreHorizontal, Wrench, Edit2, Trash2, Ban, Check } from 'lucide-react'
 import React from 'react'
 
-
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import {
@@ -103,7 +102,10 @@ export function McpServerCard({
         {/* Active Status */}
         <div className="flex items-center gap-1.5 rounded-md border border-[var(--border-muted)] bg-[var(--surface-1)] px-2 py-1">
           <div
-            className={cn('h-1.5 w-1.5 rounded-full', isActive ? 'bg-[var(--status-success)]' : 'bg-[var(--text-subtle)]')}
+            className={cn(
+              'h-1.5 w-1.5 rounded-full',
+              isActive ? 'bg-[var(--status-success)]' : 'bg-[var(--text-subtle)]',
+            )}
           />
           <span className="text-xs font-medium uppercase text-[var(--text-secondary)]">
             {isActive ? t('settings.active') : t('settings.inactive')}
diff --git a/frontend/components/settings/models-page.tsx b/frontend/components/settings/models-page.tsx
index eecdc17db..48df54921 100644
--- a/frontend/components/settings/models-page.tsx
+++ b/frontend/components/settings/models-page.tsx
@@ -26,10 +26,7 @@ export function ModelsPage() {
         onAddCustomModel={() => setShowAddCustomModel(true)}
       />
 
-      <DetailPanel
-        selectedProvider={selectedProvider}
-        onProviderDeleted={handleProviderDeleted}
-      />
+      <DetailPanel selectedProvider={selectedProvider} onProviderDeleted={handleProviderDeleted} />
 
       <AddCustomModelDialog
         open={showAddCustomModel}
diff --git a/frontend/components/settings/models/add-custom-model-dialog.tsx b/frontend/components/settings/models/add-custom-model-dialog.tsx
index 122a8f2a9..cb21ead86 100644
--- a/frontend/components/settings/models/add-custom-model-dialog.tsx
+++ b/frontend/components/settings/models/add-custom-model-dialog.tsx
@@ -32,22 +32,22 @@ interface AddCustomModelDialogProps {
   onCreated?: (providerName: string) => void
 }
 
-export function AddCustomModelDialog({ open, onOpenChange, credentialSchema, onCreated }: AddCustomModelDialogProps) {
+export function AddCustomModelDialog({
+  open,
+  onOpenChange,
+  credentialSchema,
+  onCreated,
+}: AddCustomModelDialogProps) {
   const createCustomProvider = useCreateCustomProvider()
   const { toast } = useToast()
   const [modelName, setModelName] = useState('')
   const [credFields, setCredFields] = useState<Record<string, string>>({})
 
-  const formFields = useMemo(
-    () => parseJsonSchema(credentialSchema),
-    [credentialSchema],
-  )
+  const formFields = useMemo(() => parseJsonSchema(credentialSchema), [credentialSchema])
 
   const canSubmit =
     modelName.trim() !== '' &&
-    formFields
-      .filter((f) => f.required)
-      .every((f) => credFields[f.key]?.trim())
+    formFields.filter((f) => f.required).every((f) => credFields[f.key]?.trim())
 
   const handleAdd = async () => {
     if (!canSubmit) return
@@ -81,16 +81,14 @@ export function AddCustomModelDialog({ open, onOpenChange, credentialSchema, onC
       <DialogContent className="sm:max-w-[480px]">
         <DialogHeader>
           <DialogTitle>Add Custom Model</DialogTitle>
-          <DialogDescription>
-            Add a new custom model instance
-          </DialogDescription>
+          <DialogDescription>Add a new custom model instance</DialogDescription>
         </DialogHeader>
 
         <div className="space-y-4 py-2">
           <div className="space-y-1.5">
             <Label htmlFor="model-name">
               Model Name
-              <span className="text-destructive ml-1">*</span>
+              <span className="ml-1 text-destructive">*</span>
             </Label>
             <Input
               id="model-name"
@@ -104,14 +102,12 @@ export function AddCustomModelDialog({ open, onOpenChange, credentialSchema, onC
             <div key={field.key} className="space-y-1.5">
               <Label htmlFor={`custom-${field.key}`}>
                 {field.title}
-                {field.required && <span className="text-destructive ml-1">*</span>}
+                {field.required && <span className="ml-1 text-destructive">*</span>}
               </Label>
               {field.enum ? (
                 <Select
                   value={credFields[field.key] || ''}
-                  onValueChange={(val) =>
-                    setCredFields((f) => ({ ...f, [field.key]: val }))
-                  }
+                  onValueChange={(val) => setCredFields((f) => ({ ...f, [field.key]: val }))}
                 >
                   <SelectTrigger>
                     <SelectValue placeholder={`Select ${field.title}`} />
@@ -135,9 +131,7 @@ export function AddCustomModelDialog({ open, onOpenChange, credentialSchema, onC
                   }
                   placeholder={field.description}
                   value={credFields[field.key] ?? ''}
-                  onChange={(e) =>
-                    setCredFields((f) => ({ ...f, [field.key]: e.target.value }))
-                  }
+                  onChange={(e) => setCredFields((f) => ({ ...f, [field.key]: e.target.value }))}
                 />
               )}
               {field.description && !field.enum && (
diff --git a/frontend/components/settings/models/credential-dialog.tsx b/frontend/components/settings/models/credential-dialog.tsx
index 7fe788ea2..b6bd172f8 100644
--- a/frontend/components/settings/models/credential-dialog.tsx
+++ b/frontend/components/settings/models/credential-dialog.tsx
@@ -49,7 +49,7 @@ export function CredentialDialog({
       }
       setFields(initial)
     }
-  // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open, formFields])
 
   const isDirty = useMemo(() => {
@@ -62,9 +62,8 @@ export function CredentialDialog({
     return false
   }, [fields, formFields, existingCredential])
 
-  const canSubmit = isDirty && formFields
-    .filter((f) => f.required)
-    .every((f) => fields[f.key]?.trim())
+  const canSubmit =
+    isDirty && formFields.filter((f) => f.required).every((f) => fields[f.key]?.trim())
 
   const handleSave = async () => {
     const credentials: Record<string, string> = {}
@@ -84,7 +83,8 @@ export function CredentialDialog({
       toast({
         variant: 'destructive',
         title: 'Failed to save credential',
-        description: err instanceof Error ? err.message : 'Please check credential info and try again',
+        description:
+          err instanceof Error ? err.message : 'Please check credential info and try again',
       })
     }
   }
@@ -113,14 +113,12 @@ export function CredentialDialog({
           <div key={field.key} className="space-y-1.5">
             <Label htmlFor={field.key}>
               {field.title}
-              {field.required && <span className="text-destructive ml-1">*</span>}
+              {field.required && <span className="ml-1 text-destructive">*</span>}
             </Label>
             {field.enum ? (
               <Select
                 value={fields[field.key] || ''}
-                onValueChange={(val) =>
-                  setFields((f) => ({ ...f, [field.key]: val }))
-                }
+                onValueChange={(val) => setFields((f) => ({ ...f, [field.key]: val }))}
               >
                 <SelectTrigger>
                   <SelectValue placeholder={`Select ${field.title}`} />
@@ -144,9 +142,7 @@ export function CredentialDialog({
                 }
                 placeholder={field.description}
                 value={fields[field.key] ?? ''}
-                onChange={(e) =>
-                  setFields((f) => ({ ...f, [field.key]: e.target.value }))
-                }
+                onChange={(e) => setFields((f) => ({ ...f, [field.key]: e.target.value }))}
               />
             )}
             {field.description && !field.enum && (
diff --git a/frontend/components/settings/models/detail-panel/detail-panel.tsx b/frontend/components/settings/models/detail-panel/detail-panel.tsx
index 6fa2c2381..228e88fdf 100644
--- a/frontend/components/settings/models/detail-panel/detail-panel.tsx
+++ b/frontend/components/settings/models/detail-panel/detail-panel.tsx
@@ -3,7 +3,11 @@
 import { useState } from 'react'
 
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
-import { useDeleteModelProvider, useModelCredentials, useModelProviders } from '@/hooks/queries/models'
+import {
+  useDeleteModelProvider,
+  useModelCredentials,
+  useModelProviders,
+} from '@/hooks/queries/models'
 import { useToast } from '@/hooks/use-toast'
 
 import { CredentialDialog } from '../credential-dialog'
@@ -37,7 +41,11 @@ export function DetailPanel({ selectedProvider, onProviderDeleted }: DetailPanel
   }
 
   const handleDeleteProvider = () => {
-    if (confirm(`Are you sure you want to delete provider "${provider.display_name}"? This action cannot be undone.`)) {
+    if (
+      confirm(
+        `Are you sure you want to delete provider "${provider.display_name}"? This action cannot be undone.`,
+      )
+    ) {
       deleteProvider.mutate(provider.provider_name, {
         onSuccess: () => {
           toast({ title: `Deleted provider ${provider.display_name}` })
@@ -66,27 +74,36 @@ export function DetailPanel({ selectedProvider, onProviderDeleted }: DetailPanel
       <Tabs defaultValue="models" className="flex flex-1 flex-col overflow-hidden">
         <div className="border-b border-[var(--border-muted)] px-6">
           <TabsList className="h-10 bg-transparent p-0">
-            <TabsTrigger value="models" className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent">
+            <TabsTrigger
+              value="models"
+              className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent"
+            >
               Model List
             </TabsTrigger>
-            <TabsTrigger value="playground" className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent">
+            <TabsTrigger
+              value="playground"
+              className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent"
+            >
               Playground
             </TabsTrigger>
-            <TabsTrigger value="stats" className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent">
+            <TabsTrigger
+              value="stats"
+              className="rounded-none border-b-2 border-transparent data-[state=active]:border-[var(--text-primary)] data-[state=active]:bg-transparent"
+            >
               Stats
             </TabsTrigger>
           </TabsList>
         </div>
 
-        <TabsContent value="models" className="flex-1 overflow-y-auto m-0">
+        <TabsContent value="models" className="m-0 flex-1 overflow-y-auto">
           <ModelListTab providerName={selectedProvider} provider={provider} />
         </TabsContent>
 
-        <TabsContent value="playground" className="flex-1 overflow-y-auto m-0 p-6">
+        <TabsContent value="playground" className="m-0 flex-1 overflow-y-auto p-6">
           <PlaygroundTab providerName={selectedProvider} provider={provider} />
         </TabsContent>
 
-        <TabsContent value="stats" className="flex-1 overflow-y-auto m-0 p-6">
+        <TabsContent value="stats" className="m-0 flex-1 overflow-y-auto p-6">
           <StatsTab providerName={selectedProvider} />
         </TabsContent>
       </Tabs>
diff --git a/frontend/components/settings/models/detail-panel/model-list-tab/model-list-tab.tsx b/frontend/components/settings/models/detail-panel/model-list-tab/model-list-tab.tsx
index d6253ba51..17f3518e8 100644
--- a/frontend/components/settings/models/detail-panel/model-list-tab/model-list-tab.tsx
+++ b/frontend/components/settings/models/detail-panel/model-list-tab/model-list-tab.tsx
@@ -29,13 +29,9 @@ export function ModelListTab({ providerName, provider }: ModelListTabProps) {
   }
 
   return (
-    <div className="p-4 space-y-2">
+    <div className="space-y-2 p-4">
       {providerModels.map((model) => (
-        <ModelRow
-          key={model.name}
-          model={model}
-          onEditParams={() => setEditingModel(model)}
-        />
+        <ModelRow key={model.name} model={model} onEditParams={() => setEditingModel(model)} />
       ))}
 
       {editingModel && (
diff --git a/frontend/components/settings/models/detail-panel/model-list-tab/model-row.tsx b/frontend/components/settings/models/detail-panel/model-list-tab/model-row.tsx
index 4d233e243..106e1e899 100644
--- a/frontend/components/settings/models/detail-panel/model-list-tab/model-row.tsx
+++ b/frontend/components/settings/models/detail-panel/model-list-tab/model-row.tsx
@@ -21,21 +21,21 @@ interface ModelRowProps {
 
 export function ModelRow({ model, onEditParams }: ModelRowProps) {
   const unavailableLabel = model.unavailable_reason
-    ? UNAVAILABLE_REASON_LABELS[model.unavailable_reason] ?? model.unavailable_reason
+    ? (UNAVAILABLE_REASON_LABELS[model.unavailable_reason] ?? model.unavailable_reason)
     : null
 
   return (
-    <div className="flex items-center justify-between rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] px-4 py-3 hover:bg-[var(--surface-3)] transition-colors">
-      <div className="flex items-center gap-3 min-w-0">
+    <div className="flex items-center justify-between rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] px-4 py-3 transition-colors hover:bg-[var(--surface-3)]">
+      <div className="flex min-w-0 items-center gap-3">
         <div className="min-w-0">
-          <p className="text-sm font-medium text-[var(--text-primary)] truncate">
+          <p className="truncate text-sm font-medium text-[var(--text-primary)]">
             {model.display_name || model.name}
           </p>
           {model.description && (
-            <p className="text-xs text-[var(--text-tertiary)] truncate">{model.description}</p>
+            <p className="truncate text-xs text-[var(--text-tertiary)]">{model.description}</p>
           )}
           {model.model_parameters && Object.keys(model.model_parameters).length > 0 && (
-            <p className="text-xs text-[var(--text-muted)] truncate">
+            <p className="truncate text-xs text-[var(--text-muted)]">
               {Object.entries(model.model_parameters)
                 .slice(0, 3)
                 .map(([k, v]) => `${k}: ${v}`)
@@ -45,16 +45,22 @@ export function ModelRow({ model, onEditParams }: ModelRowProps) {
         </div>
       </div>
 
-      <div className="flex items-center gap-2 shrink-0 ml-3">
+      <div className="ml-3 flex shrink-0 items-center gap-2">
         {model.is_available ? (
-          <Badge variant="outline" className="text-[var(--status-success)] border-[var(--status-success-border)] bg-[var(--status-success-bg)] text-xs">
+          <Badge
+            variant="outline"
+            className="border-[var(--status-success-border)] bg-[var(--status-success-bg)] text-xs text-[var(--status-success)]"
+          >
             Available
           </Badge>
         ) : (
           <TooltipProvider>
             <Tooltip>
               <TooltipTrigger asChild>
-                <Badge variant="outline" className="text-[var(--status-error)] border-[var(--status-error-border)] bg-[var(--status-error-bg)] text-xs cursor-help">
+                <Badge
+                  variant="outline"
+                  className="cursor-help border-[var(--status-error-border)] bg-[var(--status-error-bg)] text-xs text-[var(--status-error)]"
+                >
                   Unavailable
                 </Badge>
               </TooltipTrigger>
@@ -63,7 +69,13 @@ export function ModelRow({ model, onEditParams }: ModelRowProps) {
           </TooltipProvider>
         )}
 
-        <Button variant="ghost" size="sm" className="h-7 w-7 p-0" onClick={onEditParams} aria-label="Edit model parameters">
+        <Button
+          variant="ghost"
+          size="sm"
+          className="h-7 w-7 p-0"
+          onClick={onEditParams}
+          aria-label="Edit model parameters"
+        >
           <Settings className="h-3.5 w-3.5" />
         </Button>
       </div>
diff --git a/frontend/components/settings/models/detail-panel/model-list-tab/param-drawer.tsx b/frontend/components/settings/models/detail-panel/model-list-tab/param-drawer.tsx
index 08eca7fca..df2d7eb9a 100644
--- a/frontend/components/settings/models/detail-panel/model-list-tab/param-drawer.tsx
+++ b/frontend/components/settings/models/detail-panel/model-list-tab/param-drawer.tsx
@@ -5,7 +5,14 @@ import { useEffect, useMemo, useState } from 'react'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { Sheet, SheetContent, SheetDescription, SheetFooter, SheetHeader, SheetTitle } from '@/components/ui/sheet'
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetFooter,
+  SheetHeader,
+  SheetTitle,
+} from '@/components/ui/sheet'
 import { Slider } from '@/components/ui/slider'
 import { Switch } from '@/components/ui/switch'
 import { useToast } from '@/hooks/use-toast'
@@ -80,8 +87,7 @@ export function ParamDrawer({
     setParams((prev) => ({ ...prev, [key]: value }))
   }
 
-  const isNumericField = (field: SchemaField) =>
-    field.type === 'number' || field.type === 'integer'
+  const isNumericField = (field: SchemaField) => field.type === 'number' || field.type === 'integer'
 
   const getEffectiveValue = (field: SchemaField): unknown => {
     if (useDefaults[field.key]) {
@@ -115,10 +121,12 @@ export function ParamDrawer({
 
   return (
     <Sheet open={open} onOpenChange={onOpenChange}>
-      <SheetContent side="right" className="w-[400px] sm:w-[480px] flex flex-col">
+      <SheetContent side="right" className="flex w-[400px] flex-col sm:w-[480px]">
         <SheetHeader>
           <SheetTitle>Parameters — {modelName}</SheetTitle>
-          <SheetDescription>Adjust model runtime parameters such as temperature, max_tokens, etc.</SheetDescription>
+          <SheetDescription>
+            Adjust model runtime parameters such as temperature, max_tokens, etc.
+          </SheetDescription>
         </SheetHeader>
 
         <div className="mt-4 flex-1 space-y-5 overflow-y-auto pr-1">
@@ -127,9 +135,7 @@ export function ParamDrawer({
             const hasProviderDefault = providerDefaults[field.key] !== undefined
             const effectiveValue = getEffectiveValue(field)
             const isSlider =
-              isNumericField(field) &&
-              field.minimum !== undefined &&
-              field.maximum !== undefined
+              isNumericField(field) && field.minimum !== undefined && field.maximum !== undefined
 
             return (
               <div key={field.key} className="space-y-2">
@@ -137,11 +143,11 @@ export function ParamDrawer({
                   <div>
                     <Label className="text-sm font-medium">{field.title}</Label>
                     {field.description && (
-                      <p className="text-xs text-[var(--text-muted)] mt-0.5">{field.description}</p>
+                      <p className="mt-0.5 text-xs text-[var(--text-muted)]">{field.description}</p>
                     )}
                   </div>
                   {hasProviderDefault && (
-                    <div className="flex items-center gap-1.5 shrink-0">
+                    <div className="flex shrink-0 items-center gap-1.5">
                       <span className="text-xs text-[var(--text-muted)]">Default</span>
                       <Switch
                         checked={isUsingDefault}
@@ -164,14 +170,18 @@ export function ParamDrawer({
                       onValueChange={([v]) => setParam(field.key, v)}
                       className="flex-1"
                     />
-                    <span className="text-sm text-[var(--text-secondary)] w-12 text-right tabular-nums">
+                    <span className="w-12 text-right text-sm tabular-nums text-[var(--text-secondary)]">
                       {getNumericValue(field).toFixed(field.type === 'integer' ? 0 : 1)}
                     </span>
                   </div>
                 ) : (
                   <Input
                     type={isNumericField(field) ? 'number' : 'text'}
-                    value={effectiveValue !== undefined && effectiveValue !== null ? String(effectiveValue) : ''}
+                    value={
+                      effectiveValue !== undefined && effectiveValue !== null
+                        ? String(effectiveValue)
+                        : ''
+                    }
                     disabled={isUsingDefault}
                     placeholder={
                       field.default !== undefined && field.default !== null
@@ -186,7 +196,9 @@ export function ParamDrawer({
                         setParam(field.key, raw)
                       }
                     }}
-                    className={isUsingDefault ? 'bg-[var(--surface-3)] text-[var(--text-muted)]' : ''}
+                    className={
+                      isUsingDefault ? 'bg-[var(--surface-3)] text-[var(--text-muted)]' : ''
+                    }
                   />
                 )}
               </div>
@@ -194,7 +206,7 @@ export function ParamDrawer({
           })}
         </div>
 
-        <SheetFooter className="mt-4 pt-4 border-t border-[var(--border-muted)]">
+        <SheetFooter className="mt-4 border-t border-[var(--border-muted)] pt-4">
           <Button variant="outline" onClick={() => onOpenChange(false)}>
             Cancel
           </Button>
diff --git a/frontend/components/settings/models/detail-panel/overview-dashboard.tsx b/frontend/components/settings/models/detail-panel/overview-dashboard.tsx
index 0e9c7ff1b..47d4c95b2 100644
--- a/frontend/components/settings/models/detail-panel/overview-dashboard.tsx
+++ b/frontend/components/settings/models/detail-panel/overview-dashboard.tsx
@@ -12,10 +12,13 @@ export function OverviewDashboard() {
 
   if (isLoading || !overview) {
     return (
-      <div className="p-6 space-y-6">
+      <div className="space-y-6 p-6">
         <div className="grid grid-cols-3 gap-3">
           {Array.from({ length: 3 }).map((_, i) => (
-            <div key={i} className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
+            <div
+              key={i}
+              className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4"
+            >
               <Skeleton className="mb-2 h-4 w-16" />
               <Skeleton className="h-8 w-10" />
             </div>
@@ -23,7 +26,10 @@ export function OverviewDashboard() {
         </div>
         <div className="grid grid-cols-2 gap-3">
           {Array.from({ length: 2 }).map((_, i) => (
-            <div key={i} className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
+            <div
+              key={i}
+              className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4"
+            >
               <Skeleton className="mb-2 h-3 w-16" />
               <Skeleton className="h-8 w-10" />
             </div>
@@ -34,54 +40,72 @@ export function OverviewDashboard() {
   }
 
   return (
-    <div className="p-6 space-y-6">
+    <div className="space-y-6 p-6">
       <div>
-        <h3 className="text-sm font-semibold text-[var(--text-secondary)] mb-3">{t('settings.providerHealth')}</h3>
+        <h3 className="mb-3 text-sm font-semibold text-[var(--text-secondary)]">
+          {t('settings.providerHealth')}
+        </h3>
         <div className="grid grid-cols-3 gap-3">
           <div className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-            <div className="flex items-center gap-2 mb-1">
+            <div className="mb-1 flex items-center gap-2">
               <CheckCircle className="h-4 w-4 text-[var(--status-success)]" />
               <span className="text-xs text-[var(--text-tertiary)]">{t('settings.healthy')}</span>
             </div>
-            <p className="text-2xl font-bold text-[var(--text-primary)]">{overview.healthy_providers}</p>
+            <p className="text-2xl font-bold text-[var(--text-primary)]">
+              {overview.healthy_providers}
+            </p>
           </div>
           <div className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-            <div className="flex items-center gap-2 mb-1">
+            <div className="mb-1 flex items-center gap-2">
               <XCircle className="h-4 w-4 text-[var(--status-error)]" />
               <span className="text-xs text-[var(--text-tertiary)]">{t('settings.unhealthy')}</span>
             </div>
-            <p className="text-2xl font-bold text-[var(--text-primary)]">{overview.unhealthy_providers}</p>
+            <p className="text-2xl font-bold text-[var(--text-primary)]">
+              {overview.unhealthy_providers}
+            </p>
           </div>
           <div className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-            <div className="flex items-center gap-2 mb-1">
+            <div className="mb-1 flex items-center gap-2">
               <HelpCircle className="h-4 w-4 text-[var(--text-muted)]" />
-              <span className="text-xs text-[var(--text-tertiary)]">{t('settings.notConfiguredStatus')}</span>
+              <span className="text-xs text-[var(--text-tertiary)]">
+                {t('settings.notConfiguredStatus')}
+              </span>
             </div>
-            <p className="text-2xl font-bold text-[var(--text-primary)]">{overview.unconfigured_providers}</p>
+            <p className="text-2xl font-bold text-[var(--text-primary)]">
+              {overview.unconfigured_providers}
+            </p>
           </div>
         </div>
       </div>
 
       <div className="grid grid-cols-2 gap-3">
         <div className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-          <p className="text-xs text-[var(--text-tertiary)] mb-1">{t('settings.totalModels')}</p>
+          <p className="mb-1 text-xs text-[var(--text-tertiary)]">{t('settings.totalModels')}</p>
           <p className="text-2xl font-bold text-[var(--text-primary)]">{overview.total_models}</p>
         </div>
         <div className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-elevated)] p-4">
-          <p className="text-xs text-[var(--text-tertiary)] mb-1">{t('settings.availableModels')}</p>
-          <p className="text-2xl font-bold text-[var(--status-success)]">{overview.available_models}</p>
+          <p className="mb-1 text-xs text-[var(--text-tertiary)]">
+            {t('settings.availableModels')}
+          </p>
+          <p className="text-2xl font-bold text-[var(--status-success)]">
+            {overview.available_models}
+          </p>
         </div>
       </div>
 
       {overview.recent_credential_failure && (
         <div className="rounded-lg border border-[var(--status-warning-border)] bg-[var(--status-warning-bg)] p-4">
           <div className="flex items-start gap-2">
-            <AlertTriangle className="h-4 w-4 text-[var(--status-warning)] mt-0.5 shrink-0" />
+            <AlertTriangle className="mt-0.5 h-4 w-4 shrink-0 text-[var(--status-warning)]" />
             <div>
-              <p className="text-xs font-semibold text-[var(--status-warning-strong,var(--status-warning))] mb-1">
-                {t('settings.recentCredentialFailure', { provider: overview.recent_credential_failure.provider_display_name })}
+              <p className="mb-1 text-xs font-semibold text-[var(--status-warning-strong,var(--status-warning))]">
+                {t('settings.recentCredentialFailure', {
+                  provider: overview.recent_credential_failure.provider_display_name,
+                })}
+              </p>
+              <p className="line-clamp-2 text-xs text-[var(--status-warning)]">
+                {overview.recent_credential_failure.error}
               </p>
-              <p className="text-xs text-[var(--status-warning)] line-clamp-2">{overview.recent_credential_failure.error}</p>
             </div>
           </div>
         </div>
diff --git a/frontend/components/settings/models/detail-panel/playground-tab/playground-tab.tsx b/frontend/components/settings/models/detail-panel/playground-tab/playground-tab.tsx
index 1eeb9a24d..d15ba4051 100644
--- a/frontend/components/settings/models/detail-panel/playground-tab/playground-tab.tsx
+++ b/frontend/components/settings/models/detail-panel/playground-tab/playground-tab.tsx
@@ -42,7 +42,9 @@ export function PlaygroundTab({ providerName }: PlaygroundTabProps) {
   if (providerModels.length === 0) {
     return (
       <div className="flex h-40 items-center justify-center text-[var(--text-muted)]">
-        <p className="text-sm">No available models for this provider. Please configure credentials first.</p>
+        <p className="text-sm">
+          No available models for this provider. Please configure credentials first.
+        </p>
       </div>
     )
   }
@@ -51,7 +53,7 @@ export function PlaygroundTab({ providerName }: PlaygroundTabProps) {
     <div className="flex h-full flex-col gap-4">
       {/* Model selector */}
       <div className="flex items-center gap-2">
-        <span className="text-xs text-[var(--text-muted)] shrink-0">Model</span>
+        <span className="shrink-0 text-xs text-[var(--text-muted)]">Model</span>
         <select
           value={effectiveModel}
           onChange={(e) => setSelectedModel(e.target.value)}
@@ -96,7 +98,13 @@ export function PlaygroundTab({ providerName }: PlaygroundTabProps) {
             Run
           </Button>
         )}
-        <Button size="sm" variant="ghost" onClick={handleReset} disabled={isStreaming} className="gap-1.5">
+        <Button
+          size="sm"
+          variant="ghost"
+          onClick={handleReset}
+          disabled={isStreaming}
+          className="gap-1.5"
+        >
           <RotateCcw className="h-3.5 w-3.5" />
           Reset
         </Button>
@@ -104,16 +112,19 @@ export function PlaygroundTab({ providerName }: PlaygroundTabProps) {
 
       {/* Output */}
       {(output || error || isStreaming) && (
-        <div className="flex flex-col gap-1.5 flex-1 min-h-0">
+        <div className="flex min-h-0 flex-1 flex-col gap-1.5">
           <span className="text-xs text-[var(--text-muted)]">Output</span>
-          <div className="flex-1 min-h-[120px] rounded-md border border-[var(--border-muted)] bg-[var(--surface-3)] p-3 overflow-y-auto">
+          <div className="min-h-[120px] flex-1 overflow-y-auto rounded-md border border-[var(--border-muted)] bg-[var(--surface-3)] p-3">
             {error ? (
-              <p className="text-sm text-[var(--status-error)]">{error}</p>
+              <div className="space-y-1">
+                <p className="text-sm font-medium text-[var(--status-error)]">{error.message}</p>
+                <p className="text-xs text-[var(--text-muted)]">{error.code}</p>
+              </div>
             ) : (
-              <p className="text-sm text-[var(--text-primary)] whitespace-pre-wrap break-words">
+              <p className="whitespace-pre-wrap break-words text-sm text-[var(--text-primary)]">
                 {output}
                 {isStreaming && (
-                  <span className="inline-block w-1.5 h-4 ml-0.5 bg-[var(--text-primary)] animate-pulse align-middle" />
+                  <span className="ml-0.5 inline-block h-4 w-1.5 animate-pulse bg-[var(--text-primary)] align-middle" />
                 )}
               </p>
             )}
diff --git a/frontend/components/settings/models/detail-panel/provider-header.tsx b/frontend/components/settings/models/detail-panel/provider-header.tsx
index 46d2c5a0c..fdaede57a 100644
--- a/frontend/components/settings/models/detail-panel/provider-header.tsx
+++ b/frontend/components/settings/models/detail-panel/provider-header.tsx
@@ -39,7 +39,12 @@ function CredentialStatusBadge({ credential }: { credential?: ModelCredential })
   )
 }
 
-export function ProviderHeader({ provider, credential, onEditCredential, onDeleteProvider }: ProviderHeaderProps) {
+export function ProviderHeader({
+  provider,
+  credential,
+  onEditCredential,
+  onDeleteProvider,
+}: ProviderHeaderProps) {
   const validateMutation = useValidateCredential()
   const deleteMutation = useDeleteCredential()
   const { toast } = useToast()
@@ -48,7 +53,9 @@ export function ProviderHeader({ provider, credential, onEditCredential, onDelet
     if (credential?.id) {
       validateMutation.mutate(credential.id, {
         onSuccess: (data) => {
-          toast({ title: data.is_valid ? 'Credential validation passed' : 'Credential validation failed' })
+          toast({
+            title: data.is_valid ? 'Credential validation passed' : 'Credential validation failed',
+          })
         },
         onError: (err) => {
           toast({
@@ -89,14 +96,21 @@ export function ProviderHeader({ provider, credential, onEditCredential, onDelet
             {initials}
           </div>
           <div>
-            <h2 className="text-base font-semibold text-[var(--text-primary)]">{provider.display_name}</h2>
+            <h2 className="text-base font-semibold text-[var(--text-primary)]">
+              {provider.display_name}
+            </h2>
             <p className="text-xs text-[var(--text-tertiary)]">{provider.provider_name}</p>
           </div>
         </div>
 
         <div className="flex items-center gap-2">
           {provider.provider_type === 'custom' && onDeleteProvider && (
-            <Button variant="outline" size="sm" onClick={onDeleteProvider} className="text-[var(--status-error)] hover:text-[var(--status-error-hover)]">
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={onDeleteProvider}
+              className="text-[var(--status-error)] hover:text-[var(--status-error-hover)]"
+            >
               Delete
             </Button>
           )}
@@ -110,7 +124,9 @@ export function ProviderHeader({ provider, credential, onEditCredential, onDelet
       <div className="mt-4 rounded-lg border border-[var(--border-muted)] bg-[var(--surface-3)] p-3">
         <div className="flex items-center justify-between">
           <div className="flex items-center gap-2">
-            <span className="text-xs font-medium text-[var(--text-secondary)]">Credential Status</span>
+            <span className="text-xs font-medium text-[var(--text-secondary)]">
+              Credential Status
+            </span>
             <CredentialStatusBadge credential={credential} />
           </div>
           {credential && (
@@ -147,7 +163,9 @@ export function ProviderHeader({ provider, credential, onEditCredential, onDelet
         )}
 
         {credential?.validation_error && !credential.is_valid && (
-          <p className="mt-1 text-xs text-[var(--status-error)] line-clamp-2">{credential.validation_error}</p>
+          <p className="mt-1 line-clamp-2 text-xs text-[var(--status-error)]">
+            {credential.validation_error}
+          </p>
         )}
       </div>
     </div>
diff --git a/frontend/components/settings/models/detail-panel/stats-tab/stats-tab.tsx b/frontend/components/settings/models/detail-panel/stats-tab/stats-tab.tsx
index 7f637a4f9..1cdc21cab 100644
--- a/frontend/components/settings/models/detail-panel/stats-tab/stats-tab.tsx
+++ b/frontend/components/settings/models/detail-panel/stats-tab/stats-tab.tsx
@@ -47,9 +47,7 @@ export function StatsTab({ providerName }: StatsTabProps) {
 
       <SummaryCards summary={data?.summary} loading={isLoading} />
 
-      {!isLoading && data && (
-        <UsageChart timeline={data.timeline} byModel={data.by_model} />
-      )}
+      {!isLoading && data && <UsageChart timeline={data.timeline} byModel={data.by_model} />}
     </div>
   )
 }
diff --git a/frontend/components/settings/models/detail-panel/stats-tab/summary-cards.tsx b/frontend/components/settings/models/detail-panel/stats-tab/summary-cards.tsx
index ae9b9d2e1..2937acffb 100644
--- a/frontend/components/settings/models/detail-panel/stats-tab/summary-cards.tsx
+++ b/frontend/components/settings/models/detail-panel/stats-tab/summary-cards.tsx
@@ -33,7 +33,10 @@ export function SummaryCards({ summary, loading }: SummaryCardsProps) {
     return (
       <div className="grid grid-cols-2 gap-3 sm:grid-cols-4">
         {Array.from({ length: 4 }).map((_, i) => (
-          <div key={i} className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-1)] p-4">
+          <div
+            key={i}
+            className="rounded-lg border border-[var(--border-muted)] bg-[var(--surface-1)] p-4"
+          >
             <Skeleton className="mb-2 h-3 w-20" />
             <Skeleton className="h-6 w-16" />
           </div>
@@ -52,10 +55,7 @@ export function SummaryCards({ summary, loading }: SummaryCardsProps) {
         label="Avg Response Time"
         value={`${(summary?.avg_response_time_ms ?? 0).toFixed(0)} ms`}
       />
-      <StatCard
-        label="Error Rate"
-        value={`${((summary?.error_rate ?? 0) * 100).toFixed(1)}%`}
-      />
+      <StatCard label="Error Rate" value={`${((summary?.error_rate ?? 0) * 100).toFixed(1)}%`} />
     </div>
   )
 }
diff --git a/frontend/components/settings/models/provider-sidebar/provider-item.tsx b/frontend/components/settings/models/provider-sidebar/provider-item.tsx
index cbd3a5107..22328ad24 100644
--- a/frontend/components/settings/models/provider-sidebar/provider-item.tsx
+++ b/frontend/components/settings/models/provider-sidebar/provider-item.tsx
@@ -12,15 +12,21 @@ interface ProviderItemProps {
 
 function StatusDot({ credential }: { credential?: ModelCredential }) {
   if (!credential) {
-    return <span className="h-2 w-2 rounded-full bg-[var(--text-muted)] shrink-0" />
+    return <span className="h-2 w-2 shrink-0 rounded-full bg-[var(--text-muted)]" />
   }
   if (credential.is_valid) {
-    return <span className="h-2 w-2 rounded-full bg-[var(--status-success)] shrink-0" />
+    return <span className="h-2 w-2 shrink-0 rounded-full bg-[var(--status-success)]" />
   }
-  return <span className="h-2 w-2 rounded-full bg-[var(--status-error)] shrink-0" />
+  return <span className="h-2 w-2 shrink-0 rounded-full bg-[var(--status-error)]" />
 }
 
-export function ProviderItem({ provider, credential, isSelected, onClick, modelCount }: ProviderItemProps) {
+export function ProviderItem({
+  provider,
+  credential,
+  isSelected,
+  onClick,
+  modelCount,
+}: ProviderItemProps) {
   const initials = provider.display_name.slice(0, 2).toUpperCase()
 
   return (
@@ -32,7 +38,7 @@ export function ProviderItem({ provider, credential, isSelected, onClick, modelC
           : 'text-[var(--text-secondary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)]'
       }`}
     >
-      <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md bg-[var(--surface-elevated)] text-xs font-bold text-[var(--text-secondary)] border border-[var(--border-muted)]">
+      <div className="flex h-7 w-7 shrink-0 items-center justify-center rounded-md border border-[var(--border-muted)] bg-[var(--surface-elevated)] text-xs font-bold text-[var(--text-secondary)]">
         {initials}
       </div>
 
@@ -40,7 +46,7 @@ export function ProviderItem({ provider, credential, isSelected, onClick, modelC
         <p className="truncate text-sm font-medium leading-tight">{provider.display_name}</p>
       </div>
 
-      <div className="flex items-center gap-1.5 shrink-0">
+      <div className="flex shrink-0 items-center gap-1.5">
         {modelCount > 0 && (
           <span className="rounded-full bg-[var(--surface-3)] px-1.5 py-0.5 text-xs text-[var(--text-muted)]">
             {modelCount}
diff --git a/frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx b/frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx
index c00b8b7de..3e7e16bfc 100644
--- a/frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx
+++ b/frontend/components/settings/models/provider-sidebar/provider-sidebar.tsx
@@ -4,7 +4,11 @@ import { Plus } from 'lucide-react'
 import { useMemo, useState } from 'react'
 
 import { Button } from '@/components/ui/button'
-import { useModelCredentials, useModelProviders, useModelProvidersByConfig } from '@/hooks/queries/models'
+import {
+  useModelCredentials,
+  useModelProviders,
+  useModelProvidersByConfig,
+} from '@/hooks/queries/models'
 
 import { ProviderItem } from './provider-item'
 import { ProviderSearch } from './provider-search'
@@ -15,7 +19,11 @@ interface ProviderSidebarProps {
   onAddCustomModel?: () => void
 }
 
-export function ProviderSidebar({ selectedProvider, onSelectProvider, onAddCustomModel }: ProviderSidebarProps) {
+export function ProviderSidebar({
+  selectedProvider,
+  onSelectProvider,
+  onAddCustomModel,
+}: ProviderSidebarProps) {
   const [search, setSearch] = useState('')
   const { data: providers = [] } = useModelProviders()
   const { data: credentials = [] } = useModelCredentials()
@@ -25,9 +33,7 @@ export function ProviderSidebar({ selectedProvider, onSelectProvider, onAddCusto
     if (!search.trim()) return providers
     const q = search.toLowerCase()
     return providers.filter(
-      (p) =>
-        p.display_name.toLowerCase().includes(q) ||
-        p.provider_name.toLowerCase().includes(q),
+      (p) => p.display_name.toLowerCase().includes(q) || p.provider_name.toLowerCase().includes(q),
     )
   }, [providers, search])
 
@@ -47,7 +53,7 @@ export function ProviderSidebar({ selectedProvider, onSelectProvider, onAddCusto
         <ProviderSearch value={search} onChange={setSearch} />
       </div>
 
-      <div className="flex-1 overflow-y-auto px-2 pb-2 space-y-1">
+      <div className="flex-1 space-y-1 overflow-y-auto px-2 pb-2">
         {systemProviders.length > 0 && (
           <div>
             <p className="px-2 py-1 text-xs font-semibold text-[var(--text-muted)]">Built-in</p>
@@ -81,7 +87,9 @@ export function ProviderSidebar({ selectedProvider, onSelectProvider, onAddCusto
         )}
 
         {filtered.length === 0 && (
-          <p className="px-2 py-4 text-center text-xs text-[var(--text-muted)]">No matching providers</p>
+          <p className="px-2 py-4 text-center text-xs text-[var(--text-muted)]">
+            No matching providers
+          </p>
         )}
       </div>
     </div>
diff --git a/frontend/components/settings/profile-page.tsx b/frontend/components/settings/profile-page.tsx
index 196ea2811..6ce8e1d3b 100644
--- a/frontend/components/settings/profile-page.tsx
+++ b/frontend/components/settings/profile-page.tsx
@@ -270,7 +270,7 @@ export function ProfilePage() {
         <div className="flex flex-col gap-6 border-b border-border pb-8 sm:flex-row sm:items-center sm:justify-between">
           {/* User Avatar and Info */}
           <div className="flex items-center gap-5">
-            <Avatar className="h-16 w-16 flex-shrink-0 shadow-sm ring-1 ring-border/50">
+            <Avatar className="ring-border/50 h-16 w-16 flex-shrink-0 shadow-sm ring-1">
               {user?.image && <AvatarImage src={user.image} alt={user?.name || t('user.user')} />}
               <AvatarFallback className="bg-gradient-to-br from-[var(--brand-500)] to-[var(--brand-700)] text-lg font-medium text-white">
                 {getInitials(user?.name, user?.email)}
@@ -310,7 +310,11 @@ export function ProfilePage() {
             </div>
           </div>
 
-          <Button variant="secondary" onClick={handleResetPasswordClick} className="gap-2 self-start sm:self-center">
+          <Button
+            variant="secondary"
+            onClick={handleResetPasswordClick}
+            className="gap-2 self-start sm:self-center"
+          >
             <KeyRound size={16} className="text-muted-foreground" />
             {t('auth.resetPassword')}
           </Button>
@@ -319,14 +323,16 @@ export function ProfilePage() {
         {/* Preferences */}
         <div className="space-y-6 pt-2">
           <div className="space-y-1">
-            <h3 className="text-lg font-semibold tracking-tight text-foreground">{t('settings.preferences')}</h3>
+            <h3 className="text-lg font-semibold tracking-tight text-foreground">
+              {t('settings.preferences')}
+            </h3>
           </div>
 
-          <div className="flex flex-col rounded-2xl bg-muted/30 ring-1 ring-border/20 p-1">
-            <div className="flex items-center justify-between rounded-xl px-4 py-3 hover:bg-muted/50 transition-colors">
+          <div className="ring-border/20 flex flex-col rounded-2xl bg-muted/30 p-1 ring-1">
+            <div className="flex items-center justify-between rounded-xl px-4 py-3 transition-colors hover:bg-muted/50">
               <Label className="text-sm font-medium text-foreground">{t('common.language')}</Label>
               <Select value={i18n.language} onValueChange={(lang) => i18n.changeLanguage(lang)}>
-                <SelectTrigger className="w-40 bg-background border-border/50 shadow-sm">
+                <SelectTrigger className="border-border/50 w-40 bg-background shadow-sm">
                   <SelectValue />
                 </SelectTrigger>
                 <SelectContent>
@@ -336,9 +342,9 @@ export function ProfilePage() {
               </Select>
             </div>
 
-            <div className="mx-4 h-px bg-border/40" />
+            <div className="bg-border/40 mx-4 h-px" />
 
-            <div className="flex items-center justify-between rounded-xl px-4 py-3 hover:bg-muted/50 transition-colors">
+            <div className="flex items-center justify-between rounded-xl px-4 py-3 transition-colors hover:bg-muted/50">
               <Label className="text-sm font-medium text-foreground">{t('settings.theme')}</Label>
               <ToggleGroup
                 type="single"
@@ -346,20 +352,34 @@ export function ProfilePage() {
                 onValueChange={(val) => {
                   if (val) {
                     setTheme(val)
-                    useGeneralStore.getState().setSettings({ theme: val as 'light' | 'dark' | 'system' })
+                    useGeneralStore
+                      .getState()
+                      .setSettings({ theme: val as 'light' | 'dark' | 'system' })
                   }
                 }}
-                className="bg-background border border-border/50 shadow-sm rounded-lg p-0.5"
+                className="border-border/50 rounded-lg border bg-background p-0.5 shadow-sm"
               >
-                <ToggleGroupItem value="light" aria-label={t('settings.themeLight')} className="gap-2 h-8 px-3 rounded-md">
+                <ToggleGroupItem
+                  value="light"
+                  aria-label={t('settings.themeLight')}
+                  className="h-8 gap-2 rounded-md px-3"
+                >
                   <Sun size={14} />
                   <span className="text-xs font-medium">{t('settings.themeLight')}</span>
                 </ToggleGroupItem>
-                <ToggleGroupItem value="dark" aria-label={t('settings.themeDark')} className="gap-2 h-8 px-3 rounded-md">
+                <ToggleGroupItem
+                  value="dark"
+                  aria-label={t('settings.themeDark')}
+                  className="h-8 gap-2 rounded-md px-3"
+                >
                   <Moon size={14} />
                   <span className="text-xs font-medium">{t('settings.themeDark')}</span>
                 </ToggleGroupItem>
-                <ToggleGroupItem value="system" aria-label={t('settings.themeSystem')} className="gap-2 h-8 px-3 rounded-md">
+                <ToggleGroupItem
+                  value="system"
+                  aria-label={t('settings.themeSystem')}
+                  className="h-8 gap-2 rounded-md px-3"
+                >
                   <Monitor size={14} />
                   <span className="text-xs font-medium">{t('settings.themeSystem')}</span>
                 </ToggleGroupItem>
@@ -370,7 +390,11 @@ export function ProfilePage() {
 
         {/* Action Buttons */}
         <div className="flex items-center pt-8">
-          <Button variant="ghost" onClick={handleLogout} className="gap-2 text-muted-foreground hover:bg-destructive/10 hover:text-destructive">
+          <Button
+            variant="ghost"
+            onClick={handleLogout}
+            className="gap-2 text-muted-foreground hover:bg-destructive/10 hover:text-destructive"
+          >
             <LogOut size={16} />
             {t('user.logout')}
           </Button>
diff --git a/frontend/components/settings/sandboxes-page.tsx b/frontend/components/settings/sandboxes-page.tsx
index 37efa690e..a666961cd 100644
--- a/frontend/components/settings/sandboxes-page.tsx
+++ b/frontend/components/settings/sandboxes-page.tsx
@@ -38,8 +38,10 @@ import {
 } from '@/components/ui/table'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { useToast } from '@/hooks/use-toast'
+import { getErrorMessage } from '@/lib/utils/toast'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 import { sandboxService, Sandbox } from '@/services/sandbox-service'
 
 const IMAGE_PRESETS = ['python:3.12-slim', 'python:3.11-slim', 'node:20-slim'] as const
@@ -48,6 +50,7 @@ const CUSTOM_IMAGE_VALUE = '__custom__'
 export const SandboxesPage = () => {
   const { t } = useTranslation()
   const { toast } = useToast()
+  const { canAdmin } = useUserPermissionsContext()
   const [sandboxes, setSandboxes] = useState<Sandbox[]>([])
   const [loading, setLoading] = useState(true)
   const [actionLoading, setActionLoading] = useState<string | null>(null)
@@ -79,7 +82,7 @@ export const SandboxesPage = () => {
     } catch (error) {
       toast({
         title: t('settings.sandboxes.operationFailed'),
-        description: String(error),
+        description: getErrorMessage(error),
         variant: 'destructive',
       })
     } finally {
@@ -127,7 +130,7 @@ export const SandboxesPage = () => {
     } catch (error) {
       toast({
         title: t('settings.sandboxes.operationFailed'),
-        description: String(error),
+        description: getErrorMessage(error),
         variant: 'destructive',
       })
     } finally {
@@ -166,7 +169,7 @@ export const SandboxesPage = () => {
     } catch (error) {
       toast({
         title: t('settings.sandboxes.operationFailed'),
-        description: String(error),
+        description: getErrorMessage(error),
         variant: 'destructive',
       })
     } finally {
@@ -178,7 +181,8 @@ export const SandboxesPage = () => {
     switch (status.toLowerCase()) {
       case 'running':
         return {
-          color: 'bg-[var(--status-success-bg)] text-[var(--status-success)] border-[var(--status-success-border)]',
+          color:
+            'bg-[var(--status-success-bg)] text-[var(--status-success)] border-[var(--status-success-border)]',
           dot: 'bg-[var(--status-success)]',
           animate: true,
         }
@@ -196,7 +200,8 @@ export const SandboxesPage = () => {
         }
       case 'failed':
         return {
-          color: 'bg-[var(--status-error-bg)] text-[var(--status-error-hover)] border-[var(--status-error-border)]',
+          color:
+            'bg-[var(--status-error-bg)] text-[var(--status-error-hover)] border-[var(--status-error-border)]',
           dot: 'bg-[var(--status-error)]',
           animate: false,
         }
@@ -230,7 +235,9 @@ export const SandboxesPage = () => {
               <h2 className="text-lg font-bold tracking-tight text-[var(--text-primary)]">
                 {t('settings.sandboxes.title')}
               </h2>
-              <p className="mt-0.5 text-xs text-[var(--text-tertiary)]">{t('settings.sandboxes.description')}</p>
+              <p className="mt-0.5 text-xs text-[var(--text-tertiary)]">
+                {t('settings.sandboxes.description')}
+              </p>
             </div>
           </div>
           <Button
@@ -323,7 +330,10 @@ export const SandboxesPage = () => {
                                 {sandbox.id.substring(0, 8)}...
                               </span>
                               {sandbox.container_id && (
-                                <span className="font-mono text-xs text-[var(--text-muted)]" title={sandbox.container_id}>
+                                <span
+                                  className="font-mono text-xs text-[var(--text-muted)]"
+                                  title={sandbox.container_id}
+                                >
                                   {sandbox.container_id.substring(0, 12)}
                                 </span>
                               )}
@@ -426,7 +436,7 @@ export const SandboxesPage = () => {
                                 className="max-w-[140px] cursor-pointer truncate text-left font-mono text-xs text-[var(--text-secondary)] hover:text-[var(--brand-600)] hover:underline"
                                 title={sandbox.image}
                                 onClick={() => openInlineEdit(sandbox)}
-                                disabled={actionLoading === sandbox.id}
+                                disabled={actionLoading === sandbox.id || !canAdmin}
                               >
                                 {sandbox.image}
                               </button>
@@ -446,7 +456,10 @@ export const SandboxesPage = () => {
                             <div className="flex items-center gap-1.5 text-xs text-[var(--status-success)]">
                               <Clock className="h-3.5 w-3.5" />
                               <span className="font-medium">
-                                {formatDistance(new Date(sandbox.last_active_at), now, { addSuffix: true, includeSeconds: true })}
+                                {formatDistance(new Date(sandbox.last_active_at), now, {
+                                  addSuffix: true,
+                                  includeSeconds: true,
+                                })}
                               </span>
                             </div>
                           ) : (
@@ -455,101 +468,106 @@ export const SandboxesPage = () => {
                         </TableCell>
                         <TableCell className="py-3">
                           <div className="flex justify-end gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                            {sandbox.status === 'running' ? (
+                            {canAdmin &&
+                              (sandbox.status === 'running' ? (
+                                <Tooltip>
+                                  <TooltipTrigger asChild>
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-7 w-7 rounded-md text-[var(--status-warning)] hover:bg-[var(--status-warning-bg)] hover:text-[var(--status-warning)]"
+                                      onClick={() =>
+                                        setConfirmDialog({
+                                          type: 'stop',
+                                          sandboxId: sandbox.id,
+                                          open: true,
+                                        })
+                                      }
+                                      disabled={actionLoading === sandbox.id}
+                                      aria-label="Stop sandbox"
+                                    >
+                                      <StopCircle className="h-3.5 w-3.5" />
+                                    </Button>
+                                  </TooltipTrigger>
+                                  <TooltipContent side="top" className="text-xs">
+                                    {t('settings.sandboxes.stop')}
+                                  </TooltipContent>
+                                </Tooltip>
+                              ) : (
+                                <Tooltip>
+                                  <TooltipTrigger asChild>
+                                    <Button
+                                      variant="ghost"
+                                      size="icon"
+                                      className="h-7 w-7 rounded-md text-[var(--status-success)] hover:bg-[var(--status-success-bg)] hover:text-[var(--status-success-hover)]"
+                                      onClick={() =>
+                                        setConfirmDialog({
+                                          type: 'restart',
+                                          sandboxId: sandbox.id,
+                                          open: true,
+                                        })
+                                      }
+                                      disabled={actionLoading === sandbox.id}
+                                      aria-label="Restart sandbox"
+                                    >
+                                      <PlayCircle className="h-3.5 w-3.5" />
+                                    </Button>
+                                  </TooltipTrigger>
+                                  <TooltipContent side="top" className="text-xs">
+                                    {t('settings.sandboxes.restart')}
+                                  </TooltipContent>
+                                </Tooltip>
+                              ))}
+                            {canAdmin && (
                               <Tooltip>
                                 <TooltipTrigger asChild>
                                   <Button
                                     variant="ghost"
                                     size="icon"
-                                    className="h-7 w-7 rounded-md text-[var(--status-warning)] hover:bg-[var(--status-warning-bg)] hover:text-[var(--status-warning)]"
+                                    className="h-7 w-7 rounded-md text-[var(--brand-600)] hover:bg-[var(--brand-50)] hover:text-[var(--brand-700)]"
                                     onClick={() =>
                                       setConfirmDialog({
-                                        type: 'stop',
+                                        type: 'rebuild',
                                         sandboxId: sandbox.id,
                                         open: true,
                                       })
                                     }
                                     disabled={actionLoading === sandbox.id}
-                                    aria-label="Stop sandbox"
+                                    aria-label="Rebuild sandbox"
                                   >
-                                    <StopCircle className="h-3.5 w-3.5" />
+                                    <RotateCcw className="h-3.5 w-3.5" />
                                   </Button>
                                 </TooltipTrigger>
                                 <TooltipContent side="top" className="text-xs">
-                                  {t('settings.sandboxes.stop')}
+                                  {t('settings.sandboxes.rebuild')}
                                 </TooltipContent>
                               </Tooltip>
-                            ) : (
+                            )}
+                            {canAdmin && (
                               <Tooltip>
                                 <TooltipTrigger asChild>
                                   <Button
                                     variant="ghost"
                                     size="icon"
-                                    className="h-7 w-7 rounded-md text-[var(--status-success)] hover:bg-[var(--status-success-bg)] hover:text-[var(--status-success-hover)]"
+                                    className="h-7 w-7 rounded-md text-[var(--status-error)] hover:bg-[var(--status-error-bg)] hover:text-[var(--status-error-hover)]"
                                     onClick={() =>
                                       setConfirmDialog({
-                                        type: 'restart',
+                                        type: 'delete',
                                         sandboxId: sandbox.id,
                                         open: true,
                                       })
                                     }
                                     disabled={actionLoading === sandbox.id}
-                                    aria-label="Restart sandbox"
+                                    aria-label="Delete sandbox"
                                   >
-                                    <PlayCircle className="h-3.5 w-3.5" />
+                                    <Trash2 className="h-3.5 w-3.5" />
                                   </Button>
                                 </TooltipTrigger>
                                 <TooltipContent side="top" className="text-xs">
-                                  {t('settings.sandboxes.restart')}
+                                  {t('settings.sandboxes.delete')}
                                 </TooltipContent>
                               </Tooltip>
                             )}
-                            <Tooltip>
-                              <TooltipTrigger asChild>
-                                <Button
-                                  variant="ghost"
-                                  size="icon"
-                                  className="h-7 w-7 rounded-md text-[var(--brand-600)] hover:bg-[var(--brand-50)] hover:text-[var(--brand-700)]"
-                                  onClick={() =>
-                                    setConfirmDialog({
-                                      type: 'rebuild',
-                                      sandboxId: sandbox.id,
-                                      open: true,
-                                    })
-                                  }
-                                  disabled={actionLoading === sandbox.id}
-                                  aria-label="Rebuild sandbox"
-                                >
-                                  <RotateCcw className="h-3.5 w-3.5" />
-                                </Button>
-                              </TooltipTrigger>
-                              <TooltipContent side="top" className="text-xs">
-                                {t('settings.sandboxes.rebuild')}
-                              </TooltipContent>
-                            </Tooltip>
-                            <Tooltip>
-                              <TooltipTrigger asChild>
-                                <Button
-                                  variant="ghost"
-                                  size="icon"
-                                  className="h-7 w-7 rounded-md text-[var(--status-error)] hover:bg-[var(--status-error-bg)] hover:text-[var(--status-error-hover)]"
-                                  onClick={() =>
-                                    setConfirmDialog({
-                                      type: 'delete',
-                                      sandboxId: sandbox.id,
-                                      open: true,
-                                    })
-                                  }
-                                  disabled={actionLoading === sandbox.id}
-                                  aria-label="Delete sandbox"
-                                >
-                                  <Trash2 className="h-3.5 w-3.5" />
-                                </Button>
-                              </TooltipTrigger>
-                              <TooltipContent side="top" className="text-xs">
-                                {t('settings.sandboxes.delete')}
-                              </TooltipContent>
-                            </Tooltip>
                           </div>
                         </TableCell>
                       </TableRow>
diff --git a/frontend/components/settings/settings-dialog.tsx b/frontend/components/settings/settings-dialog.tsx
index 1717e678d..8f2edfdd8 100644
--- a/frontend/components/settings/settings-dialog.tsx
+++ b/frontend/components/settings/settings-dialog.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { LucideIcon, User, Brain, Box, Key } from 'lucide-react'
+import { LucideIcon, User } from 'lucide-react'
 import { useState } from 'react'
 
 import { Dialog, DialogContent, DialogTitle, DialogDescription } from '@/components/ui/dialog'
@@ -8,10 +8,7 @@ import { useSession } from '@/lib/auth/auth-client'
 import { useTranslation } from '@/lib/i18n'
 import { cn } from '@/lib/utils'
 
-import { ModelsPage } from './models-page'
 import { ProfilePage } from './profile-page'
-import { SandboxesPage } from './sandboxes-page'
-import { TokensPage } from './tokens-page'
 
 interface SettingsDialogProps {
   open: boolean
@@ -38,7 +35,10 @@ const MenuItem = ({
         : 'text-[var(--text-tertiary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)]',
     )}
   >
-    <Icon size={16} className={cn(isActive ? 'text-[var(--brand-600)]' : 'text-[var(--text-muted)]')} />
+    <Icon
+      size={16}
+      className={cn(isActive ? 'text-[var(--brand-600)]' : 'text-[var(--text-muted)]')}
+    />
     {label}
   </button>
 )
@@ -50,15 +50,15 @@ export function SettingsDialog({ open, onOpenChange }: SettingsDialogProps) {
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="flex max-h-[85vh] h-[700px] max-w-5xl flex-row gap-0 overflow-hidden border-0 bg-[var(--surface-elevated)] p-0 shadow-2xl">
-        <DialogTitle className="sr-only">{t('settings.title')}</DialogTitle>
+      <DialogContent className="flex h-[600px] max-h-[85vh] max-w-4xl flex-row gap-0 overflow-hidden border-0 bg-[var(--surface-elevated)] p-0 shadow-2xl">
+        <DialogTitle className="sr-only">{t('user.settings')}</DialogTitle>
         <DialogDescription className="sr-only">{t('settings.description')}</DialogDescription>
 
         {/* Sidebar Navigation */}
         <div className="flex w-60 flex-shrink-0 flex-col border-r border-[var(--border)] bg-[var(--surface-1)] p-4 backdrop-blur-sm">
           <div className="mb-6 px-2">
             <h2 className="text-lg font-bold tracking-tight text-[var(--text-primary)]">
-              {t('settings.title')}
+              {t('user.settings')}
             </h2>
           </div>
 
@@ -72,51 +72,12 @@ export function SettingsDialog({ open, onOpenChange }: SettingsDialogProps) {
               isActive={activeTab === 'profile'}
               onClick={() => setActiveTab('profile')}
             />
-
-            <div className="mb-2 mt-6 px-3 text-xs font-bold uppercase tracking-wider text-[var(--text-muted)]">
-              {t('settings.workspace')}
-            </div>
-            <MenuItem
-              icon={Brain}
-              label={t('settings.models')}
-              isActive={activeTab === 'models'}
-              onClick={() => setActiveTab('models')}
-            />
-
-            <MenuItem
-              icon={Box}
-              label={t('settings.sandboxes.title')}
-              isActive={activeTab === 'sandboxes'}
-              onClick={() => setActiveTab('sandboxes')}
-            />
-
-            <MenuItem
-              icon={Key}
-              label={t('settings.tokens.title')}
-              isActive={activeTab === 'tokens'}
-              onClick={() => setActiveTab('tokens')}
-            />
           </div>
         </div>
 
         {/* Main Content Area */}
         <div className="flex min-w-0 flex-1 flex-col overflow-hidden bg-[var(--surface-elevated)]">
-          {activeTab === 'models' && (
-            <div className="flex-1 overflow-hidden p-6">
-              <ModelsPage />
-            </div>
-          )}
           {activeTab === 'profile' && <ProfilePage />}
-          {activeTab === 'sandboxes' && (
-            <div className="flex-1 overflow-hidden p-6">
-              <SandboxesPage />
-            </div>
-          )}
-          {activeTab === 'tokens' && (
-            <div className="flex-1 overflow-hidden p-6">
-              <TokensPage />
-            </div>
-          )}
         </div>
       </DialogContent>
     </Dialog>
diff --git a/frontend/components/settings/token-created-dialog.tsx b/frontend/components/settings/token-created-dialog.tsx
index 3e78f373f..6b1aa8d00 100644
--- a/frontend/components/settings/token-created-dialog.tsx
+++ b/frontend/components/settings/token-created-dialog.tsx
@@ -36,12 +36,7 @@ export function TokenCreatedDialog({ open, onOpenChange, tokenData }: TokenCreat
       description={t('settings.tokens.tokenCreatedMessage')}
       footer={
         <>
-          <Button
-            type="button"
-            onClick={handleCopy}
-            className="gap-2"
-            disabled={!tokenData?.token}
-          >
+          <Button type="button" onClick={handleCopy} className="gap-2" disabled={!tokenData?.token}>
             {copied ? (
               <>
                 <Check size={16} />
@@ -54,33 +49,31 @@ export function TokenCreatedDialog({ open, onOpenChange, tokenData }: TokenCreat
               </>
             )}
           </Button>
-          <Button
-            type="button"
-            variant="outline"
-            onClick={() => onOpenChange(false)}
-          >
+          <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
             {t('settings.cancel')}
           </Button>
         </>
       }
     >
-      <p className="text-sm text-[var(--status-warning)] bg-[var(--status-warning-bg)] rounded-lg px-4 py-3 border border-[var(--status-warning-border)]">
+      <p className="rounded-lg border border-[var(--status-warning-border)] bg-[var(--status-warning-bg)] px-4 py-3 text-sm text-[var(--status-warning)]">
         {t('settings.tokens.tokenCreatedMessage')}
       </p>
 
       {tokenData && (
-        <div className="rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] shadow-sm overflow-hidden">
+        <div className="overflow-hidden rounded-xl border border-[var(--border)] bg-[var(--surface-elevated)] shadow-sm">
           <table className="w-full text-sm">
             <tbody className="divide-y divide-[var(--border-muted)]">
               <tr>
-                <td className="px-4 py-3 font-medium text-[var(--text-secondary)] w-32">{t('settings.tokens.name')}</td>
+                <td className="w-32 px-4 py-3 font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.name')}
+                </td>
                 <td className="px-4 py-3 text-[var(--text-primary)]">{tokenData.name}</td>
               </tr>
               <tr>
                 <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">Key</td>
                 <td className="px-4 py-3">
                   <div className="flex items-center gap-2">
-                    <span className="font-mono text-xs text-[var(--text-secondary)] break-all select-all flex-1">
+                    <span className="flex-1 select-all break-all font-mono text-xs text-[var(--text-secondary)]">
                       {tokenData.token}
                     </span>
                     <Button
@@ -91,17 +84,27 @@ export function TokenCreatedDialog({ open, onOpenChange, tokenData }: TokenCreat
                       className="h-8 w-8 shrink-0 text-[var(--text-tertiary)] hover:bg-[var(--surface-3)] hover:text-[var(--text-secondary)]"
                       aria-label="Copy token"
                     >
-                      {copied ? <Check size={15} className="text-[var(--status-success)]" /> : <Copy size={15} />}
+                      {copied ? (
+                        <Check size={15} className="text-[var(--status-success)]" />
+                      ) : (
+                        <Copy size={15} />
+                      )}
                     </Button>
                   </div>
                 </td>
               </tr>
               <tr>
-                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">{t('settings.tokens.type')}</td>
-                <td className="px-4 py-3 text-[var(--text-primary)]">{formatResourceType(tokenData.resourceType)}</td>
+                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.type')}
+                </td>
+                <td className="px-4 py-3 text-[var(--text-primary)]">
+                  {formatResourceType(tokenData.resourceType)}
+                </td>
               </tr>
               <tr>
-                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">{t('settings.tokens.permissions')}</td>
+                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.permissions')}
+                </td>
                 <td className="px-4 py-3">
                   <div className="flex flex-wrap gap-1.5">
                     {tokenData.scopes.map((scope) => (
@@ -117,15 +120,17 @@ export function TokenCreatedDialog({ open, onOpenChange, tokenData }: TokenCreat
                 </td>
               </tr>
               <tr>
-                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">{t('settings.tokens.createdAt')}</td>
+                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.createdAt')}
+                </td>
                 <td className="px-4 py-3 text-[var(--text-primary)]">
-                  {tokenData.createdAt
-                    ? new Date(tokenData.createdAt).toLocaleString()
-                    : '-'}
+                  {tokenData.createdAt ? new Date(tokenData.createdAt).toLocaleString() : '-'}
                 </td>
               </tr>
               <tr>
-                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">{t('settings.tokens.expiresAt')}</td>
+                <td className="px-4 py-3 font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.expiresAt')}
+                </td>
                 <td className="px-4 py-3 text-[var(--text-primary)]">
                   {tokenData.expiresAt
                     ? new Date(tokenData.expiresAt).toLocaleString()
diff --git a/frontend/components/settings/tokens-page.tsx b/frontend/components/settings/tokens-page.tsx
index fd16b0295..9f5932c02 100644
--- a/frontend/components/settings/tokens-page.tsx
+++ b/frontend/components/settings/tokens-page.tsx
@@ -5,10 +5,12 @@ import { useState } from 'react'
 
 import { Button } from '@/components/ui/button'
 import { useToast } from '@/hooks/use-toast'
+import { getErrorMessage } from '@/lib/utils/toast'
 import { TokenList } from '@/components/tokens/TokenList'
 import { usePlatformTokens, useCreateToken } from '@/hooks/queries/platformTokens'
 import type { PlatformTokenCreateResponse } from '@/hooks/queries/platformTokens'
 import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 
 import { CreateTokenDialog } from './create-token-dialog'
 import { TokenCreatedDialog } from './token-created-dialog'
@@ -16,6 +18,7 @@ import { TokenCreatedDialog } from './token-created-dialog'
 export const TokensPage = () => {
   const { t } = useTranslation()
   const { toast } = useToast()
+  const { canAdmin } = useUserPermissionsContext()
 
   const { data: tokens } = usePlatformTokens()
   const createToken = useCreateToken()
@@ -38,7 +41,7 @@ export const TokensPage = () => {
     } catch (error) {
       toast({
         title: t('common.error'),
-        description: error instanceof Error ? error.message : t('common.operationFailed'),
+        description: getErrorMessage(error, t('common.operationFailed')),
         variant: 'destructive',
       })
     }
@@ -54,18 +57,22 @@ export const TokensPage = () => {
           <h2 className="text-lg font-bold tracking-tight text-[var(--text-primary)]">
             {t('settings.tokens.title')}
           </h2>
-          <p className="mt-0.5 text-xs text-[var(--text-tertiary)]">{t('settings.tokens.description')}</p>
+          <p className="mt-0.5 text-xs text-[var(--text-tertiary)]">
+            {t('settings.tokens.description')}
+          </p>
         </div>
       </div>
       <Button
         size="sm"
         onClick={() => setCreateDialogOpen(true)}
-        disabled={(tokens?.length ?? 0) >= 50}
+        disabled={(tokens?.length ?? 0) >= 50 || !canAdmin}
         className="gap-2 rounded-lg"
       >
         <Key className="h-3.5 w-3.5" />
         <span className="text-xs font-medium">
-          {(tokens?.length ?? 0) >= 50 ? t('settings.tokens.limitReached') : t('settings.tokens.create')}
+          {(tokens?.length ?? 0) >= 50
+            ? t('settings.tokens.limitReached')
+            : t('settings.tokens.create')}
         </span>
       </Button>
     </div>
diff --git a/frontend/components/shared/artifact-panel.tsx b/frontend/components/shared/artifact-panel.tsx
new file mode 100644
index 000000000..b18c53734
--- /dev/null
+++ b/frontend/components/shared/artifact-panel.tsx
@@ -0,0 +1,91 @@
+'use client'
+
+import { FileText, Image, Code } from 'lucide-react'
+import { Card } from '@/components/ui/card'
+
+interface Artifact {
+  type: string
+  title?: string
+  content: string
+  language?: string
+}
+
+interface ArtifactPanelProps {
+  // Simple artifact list mode
+  artifacts?: Artifact[]
+  files?: Array<{ path: string; content: string }>
+  // File browser mode (used by SkillPreviewPanel)
+  threadId?: string | null
+  fileTree?: Record<string, { action: string; size?: number; timestamp?: number }>
+  className?: string
+  autoPreview?: boolean
+}
+
+export function ArtifactPanel({
+  artifacts,
+  files,
+  threadId: _threadId,
+  fileTree,
+  className,
+  autoPreview: _autoPreview,
+}: ArtifactPanelProps) {
+  // File browser mode: render fileTree entries
+  if (fileTree) {
+    const entries = Object.entries(fileTree)
+    if (!entries.length) return null
+    return (
+      <div className={`overflow-y-auto ${className || ''}`}>
+        <div className="space-y-1 p-2">
+          {entries.map(([path, meta]) => (
+            <div
+              key={path}
+              className="flex items-center gap-2 rounded px-2 py-1.5 text-xs hover:bg-[var(--surface-3)]"
+            >
+              <Code className="h-3.5 w-3.5 flex-shrink-0 text-[var(--text-muted)]" />
+              <span className="min-w-0 flex-1 truncate font-mono text-[var(--text-secondary)]">
+                {path}
+              </span>
+              {meta.size != null && (
+                <span className="flex-shrink-0 text-[var(--text-muted)]">
+                  {(meta.size / 1024).toFixed(1)}k
+                </span>
+              )}
+            </div>
+          ))}
+        </div>
+      </div>
+    )
+  }
+
+  // Simple artifact list mode
+  const items =
+    artifacts || files?.map((f) => ({ type: 'file', title: f.path, content: f.content })) || []
+
+  if (!items.length) return null
+
+  return (
+    <div className={`space-y-2 ${className || ''}`}>
+      {items.map((artifact, i) => (
+        <Card key={i} className="p-3">
+          <div className="flex items-center gap-2 text-sm font-medium">
+            {artifact.type === 'image' ? (
+              <Image className="h-4 w-4" />
+            ) : artifact.type === 'code' || artifact.type === 'file' ? (
+              <Code className="h-4 w-4" />
+            ) : (
+              <FileText className="h-4 w-4" />
+            )}
+            {artifact.title || `Artifact ${i + 1}`}
+          </div>
+          {artifact.type === 'code' || artifact.type === 'file' ? (
+            <pre className="mt-2 overflow-x-auto rounded bg-[var(--surface-2)] p-2 text-xs">
+              <code>{artifact.content}</code>
+            </pre>
+          ) : (
+            <p className="mt-1 text-sm text-[var(--text-muted)]">{artifact.content}</p>
+          )}
+        </Card>
+      ))}
+    </div>
+  )
+}
diff --git a/frontend/components/shared/code-viewer.tsx b/frontend/components/shared/code-viewer.tsx
new file mode 100644
index 000000000..efb39b5ab
--- /dev/null
+++ b/frontend/components/shared/code-viewer.tsx
@@ -0,0 +1,33 @@
+'use client'
+
+interface CodeViewerProps {
+  code: string
+  language?: string
+  className?: string
+  filename?: string
+  maxHeight?: string
+}
+
+export default function CodeViewer({
+  code,
+  language,
+  className,
+  filename,
+  maxHeight,
+}: CodeViewerProps) {
+  return (
+    <div
+      className={`flex flex-col overflow-hidden rounded ${className || ''}`}
+      style={maxHeight ? { maxHeight } : undefined}
+    >
+      {filename && (
+        <div className="flex-shrink-0 border-b border-[var(--border)] bg-[var(--surface-3)] px-3 py-1.5 font-mono text-xs text-[var(--text-muted)]">
+          {filename}
+        </div>
+      )}
+      <pre className="flex-1 overflow-auto bg-[var(--surface-2)] p-3 text-sm">
+        <code className={language ? `language-${language}` : ''}>{code}</code>
+      </pre>
+    </div>
+  )
+}
diff --git a/frontend/components/shared/tool-call-display.tsx b/frontend/components/shared/tool-call-display.tsx
new file mode 100644
index 000000000..7d70c85ce
--- /dev/null
+++ b/frontend/components/shared/tool-call-display.tsx
@@ -0,0 +1,36 @@
+'use client'
+
+import { Badge } from '@/components/ui/badge'
+import type { ToolCall } from '@/types/chat'
+
+interface ToolCallBadgeProps {
+  name: string
+  args?: Record<string, unknown>
+  status?: 'running' | 'completed' | 'failed'
+}
+
+export function ToolCallBadge({ name, status }: ToolCallBadgeProps) {
+  return (
+    <Badge
+      variant="outline"
+      className={`text-xs ${status === 'running' ? 'animate-pulse' : ''} ${status === 'failed' ? 'border-red-400 text-red-500' : ''}`}
+    >
+      {name}
+    </Badge>
+  )
+}
+
+export function formatToolDisplay(
+  toolName: string,
+  args?: Record<string, unknown>,
+): { label: string; detail: string } {
+  const label = toolName.replace(/_/g, ' ').replace(/\b\w/g, (char) => char.toUpperCase())
+
+  let detail = ''
+  if (args && Object.keys(args).length > 0) {
+    const preview = JSON.stringify(args).slice(0, 100)
+    detail = preview.length < JSON.stringify(args).length ? `${preview}...` : preview
+  }
+
+  return { label, detail }
+}
diff --git a/frontend/components/tasks/activity-thread.tsx b/frontend/components/tasks/activity-thread.tsx
new file mode 100644
index 000000000..3e868bacd
--- /dev/null
+++ b/frontend/components/tasks/activity-thread.tsx
@@ -0,0 +1,326 @@
+'use client'
+
+import { AlertCircle, Bot, CornerDownRight, Loader2, MessageSquare, Send, User } from 'lucide-react'
+import { useMemo, useRef, useState, useEffect, useCallback } from 'react'
+
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { useTaskActivities, useCreateTaskActivity } from '@/hooks/queries/taskActivities'
+import { useAgents, useAgentNameMap } from '@/hooks/queries/agents'
+import { cn } from '@/lib/utils'
+import { formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { TaskActivity } from '@/types/task-activities'
+
+const MENTION_RE = /\[@([^\]]*)\]\(mention:\/\/(agent|member)\/[^)]+\)/g
+
+function renderContentWithMentions(content: string) {
+  const parts: (string | React.ReactElement)[] = []
+  let lastIndex = 0
+
+  for (const match of content.matchAll(MENTION_RE)) {
+    if (match.index! > lastIndex) {
+      parts.push(content.slice(lastIndex, match.index))
+    }
+    parts.push(
+      <span
+        key={match.index}
+        className="bg-[var(--brand-400)]/10 rounded px-1 font-medium text-[var(--brand-400)]"
+      >
+        @{match[1]}
+      </span>,
+    )
+    lastIndex = match.index! + match[0].length
+  }
+
+  if (lastIndex < content.length) {
+    parts.push(content.slice(lastIndex))
+  }
+
+  return parts.length > 0 ? parts : content
+}
+
+interface ActivityThreadProps {
+  taskId: string
+  workspaceId: string
+}
+
+export function ActivityThread({ taskId, workspaceId }: ActivityThreadProps) {
+  const { data, isLoading, hasNextPage, fetchNextPage, isFetchingNextPage } = useTaskActivities(
+    taskId,
+    workspaceId,
+  )
+
+  const createActivity = useCreateTaskActivity()
+  const [newContent, setNewContent] = useState('')
+  const [replyTo, setReplyTo] = useState<string | null>(null)
+  const [mentionQuery, setMentionQuery] = useState<string | null>(null)
+  const [mentionStart, setMentionStart] = useState(0)
+  const inputRef = useRef<HTMLInputElement>(null)
+  const { data: agents = [] } = useAgents(workspaceId, { enabled: Boolean(workspaceId) })
+  const agentNameMap = useAgentNameMap(workspaceId)
+  const bottomRef = useRef<HTMLDivElement>(null)
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
+  const isAtBottomRef = useRef(true)
+
+  const allActivities = useMemo(() => {
+    if (!data?.pages) return []
+    return data.pages.flatMap((page) => page.items)
+  }, [data])
+
+  // Group into threads: root activities + their replies
+  const threads = useMemo(() => {
+    const roots: TaskActivity[] = []
+    const repliesByParent: Record<string, TaskActivity[]> = {}
+
+    for (const a of allActivities) {
+      if (a.parent_activity_id) {
+        const parentId = a.parent_activity_id
+        if (!repliesByParent[parentId]) repliesByParent[parentId] = []
+        repliesByParent[parentId].push(a)
+      } else {
+        roots.push(a)
+      }
+    }
+    return roots.map((root) => ({
+      root,
+      replies: repliesByParent[root.id] || [],
+    }))
+  }, [allActivities])
+
+  const handleScroll = useCallback(() => {
+    const el = scrollContainerRef.current
+    if (!el) return
+    isAtBottomRef.current = el.scrollHeight - el.scrollTop - el.clientHeight < 40
+  }, [])
+
+  useEffect(() => {
+    if (isAtBottomRef.current) {
+      bottomRef.current?.scrollIntoView({ behavior: 'smooth' })
+    }
+  }, [allActivities.length])
+
+  const handleSubmit = (e: React.FormEvent) => {
+    e.preventDefault()
+    const trimmed = newContent.trim()
+    if (!trimmed) return
+    setMentionQuery(null)
+    createActivity.mutate(
+      {
+        taskId,
+        workspaceId,
+        content: trimmed,
+        parent_activity_id: replyTo ?? undefined,
+      },
+      {
+        onSuccess: () => {
+          setNewContent('')
+          setReplyTo(null)
+        },
+      },
+    )
+  }
+
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const value = e.target.value
+    setNewContent(value)
+
+    const cursorPos = e.target.selectionStart ?? value.length
+    const textBeforeCursor = value.slice(0, cursorPos)
+    const atMatch = textBeforeCursor.match(/@(\w*)$/)
+    if (atMatch) {
+      setMentionQuery(atMatch[1].toLowerCase())
+      setMentionStart(cursorPos - atMatch[0].length)
+    } else {
+      setMentionQuery(null)
+    }
+  }
+
+  const handleSelectAgent = (agentId: string, agentName: string) => {
+    const before = newContent.slice(0, mentionStart)
+    const after = newContent.slice(mentionStart + (mentionQuery?.length ?? 0) + 1)
+    const mention = `[@${agentName}](mention://agent/${agentId})`
+    setNewContent(before + mention + ' ' + after)
+    setMentionQuery(null)
+    inputRef.current?.focus()
+  }
+
+  const filteredAgents = useMemo(() => {
+    if (mentionQuery === null) return []
+    return agents.filter((a) => a.name.toLowerCase().includes(mentionQuery))
+  }, [agents, mentionQuery])
+
+  if (isLoading) {
+    return (
+      <div className="flex items-center justify-center py-6">
+        <Loader2 className="h-4 w-4 animate-spin text-[var(--text-muted)]" />
+      </div>
+    )
+  }
+
+  return (
+    <div ref={scrollContainerRef} onScroll={handleScroll} className="flex flex-col">
+      {/* Load more */}
+      {hasNextPage && (
+        <button
+          type="button"
+          onClick={() => fetchNextPage()}
+          disabled={isFetchingNextPage}
+          className="mb-2 text-xs text-[var(--brand-400)] hover:underline disabled:opacity-50"
+        >
+          {isFetchingNextPage ? 'Loading...' : 'Load earlier activity'}
+        </button>
+      )}
+
+      {/* Empty state */}
+      {threads.length === 0 && (
+        <p className="py-4 text-center text-xs text-[var(--text-muted)]">No activity yet</p>
+      )}
+
+      {/* Activity threads */}
+      <div className="space-y-3">
+        {threads.map(({ root, replies }) => (
+          <div key={root.id}>
+            <ActivityItem
+              activity={root}
+              onReply={() => setReplyTo(root.id)}
+              agentNameMap={agentNameMap}
+            />
+            {replies.map((reply) => (
+              <div key={reply.id} className="ml-6 mt-1.5">
+                <ActivityItem activity={reply} isReply agentNameMap={agentNameMap} />
+              </div>
+            ))}
+          </div>
+        ))}
+      </div>
+
+      <div ref={bottomRef} />
+
+      {/* Input */}
+      <form onSubmit={handleSubmit} className="relative mt-3 flex flex-col gap-2">
+        {replyTo && (
+          <div className="flex items-center gap-1 text-xs text-[var(--text-muted)]">
+            <CornerDownRight className="h-3 w-3" />
+            <span>Replying to comment</span>
+            <button
+              type="button"
+              onClick={() => setReplyTo(null)}
+              className="ml-1 text-[var(--brand-400)] hover:underline"
+            >
+              Cancel
+            </button>
+          </div>
+        )}
+        {/* @mention dropdown */}
+        {filteredAgents.length > 0 && (
+          <div className="absolute bottom-full left-0 mb-1 w-56 rounded-md border border-[var(--border)] bg-[var(--surface-elevated)] py-1 shadow-lg">
+            {filteredAgents.slice(0, 5).map((agent) => (
+              <button
+                key={agent.id}
+                type="button"
+                onClick={() => handleSelectAgent(agent.id, agent.name)}
+                className="flex w-full items-center gap-2 px-3 py-1.5 text-left text-sm hover:bg-[var(--surface-3)]"
+              >
+                <Bot className="h-3.5 w-3.5 text-[var(--brand-400)]" />
+                <span className="text-[var(--text-primary)]">{agent.name}</span>
+              </button>
+            ))}
+          </div>
+        )}
+        <div className="flex items-center gap-2">
+          <Input
+            ref={inputRef}
+            value={newContent}
+            onChange={handleInputChange}
+            placeholder={
+              replyTo
+                ? 'Write a reply... (@ to mention agent)'
+                : 'Write a comment... (@ to mention agent)'
+            }
+            className="flex-1 text-sm"
+          />
+          <Button
+            type="submit"
+            size="icon"
+            disabled={!newContent.trim() || createActivity.isPending}
+          >
+            {createActivity.isPending ? (
+              <Loader2 className="h-4 w-4 animate-spin" />
+            ) : (
+              <Send className="h-4 w-4" />
+            )}
+          </Button>
+        </div>
+      </form>
+    </div>
+  )
+}
+
+// ---- Single activity item ----
+
+function ActivityItem({
+  activity,
+  onReply,
+  isReply,
+  agentNameMap,
+}: {
+  activity: TaskActivity
+  onReply?: () => void
+  isReply?: boolean
+  agentNameMap?: Record<string, string>
+}) {
+  const isAgent = activity.author_type === 'agent'
+  const isSystem = activity.type === 'system'
+
+  return (
+    <div
+      className={cn(
+        'rounded-lg px-3 py-2',
+        isSystem
+          ? 'border border-[var(--status-error-bg)] bg-[var(--status-error-bg)]'
+          : 'border border-[var(--border)] bg-[var(--surface-3)]',
+      )}
+    >
+      <div className="flex items-center gap-1.5">
+        {isAgent ? (
+          <Bot className="h-3.5 w-3.5 text-[var(--brand-400)]" />
+        ) : (
+          <User className="h-3.5 w-3.5 text-[var(--text-muted)]" />
+        )}
+        <span className="text-xs font-medium text-[var(--text-secondary)]">
+          {isAgent ? (agentNameMap?.[activity.author_id] ?? 'Agent') : 'You'}
+        </span>
+        {isSystem && (
+          <span className="flex items-center gap-0.5 text-xs text-[var(--status-error)]">
+            <AlertCircle className="h-3 w-3" />
+            System
+          </span>
+        )}
+        {activity.type === 'progress_update' && (
+          <span className="text-xs text-[var(--status-success)]">Update</span>
+        )}
+        <span className="ml-auto text-[10px] text-[var(--text-muted)]">
+          {formatRelativeTime(activity.created_at)}
+        </span>
+      </div>
+      <p
+        className={cn(
+          'mt-1 whitespace-pre-wrap text-sm leading-relaxed',
+          isSystem ? 'text-[var(--status-error)]' : 'text-[var(--text-primary)]',
+        )}
+      >
+        {renderContentWithMentions(activity.content)}
+      </p>
+      {onReply && !isReply && (
+        <button
+          type="button"
+          onClick={onReply}
+          className="mt-1 flex items-center gap-1 text-[10px] text-[var(--text-muted)] hover:text-[var(--brand-400)]"
+        >
+          <MessageSquare className="h-3 w-3" />
+          Reply
+        </button>
+      )}
+    </div>
+  )
+}
diff --git a/frontend/components/tasks/priority-badge.tsx b/frontend/components/tasks/priority-badge.tsx
new file mode 100644
index 000000000..56c048910
--- /dev/null
+++ b/frontend/components/tasks/priority-badge.tsx
@@ -0,0 +1,34 @@
+'use client'
+
+import { cn } from '@/lib/utils'
+import type { TaskPriority } from '@/types/tasks'
+import { TASK_PRIORITY_LABELS } from '@/types/tasks'
+
+const PRIORITY_STYLES: Record<TaskPriority, string> = {
+  urgent:
+    'bg-[var(--status-error-bg)] text-[var(--status-error)] border-[var(--status-error-border)]',
+  high: 'bg-[var(--status-warning-bg)] text-[var(--status-warning)] border-[var(--status-warning-border)]',
+  medium:
+    'bg-[var(--status-warning-bg)] text-[var(--status-warning)] border-[var(--status-warning-border)]',
+  low: 'bg-[var(--surface-3)] text-[var(--brand-400)] border-[var(--border)]',
+  none: 'bg-[var(--surface-3)] text-[var(--text-muted)] border-[var(--border)]',
+}
+
+interface PriorityBadgeProps {
+  priority: TaskPriority
+  className?: string
+}
+
+export function PriorityBadge({ priority, className }: PriorityBadgeProps) {
+  return (
+    <span
+      className={cn(
+        'inline-flex items-center rounded-full border px-2 py-0.5 text-xs font-medium',
+        PRIORITY_STYLES[priority],
+        className,
+      )}
+    >
+      {TASK_PRIORITY_LABELS[priority]}
+    </span>
+  )
+}
diff --git a/frontend/components/tasks/task-activity-summary.tsx b/frontend/components/tasks/task-activity-summary.tsx
new file mode 100644
index 000000000..234a1e580
--- /dev/null
+++ b/frontend/components/tasks/task-activity-summary.tsx
@@ -0,0 +1,137 @@
+'use client'
+
+import { Bot, CheckCircle2, Play } from 'lucide-react'
+
+import { Badge } from '@/components/ui/badge'
+import { Card } from '@/components/ui/card'
+import { PulsingDot } from '@/components/ui/pulsing-dot'
+import { useTranslation } from '@/lib/i18n'
+import { formatRelativeTime } from '@/lib/utils/dateHelpers'
+import type { Task } from '@/types/tasks'
+
+interface TaskActivitySummaryProps {
+  inProgressTasks: Task[]
+  recentlyDoneTasks: Task[]
+  agentsMap: Record<string, string>
+  onSelectTask?: (id: string) => void
+}
+
+export function TaskActivitySummary({
+  inProgressTasks,
+  recentlyDoneTasks,
+  agentsMap,
+  onSelectTask,
+}: TaskActivitySummaryProps) {
+  const { t } = useTranslation()
+
+  if (inProgressTasks.length === 0 && recentlyDoneTasks.length === 0) return null
+
+  return (
+    <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+      {/* In Progress */}
+      <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+        <div className="mb-3 flex items-center gap-2">
+          <Play className="h-3.5 w-3.5 text-[var(--brand-500)]" />
+          <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('tasks.inProgress')}
+          </h3>
+          {inProgressTasks.length > 0 && (
+            <Badge variant="outline" className="text-xs">
+              {inProgressTasks.length}
+            </Badge>
+          )}
+        </div>
+        {inProgressTasks.length === 0 ? (
+          <p className="text-xs text-[var(--text-muted)]">{t('tasks.noInProgress')}</p>
+        ) : (
+          <div className="space-y-2">
+            {inProgressTasks.slice(0, 5).map((task) => {
+              const agentId = task.agent_id
+              const agentName = agentId ? agentsMap[agentId] : undefined
+              return (
+                <button
+                  key={task.id}
+                  type="button"
+                  onClick={() => onSelectTask?.(task.id)}
+                  className="flex w-full items-center gap-3 rounded-md p-2 text-left transition-colors hover:bg-[var(--surface-3)]"
+                >
+                  <PulsingDot />
+                  <div className="min-w-0 flex-1">
+                    <p className="truncate text-sm font-medium text-[var(--text-primary)]">
+                      {task.title}
+                    </p>
+                    {agentName && (
+                      <div className="mt-0.5 flex items-center gap-1 text-xs text-[var(--text-muted)]">
+                        <Bot className="h-3 w-3" />
+                        <span>{agentName}</span>
+                      </div>
+                    )}
+                  </div>
+                  {task.updated_at && (
+                    <span className="flex-shrink-0 text-xs text-[var(--text-muted)]">
+                      {formatElapsed(task.updated_at)}
+                    </span>
+                  )}
+                </button>
+              )
+            })}
+          </div>
+        )}
+      </Card>
+
+      {/* Recently Done */}
+      <Card className="border-[var(--border)] bg-[var(--surface-1)] p-5">
+        <div className="mb-3 flex items-center gap-2">
+          <CheckCircle2 className="h-3.5 w-3.5 text-[var(--status-success)]" />
+          <h3 className="text-sm font-semibold text-[var(--text-primary)]">
+            {t('tasks.recentlyDone')}
+          </h3>
+        </div>
+        {recentlyDoneTasks.length === 0 ? (
+          <p className="text-xs text-[var(--text-muted)]">{t('tasks.noRecentlyDone')}</p>
+        ) : (
+          <div className="space-y-2">
+            {recentlyDoneTasks.slice(0, 5).map((task) => {
+              const agentId = task.agent_id
+              const agentName = agentId ? agentsMap[agentId] : undefined
+              return (
+                <button
+                  key={task.id}
+                  type="button"
+                  onClick={() => onSelectTask?.(task.id)}
+                  className="flex w-full items-center gap-3 rounded-md p-2 text-left transition-colors hover:bg-[var(--surface-3)]"
+                >
+                  <CheckCircle2 className="h-3.5 w-3.5 flex-shrink-0 text-[var(--status-success)]" />
+                  <div className="min-w-0 flex-1">
+                    <p className="truncate text-sm text-[var(--text-secondary)]">{task.title}</p>
+                    {agentName && (
+                      <div className="mt-0.5 flex items-center gap-1 text-xs text-[var(--text-muted)]">
+                        <Bot className="h-3 w-3" />
+                        <span>{agentName}</span>
+                      </div>
+                    )}
+                  </div>
+                  {task.updated_at && (
+                    <span className="flex-shrink-0 text-xs text-[var(--text-muted)]">
+                      {formatRelativeTime(task.updated_at, t)}
+                    </span>
+                  )}
+                </button>
+              )
+            })}
+          </div>
+        )}
+      </Card>
+    </div>
+  )
+}
+
+function formatElapsed(dateStr: string): string {
+  const diff = Date.now() - new Date(dateStr).getTime()
+  const seconds = Math.floor(diff / 1000)
+  if (seconds < 60) return `${seconds}s`
+  const minutes = Math.floor(seconds / 60)
+  if (minutes < 60) return `${minutes}m${String(seconds % 60).padStart(2, '0')}s`
+  const hours = Math.floor(minutes / 60)
+  return `${hours}h${String(minutes % 60).padStart(2, '0')}m`
+}
diff --git a/frontend/components/tasks/task-attention-panel.tsx b/frontend/components/tasks/task-attention-panel.tsx
new file mode 100644
index 000000000..0cd57de6d
--- /dev/null
+++ b/frontend/components/tasks/task-attention-panel.tsx
@@ -0,0 +1,120 @@
+'use client'
+
+import { AlertTriangle, ExternalLink, RefreshCw } from 'lucide-react'
+import Link from 'next/link'
+
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import { Card } from '@/components/ui/card'
+import { useTranslation } from '@/lib/i18n'
+import type { Task } from '@/types/tasks'
+
+interface TaskAttentionPanelProps {
+  tasks: Task[]
+  agentsMap: Record<string, string>
+  onSelectTask?: (id: string) => void
+  onRetry?: (taskId: string) => void
+}
+
+export function TaskAttentionPanel({
+  tasks,
+  agentsMap,
+  onSelectTask,
+  onRetry,
+}: TaskAttentionPanelProps) {
+  const { t } = useTranslation()
+
+  if (tasks.length === 0) return null
+
+  return (
+    <Card className="bg-[var(--status-warning-bg)]/30 border-[var(--status-warning-border)] p-5">
+      <div className="mb-3 flex items-center gap-2">
+        <AlertTriangle className="h-4 w-4 text-[var(--status-warning)]" />
+        <h2 className="text-sm font-semibold text-[var(--text-primary)]">
+          {t('tasks.needsAttention')}
+        </h2>
+        <Badge variant="outline" className="text-xs">
+          {tasks.length}
+        </Badge>
+      </div>
+
+      <div className="space-y-2">
+        {tasks.slice(0, 5).map((task) => {
+          const agentId = task.agent_id
+          const agentName = agentId ? agentsMap[agentId] : undefined
+          const isFailed = task.status === 'in_review'
+
+          return (
+            <div
+              key={task.id}
+              className="flex items-center justify-between rounded-lg border border-[var(--border)] bg-[var(--surface-elevated)] p-3"
+            >
+              <div className="flex min-w-0 items-center gap-3">
+                <div
+                  className={`h-2 w-2 flex-shrink-0 rounded-full ${
+                    isFailed ? 'bg-[var(--status-error)]' : 'bg-[var(--status-warning)]'
+                  }`}
+                />
+                <div className="min-w-0">
+                  <div className="flex items-center gap-2">
+                    {agentName && (
+                      <Link
+                        href={`/agents/${agentId}`}
+                        onClick={(e) => e.stopPropagation()}
+                        className="text-xs font-medium text-[var(--brand-500)] hover:underline"
+                      >
+                        {agentName}
+                      </Link>
+                    )}
+                    <span className="text-xs text-[var(--text-muted)]">›</span>
+                    <span className="truncate text-sm font-medium text-[var(--text-primary)]">
+                      {task.title}
+                    </span>
+                  </div>
+                  <p className="mt-0.5 text-xs text-[var(--text-muted)]">
+                    {isFailed ? t('tasks.executionFailed') : t('tasks.awaitingReview')}
+                    {task.updated_at && ` · ${formatRelativeTime(task.updated_at, t)}`}
+                  </p>
+                </div>
+              </div>
+
+              <div className="flex flex-shrink-0 items-center gap-2">
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="h-7 text-xs"
+                  onClick={() => onSelectTask?.(task.id)}
+                >
+                  <ExternalLink className="mr-1 h-3 w-3" />
+                  {t('tasks.details')}
+                </Button>
+                {isFailed && onRetry && (
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    className="h-7 text-xs"
+                    onClick={() => onRetry(task.id)}
+                  >
+                    <RefreshCw className="mr-1 h-3 w-3" />
+                    {t('tasks.retry')}
+                  </Button>
+                )}
+              </div>
+            </div>
+          )
+        })}
+      </div>
+    </Card>
+  )
+}
+
+function formatRelativeTime(dateStr: string, t: (key: string) => string): string {
+  const diff = Date.now() - new Date(dateStr).getTime()
+  const minutes = Math.floor(diff / 60000)
+  if (minutes < 1) return t('execution.justNow')
+  if (minutes < 60) return `${minutes}${t('execution.minutesSuffix')}`
+  const hours = Math.floor(minutes / 60)
+  if (hours < 24) return `${hours}${t('execution.hoursSuffix')}`
+  const days = Math.floor(hours / 24)
+  return `${days}${t('execution.daysSuffix')}`
+}
diff --git a/frontend/components/tasks/task-board.tsx b/frontend/components/tasks/task-board.tsx
new file mode 100644
index 000000000..0a19ab7a4
--- /dev/null
+++ b/frontend/components/tasks/task-board.tsx
@@ -0,0 +1,183 @@
+'use client'
+
+import {
+  DndContext,
+  DragOverlay,
+  PointerSensor,
+  useSensor,
+  useSensors,
+  closestCorners,
+  type DragEndEvent,
+  type DragStartEvent,
+} from '@dnd-kit/core'
+import { useCallback, useMemo, useState } from 'react'
+
+import { useUpdateTask, useTaskTransitions } from '@/hooks/queries/tasks'
+import { toastError } from '@/lib/utils/toast'
+import type { Task, TaskStatus } from '@/types/tasks'
+import {
+  DEFAULT_MANUAL_TRANSITIONS,
+  TASK_STATUS_ORDER,
+  INACTIVE_TASK_STATUSES,
+} from '@/types/tasks'
+
+import { TaskCard } from './task-card'
+import { TaskColumn } from './task-column'
+
+interface TaskBoardProps {
+  tasks: Task[]
+  workspaceId: string
+  agentsMap: Record<string, string>
+  onSelectTask?: (id: string) => void
+}
+
+export function TaskBoard({ tasks, workspaceId, agentsMap, onSelectTask }: TaskBoardProps) {
+  const [activeId, setActiveId] = useState<string | null>(null)
+  const updateTask = useUpdateTask()
+  const { data: transitions } = useTaskTransitions(workspaceId)
+  const effectiveTransitions = transitions ?? DEFAULT_MANUAL_TRANSITIONS
+
+  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }))
+
+  const grouped = useMemo(() => {
+    const map: Record<TaskStatus, Task[]> = {
+      backlog: [],
+      todo: [],
+      in_progress: [],
+      in_review: [],
+      done: [],
+      cancelled: [],
+    }
+    for (const m of tasks) {
+      if (map[m.status]) {
+        map[m.status].push(m)
+      }
+    }
+    for (const key of Object.keys(map) as TaskStatus[]) {
+      map[key].sort((a, b) => a.position - b.position)
+    }
+    return map
+  }, [tasks])
+
+  const activeTask = useMemo(
+    () => (activeId ? tasks.find((m) => m.id === activeId) : undefined),
+    [activeId, tasks],
+  )
+
+  const handleDragStart = useCallback((event: DragStartEvent) => {
+    setActiveId(event.active.id as string)
+  }, [])
+
+  const handleDragEnd = useCallback(
+    (event: DragEndEvent) => {
+      setActiveId(null)
+      const { active, over } = event
+      if (!over) return
+
+      const draggedTask = tasks.find((m) => m.id === active.id)
+      if (!draggedTask) return
+
+      // Determine target column
+      const overData = over.data.current
+      let targetStatus: TaskStatus
+      if (overData?.type === 'column') {
+        targetStatus = overData.status as TaskStatus
+      } else if (overData?.type === 'task') {
+        targetStatus = (overData.task as Task).status
+      } else {
+        // over.id is `column-<status>` format
+        const colPrefix = 'column-'
+        const overId = over.id as string
+        if (overId.startsWith(colPrefix)) {
+          targetStatus = overId.slice(colPrefix.length) as TaskStatus
+        } else {
+          // Dropped on a card — find its status
+          const targetTask = tasks.find((m) => m.id === over.id)
+          if (!targetTask) return
+          targetStatus = targetTask.status
+        }
+      }
+
+      // Calculate new position
+      const targetColumn = grouped[targetStatus] || []
+      let newPosition: number
+
+      if (overData?.type === 'task' && over.id !== active.id) {
+        // Dropped on a specific card
+        const overIndex = targetColumn.findIndex((m) => m.id === over.id)
+        if (overIndex <= 0) {
+          newPosition = (targetColumn[0]?.position ?? 0) - 1
+        } else {
+          const prev = targetColumn[overIndex - 1]
+          const curr = targetColumn[overIndex]
+          newPosition = (prev.position + curr.position) / 2
+        }
+      } else {
+        // Dropped on column — place at end
+        const last = targetColumn[targetColumn.length - 1]
+        newPosition = last ? last.position + 1 : 0
+      }
+
+      const statusChanged = draggedTask.status !== targetStatus
+      const positionChanged = draggedTask.position !== newPosition
+
+      if (!statusChanged && !positionChanged) return
+
+      if (statusChanged) {
+        const from = draggedTask.status
+        const allowed = effectiveTransitions[from] ?? []
+        if (!allowed.includes(targetStatus)) {
+          toastError(`Cannot move from ${from} to ${targetStatus}`)
+          return
+        }
+        const toTerminal = (INACTIVE_TASK_STATUSES as readonly string[]).includes(targetStatus)
+        if (draggedTask.current_execution_id && toTerminal) {
+          toastError('Cancel the running execution before moving to this status')
+          return
+        }
+      }
+
+      const updates: Record<string, unknown> = {}
+      if (statusChanged) updates.status = targetStatus
+      if (positionChanged) updates.position = newPosition
+
+      updateTask.mutate({
+        taskId: draggedTask.id,
+        workspaceId,
+        ...updates,
+      })
+    },
+    [tasks, grouped, workspaceId, updateTask, effectiveTransitions],
+  )
+
+  return (
+    <DndContext
+      sensors={sensors}
+      collisionDetection={closestCorners}
+      onDragStart={handleDragStart}
+      onDragEnd={handleDragEnd}
+    >
+      <div className="flex h-full gap-3 p-4">
+        {TASK_STATUS_ORDER.map((status) => (
+          <TaskColumn
+            key={status}
+            status={status}
+            tasks={grouped[status]}
+            agentsMap={agentsMap}
+            onSelectTask={onSelectTask}
+          />
+        ))}
+      </div>
+
+      <DragOverlay>
+        {activeTask ? (
+          <TaskCard
+            task={activeTask}
+            agentName={agentsMap[activeTask.agent_id ?? '']}
+            isDragOverlay
+          />
+        ) : null}
+      </DragOverlay>
+    </DndContext>
+  )
+}
diff --git a/frontend/components/tasks/task-card.tsx b/frontend/components/tasks/task-card.tsx
new file mode 100644
index 000000000..99b9f9ed1
--- /dev/null
+++ b/frontend/components/tasks/task-card.tsx
@@ -0,0 +1,150 @@
+'use client'
+
+import { Bot, Calendar, ExternalLink, User } from 'lucide-react'
+import Link from 'next/link'
+import { forwardRef } from 'react'
+
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+import { PulsingDot } from '@/components/ui/pulsing-dot'
+import type { Task, TaskPriority } from '@/types/tasks'
+import { TASK_STATUS_STYLES } from '@/types/tasks'
+
+import { PriorityBadge } from './priority-badge'
+
+const PRIORITY_LEFT_BORDER: Record<TaskPriority, string> = {
+  urgent: 'border-l-[var(--status-error)]',
+  high: 'border-l-[var(--status-warning)]',
+  medium: 'border-l-[var(--brand-400)]',
+  low: 'border-l-[var(--text-muted)]',
+  none: 'border-l-transparent',
+}
+
+interface TaskCardProps {
+  task: Task
+  agentName?: string
+  onSelectTask?: (id: string) => void
+  isDragOverlay?: boolean
+  style?: React.CSSProperties
+}
+
+export const TaskCard = forwardRef<
+  HTMLButtonElement,
+  TaskCardProps & React.HTMLAttributes<HTMLButtonElement>
+>(function TaskCard(
+  { task, agentName, onSelectTask, isDragOverlay, style, className, ...props },
+  ref,
+) {
+  const { t } = useTranslation()
+  const effectiveAgentId = task.agent_id
+  const hasActiveExecution = Boolean(task.current_execution_id)
+  const isAssignedToAgent = Boolean(task.agent_id)
+  // Show run status badge when there's a linked run but no active execution
+  const hasLinkedRun = Boolean(task.latest_run_id) && !hasActiveExecution
+
+  const isOverdue = task.due_date ? Date.parse(task.due_date) < Date.now() : false
+
+  return (
+    <button
+      ref={ref}
+      type="button"
+      onClick={() => onSelectTask?.(task.id)}
+      style={style}
+      className={cn(
+        'w-full rounded-lg border border-l-[3px] border-[var(--border)] bg-[var(--surface-elevated)] p-3 text-left',
+        PRIORITY_LEFT_BORDER[task.priority],
+        'transition-shadow hover:shadow-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--brand-400)]',
+        isDragOverlay && 'ring-[var(--brand-400)]/40 shadow-lg ring-2',
+        className,
+      )}
+      {...props}
+    >
+      <p className="line-clamp-2 text-sm font-medium text-[var(--text-primary)]">{task.title}</p>
+
+      <div className="mt-2 flex flex-wrap items-center gap-2">
+        <PriorityBadge priority={task.priority} />
+
+        <span className="inline-flex items-center gap-1 text-xs text-[var(--text-muted)]">
+          {isAssignedToAgent ? (
+            <>
+              <Bot className="h-3 w-3" />
+              {effectiveAgentId ? (
+                <Link
+                  href={`/agents/${effectiveAgentId}`}
+                  onClick={(e) => e.stopPropagation()}
+                  className="max-w-[80px] truncate text-[var(--brand-500)] hover:underline"
+                >
+                  {agentName || 'Agent'}
+                </Link>
+              ) : (
+                <span>{t('tasks.unassigned')}</span>
+              )}
+            </>
+          ) : (
+            <>
+              <User className="h-3 w-3" />
+              <span>{effectiveAgentId ? 'Assigned' : t('tasks.unassigned')}</span>
+            </>
+          )}
+        </span>
+
+        {/* Latest run status badge — shown when a prior run exists but is no longer active */}
+        {hasLinkedRun && (
+          <Link
+            href={`/tasks?task=${task.id}`}
+            onClick={(e) => e.stopPropagation()}
+            className={cn(
+              'inline-flex items-center gap-1 rounded-full border px-2 py-0.5 text-[10px] font-medium',
+              TASK_STATUS_STYLES[task.status] ??
+                'border-[var(--border)] bg-[var(--surface-3)] text-[var(--text-muted)]',
+            )}
+          >
+            <ExternalLink className="h-2.5 w-2.5" />
+            {t('tasks.lastRun')}
+          </Link>
+        )}
+      </div>
+
+      {(task.tags?.length || task.due_date) && (
+        <div className="mt-1.5 flex flex-wrap items-center gap-1.5">
+          {task.tags?.slice(0, 2).map((tag) => (
+            <span
+              key={tag}
+              className="inline-block max-w-[80px] truncate rounded bg-[var(--surface-3)] px-1.5 py-0.5 text-[10px] text-[var(--text-secondary)]"
+            >
+              {tag}
+            </span>
+          ))}
+          {(task.tags?.length ?? 0) > 2 && (
+            <span className="text-[10px] text-[var(--text-muted)]">
+              +{(task.tags?.length ?? 0) - 2}
+            </span>
+          )}
+          {task.due_date && (
+            <span
+              className={cn(
+                'inline-flex items-center gap-0.5 text-[10px]',
+                isOverdue ? 'text-[var(--status-error)]' : 'text-[var(--text-muted)]',
+              )}
+            >
+              <Calendar className="h-2.5 w-2.5" />
+              {new Date(task.due_date).toLocaleDateString()}
+            </span>
+          )}
+        </div>
+      )}
+
+      {hasActiveExecution && (
+        <Link
+          href={`/tasks?task=${task.id}`}
+          onClick={(e) => e.stopPropagation()}
+          className="bg-[var(--surface-3)]/50 -mx-3 -mb-3 mt-2 flex items-center gap-1.5 rounded-b-lg border-t border-[var(--border)] px-3 py-1.5 text-xs text-[var(--status-success)] hover:bg-[var(--surface-3)]"
+        >
+          <PulsingDot />
+          {t('tasks.running')}
+          <ExternalLink className="ml-auto h-3 w-3" />
+        </Link>
+      )}
+    </button>
+  )
+})
diff --git a/frontend/components/tasks/task-column.tsx b/frontend/components/tasks/task-column.tsx
new file mode 100644
index 000000000..0453ea4ff
--- /dev/null
+++ b/frontend/components/tasks/task-column.tsx
@@ -0,0 +1,109 @@
+'use client'
+
+import { useDroppable } from '@dnd-kit/core'
+import { SortableContext, useSortable, verticalListSortingStrategy } from '@dnd-kit/sortable'
+import { CSS } from '@dnd-kit/utilities'
+
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+import type { Task, TaskStatus } from '@/types/tasks'
+import { TASK_STATUS_LABELS } from '@/types/tasks'
+
+import { TaskCard } from './task-card'
+
+const STATUS_COLUMN_STYLES: Record<TaskStatus, { bg: string; indicator: string }> = {
+  backlog: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--text-muted)]' },
+  todo: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--brand-400)]' },
+  in_progress: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--status-warning)]' },
+  in_review: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--brand-400)]' },
+  done: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--status-success)]' },
+  cancelled: { bg: 'bg-[var(--surface-1)]', indicator: 'bg-[var(--text-muted)]' },
+}
+
+interface SortableTaskCardProps {
+  task: Task
+  agentName?: string
+  onSelectTask?: (id: string) => void
+}
+
+function SortableTaskCard({ task, agentName, onSelectTask }: SortableTaskCardProps) {
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
+    id: task.id,
+    data: { type: 'task', task },
+  })
+
+  const style: React.CSSProperties = {
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.4 : undefined,
+  }
+
+  return (
+    <TaskCard
+      ref={setNodeRef}
+      task={task}
+      agentName={agentName}
+      onSelectTask={onSelectTask}
+      style={style}
+      {...attributes}
+      {...listeners}
+    />
+  )
+}
+
+interface TaskColumnProps {
+  status: TaskStatus
+  tasks: Task[]
+  agentsMap?: Record<string, string>
+  onSelectTask?: (id: string) => void
+}
+
+export function TaskColumn({ status, tasks, agentsMap, onSelectTask }: TaskColumnProps) {
+  const { t } = useTranslation()
+  const { setNodeRef, isOver } = useDroppable({
+    id: `column-${status}`,
+    data: { type: 'column', status },
+  })
+
+  const taskIds = tasks.map((m) => m.id)
+  const colStyle = STATUS_COLUMN_STYLES[status]
+
+  return (
+    <div
+      className={cn(
+        'flex min-w-[200px] flex-1 flex-col rounded-lg border border-[var(--border)] transition-all',
+        colStyle.bg,
+        isOver && 'ring-[var(--brand-400)]/30 ring-2',
+      )}
+    >
+      <div className="flex items-center gap-2 px-3 py-2.5">
+        <span className={cn('h-2.5 w-2.5 rounded-full', colStyle.indicator)} />
+        <span className="text-sm font-semibold text-[var(--text-primary)]">
+          {TASK_STATUS_LABELS[status]}
+        </span>
+        <span className="inline-flex h-5 min-w-[20px] items-center justify-center rounded-full bg-[var(--surface-5)] px-1.5 text-xs font-medium text-[var(--text-secondary)]">
+          {tasks.length}
+        </span>
+      </div>
+
+      <div ref={setNodeRef} className="flex-1 space-y-2 overflow-y-auto p-2">
+        <SortableContext items={taskIds} strategy={verticalListSortingStrategy}>
+          {tasks.map((task) => (
+            <SortableTaskCard
+              key={task.id}
+              task={task}
+              agentName={agentsMap?.[task.agent_id ?? '']}
+              onSelectTask={onSelectTask}
+            />
+          ))}
+        </SortableContext>
+        {tasks.length === 0 && (
+          <div className="flex flex-col items-center justify-center py-8 text-[var(--text-muted)]">
+            <div className="mb-1.5 h-8 w-8 rounded-full border-2 border-dashed border-[var(--border)]" />
+            <p className="text-xs">{t('tasks.noTasks')}</p>
+          </div>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/frontend/components/tasks/task-create-dialog.tsx b/frontend/components/tasks/task-create-dialog.tsx
new file mode 100644
index 000000000..eb5fe2111
--- /dev/null
+++ b/frontend/components/tasks/task-create-dialog.tsx
@@ -0,0 +1,225 @@
+'use client'
+
+import { useState } from 'react'
+
+import { Button } from '@/components/ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogTrigger,
+} from '@/components/ui/dialog'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { Switch } from '@/components/ui/switch'
+import { Textarea } from '@/components/ui/textarea'
+import { useAgents } from '@/hooks/queries/agents'
+import { useCreateTask, useAssignTask } from '@/hooks/queries/tasks'
+import { useTranslation } from '@/lib/i18n'
+import type { TaskPriority } from '@/types/tasks'
+
+const PRIORITY_KEYS: { value: TaskPriority; key: string }[] = [
+  { value: 'none', key: 'tasks.priorityNone' },
+  { value: 'low', key: 'tasks.priorityLow' },
+  { value: 'medium', key: 'tasks.priorityMedium' },
+  { value: 'high', key: 'tasks.priorityHigh' },
+  { value: 'urgent', key: 'tasks.priorityUrgent' },
+]
+
+interface TaskCreateDialogProps {
+  workspaceId: string
+  defaultAgentId?: string
+  trigger: React.ReactNode
+}
+
+export function TaskCreateDialog({ workspaceId, defaultAgentId, trigger }: TaskCreateDialogProps) {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(false)
+  const [title, setTitle] = useState('')
+  const [description, setDescription] = useState('')
+  const [goal, setGoal] = useState('')
+  const [priority, setPriority] = useState<TaskPriority>('none')
+  const [agentId, setAgentId] = useState(defaultAgentId || '')
+  const [tagsInput, setTagsInput] = useState('')
+  const [autoApprove, setAutoApprove] = useState(false)
+
+  const { data: agents = [] } = useAgents(workspaceId)
+  const createTask = useCreateTask()
+  const assignTask = useAssignTask()
+
+  function reset() {
+    setTitle('')
+    setDescription('')
+    setGoal('')
+    setPriority('none')
+    setAgentId(defaultAgentId || '')
+    setTagsInput('')
+    setAutoApprove(false)
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
+    e.preventDefault()
+    if (!title.trim()) return
+
+    const tags = tagsInput
+      .split(',')
+      .map((t) => t.trim())
+      .filter(Boolean)
+
+    try {
+      const task = await createTask.mutateAsync({
+        workspace_id: workspaceId,
+        title: title.trim(),
+        description: description.trim() || undefined,
+        goal: goal.trim() || undefined,
+        priority,
+        tags: tags.length > 0 ? tags : undefined,
+        auto_approve: autoApprove,
+      })
+
+      if (agentId && task?.id) {
+        try {
+          await assignTask.mutateAsync({
+            taskId: task.id,
+            workspaceId,
+            agentId: agentId,
+          })
+        } catch {
+          // Task created but assignment failed — user can assign later
+        }
+      }
+
+      reset()
+      setOpen(false)
+    } catch {
+      // Global mutation error handler shows toast
+    }
+  }
+
+  const isPending = createTask.isPending || assignTask.isPending
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>{trigger}</DialogTrigger>
+      <DialogContent>
+        <form onSubmit={handleSubmit}>
+          <DialogHeader>
+            <DialogTitle>{t('tasks.createTitle')}</DialogTitle>
+            <DialogDescription>{t('tasks.createDescription')}</DialogDescription>
+          </DialogHeader>
+
+          <div className="mt-4 space-y-4">
+            <div className="space-y-2">
+              <Label htmlFor="task-title">{t('tasks.taskTitleLabel')}</Label>
+              <Input
+                id="task-title"
+                placeholder={t('tasks.taskTitlePlaceholder')}
+                value={title}
+                onChange={(e) => setTitle(e.target.value)}
+                required
+              />
+            </div>
+
+            <div className="space-y-2">
+              <Label htmlFor="task-agent">{t('tasks.assignAgentLabel')}</Label>
+              <Select value={agentId} onValueChange={setAgentId}>
+                <SelectTrigger id="task-agent">
+                  <SelectValue placeholder={t('tasks.assignAgentPlaceholder')} />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="">{t('tasks.noAssignment')}</SelectItem>
+                  {agents.map((agent) => (
+                    <SelectItem key={agent.id} value={agent.id}>
+                      {agent.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+
+            <div className="space-y-2">
+              <Label htmlFor="task-goal">{t('tasks.goalLabel')}</Label>
+              <Textarea
+                id="task-goal"
+                placeholder={t('tasks.goalPlaceholder')}
+                value={goal}
+                onChange={(e) => setGoal(e.target.value)}
+                rows={2}
+              />
+            </div>
+
+            <div className="space-y-2">
+              <Label htmlFor="task-description">{t('tasks.descriptionLabel')}</Label>
+              <Textarea
+                id="task-description"
+                placeholder={t('tasks.descriptionPlaceholder')}
+                value={description}
+                onChange={(e) => setDescription(e.target.value)}
+                rows={3}
+              />
+            </div>
+
+            <div className="grid grid-cols-2 gap-4">
+              <div className="space-y-2">
+                <Label htmlFor="task-priority">{t('tasks.priorityLabel')}</Label>
+                <Select value={priority} onValueChange={(v) => setPriority(v as TaskPriority)}>
+                  <SelectTrigger id="task-priority">
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {PRIORITY_KEYS.map((opt) => (
+                      <SelectItem key={opt.value} value={opt.value}>
+                        {t(opt.key)}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+              </div>
+
+              <div className="space-y-2">
+                <Label htmlFor="task-tags">{t('tasks.tagsLabel')}</Label>
+                <Input
+                  id="task-tags"
+                  placeholder={t('tasks.tagsPlaceholder')}
+                  value={tagsInput}
+                  onChange={(e) => setTagsInput(e.target.value)}
+                />
+              </div>
+            </div>
+
+            <div className="flex items-center justify-between">
+              <div className="space-y-0.5">
+                <Label htmlFor="task-auto-approve">{t('tasks.autoApproveLabel')}</Label>
+                <p className="text-xs text-[var(--text-muted)]">{t('tasks.autoApproveHint')}</p>
+              </div>
+              <Switch
+                id="task-auto-approve"
+                checked={autoApprove}
+                onCheckedChange={setAutoApprove}
+              />
+            </div>
+          </div>
+
+          <DialogFooter className="mt-6">
+            <Button type="button" variant="outline" onClick={() => setOpen(false)}>
+              {t('common.cancel')}
+            </Button>
+            <Button type="submit" disabled={!title.trim() || isPending}>
+              {isPending ? t('tasks.creating') : t('tasks.createTask')}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/frontend/components/tasks/task-detail-panel.tsx b/frontend/components/tasks/task-detail-panel.tsx
new file mode 100644
index 000000000..907965e9d
--- /dev/null
+++ b/frontend/components/tasks/task-detail-panel.tsx
@@ -0,0 +1,735 @@
+'use client'
+
+import {
+  Archive,
+  Bot,
+  Check,
+  ChevronDown,
+  Clock,
+  ExternalLink,
+  Loader2,
+  Play,
+  Square,
+  X,
+} from 'lucide-react'
+import Link from 'next/link'
+import { useCallback, useMemo, useState } from 'react'
+
+import { AgentStatusIndicator } from '@/components/agents/agent-status'
+import { ExecutionTimeline } from '@/components/executions/execution-timeline'
+import { ActivityThread } from '@/components/tasks/activity-thread'
+import { PulsingDot } from '@/components/ui/pulsing-dot'
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from '@/components/ui/command'
+import { ConfirmDialog } from '@/components/ui/confirm-dialog'
+import { InlineRenameInput } from '@/components/ui/inline-rename-input'
+import { Input } from '@/components/ui/input'
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { ScrollArea } from '@/components/ui/scroll-area'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { Switch } from '@/components/ui/switch'
+import { Textarea } from '@/components/ui/textarea'
+import { useAgent, useAgents } from '@/hooks/queries/agents'
+import { useAgentRuns, useCancelAgentRun } from '@/hooks/queries/agentRuns'
+import {
+  useAssignTask,
+  useCancelTask,
+  useDispatchTask,
+  useTask,
+  useTaskTransitions,
+  useUpdateTask,
+} from '@/hooks/queries/tasks'
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+import { toastSuccess, toastError, getErrorMessage } from '@/lib/utils/toast'
+import { ACTIVE_RUN_STATUSES } from '@/types/agent-run'
+import type { TaskPriority, TaskStatus, UpdateTaskRequest } from '@/types/tasks'
+import {
+  DEFAULT_MANUAL_TRANSITIONS,
+  TASK_PRIORITY_LABELS,
+  TASK_STATUS_LABELS,
+  TASK_STATUS_ORDER,
+  TASK_STATUS_STYLES,
+  INACTIVE_TASK_STATUSES,
+} from '@/types/tasks'
+
+import { PriorityBadge } from './priority-badge'
+
+function formatDate(dateStr: string) {
+  const d = new Date(dateStr)
+  return d.toLocaleString(undefined, {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+  })
+}
+
+interface TaskDetailPanelProps {
+  taskId: string
+  workspaceId: string
+  onClose: () => void
+}
+
+export function TaskDetailPanel({ taskId, workspaceId, onClose }: TaskDetailPanelProps) {
+  const { t } = useTranslation()
+  const { data: task, isLoading } = useTask(taskId, workspaceId)
+  const { data: agent } = useAgent(task?.agent_id ?? '', workspaceId, {
+    enabled: Boolean(task?.agent_id),
+  })
+  const { data: agents = [] } = useAgents(workspaceId, { enabled: Boolean(workspaceId) })
+  const { data: runs = [] } = useAgentRuns(
+    { workspace_id: workspaceId, task_id: taskId },
+    { enabled: Boolean(workspaceId) },
+  )
+  const { data: transitions } = useTaskTransitions(workspaceId)
+  const effectiveTransitions = transitions ?? DEFAULT_MANUAL_TRANSITIONS
+
+  const assignTask = useAssignTask()
+  const dispatchTask = useDispatchTask()
+  const cancelTask = useCancelTask()
+  const cancelRun = useCancelAgentRun()
+  const updateTask = useUpdateTask()
+
+  // Editing states
+  const [isEditingTitle, setIsEditingTitle] = useState(false)
+  const [editTitle, setEditTitle] = useState('')
+  const [isEditingDesc, setIsEditingDesc] = useState(false)
+  const [editDesc, setEditDesc] = useState('')
+  const [isEditingObj, setIsEditingObj] = useState(false)
+  const [editObj, setEditObj] = useState('')
+  const [tagInput, setTagInput] = useState('')
+  const [agentPickerOpen, setAgentPickerOpen] = useState(false)
+  const [showCancelConfirm, setShowCancelConfirm] = useState(false)
+  const [timelineExpanded, setTimelineExpanded] = useState(false)
+
+  const canDispatch = useMemo(() => {
+    if (!task) return false
+    const hasAgent = Boolean(task.agent_id)
+    const notRunning = !task.current_execution_id && !task.latest_run_id
+    const validStatus: TaskStatus[] = ['todo', 'in_progress', 'in_review', 'backlog']
+    return hasAgent && notRunning && validStatus.includes(task.status)
+  }, [task])
+
+  const currentRun = useMemo(
+    () => (task?.latest_run_id ? runs.find((r) => r.id === task.latest_run_id) : undefined),
+    [task, runs],
+  )
+
+  const canCancel = currentRun ? ACTIVE_RUN_STATUSES.includes(currentRun.status) : false
+
+  const pastRunCount = runs.length - (currentRun ? 1 : 0)
+
+  const onMutationError = useCallback(
+    (err: unknown) => toastError(getErrorMessage(err, t('common.operationFailed'))),
+    [t],
+  )
+
+  const doUpdate = useCallback(
+    (updates: Partial<UpdateTaskRequest>) => {
+      updateTask.mutate({ taskId, workspaceId, ...updates }, { onError: onMutationError })
+    },
+    [taskId, workspaceId, updateTask, onMutationError],
+  )
+
+  const handleTitleSave = () => {
+    const trimmed = editTitle.trim()
+    if (trimmed && trimmed !== task?.title) {
+      doUpdate({ title: trimmed })
+    }
+    setIsEditingTitle(false)
+  }
+
+  const handleDescSave = () => {
+    if (editDesc !== (task?.description ?? '')) {
+      doUpdate({ description: editDesc || undefined })
+    }
+    setIsEditingDesc(false)
+  }
+
+  const handleObjSave = () => {
+    if (editObj !== (task?.goal ?? '')) {
+      doUpdate({ goal: editObj || undefined })
+    }
+    setIsEditingObj(false)
+  }
+
+  const handleAddTag = () => {
+    const tag = tagInput.trim()
+    if (!tag || !task) return
+    const current = task.tags ?? []
+    if (!current.includes(tag)) {
+      doUpdate({ tags: [...current, tag] })
+    }
+    setTagInput('')
+  }
+
+  const handleRemoveTag = (tag: string) => {
+    if (!task) return
+    doUpdate({ tags: (task.tags ?? []).filter((v) => v !== tag) })
+  }
+
+  const handleAssign = (agentId: string) => {
+    assignTask.mutate({ taskId, workspaceId, agentId: agentId }, { onError: onMutationError })
+    setAgentPickerOpen(false)
+  }
+
+  const handleUnassign = () => {
+    doUpdate({ agent_id: null })
+    setAgentPickerOpen(false)
+  }
+
+  return (
+    <div className="fixed inset-y-0 right-0 z-50 flex w-[480px] flex-col border-l border-[var(--border)] bg-[var(--bg)] shadow-xl">
+      {/* Header */}
+      <div className="flex items-center justify-between border-b border-[var(--border)] px-5 py-3">
+        <span className="text-xs font-medium text-[var(--text-muted)]">
+          {t('tasks.detailTitle')}
+        </span>
+        <button
+          type="button"
+          onClick={onClose}
+          className="rounded-md p-1 text-[var(--text-muted)] hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)]"
+          aria-label="Close panel"
+        >
+          <X className="h-4 w-4" />
+        </button>
+      </div>
+
+      {isLoading || !task ? (
+        <div className="flex flex-1 items-center justify-center">
+          <Loader2 className="h-6 w-6 animate-spin text-[var(--text-muted)]" />
+        </div>
+      ) : (
+        <ScrollArea className="flex-1">
+          <div className="space-y-5 p-5">
+            {/* Title — inline edit */}
+            {isEditingTitle ? (
+              <InlineRenameInput
+                value={editTitle}
+                onChange={setEditTitle}
+                onSave={handleTitleSave}
+                onCancel={() => setIsEditingTitle(false)}
+              />
+            ) : (
+              <h2
+                className="cursor-pointer rounded px-1 text-lg font-semibold text-[var(--text-primary)] hover:bg-[var(--surface-3)]"
+                onClick={() => {
+                  setEditTitle(task.title)
+                  setIsEditingTitle(true)
+                }}
+              >
+                {task.title}
+              </h2>
+            )}
+
+            {/* Status + Priority selectors */}
+            <div className="flex flex-wrap items-center gap-2">
+              {/* Priority Select */}
+              <Select
+                value={task.priority}
+                onValueChange={(v) => doUpdate({ priority: v as TaskPriority })}
+              >
+                <SelectTrigger className="h-auto w-auto border-0 bg-transparent p-0 shadow-none focus:ring-0">
+                  <PriorityBadge priority={task.priority} />
+                </SelectTrigger>
+                <SelectContent>
+                  {Object.entries(TASK_PRIORITY_LABELS).map(([value, label]) => (
+                    <SelectItem key={value} value={value}>
+                      {label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+
+              {/* Status Select */}
+              <Select
+                value={task.status}
+                onValueChange={(v) => {
+                  if (
+                    task.current_execution_id &&
+                    (INACTIVE_TASK_STATUSES as readonly string[]).includes(v)
+                  )
+                    return
+                  doUpdate({ status: v as TaskStatus })
+                }}
+              >
+                <SelectTrigger className="h-auto w-auto border-0 bg-transparent p-0 shadow-none focus:ring-0 [&>span]:line-clamp-none">
+                  <span
+                    className={cn(
+                      'inline-flex items-center gap-1 whitespace-nowrap rounded-full px-2.5 py-0.5 text-xs font-medium',
+                      TASK_STATUS_STYLES[task.status] ??
+                        'bg-[var(--surface-3)] text-[var(--text-muted)]',
+                    )}
+                  >
+                    {TASK_STATUS_LABELS[task.status]}
+                  </span>
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem key={task.status} value={task.status}>
+                    {TASK_STATUS_LABELS[task.status]}
+                  </SelectItem>
+                  {(effectiveTransitions[task.status] ?? []).map((s) => (
+                    <SelectItem
+                      key={s}
+                      value={s}
+                      disabled={
+                        Boolean(task.current_execution_id) &&
+                        (INACTIVE_TASK_STATUSES as readonly string[]).includes(s)
+                      }
+                    >
+                      {TASK_STATUS_LABELS[s]}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+
+              {canCancel && (
+                <span className="inline-flex items-center gap-1 text-xs text-[var(--status-success)]">
+                  <PulsingDot />
+                  {t('tasks.running')}
+                </span>
+              )}
+            </div>
+
+            {/* Objective + Description */}
+            <section className="space-y-3">
+              <div>
+                <h3 className="mb-1 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                  {t('tasks.objective')}
+                </h3>
+                {isEditingObj ? (
+                  <div className="space-y-1.5">
+                    <Textarea
+                      value={editObj}
+                      onChange={(e) => setEditObj(e.target.value)}
+                      rows={2}
+                      autoFocus
+                      className="text-sm"
+                    />
+                    <div className="flex gap-1">
+                      <Button size="sm" variant="outline" onClick={handleObjSave}>
+                        Save
+                      </Button>
+                      <Button size="sm" variant="ghost" onClick={() => setIsEditingObj(false)}>
+                        Cancel
+                      </Button>
+                    </div>
+                  </div>
+                ) : (
+                  <p
+                    className="cursor-pointer rounded px-1 text-sm leading-relaxed text-[var(--text-secondary)] hover:bg-[var(--surface-3)]"
+                    onClick={() => {
+                      setEditObj(task.goal ?? '')
+                      setIsEditingObj(true)
+                    }}
+                  >
+                    {task.goal || (
+                      <span className="italic text-[var(--text-muted)]">
+                        Click to add objective...
+                      </span>
+                    )}
+                  </p>
+                )}
+              </div>
+              <div>
+                <h3 className="mb-1 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                  {t('tasks.description')}
+                </h3>
+                {isEditingDesc ? (
+                  <div className="space-y-1.5">
+                    <Textarea
+                      value={editDesc}
+                      onChange={(e) => setEditDesc(e.target.value)}
+                      rows={4}
+                      autoFocus
+                      className="text-sm"
+                    />
+                    <div className="flex gap-1">
+                      <Button size="sm" variant="outline" onClick={handleDescSave}>
+                        Save
+                      </Button>
+                      <Button size="sm" variant="ghost" onClick={() => setIsEditingDesc(false)}>
+                        Cancel
+                      </Button>
+                    </div>
+                  </div>
+                ) : (
+                  <p
+                    className="cursor-pointer whitespace-pre-wrap rounded px-1 text-sm leading-relaxed text-[var(--text-secondary)] hover:bg-[var(--surface-3)]"
+                    onClick={() => {
+                      setEditDesc(task.description ?? '')
+                      setIsEditingDesc(true)
+                    }}
+                  >
+                    {task.description || (
+                      <span className="italic text-[var(--text-muted)]">
+                        Click to add description...
+                      </span>
+                    )}
+                  </p>
+                )}
+              </div>
+            </section>
+
+            {/* Metadata card */}
+            <section className="overflow-hidden rounded-lg border border-[var(--border)]">
+              {/* Tags */}
+              <div className="flex items-start gap-3 px-3 py-2.5">
+                <span className="shrink-0 pt-0.5 text-xs font-medium text-[var(--text-muted)]">
+                  {t('tasks.tags')}
+                </span>
+                <div className="flex flex-1 flex-wrap items-center gap-1.5">
+                  {(task.tags ?? []).map((tag) => (
+                    <Badge key={tag} variant="secondary" className="gap-1 pr-1">
+                      {tag}
+                      <button
+                        type="button"
+                        onClick={() => handleRemoveTag(tag)}
+                        className="rounded-full p-0.5 hover:bg-[var(--surface-5)]"
+                      >
+                        <X className="h-2.5 w-2.5" />
+                      </button>
+                    </Badge>
+                  ))}
+                  <Input
+                    placeholder="Add tag..."
+                    value={tagInput}
+                    onChange={(e) => setTagInput(e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        e.preventDefault()
+                        handleAddTag()
+                      }
+                    }}
+                    className="h-6 w-24 border-dashed px-2 text-xs"
+                  />
+                </div>
+              </div>
+
+              <div className="h-px bg-[var(--border)]" />
+
+              {/* Due Date */}
+              <div className="flex items-center justify-between px-3 py-2.5">
+                <span className="text-xs font-medium text-[var(--text-muted)]">
+                  {t('tasks.dueDate')}
+                </span>
+                <div className="flex items-center gap-2">
+                  <input
+                    type="date"
+                    value={task.due_date ? new Date(task.due_date).toISOString().split('T')[0] : ''}
+                    onChange={(e) => doUpdate({ due_date: e.target.value || null })}
+                    className="h-7 rounded border border-[var(--border)] bg-transparent px-2 text-xs text-[var(--text-secondary)] outline-none focus:ring-1 focus:ring-[var(--brand-400)]"
+                  />
+                  {task.due_date && (
+                    <button
+                      type="button"
+                      onClick={() => doUpdate({ due_date: null })}
+                      className="text-xs text-[var(--text-muted)] hover:text-[var(--status-error)]"
+                    >
+                      Clear
+                    </button>
+                  )}
+                </div>
+              </div>
+
+              <div className="h-px bg-[var(--border)]" />
+
+              {/* Agent */}
+              <div className="flex items-center justify-between px-3 py-2.5">
+                <span className="text-xs font-medium text-[var(--text-muted)]">
+                  {t('tasks.agent')}
+                </span>
+                {Boolean(task.agent_id) && agent ? (
+                  <div className="flex items-center gap-2">
+                    <Bot className="h-3.5 w-3.5 text-[var(--text-secondary)]" />
+                    <Link
+                      href={`/agents/${task.agent_id}`}
+                      className="text-sm font-medium text-[var(--brand-500)] hover:underline"
+                    >
+                      {agent.name}
+                    </Link>
+                    <AgentStatusIndicator status={agent.status} />
+                    <Popover open={agentPickerOpen} onOpenChange={setAgentPickerOpen}>
+                      <PopoverTrigger asChild>
+                        <Button variant="ghost" size="sm" className="h-6 px-2 text-xs">
+                          {t('tasks.changeAgent')}
+                        </Button>
+                      </PopoverTrigger>
+                      <PopoverContent className="w-60 p-0" align="end">
+                        <AgentPickerContent
+                          agents={agents}
+                          currentAgentId={task.agent_id}
+                          onSelect={handleAssign}
+                          onUnassign={handleUnassign}
+                        />
+                      </PopoverContent>
+                    </Popover>
+                  </div>
+                ) : (
+                  <Popover open={agentPickerOpen} onOpenChange={setAgentPickerOpen}>
+                    <PopoverTrigger asChild>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-6 gap-1 px-2 text-xs text-[var(--text-muted)]"
+                      >
+                        <Bot className="h-3 w-3" />
+                        {t('tasks.assignAgent')}
+                      </Button>
+                    </PopoverTrigger>
+                    <PopoverContent className="w-60 p-0" align="end">
+                      <AgentPickerContent agents={agents} onSelect={handleAssign} />
+                    </PopoverContent>
+                  </Popover>
+                )}
+              </div>
+
+              <div className="h-px bg-[var(--border)]" />
+
+              {/* Auto Approve */}
+              <div className="flex items-center justify-between px-3 py-2.5">
+                <div className="space-y-0.5">
+                  <p className="text-xs font-medium text-[var(--text-primary)]">
+                    {t('tasks.autoApprove')}
+                  </p>
+                  <p className="text-[10px] text-[var(--text-muted)]">
+                    {task.auto_approve
+                      ? t('tasks.autoApproveOnDesc')
+                      : t('tasks.autoApproveOffDesc')}
+                  </p>
+                </div>
+                <Switch
+                  checked={task.auto_approve}
+                  onCheckedChange={(checked) => doUpdate({ auto_approve: checked })}
+                />
+              </div>
+            </section>
+
+            {/* Dispatch */}
+            {canDispatch && (
+              <Button
+                size="sm"
+                onClick={() => {
+                  dispatchTask.mutate(
+                    { taskId, workspaceId },
+                    {
+                      onSuccess: () => toastSuccess(t('execution.dispatchedToast')),
+                      onError: onMutationError,
+                    },
+                  )
+                }}
+                disabled={dispatchTask.isPending}
+              >
+                <Play className="h-3.5 w-3.5" />
+                {dispatchTask.isPending ? t('execution.dispatching') : t('execution.dispatch')}
+              </Button>
+            )}
+
+            {task.current_execution_id && (
+              <section>
+                <h3 className="mb-2 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                  {t('tasks.currentExecution')}
+                </h3>
+                <div className="overflow-hidden rounded-lg border border-[var(--border)]">
+                  <div className="flex items-center justify-between px-3 py-2.5">
+                    <div className="flex items-center gap-2">
+                      <PulsingDot className="text-[var(--status-success)]" />
+                      <Badge variant="outline" className="text-xs">
+                        {currentRun?.status ?? t('tasks.running')}
+                      </Badge>
+                      {canCancel && currentRun && (
+                        <Button
+                          variant="destructive"
+                          size="sm"
+                          className="h-6 px-2 text-xs"
+                          onClick={() =>
+                            cancelRun.mutate(currentRun.id, { onError: onMutationError })
+                          }
+                          disabled={cancelRun.isPending}
+                        >
+                          <Square className="mr-1 h-3 w-3" />
+                          {cancelRun.isPending ? t('tasks.stoppingRun') : t('tasks.stopRun')}
+                        </Button>
+                      )}
+                    </div>
+                    <Button
+                      variant="ghost"
+                      size="sm"
+                      className="h-6 gap-1 px-2 text-xs"
+                      onClick={() => setTimelineExpanded(!timelineExpanded)}
+                    >
+                      <ChevronDown
+                        className={cn(
+                          'h-3 w-3 transition-transform',
+                          timelineExpanded && 'rotate-180',
+                        )}
+                      />
+                      {timelineExpanded ? t('tasks.collapseTimeline') : t('tasks.expandTimeline')}
+                    </Button>
+                  </div>
+                  {timelineExpanded && (
+                    <div className="border-t border-[var(--border)]">
+                      <ExecutionTimeline
+                        executionId={task.current_execution_id}
+                        workspaceId={workspaceId}
+                        compact
+                        taskId={taskId}
+                      />
+                    </div>
+                  )}
+                </div>
+                <Link
+                  href={`/tasks?task=${taskId}`}
+                  className="mt-1.5 flex items-center gap-1 text-xs text-[var(--brand-400)] hover:underline"
+                >
+                  <ExternalLink className="h-3 w-3" />
+                  {t('tasks.viewFullLogs')}
+                </Link>
+              </section>
+            )}
+
+            {pastRunCount > 0 && (
+              <section>
+                <h3 className="mb-1.5 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                  {t('execution.pastExecutions')}
+                </h3>
+                <p className="text-xs text-[var(--text-muted)]">
+                  {t('execution.pastExecutionsCount', { count: pastRunCount })} —{' '}
+                  <Link
+                    href={`/tasks?task=${taskId}`}
+                    className="text-[var(--brand-400)] hover:underline"
+                  >
+                    {t('execution.pastExecutionsLink')}
+                  </Link>
+                </p>
+              </section>
+            )}
+
+            {/* Latest run link — shown when there's a linked run but no active execution */}
+            {task.latest_run_id && !task.current_execution_id && pastRunCount === 0 && (
+              <section>
+                <h3 className="mb-1.5 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                  {t('tasks.lastRun')}
+                </h3>
+                <Link
+                  href={`/tasks?task=${taskId}`}
+                  className="flex items-center gap-1 text-xs text-[var(--brand-400)] hover:underline"
+                >
+                  <ExternalLink className="h-3 w-3" />
+                  {t('tasks.viewRunHistory')}
+                </Link>
+              </section>
+            )}
+
+            {/* Activities */}
+            <section>
+              <h3 className="mb-2 text-xs font-semibold uppercase tracking-wider text-[var(--text-muted)]">
+                {t('tasks.activities')}
+              </h3>
+              <ActivityThread taskId={taskId} workspaceId={workspaceId} />
+            </section>
+
+            {/* Cancel Task */}
+            <section className="border-t border-[var(--border)] pt-4">
+              <div className="flex items-center justify-between">
+                <div className="flex items-center gap-1.5 text-xs text-[var(--text-muted)]">
+                  <Clock className="h-3 w-3" />
+                  Created {formatDate(task.created_at)}
+                </div>
+                {!INACTIVE_TASK_STATUSES.includes(task.status) && !task.current_execution_id && (
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
+                    onClick={() => setShowCancelConfirm(true)}
+                  >
+                    <Archive className="h-3.5 w-3.5" />
+                    {t('tasks.archive')}
+                  </Button>
+                )}
+              </div>
+              {task.updated_at !== task.created_at && (
+                <div className="mt-1 flex items-center gap-1.5 text-xs text-[var(--text-muted)]">
+                  <Clock className="h-3 w-3" />
+                  Updated {formatDate(task.updated_at)}
+                </div>
+              )}
+            </section>
+          </div>
+        </ScrollArea>
+      )}
+
+      <ConfirmDialog
+        open={showCancelConfirm}
+        onOpenChange={setShowCancelConfirm}
+        title={t('tasks.archiveConfirmTitle')}
+        description={t('tasks.archiveConfirmDesc')}
+        confirmLabel={t('tasks.archiveConfirm')}
+        variant="default"
+        onConfirm={() => {
+          cancelTask.mutate({ taskId, workspaceId }, { onError: onMutationError })
+          setShowCancelConfirm(false)
+        }}
+      />
+    </div>
+  )
+}
+
+// --- Internal sub-components ---
+
+function AgentPickerContent({
+  agents,
+  currentAgentId,
+  onSelect,
+  onUnassign,
+}: {
+  agents: { id: string; name: string }[]
+  currentAgentId?: string | null
+  onSelect: (agentId: string) => void
+  onUnassign?: () => void
+}) {
+  const { t } = useTranslation()
+  return (
+    <Command>
+      <CommandInput placeholder={t('tasks.searchAgents')} />
+      <CommandList>
+        <CommandEmpty>{t('tasks.noAgentsFound')}</CommandEmpty>
+        <CommandGroup>
+          {agents.map((a) => (
+            <CommandItem key={a.id} value={a.name} onSelect={() => onSelect(a.id)}>
+              <Bot className="mr-2 h-3.5 w-3.5" />
+              {a.name}
+              {a.id === currentAgentId && (
+                <Check className="ml-auto h-3.5 w-3.5 text-[var(--brand-400)]" />
+              )}
+            </CommandItem>
+          ))}
+        </CommandGroup>
+        {onUnassign && (
+          <CommandGroup>
+            <CommandItem onSelect={onUnassign} className="text-[var(--status-error)]">
+              <X className="mr-2 h-3.5 w-3.5" />
+              {t('tasks.unassignAgent')}
+            </CommandItem>
+          </CommandGroup>
+        )}
+      </CommandList>
+    </Command>
+  )
+}
diff --git a/frontend/components/tasks/task-list-view.tsx b/frontend/components/tasks/task-list-view.tsx
new file mode 100644
index 000000000..396ac7104
--- /dev/null
+++ b/frontend/components/tasks/task-list-view.tsx
@@ -0,0 +1,228 @@
+'use client'
+
+import { ArrowDown, ArrowUp, Calendar, ExternalLink } from 'lucide-react'
+import Link from 'next/link'
+import { useMemo, useState } from 'react'
+
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import { cn } from '@/lib/utils'
+import { useTranslation } from '@/lib/i18n'
+import { PulsingDot } from '@/components/ui/pulsing-dot'
+import type { Task, TaskStatus } from '@/types/tasks'
+import {
+  TASK_PRIORITY_LABELS,
+  TASK_STATUS_LABELS,
+  TASK_STATUS_ORDER,
+  TASK_STATUS_STYLES,
+} from '@/types/tasks'
+
+import { PriorityBadge } from './priority-badge'
+
+type SortField = 'title' | 'status' | 'priority' | 'updated_at' | 'due_date'
+
+interface TaskListViewProps {
+  tasks: Task[]
+  agentsMap: Record<string, string>
+  onSelectTask?: (id: string) => void
+}
+
+const PRIORITY_ORDER: Record<string, number> = Object.fromEntries(
+  Object.keys(TASK_PRIORITY_LABELS)
+    .reverse()
+    .map((k, i) => [k, i]),
+)
+const STATUS_ORDER: Record<string, number> = Object.fromEntries(
+  TASK_STATUS_ORDER.map((s, i) => [s, i]),
+)
+
+function SortIcon({
+  field,
+  sortField,
+  sortDir,
+}: {
+  field: SortField
+  sortField: SortField
+  sortDir: 'asc' | 'desc'
+}) {
+  if (sortField !== field) return null
+  return sortDir === 'asc' ? (
+    <ArrowUp className="ml-1 inline h-3 w-3" />
+  ) : (
+    <ArrowDown className="ml-1 inline h-3 w-3" />
+  )
+}
+
+export function TaskListView({ tasks, agentsMap, onSelectTask }: TaskListViewProps) {
+  const { t } = useTranslation()
+  const [sortField, setSortField] = useState<SortField>('updated_at')
+  const [sortDir, setSortDir] = useState<'asc' | 'desc'>('desc')
+
+  const toggleSort = (field: SortField) => {
+    if (sortField === field) {
+      setSortDir((d) => (d === 'asc' ? 'desc' : 'asc'))
+    } else {
+      setSortField(field)
+      setSortDir('asc')
+    }
+  }
+
+  const sorted = useMemo(() => {
+    const arr = [...tasks]
+    const dir = sortDir === 'asc' ? 1 : -1
+
+    arr.sort((a, b) => {
+      switch (sortField) {
+        case 'title':
+          return dir * a.title.localeCompare(b.title)
+        case 'status':
+          return dir * ((STATUS_ORDER[a.status] ?? 9) - (STATUS_ORDER[b.status] ?? 9))
+        case 'priority':
+          return dir * ((PRIORITY_ORDER[a.priority] ?? 9) - (PRIORITY_ORDER[b.priority] ?? 9))
+        case 'due_date': {
+          const da = a.due_date ? new Date(a.due_date).getTime() : Infinity
+          const db = b.due_date ? new Date(b.due_date).getTime() : Infinity
+          return dir * (da - db)
+        }
+        case 'updated_at':
+          return dir * (new Date(a.updated_at).getTime() - new Date(b.updated_at).getTime())
+        default:
+          return 0
+      }
+    })
+    return arr
+  }, [tasks, sortField, sortDir])
+
+  return (
+    <div className="overflow-auto p-4">
+      <Table>
+        <TableHeader>
+          <TableRow>
+            <TableHead className="w-[40%] cursor-pointer" onClick={() => toggleSort('title')}>
+              Title <SortIcon field="title" sortField={sortField} sortDir={sortDir} />
+            </TableHead>
+            <TableHead className="cursor-pointer" onClick={() => toggleSort('status')}>
+              Status <SortIcon field="status" sortField={sortField} sortDir={sortDir} />
+            </TableHead>
+            <TableHead className="cursor-pointer" onClick={() => toggleSort('priority')}>
+              Priority <SortIcon field="priority" sortField={sortField} sortDir={sortDir} />
+            </TableHead>
+            <TableHead>Agent</TableHead>
+            <TableHead>Tags</TableHead>
+            <TableHead className="cursor-pointer" onClick={() => toggleSort('due_date')}>
+              Due <SortIcon field="due_date" sortField={sortField} sortDir={sortDir} />
+            </TableHead>
+            <TableHead
+              className="cursor-pointer text-right"
+              onClick={() => toggleSort('updated_at')}
+            >
+              Updated <SortIcon field="updated_at" sortField={sortField} sortDir={sortDir} />
+            </TableHead>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {sorted.map((m) => {
+            const isOverdue = m.due_date ? Date.parse(m.due_date) < Date.now() : false
+            return (
+              <TableRow
+                key={m.id}
+                className="cursor-pointer hover:bg-[var(--surface-2)]"
+                onClick={() => onSelectTask?.(m.id)}
+              >
+                <TableCell className="font-medium">{m.title}</TableCell>
+                <TableCell>
+                  <div className="flex items-center gap-2">
+                    <span
+                      className={cn(
+                        'inline-flex rounded-full px-2 py-0.5 text-[10px] font-medium',
+                        TASK_STATUS_STYLES[m.status] ??
+                          'bg-[var(--surface-3)] text-[var(--text-muted)]',
+                      )}
+                    >
+                      {TASK_STATUS_LABELS[m.status]}
+                    </span>
+                    {m.current_execution_id && (
+                      <Link
+                        href={`/tasks?task=${m.id}`}
+                        onClick={(e) => e.stopPropagation()}
+                        className="inline-flex items-center gap-1 text-[10px] text-[var(--status-success)] hover:underline"
+                      >
+                        <PulsingDot size="sm" />
+                        {t('tasks.running')}
+                      </Link>
+                    )}
+                    {/* Show last run link when there's a linked run but no active execution */}
+                    {m.latest_run_id && !m.current_execution_id && (
+                      <Link
+                        href={`/tasks?task=${m.id}`}
+                        onClick={(e) => e.stopPropagation()}
+                        className="inline-flex items-center gap-1 text-[10px] text-[var(--text-muted)] hover:text-[var(--text-secondary)] hover:underline"
+                      >
+                        <ExternalLink className="h-2.5 w-2.5" />
+                        {t('tasks.lastRun')}
+                      </Link>
+                    )}
+                  </div>
+                </TableCell>
+                <TableCell>
+                  <PriorityBadge priority={m.priority} />
+                </TableCell>
+                <TableCell className="text-xs text-[var(--text-muted)]">
+                  {m.agent_id ? (agentsMap[m.agent_id] ?? 'Agent') : '—'}
+                </TableCell>
+                <TableCell>
+                  <div className="flex flex-wrap gap-1">
+                    {m.tags?.slice(0, 2).map((t) => (
+                      <span
+                        key={t}
+                        className="inline-block max-w-[60px] truncate rounded bg-[var(--surface-3)] px-1 py-0.5 text-[10px] text-[var(--text-secondary)]"
+                      >
+                        {t}
+                      </span>
+                    ))}
+                    {(m.tags?.length ?? 0) > 2 && (
+                      <span className="text-[10px] text-[var(--text-muted)]">
+                        +{(m.tags?.length ?? 0) - 2}
+                      </span>
+                    )}
+                  </div>
+                </TableCell>
+                <TableCell>
+                  {m.due_date ? (
+                    <span
+                      className={cn(
+                        'inline-flex items-center gap-1 text-xs',
+                        isOverdue ? 'text-[var(--status-error)]' : 'text-[var(--text-muted)]',
+                      )}
+                    >
+                      <Calendar className="h-3 w-3" />
+                      {new Date(m.due_date).toLocaleDateString()}
+                    </span>
+                  ) : (
+                    <span className="text-xs text-[var(--text-muted)]">—</span>
+                  )}
+                </TableCell>
+                <TableCell className="text-right text-xs text-[var(--text-muted)]">
+                  {new Date(m.updated_at).toLocaleDateString()}
+                </TableCell>
+              </TableRow>
+            )
+          })}
+          {sorted.length === 0 && (
+            <TableRow>
+              <TableCell colSpan={7} className="py-8 text-center text-sm text-[var(--text-muted)]">
+                No tasks yet
+              </TableCell>
+            </TableRow>
+          )}
+        </TableBody>
+      </Table>
+    </div>
+  )
+}
diff --git a/frontend/components/tokens/TokenList.tsx b/frontend/components/tokens/TokenList.tsx
index c99ea58e0..582321456 100644
--- a/frontend/components/tokens/TokenList.tsx
+++ b/frontend/components/tokens/TokenList.tsx
@@ -7,6 +7,7 @@ import { ConfirmDialog } from '@/components/ui/confirm-dialog'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { useToast } from '@/hooks/use-toast'
+import { getErrorMessage } from '@/lib/utils/toast'
 import {
   Table,
   TableBody,
@@ -16,7 +17,7 @@ import {
   TableRow,
 } from '@/components/ui/table'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
-import { useCopyToClipboard } from '@/app/chat/shared/hooks/useCopyToClipboard'
+import { useCopyToClipboard } from '@/hooks/useCopyToClipboard'
 import {
   usePlatformTokens,
   useRevokeToken,
@@ -44,18 +45,26 @@ const getTypeBadgeColor = (type?: string | null) => {
   }
 }
 
-function TokenTableRow({ token, onRevoke, revokingId }: { token: PlatformToken, onRevoke: (t: PlatformToken) => void, revokingId: string | null }) {
+function TokenTableRow({
+  token,
+  onRevoke,
+  revokingId,
+}: {
+  token: PlatformToken
+  onRevoke: (t: PlatformToken) => void
+  revokingId: string | null
+}) {
   const { t } = useTranslation()
   const { copied, handleCopy } = useCopyToClipboard()
 
   return (
     <TableRow>
-      <TableCell className="font-medium text-[var(--text-primary)] border-b border-[var(--border-muted)]">
+      <TableCell className="border-b border-[var(--border-muted)] font-medium text-[var(--text-primary)]">
         {token.name}
       </TableCell>
       <TableCell className="border-b border-[var(--border-muted)]">
         <div className="flex items-center gap-2">
-          <code className="bg-[var(--surface-1)] px-2 py-1 rounded text-xs text-[var(--text-secondary)] font-mono border border-[var(--border-muted)]">
+          <code className="rounded border border-[var(--border-muted)] bg-[var(--surface-1)] px-2 py-1 font-mono text-xs text-[var(--text-secondary)]">
             {token.tokenPrefix}...
           </code>
           <TooltipProvider delayDuration={300}>
@@ -67,7 +76,11 @@ function TokenTableRow({ token, onRevoke, revokingId }: { token: PlatformToken,
                   className="h-6 w-6 text-[var(--text-muted)] hover:text-[var(--text-secondary)]"
                   onClick={() => handleCopy(token.tokenPrefix)}
                 >
-                  {copied ? <Check className="h-3.5 w-3.5 text-[var(--status-success)]" /> : <Copy className="h-3.5 w-3.5" />}
+                  {copied ? (
+                    <Check className="h-3.5 w-3.5 text-[var(--status-success)]" />
+                  ) : (
+                    <Copy className="h-3.5 w-3.5" />
+                  )}
                 </Button>
               </TooltipTrigger>
               <TooltipContent>{t('common.copy', { defaultValue: 'Copy' })}</TooltipContent>
@@ -80,13 +93,15 @@ function TokenTableRow({ token, onRevoke, revokingId }: { token: PlatformToken,
           {formatResourceType(token.resourceType)}
         </Badge>
       </TableCell>
-      <TableCell className="text-[var(--text-tertiary)] text-sm border-b border-[var(--border-muted)]">
+      <TableCell className="border-b border-[var(--border-muted)] text-sm text-[var(--text-tertiary)]">
         {token.createdAt ? new Date(token.createdAt).toLocaleDateString() : '-'}
       </TableCell>
-      <TableCell className="text-[var(--text-tertiary)] text-sm border-b border-[var(--border-muted)]">
-        {token.expiresAt ? new Date(token.expiresAt).toLocaleDateString() : t('settings.tokens.noExpiry', { defaultValue: 'No expiry' })}
+      <TableCell className="border-b border-[var(--border-muted)] text-sm text-[var(--text-tertiary)]">
+        {token.expiresAt
+          ? new Date(token.expiresAt).toLocaleDateString()
+          : t('settings.tokens.noExpiry', { defaultValue: 'No expiry' })}
       </TableCell>
-      <TableCell className="text-right border-b border-[var(--border-muted)]">
+      <TableCell className="border-b border-[var(--border-muted)] text-right">
         <Button
           variant="ghost"
           size="icon"
@@ -126,7 +141,7 @@ export function TokenList({ resourceType, resourceId, header }: TokenListProps)
     } catch (error) {
       toast({
         title: t('common.error'),
-        description: error instanceof Error ? error.message : t('common.operationFailed'),
+        description: getErrorMessage(error, t('common.operationFailed')),
         variant: 'destructive',
       })
     } finally {
@@ -150,21 +165,35 @@ export function TokenList({ resourceType, resourceId, header }: TokenListProps)
       {!tokens || tokens.length === 0 ? (
         <div className="flex flex-col items-center justify-center gap-3 rounded-xl border border-dashed border-[var(--border)] bg-[var(--surface-1)] py-12">
           <div className="rounded-full border border-[var(--border)] bg-[var(--surface-3)] p-4">
-             <Key className="h-8 w-8 text-[var(--text-subtle)]" />
+            <Key className="h-8 w-8 text-[var(--text-subtle)]" />
           </div>
-          <p className="text-sm font-medium text-[var(--text-tertiary)]">{t('settings.tokens.emptyState')}</p>
+          <p className="text-sm font-medium text-[var(--text-tertiary)]">
+            {t('settings.tokens.emptyState')}
+          </p>
         </div>
       ) : (
         <div className="rounded-md border border-[var(--border)] bg-[var(--surface-elevated)] shadow-sm">
           <Table>
             <TableHeader>
               <TableRow className="bg-[var(--surface-1)] hover:bg-[var(--surface-1)]">
-                <TableHead className="w-[200px] text-[var(--text-secondary)] font-medium">{t('settings.tokens.name', { defaultValue: 'Name' })}</TableHead>
-                <TableHead className="text-[var(--text-secondary)] font-medium">{t('settings.tokens.key', { defaultValue: 'Key' })}</TableHead>
-                <TableHead className="text-[var(--text-secondary)] font-medium">{t('settings.tokens.type', { defaultValue: 'Type' })}</TableHead>
-                <TableHead className="text-[var(--text-secondary)] font-medium">{t('settings.tokens.createdAt', { defaultValue: 'Created At' })}</TableHead>
-                <TableHead className="text-[var(--text-secondary)] font-medium">{t('settings.tokens.expiresAt', { defaultValue: 'Expires At' })}</TableHead>
-                <TableHead className="w-[80px] text-right text-[var(--text-secondary)] font-medium">{t('settings.tokens.actions', { defaultValue: 'Actions' })}</TableHead>
+                <TableHead className="w-[200px] font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.name', { defaultValue: 'Name' })}
+                </TableHead>
+                <TableHead className="font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.key', { defaultValue: 'Key' })}
+                </TableHead>
+                <TableHead className="font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.type', { defaultValue: 'Type' })}
+                </TableHead>
+                <TableHead className="font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.createdAt', { defaultValue: 'Created At' })}
+                </TableHead>
+                <TableHead className="font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.expiresAt', { defaultValue: 'Expires At' })}
+                </TableHead>
+                <TableHead className="w-[80px] text-right font-medium text-[var(--text-secondary)]">
+                  {t('settings.tokens.actions', { defaultValue: 'Actions' })}
+                </TableHead>
               </TableRow>
             </TableHeader>
             <TableBody>
@@ -173,7 +202,7 @@ export function TokenList({ resourceType, resourceId, header }: TokenListProps)
                   key={token.id}
                   token={token}
                   onRevoke={openRevokeDialog}
-                  revokingId={revokeToken.isPending ? tokenToRevoke?.id ?? null : null}
+                  revokingId={revokeToken.isPending ? (tokenToRevoke?.id ?? null) : null}
                 />
               ))}
             </TableBody>
diff --git a/frontend/components/tools/tools-page.tsx b/frontend/components/tools/tools-page.tsx
index 8508221da..8e9279e7c 100644
--- a/frontend/components/tools/tools-page.tsx
+++ b/frontend/components/tools/tools-page.tsx
@@ -3,7 +3,6 @@
 import { Plus, Loader2 } from 'lucide-react'
 import { useState } from 'react'
 
-
 import { AddMcpDialog } from '@/components/settings/add-mcp-dialog'
 import { McpServerCard, BuiltinToolCard } from '@/components/settings/mcp-server-card'
 import { Button } from '@/components/ui/button'
@@ -16,9 +15,11 @@ import {
 } from '@/hooks/queries/mcp'
 import { useBuiltinTools } from '@/hooks/queries/tools'
 import { useTranslation } from '@/lib/i18n'
+import { useUserPermissionsContext } from '@/providers/workspace-permissions-provider'
 
 export function ToolsPage() {
   const { t } = useTranslation()
+  const { canEdit, canAdmin } = useUserPermissionsContext()
   const [showAddMcp, setShowAddMcp] = useState(false)
   const [editingServer, setEditingServer] = useState<McpServer | null>(null)
   const { toast } = useToast()
@@ -90,15 +91,21 @@ export function ToolsPage() {
 
       <div className="flex items-center justify-between border-b border-[var(--border-muted)] bg-[var(--surface-elevated)] p-6">
         <div>
-          <h2 className="text-lg font-bold text-[var(--text-primary)]">{t('settings.toolsAndMcpTitle')}</h2>
-          <p className="mt-1 text-xs text-[var(--text-tertiary)]">{t('settings.toolsAndMcpDescription')}</p>
+          <h2 className="text-lg font-bold text-[var(--text-primary)]">
+            {t('settings.toolsAndMcpTitle')}
+          </h2>
+          <p className="mt-1 text-xs text-[var(--text-tertiary)]">
+            {t('settings.toolsAndMcpDescription')}
+          </p>
         </div>
-        <Button
-          onClick={() => setShowAddMcp(true)}
-          className="h-9 gap-2 bg-[var(--status-success)] text-xs text-white shadow-lg shadow-[var(--status-success-border)] hover:bg-[var(--status-success-hover)]"
-        >
-          <Plus size={14} /> {t('settings.addMcp')}
-        </Button>
+        {canAdmin && (
+          <Button
+            onClick={() => setShowAddMcp(true)}
+            className="h-9 gap-2 bg-[var(--status-success)] text-xs text-white shadow-lg shadow-[var(--status-success-border)] hover:bg-[var(--status-success-hover)]"
+          >
+            <Plus size={14} /> {t('settings.addMcp')}
+          </Button>
+        )}
       </div>
 
       <div className="flex-1 space-y-6 overflow-y-auto bg-[var(--surface-1)] p-6">
@@ -134,9 +141,9 @@ export function ToolsPage() {
                     key={server.id}
                     server={server}
                     toolCount={server.toolCount}
-                    onEdit={setEditingServer}
-                    onToggleEnabled={handleToggleEnabled}
-                    onDelete={handleDelete}
+                    onEdit={canAdmin ? setEditingServer : undefined}
+                    onToggleEnabled={canEdit ? handleToggleEnabled : undefined}
+                    onDelete={canAdmin ? handleDelete : undefined}
                     isUpdating={updateMcpServer.isPending}
                     isDeleting={deleteMcpServer.isPending}
                   />
@@ -144,7 +151,7 @@ export function ToolsPage() {
               </div>
             )}
 
-            {builtinTools.length === 0 && mcpServers.length === 0 && (
+            {builtinTools.length === 0 && mcpServers.length === 0 && canAdmin && (
               <div
                 className="flex cursor-pointer flex-col items-center justify-center gap-2 rounded-xl border border-dashed border-[var(--border-strong)] bg-[var(--surface-1)] p-4 text-center transition-colors hover:border-[var(--text-muted)] hover:bg-[var(--surface-elevated)]"
                 onClick={() => setShowAddMcp(true)}
@@ -163,7 +170,7 @@ export function ToolsPage() {
               </div>
             )}
 
-            {(builtinTools.length > 0 || mcpServers.length > 0) && (
+            {(builtinTools.length > 0 || mcpServers.length > 0) && canAdmin && (
               <div
                 className="flex cursor-pointer flex-col items-center justify-center gap-2 rounded-xl border border-dashed border-[var(--border-strong)] bg-[var(--surface-1)] p-4 text-center transition-colors hover:border-[var(--text-muted)] hover:bg-[var(--surface-elevated)]"
                 onClick={() => setShowAddMcp(true)}
diff --git a/frontend/components/ui/alert-dialog.tsx b/frontend/components/ui/alert-dialog.tsx
index 800505dc9..70be02421 100644
--- a/frontend/components/ui/alert-dialog.tsx
+++ b/frontend/components/ui/alert-dialog.tsx
@@ -159,10 +159,7 @@ const AlertDialogTitle = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Title
     ref={ref}
-    className={cn(
-      'text-lg font-semibold tracking-tight text-[var(--text-primary)]',
-      className,
-    )}
+    className={cn('text-lg font-semibold tracking-tight text-[var(--text-primary)]', className)}
     {...props}
   />
 ))
diff --git a/frontend/components/ui/dropdown-menu.tsx b/frontend/components/ui/dropdown-menu.tsx
index 11dfd056c..8bf266990 100644
--- a/frontend/components/ui/dropdown-menu.tsx
+++ b/frontend/components/ui/dropdown-menu.tsx
@@ -147,7 +147,11 @@ const DropdownMenuLabel = React.forwardRef<
 >(({ className, inset, ...props }, ref) => (
   <DropdownMenuPrimitive.Label
     ref={ref}
-    className={cn('px-3 py-2 text-xs font-medium text-[var(--text-primary)]', inset && 'pl-8', className)}
+    className={cn(
+      'px-3 py-2 text-xs font-medium text-[var(--text-primary)]',
+      inset && 'pl-8',
+      className,
+    )}
     {...props}
   />
 ))
diff --git a/frontend/components/ui/index.ts b/frontend/components/ui/index.ts
index 3d056e73f..72a2f0c72 100644
--- a/frontend/components/ui/index.ts
+++ b/frontend/components/ui/index.ts
@@ -125,4 +125,4 @@ export {
   ToastTitle,
   ToastViewport,
 } from './toast'
-export { toast, useToast } from './use-toast'
+export { toast, useToast } from '@/hooks/use-toast'
diff --git a/frontend/components/ui/inline-rename-input.tsx b/frontend/components/ui/inline-rename-input.tsx
index f8c1192be..7bcc1938a 100644
--- a/frontend/components/ui/inline-rename-input.tsx
+++ b/frontend/components/ui/inline-rename-input.tsx
@@ -70,9 +70,7 @@ export function InlineRenameInput({
         placeholder={placeholder}
         className={cn(
           'flex-1 border border-[var(--brand-500)] bg-[var(--surface-1)] font-medium text-[var(--text-primary)] shadow-sm outline-none ring-2 ring-[var(--brand-500)] transition-all placeholder:text-[var(--text-subtle)] focus:border-[var(--brand-500)] focus:ring-[var(--brand-500)]',
-          isSmall
-            ? 'rounded-sm px-1.5 py-[2px] text-sm'
-            : 'rounded-md px-2 py-1 text-sm',
+          isSmall ? 'rounded-sm px-1.5 py-[2px] text-sm' : 'rounded-md px-2 py-1 text-sm',
         )}
       />
       <div className={cn('flex items-center', isSmall ? 'gap-0.5' : 'gap-[2px]')}>
diff --git a/frontend/components/ui/notice.tsx b/frontend/components/ui/notice.tsx
index a7c1b91c6..371554684 100644
--- a/frontend/components/ui/notice.tsx
+++ b/frontend/components/ui/notice.tsx
@@ -21,27 +21,29 @@ const variantStyles = {
     icon: <Info className="mr-2 h-4 w-4 flex-shrink-0 text-muted-foreground" />,
   },
   info: {
-    container: 'bg-[var(--brand-50)] border-[var(--brand-200)] dark:bg-[var(--brand-50)] dark:border-[var(--brand-200)]',
+    container:
+      'bg-[var(--brand-50)] border-[var(--brand-200)] dark:bg-[var(--brand-50)] dark:border-[var(--brand-200)]',
     text: 'text-[var(--text-primary)] dark:text-[var(--text-primary)]',
     title: 'text-[var(--text-primary)] dark:text-[var(--text-primary)] font-medium',
     icon: <Info className="mr-2 h-4 w-4 flex-shrink-0 text-[var(--brand-500)]" />,
   },
   warning: {
-    container: 'bg-[var(--status-warning-bg)] border-[var(--status-warning-border)] dark:bg-[var(--status-warning-bg)] dark:border-[var(--status-warning-border)]',
+    container:
+      'bg-[var(--status-warning-bg)] border-[var(--status-warning-border)] dark:bg-[var(--status-warning-bg)] dark:border-[var(--status-warning-border)]',
     text: 'text-[var(--text-primary)] dark:text-[var(--text-primary)]',
     title: 'text-[var(--text-primary)] dark:text-[var(--text-primary)] font-medium',
-    icon: (
-      <AlertTriangle className="mr-2 h-4 w-4 flex-shrink-0 text-[var(--status-warning)]" />
-    ),
+    icon: <AlertTriangle className="mr-2 h-4 w-4 flex-shrink-0 text-[var(--status-warning)]" />,
   },
   success: {
-    container: 'bg-[var(--status-success-bg)] border-[var(--status-success-border)] dark:bg-[var(--status-success-bg)] dark:border-[var(--status-success-border)]',
+    container:
+      'bg-[var(--status-success-bg)] border-[var(--status-success-border)] dark:bg-[var(--status-success-bg)] dark:border-[var(--status-success-border)]',
     text: 'text-[var(--text-primary)] dark:text-[var(--text-primary)]',
     title: 'text-[var(--text-primary)] dark:text-[var(--text-primary)] font-medium',
     icon: <Check className="mr-2 h-4 w-4 flex-shrink-0 text-[var(--status-success)]" />,
   },
   error: {
-    container: 'bg-[var(--status-error-bg)] border-[var(--status-error-border)] dark:bg-[var(--status-error-bg)] dark:border-[var(--status-error-border)]',
+    container:
+      'bg-[var(--status-error-bg)] border-[var(--status-error-border)] dark:bg-[var(--status-error-bg)] dark:border-[var(--status-error-border)]',
     text: 'text-[var(--text-primary)] dark:text-[var(--text-primary)]',
     title: 'text-[var(--text-primary)] dark:text-[var(--text-primary)] font-medium',
     icon: <AlertCircle className="mr-2 h-4 w-4 flex-shrink-0 text-[var(--status-error)]" />,
diff --git a/frontend/components/ui/progress.tsx b/frontend/components/ui/progress.tsx
index 9092c0b43..d6c384745 100644
--- a/frontend/components/ui/progress.tsx
+++ b/frontend/components/ui/progress.tsx
@@ -17,10 +17,7 @@ const Progress = React.forwardRef<React.ElementRef<typeof ProgressPrimitive.Root
       {...props}
     >
       <ProgressPrimitive.Indicator
-        className={cn(
-          'h-full w-full flex-1 bg-primary transition-all',
-          indicatorClassName,
-        )}
+        className={cn('h-full w-full flex-1 bg-primary transition-all', indicatorClassName)}
         style={{ transform: `translateX(-${100 - (value || 0)}%)` }}
       />
     </ProgressPrimitive.Root>
diff --git a/frontend/components/ui/pulsing-dot.tsx b/frontend/components/ui/pulsing-dot.tsx
new file mode 100644
index 000000000..2c7a45ddc
--- /dev/null
+++ b/frontend/components/ui/pulsing-dot.tsx
@@ -0,0 +1,25 @@
+import { cn } from '@/lib/utils'
+
+interface PulsingDotProps {
+  size?: 'sm' | 'md'
+  className?: string
+}
+
+const SIZE_CLASSES = {
+  sm: 'h-1.5 w-1.5',
+  md: 'h-2 w-2',
+} as const
+
+export function PulsingDot({ size = 'md', className }: PulsingDotProps) {
+  const sizeClass = SIZE_CLASSES[size]
+  return (
+    <span className={cn('relative flex', sizeClass, className)}>
+      <span
+        className={cn(
+          'absolute inline-flex h-full w-full animate-ping rounded-full bg-current opacity-75',
+        )}
+      />
+      <span className={cn('relative inline-flex rounded-full bg-current', sizeClass)} />
+    </span>
+  )
+}
diff --git a/frontend/components/ui/resizable.tsx b/frontend/components/ui/resizable.tsx
index aedaa89f3..6dda8bbd6 100644
--- a/frontend/components/ui/resizable.tsx
+++ b/frontend/components/ui/resizable.tsx
@@ -45,7 +45,7 @@ function ResizableHandle({
       {...props}
     >
       {withHandle && (
-        <div className="rounded-xs z-10 flex h-4 w-3 items-center justify-center border bg-border transition-colors hover:bg-muted">
+        <div className="z-10 flex h-4 w-3 items-center justify-center rounded-xs border bg-border transition-colors hover:bg-muted">
           <GripVerticalIcon className="size-2.5" />
         </div>
       )}
diff --git a/frontend/components/ui/slider.tsx b/frontend/components/ui/slider.tsx
index 311869112..760cc4d08 100644
--- a/frontend/components/ui/slider.tsx
+++ b/frontend/components/ui/slider.tsx
@@ -11,10 +11,7 @@ const Slider = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <SliderPrimitive.Root
     ref={ref}
-    className={cn(
-      'relative flex w-full touch-none select-none items-center',
-      className,
-    )}
+    className={cn('relative flex w-full touch-none select-none items-center', className)}
     {...props}
   >
     <SliderPrimitive.Track className="relative h-1.5 w-full grow overflow-hidden rounded-full bg-[var(--surface-5)]">
diff --git a/frontend/components/ui/toggle-group.tsx b/frontend/components/ui/toggle-group.tsx
index bb37a47db..ebd5c0af9 100644
--- a/frontend/components/ui/toggle-group.tsx
+++ b/frontend/components/ui/toggle-group.tsx
@@ -23,9 +23,7 @@ const ToggleGroup = React.forwardRef<
     className={cn('flex items-center justify-center gap-1', className)}
     {...props}
   >
-    <ToggleGroupContext.Provider value={{ variant, size }}>
-      {children}
-    </ToggleGroupContext.Provider>
+    <ToggleGroupContext.Provider value={{ variant, size }}>{children}</ToggleGroupContext.Provider>
   </ToggleGroupPrimitive.Root>
 ))
 ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName
diff --git a/frontend/components/ui/unified-dialog.tsx b/frontend/components/ui/unified-dialog.tsx
index fd63e9a32..6be68dc09 100644
--- a/frontend/components/ui/unified-dialog.tsx
+++ b/frontend/components/ui/unified-dialog.tsx
@@ -189,7 +189,9 @@ export function FileListBox({ title, files, maxShow = 20, moreText }: FileListBo
             {file.icon && <span className="shrink-0 text-[var(--text-muted)]">{file.icon}</span>}
             <span className="truncate font-mono">{file.name}</span>
             {file.size !== undefined && (
-              <span className="shrink-0 text-[var(--text-muted)]">({(file.size / 1024).toFixed(1)} KB)</span>
+              <span className="shrink-0 text-[var(--text-muted)]">
+                ({(file.size / 1024).toFixed(1)} KB)
+              </span>
             )}
           </div>
         ))}
diff --git a/frontend/components/ui/use-toast.ts b/frontend/components/ui/use-toast.ts
deleted file mode 100644
index cb9a55b00..000000000
--- a/frontend/components/ui/use-toast.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Re-export toast from @/hooks/use-toast for backwards compatibility.
- *
- * The canonical location for toast is @/hooks/use-toast.
- * New code should import directly from @/hooks/use-toast.
- */
-export { useToast, toast } from '@/hooks/use-toast'
diff --git a/frontend/docs/API_CLIENT_GUIDE.md b/frontend/docs/API_CLIENT_GUIDE.md
index e96a5258f..85586890a 100644
--- a/frontend/docs/API_CLIENT_GUIDE.md
+++ b/frontend/docs/API_CLIENT_GUIDE.md
@@ -3,6 +3,7 @@
 ## 概述
 
 所有前端 API 请求都应使用 `@/lib/api-client` 中的统一方法，确保：
+
 - 统一的 URL 构建规则（所有端点都在 `/api/v1` 下）
 - 统一的 CSRF Token 处理
 - 统一的 401 自动刷新
@@ -33,10 +34,10 @@ await apiPatch('users/123', { name: 'John Updated' })
 
 **相对路径**会自动添加 `/api/v1` 前缀：
 
-| 调用 | 实际请求 URL |
-|------|-------------|
-| `apiGet('users')` | `/api/v1/users` |
-| `apiGet('graphs/123')` | `/api/v1/graphs/123` |
+| 调用                           | 实际请求 URL         |
+| ------------------------------ | -------------------- |
+| `apiGet('users')`              | `/api/v1/users`      |
+| `apiGet('graphs/123')`         | `/api/v1/graphs/123` |
 | `apiPost('auth/login', {...})` | `/api/v1/auth/login` |
 
 ## 流式请求
@@ -83,9 +84,11 @@ try {
   const data = await apiGet('some-endpoint')
 } catch (error) {
   if (error instanceof ApiError) {
-    console.log(error.status)     // HTTP 状态码
+    console.log(error.status) // HTTP 状态码
     console.log(error.statusText) // 状态文本
-    console.log(error.detail)     // 详细错误信息
+    console.log(error.code) // 业务错误码
+    console.log(error.message) // 错误消息
+    console.log(error.data) // 结构化错误数据
   }
 }
 ```
@@ -111,19 +114,10 @@ const result = await apiUpload<UploadResult>('upload', file)
 
 ## 迁移指南
 
-### 从旧代码迁移
-
-旧代码：
-```ts
-// ❌ 直接使用 fetch
-const response = await fetch('/api/v1/users')
-
-// ❌ 使用废弃的 apiClient
-import { api } from './services/apiClient'
-const data = await api.get('/v1/users')
-```
+> **迁移已完成。** 旧 `./services/apiClient` 模块已删除，所有调用方已迁移到 `@/lib/api-client`。
 
 新代码：
+
 ```ts
 // ✅ 使用统一 API 客户端
 import { apiGet } from '@/lib/api-client'
diff --git a/frontend/hooks/copilot/useActionExecutor.ts b/frontend/hooks/copilot/useActionExecutor.ts
index 1d5eb305f..c464a366a 100644
--- a/frontend/hooks/copilot/useActionExecutor.ts
+++ b/frontend/hooks/copilot/useActionExecutor.ts
@@ -5,7 +5,7 @@
 import { useState, useCallback } from 'react'
 import { Node, Edge } from 'reactflow'
 
-import { useBuilderStore } from '@/app/workspace/[workspaceId]/[agentId]/stores/builderStore'
+import { useGraphStore } from '@/components/editors/graph-builder/stores/graphStore'
 import type { GraphAction } from '@/types/copilot'
 import { createLogger } from '@/lib/logs/console/logger'
 import { ActionProcessor } from '@/lib/utils/copilot/actionProcessor'
@@ -14,11 +14,11 @@ const logger = createLogger('useActionExecutor')
 
 export function useActionExecutor(expectedGraphId?: string) {
   const [executingActions, setExecutingActions] = useState(false)
-  const { applyAIChanges } = useBuilderStore()
+  const { applyAIChanges } = useGraphStore()
 
   const executeActions = useCallback(
     async (actions: GraphAction[]) => {
-      const currentState = useBuilderStore.getState()
+      const currentState = useGraphStore.getState()
       const currentGraphId = currentState.graphId
 
       if (expectedGraphId && currentGraphId !== expectedGraphId) {
diff --git a/frontend/hooks/copilot/useCopilotExecutionBridge.ts b/frontend/hooks/copilot/useCopilotExecutionBridge.ts
new file mode 100644
index 000000000..c9d86b612
--- /dev/null
+++ b/frontend/hooks/copilot/useCopilotExecutionBridge.ts
@@ -0,0 +1,139 @@
+/**
+ * useCopilotExecutionBridge - Bridge execution events to copilot callbacks
+ *
+ * When copilot dispatches through the execution engine (POST /v1/copilot/run),
+ * events arrive as ExecutionEventFrames via the execution WebSocket.
+ * This hook maps those events to the existing copilot callback system
+ * (onStatus, onContent, onThoughtStep, etc.) so the UI works unchanged.
+ */
+
+import { useEffect, useRef } from 'react'
+
+import { useExecutionStream } from '@/hooks/use-execution-stream'
+import { TERMINAL_EXECUTION_STATUSES } from '@/types/agent-run'
+import type { AppErrorPayload, ExecutionEvent } from '@/types/agent-run'
+import type { GraphAction } from '@/types/copilot'
+
+interface CopilotCallbacks {
+  onStatus: (stage: string, message: string) => void
+  onContent: (content: string) => void
+  onThoughtStep: (step: { index: number; content: string }) => void
+  onToolCall: (tool: string, input: Record<string, unknown>) => void
+  onToolResult: (action: {
+    type: string
+    payload: Record<string, unknown>
+    reasoning?: string
+  }) => void
+  onResult: (response: { message: string; actions?: GraphAction[] }) => Promise<void>
+  onError: (error: AppErrorPayload) => void
+  onDone: () => Promise<void>
+}
+
+interface UseCopilotExecutionBridgeOptions {
+  executionId: string | null
+  callbacks: CopilotCallbacks
+}
+
+/**
+ * Subscribes to execution events and dispatches to copilot callbacks.
+ */
+export function useCopilotExecutionBridge({
+  executionId,
+  callbacks,
+}: UseCopilotExecutionBridgeOptions) {
+  const callbacksRef = useRef(callbacks)
+  useEffect(() => {
+    callbacksRef.current = callbacks
+  }, [callbacks])
+
+  const { status, events, error } = useExecutionStream({
+    executionId: executionId || '',
+    enabled: Boolean(executionId),
+  })
+
+  const processedSeqRef = useRef(0)
+
+  // Process new events as they arrive
+  useEffect(() => {
+    if (!events || events.length === 0) return
+
+    const cb = callbacksRef.current
+    const newEvents = events.filter((e: ExecutionEvent) => e.seq > processedSeqRef.current)
+
+    for (const event of newEvents) {
+      processedSeqRef.current = event.seq
+      const payload = event.payload as Record<string, unknown>
+
+      switch (event.event_type) {
+        case 'copilot_status':
+          cb.onStatus((payload.stage as string) ?? 'processing', (payload.message as string) ?? '')
+          break
+
+        case 'copilot_content':
+          cb.onContent((payload.content as string) ?? '')
+          break
+
+        case 'copilot_thought_step':
+          cb.onThoughtStep(payload.step as { index: number; content: string })
+          break
+
+        case 'copilot_tool_call':
+          cb.onToolCall(payload.tool as string, (payload.input as Record<string, unknown>) ?? {})
+          break
+
+        case 'copilot_tool_result':
+          cb.onToolResult(
+            payload.action as {
+              type: string
+              payload: Record<string, unknown>
+              reasoning?: string
+            },
+          )
+          break
+
+        case 'copilot_result':
+          cb.onResult({
+            message: (payload.message as string) ?? '',
+            actions: payload.actions as GraphAction[] | undefined,
+          })
+          break
+
+        case 'error':
+          cb.onError({
+            code: (payload.code as string) ?? 'UNKNOWN_ERROR',
+            message: (payload.message as string) ?? 'Unknown error',
+            data: (payload.data as Record<string, unknown> | null) ?? null,
+          })
+          break
+      }
+    }
+  }, [events])
+
+  useEffect(() => {
+    if (!error) {
+      return
+    }
+
+    const cb = callbacksRef.current
+    cb.onError(error)
+  }, [error])
+
+  useEffect(() => {
+    if (!executionId || !status || !TERMINAL_EXECUTION_STATUSES.includes(status as never)) {
+      return
+    }
+
+    void callbacksRef.current.onDone()
+  }, [executionId, status])
+
+  // Reset processed seq when execution changes
+  useEffect(() => {
+    processedSeqRef.current = 0
+  }, [executionId])
+
+  const isActive = Boolean(
+    executionId && status && !TERMINAL_EXECUTION_STATUSES.includes(status as never),
+  )
+
+  return { isActive, status }
+}
diff --git a/frontend/hooks/copilot/useCopilotMessages.ts b/frontend/hooks/copilot/useCopilotMessages.ts
index ffbf93411..a59911473 100644
--- a/frontend/hooks/copilot/useCopilotMessages.ts
+++ b/frontend/hooks/copilot/useCopilotMessages.ts
@@ -4,7 +4,6 @@
 
 import { useState, useEffect, useRef, useCallback } from 'react'
 
-import { useCopilotHistory } from '@/hooks/queries/graphs'
 import type { GraphAction } from '@/types/copilot'
 
 export interface CopilotMessage {
@@ -19,36 +18,17 @@ export function useCopilotMessages(graphId?: string) {
   const currentMessageIndexRef = useRef<number | null>(null)
   const prevGraphIdRef = useRef<string | null>(null)
 
-  const {
-    data: historyData,
-    isLoading: loadingHistory,
-    isSuccess: isHistoryLoaded,
-  } = useCopilotHistory(graphId)
-
-  // Load history when graphId changes
+  // Reset messages when graphId changes
   useEffect(() => {
     if (!graphId) return
 
-    // Detect graphId changes and reset messages
     if (prevGraphIdRef.current && prevGraphIdRef.current !== graphId) {
       // eslint-disable-next-line react-hooks/set-state-in-effect
       setMessages([])
       currentMessageIndexRef.current = null
     }
     prevGraphIdRef.current = graphId
-
-    // Load history messages when data is available
-    if (isHistoryLoaded && historyData?.messages && historyData.messages.length > 0) {
-      const loadedMessages: CopilotMessage[] = historyData.messages.map((msg) => ({
-        role: msg.role === 'user' ? 'user' : 'model',
-        text: msg.content,
-        actions: (msg.actions as GraphAction[]) || undefined,
-        thoughtSteps: msg.thought_steps || undefined,
-      }))
-
-      setMessages(loadedMessages)
-    }
-  }, [graphId, isHistoryLoaded, historyData])
+  }, [graphId])
 
   const addMessage = useCallback((message: CopilotMessage) => {
     setMessages((prev) => [...prev, message])
@@ -122,7 +102,7 @@ export function useCopilotMessages(graphId?: string) {
 
   return {
     messages,
-    loadingHistory,
+    loadingHistory: false,
     currentMessageIndexRef,
     addMessage,
     addThoughtStep,
diff --git a/frontend/hooks/copilot/useCopilotSession.ts b/frontend/hooks/copilot/useCopilotSession.ts
index 4f95a0f3b..af2ab5e1c 100644
--- a/frontend/hooks/copilot/useCopilotSession.ts
+++ b/frontend/hooks/copilot/useCopilotSession.ts
@@ -1,44 +1,61 @@
-/**
- * useCopilotSession - Hook for managing Copilot run state
- *
- * Tracks the current run_id (formerly session_id) via Run Center.
- */
-
 import { useState, useEffect, useRef, useCallback } from 'react'
 
+interface SessionData {
+  runId: string
+  executionId: string | null
+}
+
+function readSession(graphId: string): SessionData | null {
+  const raw =
+    localStorage.getItem(`draft_copilot_run_${graphId}`) ??
+    localStorage.getItem(`copilot_run_${graphId}`)
+  if (!raw) return null
+  try {
+    const parsed = JSON.parse(raw)
+    if (typeof parsed === 'object' && parsed.runId) return parsed as SessionData
+  } catch {
+    if (typeof raw === 'string' && raw.length > 0) {
+      return { runId: raw, executionId: null }
+    }
+  }
+  return null
+}
+
 export function useCopilotSession(graphId?: string) {
-  const [currentRunId, setCurrentRunId] = useState<string | null>(null)
+  const [session, setSessionState] = useState<SessionData | null>(null)
   const hasProcessedUrlInputRef = useRef(false)
 
-  // Read initial run_id from localStorage on mount
   useEffect(() => {
     if (!graphId) return
-    const storedRunId = localStorage.getItem(`copilot_run_${graphId}`)
-    if (storedRunId) {
+    const stored = readSession(graphId)
+    if (stored) {
       // eslint-disable-next-line react-hooks/set-state-in-effect
-      setCurrentRunId(storedRunId)
+      setSessionState(stored)
     }
   }, [graphId])
 
   const setSession = useCallback(
-    (runId: string) => {
-      setCurrentRunId(runId)
+    (runId: string, executionId: string | null = null) => {
+      setSessionState({ runId, executionId })
       if (graphId) {
-        localStorage.setItem(`copilot_run_${graphId}`, runId)
+        localStorage.setItem(`draft_copilot_run_${graphId}`, JSON.stringify({ runId, executionId }))
+        localStorage.removeItem(`copilot_run_${graphId}`)
       }
     },
     [graphId],
   )
 
   const clearSession = useCallback(() => {
-    setCurrentRunId(null)
+    setSessionState(null)
     if (graphId) {
+      localStorage.removeItem(`draft_copilot_run_${graphId}`)
       localStorage.removeItem(`copilot_run_${graphId}`)
     }
   }, [graphId])
 
   return {
-    currentRunId,
+    currentRunId: session?.runId ?? null,
+    currentExecutionId: session?.executionId ?? null,
     hasProcessedUrlInputRef,
     setSession,
     clearSession,
diff --git a/frontend/hooks/queries/agentPublish.ts b/frontend/hooks/queries/agentPublish.ts
new file mode 100644
index 000000000..a8b6f94e1
--- /dev/null
+++ b/frontend/hooks/queries/agentPublish.ts
@@ -0,0 +1,88 @@
+'use client'
+
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+
+import { agentPublishService } from '@/services/agentPublishService'
+import { agentKeys } from './agents'
+import { STALE_TIME } from './constants'
+
+export const publishKeys = {
+  all: (agentId: string) => [...agentKeys.all, 'releases', agentId] as const,
+  list: (agentId: string, workspaceId: string) =>
+    [...publishKeys.all(agentId), 'list', workspaceId] as const,
+}
+
+export function useReleaseHistory(
+  agentId: string,
+  workspaceId: string,
+  options?: { enabled?: boolean },
+) {
+  return useQuery({
+    queryKey: publishKeys.list(agentId, workspaceId),
+    queryFn: () => agentPublishService.list(agentId, workspaceId),
+    enabled: !!agentId && !!workspaceId && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+  })
+}
+
+export function usePublishAgent() {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: ({ agentId, workspaceId }: { agentId: string; workspaceId: string }) =>
+      agentPublishService.publish(agentId, workspaceId),
+    onSuccess: (_, { agentId, workspaceId }) => {
+      qc.invalidateQueries({ queryKey: publishKeys.all(agentId) })
+      qc.invalidateQueries({ queryKey: agentKeys.detail(agentId, workspaceId) })
+    },
+  })
+}
+
+export function useRollbackAgent() {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: ({
+      agentId,
+      releaseId,
+      workspaceId,
+    }: {
+      agentId: string
+      releaseId: string
+      workspaceId: string
+    }) => agentPublishService.rollback(agentId, releaseId, workspaceId),
+    onSuccess: (_, { agentId, workspaceId }) => {
+      qc.invalidateQueries({ queryKey: publishKeys.all(agentId) })
+      qc.invalidateQueries({ queryKey: agentKeys.detail(agentId, workspaceId) })
+    },
+  })
+}
+
+export function useRetireRelease() {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: ({
+      agentId,
+      releaseId,
+      workspaceId,
+    }: {
+      agentId: string
+      releaseId: string
+      workspaceId: string
+    }) => agentPublishService.retire(agentId, releaseId, workspaceId),
+    onSuccess: (_, { agentId, workspaceId }) => {
+      qc.invalidateQueries({ queryKey: publishKeys.all(agentId) })
+      qc.invalidateQueries({ queryKey: agentKeys.detail(agentId, workspaceId) })
+    },
+  })
+}
+
+export function useUnpublishAgent() {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: ({ agentId, workspaceId }: { agentId: string; workspaceId: string }) =>
+      agentPublishService.unpublish(agentId, workspaceId),
+    onSuccess: (_, { agentId, workspaceId }) => {
+      qc.invalidateQueries({ queryKey: publishKeys.all(agentId) })
+      qc.invalidateQueries({ queryKey: agentKeys.detail(agentId, workspaceId) })
+    },
+  })
+}
diff --git a/frontend/hooks/queries/agentReleases.ts b/frontend/hooks/queries/agentReleases.ts
new file mode 100644
index 000000000..b2b5a9daa
--- /dev/null
+++ b/frontend/hooks/queries/agentReleases.ts
@@ -0,0 +1,36 @@
+/**
+ * Agent Release Queries
+ *
+ * React Query hooks for AgentRelease, nested under Agent.
+ */
+import { keepPreviousData, useQuery } from '@tanstack/react-query'
+
+import { agentReleaseService } from '@/services/agentReleaseService'
+
+import { STALE_TIME } from './constants'
+import { agentKeys } from './agents'
+
+// ==================== Query Keys ====================
+
+export const releaseKeys = {
+  all: (agentId: string, workspaceId: string) =>
+    [...agentKeys.detail(agentId, workspaceId), 'releases'] as const,
+  list: (agentId: string, workspaceId: string) =>
+    [...releaseKeys.all(agentId, workspaceId), 'list'] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useReleases(agentId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: releaseKeys.list(agentId, workspaceId),
+    queryFn: async () => {
+      const releases = await agentReleaseService.list(agentId, workspaceId)
+      return releases || []
+    },
+    enabled: Boolean(agentId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+    refetchOnWindowFocus: true,
+    placeholderData: keepPreviousData,
+  })
+}
diff --git a/frontend/hooks/queries/agentRuns.ts b/frontend/hooks/queries/agentRuns.ts
new file mode 100644
index 000000000..f68e1d6c8
--- /dev/null
+++ b/frontend/hooks/queries/agentRuns.ts
@@ -0,0 +1,141 @@
+/**
+ * Agent Run Queries
+ *
+ * React Query hooks for AgentRun and Execution.
+ */
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+
+import { agentRunService } from '@/services/agentRunService'
+import type { AgentRun, CreateAgentRunRequest, Execution, ExecutionEvent } from '@/types/agent-run'
+import { TERMINAL_RUN_STATUSES, TERMINAL_EXECUTION_STATUSES } from '@/types/agent-run'
+
+import { STALE_TIME } from './constants'
+
+// ==================== Query Keys ====================
+
+export const agentRunKeys = {
+  all: ['agent-runs'] as const,
+  list: (filters?: { workspace_id?: string; release_id?: string; task_id?: string }) =>
+    [
+      ...agentRunKeys.all,
+      'list',
+      filters?.workspace_id || '',
+      filters?.release_id || '',
+      filters?.task_id || '',
+    ] as const,
+  detail: (runId: string) => [...agentRunKeys.all, 'detail', runId] as const,
+  executions: (runId: string) => [...agentRunKeys.all, 'executions', runId] as const,
+  execution: (executionId: string) => [...agentRunKeys.all, 'execution', executionId] as const,
+  events: (executionId: string) => [...agentRunKeys.all, 'events', executionId] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useAgentRuns(
+  filters?: { workspace_id?: string; release_id?: string; task_id?: string },
+  options?: { enabled?: boolean },
+) {
+  return useQuery({
+    queryKey: agentRunKeys.list(filters),
+    queryFn: async (): Promise<AgentRun[]> => {
+      const runs = await agentRunService.list(filters || {})
+      return runs || []
+    },
+    enabled: options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: 15000,
+    refetchOnWindowFocus: true,
+  })
+}
+
+export function useAgentRun(runId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: agentRunKeys.detail(runId),
+    queryFn: () => agentRunService.get(runId),
+    enabled: Boolean(runId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: (query) => {
+      const status = query.state.data?.status
+      if (status && TERMINAL_RUN_STATUSES.includes(status)) return false
+      return 10_000
+    },
+  })
+}
+
+export function useRunExecutions(runId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: agentRunKeys.executions(runId),
+    queryFn: async (): Promise<Execution[]> => {
+      const executions = await agentRunService.listExecutions(runId)
+      return executions || []
+    },
+    enabled: Boolean(runId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: 10_000,
+  })
+}
+
+export function useExecution(executionId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: agentRunKeys.execution(executionId),
+    queryFn: () => agentRunService.getExecution(executionId),
+    enabled: Boolean(executionId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: (query) => {
+      const status = query.state.data?.status
+      if (status && TERMINAL_EXECUTION_STATUSES.includes(status)) return false
+      return 10_000
+    },
+  })
+}
+
+export function useExecutionEvents(executionId: string, options?: { enabled?: boolean }) {
+  return useQuery<ExecutionEvent[]>({
+    queryKey: agentRunKeys.events(executionId),
+    queryFn: () => agentRunService.listExecutionEvents(executionId),
+    enabled: Boolean(executionId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: 5_000,
+  })
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateAgentRun() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (data: CreateAgentRunRequest) => {
+      return agentRunService.create(data)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentRunKeys.all })
+    },
+  })
+}
+
+export function useCancelAgentRun() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (runId: string) => {
+      return agentRunService.cancel(runId)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentRunKeys.all })
+    },
+  })
+}
+
+export function useRetryAgentRun() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (runId: string) => {
+      return agentRunService.retry(runId)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentRunKeys.all })
+    },
+  })
+}
diff --git a/frontend/hooks/queries/agentVersions.ts b/frontend/hooks/queries/agentVersions.ts
new file mode 100644
index 000000000..534611050
--- /dev/null
+++ b/frontend/hooks/queries/agentVersions.ts
@@ -0,0 +1,188 @@
+/**
+ * Agent Version Queries
+ *
+ * React Query hooks for AgentVersion, nested under Agent.
+ */
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import type { Node, Edge } from 'reactflow'
+
+import { agentVersionService } from '@/services/agentVersionService'
+import {
+  visualDefinitionAdapter,
+  type LoadedVersionGraphState,
+} from '@/components/editors/graph-builder/services/visualDefinitionAdapter'
+import type {
+  AgentVersion,
+  CreateAgentVersionRequest,
+  UpdateAgentVersionRequest,
+} from '@/types/agent'
+
+import { STALE_TIME, CACHE_TIME } from './constants'
+import { agentKeys } from './agents'
+
+// ==================== Query Keys ====================
+
+export const versionKeys = {
+  all: (agentId: string, workspaceId: string) =>
+    [...agentKeys.detail(agentId, workspaceId), 'versions'] as const,
+  list: (agentId: string, workspaceId: string) =>
+    [...versionKeys.all(agentId, workspaceId), 'list'] as const,
+  detail: (agentId: string, versionId: string, workspaceId: string) =>
+    [...versionKeys.all(agentId, workspaceId), 'detail', versionId] as const,
+  graphState: (agentId: string, versionId: string, workspaceId: string) =>
+    [...versionKeys.detail(agentId, versionId, workspaceId), 'graphState'] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useVersions(agentId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: versionKeys.list(agentId, workspaceId),
+    queryFn: async (): Promise<AgentVersion[]> => {
+      const versions = await agentVersionService.list(agentId, workspaceId)
+      return versions || []
+    },
+    enabled: Boolean(agentId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+    refetchOnWindowFocus: true,
+    placeholderData: keepPreviousData,
+  })
+}
+
+export function useVersion(
+  agentId: string,
+  versionId: string,
+  workspaceId: string,
+  options?: { enabled?: boolean },
+) {
+  return useQuery({
+    queryKey: versionKeys.detail(agentId, versionId, workspaceId),
+    queryFn: () => agentVersionService.get(agentId, versionId, workspaceId),
+    enabled:
+      Boolean(agentId) && Boolean(versionId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+  })
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateVersion() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      agentId,
+      workspaceId,
+      ...data
+    }: CreateAgentVersionRequest & { agentId: string; workspaceId: string }) => {
+      return agentVersionService.create(agentId, workspaceId, data)
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: versionKeys.all(variables.agentId, variables.workspaceId),
+      })
+      queryClient.invalidateQueries({
+        queryKey: agentKeys.detail(variables.agentId, variables.workspaceId),
+      })
+    },
+  })
+}
+
+export function useUpdateVersion() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      agentId,
+      versionId,
+      workspaceId,
+      ...data
+    }: UpdateAgentVersionRequest & {
+      agentId: string
+      versionId: string
+      workspaceId: string
+    }) => {
+      return agentVersionService.update(agentId, versionId, workspaceId, data)
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: versionKeys.all(variables.agentId, variables.workspaceId),
+      })
+    },
+  })
+}
+
+// ==================== Graph State from Version ====================
+
+export interface VersionGraphState {
+  nodes: Node[]
+  edges: Edge[]
+  viewport?: { x: number; y: number; zoom: number }
+  variables?: Record<string, unknown>
+  definitionKind?: string
+  versionStatus?: 'draft' | 'frozen'
+}
+
+function toVersionGraphState({
+  graphState,
+  rawPayload,
+}: LoadedVersionGraphState): VersionGraphState {
+  const edges = graphState.edges ?? []
+  const seenEdges = new Set<string>()
+  const deduplicatedEdges = edges.filter((edge) => {
+    const key = `${edge.source}-${edge.target}`
+    if (seenEdges.has(key)) return false
+    seenEdges.add(key)
+    return true
+  })
+
+  return {
+    nodes: graphState.nodes ?? [],
+    edges: deduplicatedEdges,
+    viewport: graphState.viewport,
+    variables: {
+      state_fields: graphState.graphStateFields ?? rawPayload.state_fields,
+      fallback_node_id: graphState.fallbackNodeId ?? rawPayload.fallback_node_id,
+      graph_mode: rawPayload.graph_mode,
+      code_content: rawPayload.code_content,
+      context: rawPayload.context,
+    },
+  }
+}
+
+/**
+ * Load graph state from agent version definition_payload.
+ * New-architecture equivalent of useGraphState — returns the same shape
+ * (nodes, edges, viewport, variables) so AgentBuilder can consume it directly.
+ */
+export function useVersionGraphState(
+  agentId?: string,
+  versionId?: string,
+  workspaceId?: string,
+  options?: {
+    enabled?: boolean
+    refetchOnMount?: boolean | 'always'
+  },
+) {
+  return useQuery({
+    queryKey: versionKeys.graphState(agentId || '', versionId || '', workspaceId || ''),
+    queryFn: async (): Promise<VersionGraphState> => {
+      const versionState = await visualDefinitionAdapter.loadVersionGraphState(
+        agentId!,
+        versionId!,
+        workspaceId!,
+      )
+      return {
+        ...toVersionGraphState(versionState),
+        definitionKind: versionState.definitionKind,
+        versionStatus: versionState.versionStatus,
+      }
+    },
+    enabled:
+      Boolean(agentId) && Boolean(versionId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    gcTime: CACHE_TIME.STANDARD,
+    refetchOnMount: options?.refetchOnMount ?? false,
+    refetchOnWindowFocus: false,
+  })
+}
diff --git a/frontend/hooks/queries/agents.ts b/frontend/hooks/queries/agents.ts
new file mode 100644
index 000000000..c87c69650
--- /dev/null
+++ b/frontend/hooks/queries/agents.ts
@@ -0,0 +1,110 @@
+/**
+ * Agent Queries
+ *
+ * React Query hooks for the new Agent entity (replacing AgentProfile).
+ */
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useMemo } from 'react'
+
+import { agentService } from '@/services/agentService'
+import type { Agent, CreateAgentRequest, UpdateAgentRequest } from '@/types/agent'
+
+import { STALE_TIME } from './constants'
+
+// ==================== Query Keys ====================
+
+export const agentKeys = {
+  all: ['agents'] as const,
+  list: (workspaceId: string) => [...agentKeys.all, 'list', workspaceId] as const,
+  detail: (agentId: string, workspaceId: string) =>
+    [...agentKeys.all, 'detail', agentId, workspaceId] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useAgents(workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: agentKeys.list(workspaceId),
+    queryFn: async (): Promise<Agent[]> => {
+      const agents = await agentService.list(workspaceId)
+      return agents || []
+    },
+    enabled: Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+    refetchOnWindowFocus: true,
+    placeholderData: keepPreviousData,
+  })
+}
+
+export function useAgent(agentId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: agentKeys.detail(agentId, workspaceId),
+    queryFn: () => agentService.get(agentId, workspaceId),
+    enabled: Boolean(agentId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.STANDARD,
+  })
+}
+
+export function useAgentNameMap(workspaceId: string) {
+  const { data: agents = [] } = useAgents(workspaceId)
+  return useMemo(
+    () => Object.fromEntries(agents.map((a) => [a.id, a.name])) as Record<string, string>,
+    [agents],
+  )
+}
+
+export function useReleaseAgentNameMap(workspaceId: string) {
+  const { data: agents = [] } = useAgents(workspaceId)
+  return useMemo(
+    () =>
+      Object.fromEntries(
+        agents.filter((a) => a.active_release_id).map((a) => [a.active_release_id!, a.name]),
+      ) as Record<string, string>,
+    [agents],
+  )
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateAgent() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (data: CreateAgentRequest & { workspace_id: string }) => {
+      return agentService.create(data)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentKeys.all })
+    },
+  })
+}
+
+export function useUpdateAgent() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      agentId,
+      workspaceId,
+      ...updates
+    }: UpdateAgentRequest & { agentId: string; workspaceId: string }) => {
+      return agentService.update(agentId, workspaceId, updates)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentKeys.all })
+    },
+  })
+}
+
+export function useDeleteAgent() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ agentId, workspaceId }: { agentId: string; workspaceId: string }) => {
+      await agentService.delete(agentId, workspaceId)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: agentKeys.all })
+    },
+  })
+}
diff --git a/frontend/hooks/queries/custom-tools.ts b/frontend/hooks/queries/custom-tools.ts
index 01450e0b2..de617d0e6 100644
--- a/frontend/hooks/queries/custom-tools.ts
+++ b/frontend/hooks/queries/custom-tools.ts
@@ -5,17 +5,9 @@
  * - Use camelCase for types
  * - API response: { success: true, data: {...} }
  */
-import { apiGet } from '@/lib/api-client'
+import { apiGet, createApiError } from '@/lib/api-client'
 import { createLogger } from '@/lib/logs/console/logger'
-import { useCustomToolsStore } from '@/stores/custom-tools/store'
-import type {
-  CustomToolDefinition,
-  CustomToolSchema,
-  CustomTool as LegacyCustomTool,
-  LegacyCustomToolSchema,
-  CustomToolParameter,
-} from '@/stores/custom-tools/types'
-
+import type { CustomToolDefinition, CustomToolSchema } from '@/stores/custom-tools/types'
 
 const logger = createLogger('CustomToolsQueries')
 
@@ -29,9 +21,6 @@ export const customToolsKeys = {
   detail: (toolId: string) => [...customToolsKeys.all, 'detail', toolId] as const,
 }
 
-// Re-export CustomToolDefinition as CustomTool for backward compatibility
-export type CustomTool = CustomToolDefinition
-
 type ApiCustomTool = Partial<CustomToolDefinition> & {
   id: string
   title: string
@@ -77,55 +66,6 @@ function normalizeCustomTool(tool: ApiCustomTool): CustomToolDefinition {
   }
 }
 
-/**
- * Convert CustomToolDefinition (OpenAI format) to CustomTool (legacy format) for store
- */
-function convertToLegacyTool(definition: CustomToolDefinition): LegacyCustomTool {
-  const functionSchema = definition.schema.function
-  const name = functionSchema?.name || definition.title
-  const description = functionSchema?.description || ''
-
-  // Convert OpenAI-style parameters to legacy format
-  const parameters: CustomToolParameter[] = []
-  if (functionSchema?.parameters?.properties) {
-    const required = new Set(functionSchema.parameters.required || [])
-    for (const [paramName, paramDef] of Object.entries(functionSchema.parameters.properties)) {
-      if (typeof paramDef === 'object' && paramDef !== null) {
-        parameters.push({
-          name: paramName,
-          type: (paramDef as any).type || 'string',
-          description: (paramDef as any).description,
-          required: required.has(paramName),
-          default: (paramDef as any).default,
-        })
-      }
-    }
-  }
-
-  const legacySchema: LegacyCustomToolSchema = {
-    id: definition.id,
-    name,
-    description,
-    parameters,
-    code: definition.code,
-  }
-
-  return {
-    id: definition.id,
-    name,
-    description,
-    schema: legacySchema,
-    createdAt: new Date(definition.createdAt),
-    updatedAt: definition.updatedAt ? new Date(definition.updatedAt) : new Date(),
-    userId: definition.userId || undefined,
-  }
-}
-
-function syncCustomToolsToStore(tools: CustomToolDefinition[]) {
-  const legacyTools = tools.map(convertToLegacyTool)
-  useCustomToolsStore.getState().setTools(legacyTools)
-}
-
 // Raw API response type (backend may return name or title)
 type RawApiCustomTool = Partial<CustomToolDefinition> & {
   id: string
@@ -146,7 +86,11 @@ async function fetchCustomTools(): Promise<CustomToolDefinition[]> {
   const data = await apiGet<RawApiCustomTool[]>('custom-tools')
 
   if (!Array.isArray(data)) {
-    throw new Error('Invalid response format')
+    throw createApiError(500, 'Invalid Custom Tools Response', {
+      code: 'CUSTOM_TOOLS_RESPONSE_INVALID',
+      message: 'Invalid response format',
+      data: null,
+    })
   }
 
   const normalizedTools: CustomToolDefinition[] = []
diff --git a/frontend/hooks/queries/folders.ts b/frontend/hooks/queries/folders.ts
deleted file mode 100644
index dd59c21df..000000000
--- a/frontend/hooks/queries/folders.ts
+++ /dev/null
@@ -1,280 +0,0 @@
-/**
- * Folders Queries
- *
- * Follow project standards:
- * - Use camelCase for types
- * - API response: { success: true, data: {...} }
- */
-import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { useEffect } from 'react'
-
-import { API_ENDPOINTS, apiDelete, apiGet, apiPost, apiPut } from '@/lib/api-client'
-import i18n from '@/lib/i18n/config'
-import { createLogger } from '@/lib/logs/console/logger'
-import { toastError, toastSuccess } from '@/lib/utils/toast'
-import { useFolderStore, type WorkflowFolder } from '@/stores/folders/store'
-
-import { STALE_TIME } from './constants'
-
-const logger = createLogger('FolderQueries')
-
-export const folderKeys = {
-  all: ['folders'] as const,
-  lists: () => [...folderKeys.all, 'list'] as const,
-  list: (workspaceId: string | undefined) => [...folderKeys.lists(), workspaceId ?? ''] as const,
-}
-
-interface WorkflowFolderDto {
-  id: string
-  name: string
-  userId: string
-  workspaceId: string
-  parentId: string | null
-  color: string | null
-  isExpanded: boolean
-  sortOrder: number
-  createdAt: string
-  updatedAt: string
-}
-
-interface ListFoldersResponse {
-  folders: WorkflowFolderDto[]
-}
-
-const mapFolderDtoToModel = (folder: WorkflowFolderDto): WorkflowFolder => ({
-  id: folder.id,
-  name: folder.name,
-  workspaceId: folder.workspaceId,
-  parentId: folder.parentId,
-  color: folder.color ?? '#6B7280',
-  isExpanded: folder.isExpanded,
-  sortOrder: folder.sortOrder,
-  createdAt: new Date(folder.createdAt),
-  updatedAt: new Date(folder.updatedAt),
-})
-
-export function useFolders(workspaceId?: string) {
-  const setFolders = useFolderStore((state) => state.setFolders)
-
-  const query = useQuery({
-    queryKey: folderKeys.list(workspaceId),
-    queryFn: async () => {
-      if (!workspaceId) {
-        return [] as WorkflowFolder[]
-      }
-
-      logger.info('Fetching folders from API', { workspaceId })
-      const result = await apiGet<ListFoldersResponse>(
-        `${API_ENDPOINTS.folders}?workspaceId=${encodeURIComponent(workspaceId)}`,
-      )
-      const folders = result.folders.map(mapFolderDtoToModel)
-      return folders
-    },
-    enabled: Boolean(workspaceId),
-    placeholderData: keepPreviousData,
-    staleTime: STALE_TIME.STANDARD,
-  })
-
-  useEffect(() => {
-    if (query.data) {
-      setFolders(query.data)
-    }
-  }, [query.data, setFolders])
-
-  return query
-}
-
-interface CreateFolderVariables {
-  workspaceId: string
-  name: string
-  parentId?: string | null
-  color?: string
-}
-
-interface CreateFolderResponse {
-  folder: WorkflowFolderDto
-}
-
-export function useCreateFolder() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async ({ workspaceId, name, parentId, color }: CreateFolderVariables) => {
-      logger.info('Creating folder', { workspaceId, name })
-
-      const result = await apiPost<CreateFolderResponse>(API_ENDPOINTS.folders, {
-        workspaceId,
-        name,
-        parentId: parentId ?? null,
-        color,
-      })
-
-      return mapFolderDtoToModel(result.folder)
-    },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({ queryKey: folderKeys.list(variables.workspaceId) })
-      logger.info('Folder created successfully')
-      toastSuccess(i18n.t('workspace.folderCreateSuccess') || 'Folder created successfully')
-    },
-    onError: (error) => {
-      logger.error('Failed to create folder', { error })
-      let errorMessage = i18n.t('workspace.folderCreateFailed') || 'Failed to create folder'
-      if (error instanceof Error) {
-        errorMessage = error.message || errorMessage
-      }
-      toastError(errorMessage)
-    },
-  })
-}
-
-interface UpdateFolderVariables {
-  workspaceId: string
-  id: string
-  updates: Partial<Pick<WorkflowFolder, 'name' | 'parentId' | 'color' | 'sortOrder' | 'isExpanded'>>
-}
-
-interface UpdateFolderResponse {
-  folder: WorkflowFolderDto
-}
-
-export function useUpdateFolder() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async ({ workspaceId, id, updates }: UpdateFolderVariables) => {
-      logger.info('Updating folder', { id, workspaceId, updates })
-
-      const payload: Record<string, unknown> = {
-        workspaceId,
-      }
-
-      if (typeof updates.name !== 'undefined') {
-        payload.name = updates.name
-      }
-      if (typeof updates.parentId !== 'undefined') {
-        payload.parentId = updates.parentId
-      }
-      if (typeof updates.color !== 'undefined') {
-        payload.color = updates.color
-      }
-      if (typeof updates.isExpanded !== 'undefined') {
-        payload.isExpanded = updates.isExpanded
-      }
-
-      const result = await apiPut<UpdateFolderResponse>(
-        `${API_ENDPOINTS.folders}/${encodeURIComponent(id)}`,
-        payload,
-      )
-
-      return mapFolderDtoToModel(result.folder)
-    },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({ queryKey: folderKeys.list(variables.workspaceId) })
-      // Only show toast when modifying name (expand/collapse doesn't need notification)
-      if (variables.updates.name) {
-        toastSuccess(i18n.t('workspace.folderUpdateSuccess') || 'Folder updated successfully')
-      }
-    },
-    onError: (error) => {
-      logger.error('Failed to update folder', { error })
-      let errorMessage = i18n.t('workspace.folderUpdateFailed') || 'Failed to update folder'
-      if (error instanceof Error) {
-        errorMessage = error.message || errorMessage
-      }
-      toastError(errorMessage)
-    },
-  })
-}
-
-interface DeleteFolderVariables {
-  workspaceId: string
-  id: string
-}
-
-export function useDeleteFolderMutation() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async ({ workspaceId, id }: DeleteFolderVariables) => {
-      logger.info('Deleting folder', { id, workspaceId })
-
-      await apiDelete<unknown>(`${API_ENDPOINTS.folders}/${encodeURIComponent(id)}`)
-      return { success: true }
-    },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({ queryKey: folderKeys.list(variables.workspaceId) })
-      toastSuccess(i18n.t('workspace.folderDeleteSuccess') || 'Folder deleted successfully')
-    },
-    onError: (error) => {
-      logger.error('Failed to delete folder', { error })
-      let errorMessage = i18n.t('workspace.folderDeleteFailed') || 'Failed to delete folder'
-      if (error instanceof Error) {
-        errorMessage = error.message || errorMessage
-      }
-      toastError(errorMessage)
-    },
-  })
-}
-
-interface DuplicateFolderVariables {
-  workspaceId: string
-  id: string
-  name: string
-  parentId?: string | null
-  color?: string
-}
-
-interface DuplicateFolderResponse {
-  id: string
-  name: string
-  color?: string | null
-  workspaceId: string
-  parentId: string | null
-}
-
-export function useDuplicateFolderMutation() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async ({ workspaceId, id, name, parentId, color }: DuplicateFolderVariables) => {
-      logger.info('Duplicating folder', { id, name, workspaceId })
-
-      const result = await apiPost<DuplicateFolderResponse>(
-        `${API_ENDPOINTS.folders}/${encodeURIComponent(id)}/duplicate`,
-        {
-          workspaceId,
-          name,
-          parentId: parentId ?? null,
-          color,
-        },
-      )
-
-      const dto: WorkflowFolderDto = {
-        id: result.id,
-        name: result.name,
-        userId: '', // Backend does not currently return user ID in duplicate response
-        workspaceId: result.workspaceId,
-        parentId: result.parentId,
-        color: result.color ?? '#6B7280',
-        isExpanded: false,
-        sortOrder: 0,
-        createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString(),
-      }
-
-      return mapFolderDtoToModel(dto)
-    },
-    onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries({ queryKey: folderKeys.list(variables.workspaceId) })
-      toastSuccess(i18n.t('workspace.folderDuplicateSuccess') || 'Folder duplicated successfully')
-    },
-    onError: (error) => {
-      logger.error('Failed to duplicate folder', { error })
-      let errorMessage = i18n.t('workspace.folderDuplicateFailed') || 'Failed to duplicate folder'
-      if (error instanceof Error) {
-        errorMessage = error.message || errorMessage
-      }
-      toastError(errorMessage)
-    },
-  })
-}
diff --git a/frontend/hooks/queries/graphs.ts b/frontend/hooks/queries/graphs.ts
deleted file mode 100644
index 2561f29df..000000000
--- a/frontend/hooks/queries/graphs.ts
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * Graphs Query Hooks
- *
- * Unified management of all graph-related API calls
- * - Use React Query for caching and deduplication
- * - Avoid duplicate requests
- * - Provide consistent queryKey management
- */
-import { useQuery, useMutation, useQueryClient, keepPreviousData } from '@tanstack/react-query'
-import type { Node, Edge } from 'reactflow'
-
-import type { AgentGraph } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { apiGet, apiPost, apiPut, apiDelete } from '@/lib/api-client'
-import { createLogger } from '@/lib/logs/console/logger'
-import type {
-  GraphDeploymentVersion as DeploymentVersion,
-  GraphDeploymentStatus as DeploymentStatus,
-} from '@/services/graphDeploymentService'
-
-import { STALE_TIME, CACHE_TIME } from './constants'
-
-// ============================================================================
-// Types - Import unified type definitions from service layer
-// ============================================================================
-
-// Re-export types for other modules to use
-export type { AgentGraph, DeploymentVersion, DeploymentStatus }
-
-const logger = createLogger('GraphsQueries')
-
-const isValidUUID = (str: string): boolean => {
-  const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-  return uuidRegex.test(str)
-}
-
-// GraphState is a type specific to this module
-export interface GraphState {
-  nodes: Node[]
-  edges: Edge[]
-  viewport?: { x: number; y: number; zoom: number }
-  variables?: { context?: Record<string, unknown> }
-}
-
-// ============================================================================
-// Query Key Factory
-// ============================================================================
-
-export const graphKeys = {
-  all: ['graphs'] as const,
-
-  // Lists
-  lists: () => [...graphKeys.all, 'list'] as const,
-  list: (workspaceId?: string) => [...graphKeys.lists(), workspaceId] as const,
-  deployed: () => [...graphKeys.all, 'deployed'] as const,
-
-  // Details
-  details: () => [...graphKeys.all, 'detail'] as const,
-  detail: (id: string) => [...graphKeys.details(), id] as const,
-
-  // Graph state (nodes, edges)
-  states: () => [...graphKeys.all, 'state'] as const,
-  state: (id: string) => [...graphKeys.states(), id] as const,
-
-  // Deployment
-  deployments: () => [...graphKeys.all, 'deployment'] as const,
-  deployment: (id: string) => [...graphKeys.deployments(), id] as const,
-
-  // Deployment versions
-  versions: (id: string) => [...graphKeys.deployments(), id, 'versions'] as const,
-
-  // Copilot history
-  copilotHistory: (id: string) => [...graphKeys.all, 'copilot', id] as const,
-} as const
-
-// ============================================================================
-// Fetch Functions
-// ============================================================================
-
-async function fetchGraphs(workspaceId?: string): Promise<AgentGraph[]> {
-  const url = workspaceId ? `graphs?workspaceId=${workspaceId}` : 'graphs'
-  const response = await apiGet<AgentGraph[]>(url)
-  return response || []
-}
-
-async function fetchDeployedGraphs(): Promise<AgentGraph[]> {
-  const response = await apiGet<AgentGraph[]>('graphs/deployed')
-  return response || []
-}
-
-async function fetchGraphState(graphId: string): Promise<GraphState> {
-  // apiGet's parseResponse already unwraps { success, data } structure, returns data directly
-  const data = (await apiGet<GraphState>(`graphs/${graphId}/state`)) || { nodes: [], edges: [] }
-
-  // Edge deduplication
-  if (data.edges && data.edges.length > 0) {
-    const seenEdges = new Set<string>()
-    data.edges = data.edges.filter((edge) => {
-      const key = `${edge.source}-${edge.target}`
-      if (seenEdges.has(key)) {
-        return false
-      }
-      seenEdges.add(key)
-      return true
-    })
-  }
-
-  return data
-}
-
-async function fetchDeploymentStatus(graphId: string): Promise<DeploymentStatus> {
-  return apiGet<DeploymentStatus>(`graphs/${graphId}/deploy`)
-}
-
-async function fetchDeploymentVersions(
-  graphId: string,
-  page: number = 1,
-  pageSize: number = 10,
-): Promise<{
-  versions: DeploymentVersion[]
-  total: number
-  page: number
-  pageSize: number
-  totalPages: number
-}> {
-  // Use correct backend endpoint /deployments (not /deploy/versions)
-  return apiGet(`graphs/${graphId}/deployments?page=${page}&page_size=${pageSize}`)
-}
-
-// Copilot History type definitions
-export interface CopilotHistoryMessage {
-  id: string
-  role: 'user' | 'assistant'
-  content: string
-  created_at: string | null
-  actions: Array<{ type: string; payload: Record<string, unknown> }> | null
-  thought_steps: Array<{ index: number; content: string }> | null
-  tool_calls: Array<{ tool: string; input: Record<string, unknown> }> | null
-}
-
-// apiGet automatically unwraps { success, data } structure, only returns data part
-export interface CopilotHistoryData {
-  graph_id: string
-  messages: CopilotHistoryMessage[]
-  created_at: string | null
-  updated_at: string | null
-}
-
-async function fetchCopilotHistory(graphId: string): Promise<CopilotHistoryData> {
-  return apiGet<CopilotHistoryData>(`graphs/${graphId}/copilot/history`)
-}
-
-// ============================================================================
-// Query Hooks
-// ============================================================================
-
-/**
- * Hook: Get list of all graphs in workspace
- *
- * Use the same queryKey to ensure cache consistency,
- * automatically deduplicate requests when multiple components use this hook
- */
-export function useGraphs(workspaceId?: string) {
-  return useQuery({
-    queryKey: graphKeys.list(workspaceId),
-    queryFn: () => fetchGraphs(workspaceId),
-    enabled: !!workspaceId,
-    staleTime: STALE_TIME.SHORT,
-    placeholderData: keepPreviousData,
-  })
-}
-
-/**
- * Hook: Get list of deployed graphs (for chat interface)
- */
-export function useDeployedGraphs() {
-  return useQuery({
-    queryKey: graphKeys.deployed(),
-    queryFn: fetchDeployedGraphs,
-    staleTime: STALE_TIME.SHORT,
-    placeholderData: keepPreviousData,
-  })
-}
-
-/**
- * Hook: Get single graph state (nodes, edges, viewport)
- *
- * Unified management of graph state fetching, use React Query for caching and deduplication
- * Avoid multiple components requesting the same graph state simultaneously
- *
- * @param graphId - Graph ID
- * @param options.enabled - Whether to enable query
- * @param options.refetchOnMount - Whether to refetch on mount (default false, use cache)
- */
-export function useGraphState(
-  graphId?: string,
-  options?: {
-    enabled?: boolean
-    refetchOnMount?: boolean | 'always'
-  },
-) {
-  return useQuery({
-    queryKey: graphKeys.state(graphId || ''),
-    queryFn: () => fetchGraphState(graphId!),
-    enabled: !!graphId && options?.enabled !== false,
-    staleTime: STALE_TIME.SHORT,
-    gcTime: CACHE_TIME.STANDARD,
-    refetchOnMount: options?.refetchOnMount ?? false, // default to use cache
-    refetchOnWindowFocus: false, // avoid duplicate requests when switching windows
-  })
-}
-
-/**
- * Hook: Get deployment status of graph
- *
- * This is key to solving duplicate /deploy requests
- * Use React Query's deduplication mechanism
- *
- * @param graphId - Graph ID
- * @param options.enabled - Whether to enable query (for conditional loading)
- */
-export function useDeploymentStatus(graphId?: string, options?: { enabled?: boolean }) {
-  return useQuery({
-    queryKey: graphKeys.deployment(graphId || ''),
-    queryFn: () => fetchDeploymentStatus(graphId!),
-    enabled: !!graphId && options?.enabled !== false,
-    staleTime: STALE_TIME.SHORT,
-    placeholderData: keepPreviousData,
-  })
-}
-
-/**
- * Hook: Get deployment version history of graph
- *
- * @param graphId - Graph ID
- * @param page - Page number
- * @param pageSize - Items per page
- * @param options.enabled - Whether to enable query (for conditional loading, e.g., when panel opens)
- */
-export function useDeploymentVersions(
-  graphId?: string,
-  page: number = 1,
-  pageSize: number = 10,
-  options?: { enabled?: boolean },
-) {
-  return useQuery({
-    queryKey: [...graphKeys.versions(graphId || ''), page, pageSize],
-    queryFn: () => fetchDeploymentVersions(graphId!, page, pageSize),
-    // Only execute when graphId exists and enabled is true (or not specified)
-    enabled: !!graphId && options?.enabled !== false,
-    staleTime: STALE_TIME.SHORT,
-    placeholderData: keepPreviousData,
-  })
-}
-
-/**
- * Hook: Get Copilot history
- *
- * Unified management of Copilot history fetching, avoid duplicate fetch function definitions in components
- *
- * @param graphId - Graph ID
- * @param options.enabled - Whether to enable query
- */
-export function useCopilotHistory(graphId?: string, options?: { enabled?: boolean }) {
-  return useQuery({
-    queryKey: graphKeys.copilotHistory(graphId || ''),
-    queryFn: () => fetchCopilotHistory(graphId!),
-    enabled: !!graphId && options?.enabled !== false,
-    staleTime: STALE_TIME.STANDARD,
-    // Don't show old data on first load
-    placeholderData: undefined,
-  })
-}
-
-// ============================================================================
-// Mutation Hooks
-// ============================================================================
-
-/**
- * Hook: Save graph state
- */
-export function useSaveGraphState() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (params: {
-      graphId: string
-      nodes: Node[]
-      edges: Edge[]
-      viewport?: { x: number; y: number; zoom: number }
-      variables?: { context?: Record<string, unknown> }
-    }) => {
-      if (!params.graphId || !isValidUUID(params.graphId)) {
-        logger.warn('useSaveGraphState called with invalid graphId, skip request', {
-          graphId: params.graphId,
-        })
-        return
-      }
-
-      await apiPost(`graphs/${params.graphId}/state`, {
-        nodes: params.nodes,
-        edges: params.edges,
-        viewport: params.viewport,
-        variables: params.variables,
-      })
-    },
-    onSuccess: (_, variables) => {
-      // Update state in cache
-      queryClient.setQueryData(graphKeys.state(variables.graphId), {
-        nodes: variables.nodes,
-        edges: variables.edges,
-        viewport: variables.viewport,
-        variables: variables.variables,
-      })
-    },
-  })
-}
-
-/**
- * Hook: Create new graph
- */
-export function useCreateGraph() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (params: {
-      name: string
-      description?: string
-      color?: string
-      workspaceId?: string | null
-      variables?: Record<string, unknown>
-    }) => {
-      const response = await apiPost<AgentGraph>('graphs', params)
-      return response
-    },
-    onSuccess: (newGraph, variables) => {
-      // Refresh graph list for corresponding workspace
-      if (variables.workspaceId) {
-        queryClient.invalidateQueries({ queryKey: graphKeys.list(variables.workspaceId) })
-      }
-    },
-  })
-}
-
-/**
- * Hook: Update graph information
- */
-export function useUpdateGraph() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (params: {
-      id: string
-      name?: string
-      description?: string
-      color?: string
-      workspaceId?: string
-    }) => {
-      const { id, workspaceId, ...updates } = params
-      await apiPut(`graphs/${id}`, updates)
-      return { id, workspaceId, ...updates }
-    },
-    onSuccess: (result) => {
-      // Refresh graph list
-      if (result.workspaceId) {
-        queryClient.invalidateQueries({ queryKey: graphKeys.list(result.workspaceId) })
-      }
-      // Refresh details
-      queryClient.invalidateQueries({ queryKey: graphKeys.detail(result.id) })
-    },
-  })
-}
-
-/**
- * Hook: Delete graph
- */
-export function useDeleteGraph() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (params: { id: string; workspaceId?: string }) => {
-      await apiDelete(`graphs/${params.id}`)
-      return params
-    },
-    onSuccess: (params) => {
-      // Refresh graph list
-      if (params.workspaceId) {
-        queryClient.invalidateQueries({ queryKey: graphKeys.list(params.workspaceId) })
-      }
-      // Clear related cache
-      queryClient.removeQueries({ queryKey: graphKeys.detail(params.id) })
-      queryClient.removeQueries({ queryKey: graphKeys.state(params.id) })
-      queryClient.removeQueries({ queryKey: graphKeys.deployment(params.id) })
-    },
-  })
-}
-
-/**
- * Hook: Deploy graph
- */
-export function useDeployGraph() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (params: { graphId: string; name?: string }) => {
-      return apiPost<{ message: string; version?: number }>(`graphs/${params.graphId}/deploy`, {
-        name: params.name,
-      })
-    },
-    onSuccess: (_, variables) => {
-      // Refresh deployment status
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployment(variables.graphId) })
-      // Refresh version list
-      queryClient.invalidateQueries({ queryKey: graphKeys.versions(variables.graphId) })
-      // Refresh deployed list
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployed() })
-    },
-  })
-}
-
-/**
- * Hook: Cancel graph deployment
- */
-export function useUndeployGraph() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (graphId: string) => {
-      await apiDelete(`graphs/${graphId}/deploy`)
-      return graphId
-    },
-    onSuccess: (graphId) => {
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployment(graphId) })
-      queryClient.invalidateQueries({ queryKey: graphKeys.deployed() })
-    },
-  })
-}
-
-// ============================================================================
-// Helper Hooks
-// ============================================================================
-
-/**
- * Helper: Get graph details (search from list cache to avoid extra requests)
- */
-export function useGraphFromCache(graphId?: string, workspaceId?: string) {
-  const { data: graphs } = useGraphs(workspaceId)
-  return graphs?.find((g) => g.id === graphId)
-}
-
-/**
- * Helper: Refresh all graph data related to workspace
- */
-export function useInvalidateGraphs() {
-  const queryClient = useQueryClient()
-
-  return (workspaceId?: string) => {
-    if (workspaceId) {
-      queryClient.invalidateQueries({ queryKey: graphKeys.list(workspaceId) })
-    } else {
-      queryClient.invalidateQueries({ queryKey: graphKeys.lists() })
-    }
-  }
-}
diff --git a/frontend/hooks/queries/index.ts b/frontend/hooks/queries/index.ts
index 601de5e98..59062efa9 100644
--- a/frontend/hooks/queries/index.ts
+++ b/frontend/hooks/queries/index.ts
@@ -1,6 +1,4 @@
 // Export all query hooks for convenient importing
-export * from './folders'
-export * from './graphs'
 export * from './workspaces'
 export * from './workspace'
 export * from './models'
@@ -13,4 +11,6 @@ export * from './custom-tools'
 export * from './general-settings'
 export * from './useMemories'
 export * from './platformTokens'
+export * from './tasks'
+export * from './agentRuns'
 export * from './constants'
diff --git a/frontend/hooks/queries/models.ts b/frontend/hooks/queries/models.ts
index 1a1e71605..650c720cd 100644
--- a/frontend/hooks/queries/models.ts
+++ b/frontend/hooks/queries/models.ts
@@ -405,10 +405,7 @@ export function useUpdateModelInstance() {
       instanceId: string
       request: UpdateModelInstanceRequest
     }) => {
-      const data = await apiPatch<ModelInstance>(
-        `${MODELS_PATH}/instances/${instanceId}`,
-        request,
-      )
+      const data = await apiPatch<ModelInstance>(`${MODELS_PATH}/instances/${instanceId}`, request)
       logger.info(`Updated model instance: ${instanceId}`)
       return data
     },
@@ -429,7 +426,14 @@ export function useModelUsageStats(params: {
 }) {
   const { period = '24h', granularity = 'hour', providerName, modelName, enabled = true } = params
   return useQuery({
-    queryKey: [...modelKeys.all, 'usage-stats', period, granularity, providerName, modelName] as const,
+    queryKey: [
+      ...modelKeys.all,
+      'usage-stats',
+      period,
+      granularity,
+      providerName,
+      modelName,
+    ] as const,
     queryFn: async (): Promise<ModelUsageStats> => {
       const p = new URLSearchParams({ period, granularity })
       if (providerName) p.set('provider_name', providerName)
diff --git a/frontend/hooks/queries/platformTokens.ts b/frontend/hooks/queries/platformTokens.ts
index 4a8f0aaaf..f59d9bee4 100644
--- a/frontend/hooks/queries/platformTokens.ts
+++ b/frontend/hooks/queries/platformTokens.ts
@@ -2,9 +2,19 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 
 import { STALE_TIME } from './constants'
 import { platformTokenService } from '@/services/platformTokenService'
-import type { PlatformToken, PlatformTokenCreateResponse, TokenCreateRequest, TokenListParams } from '@/services/platformTokenService'
+import type {
+  PlatformToken,
+  PlatformTokenCreateResponse,
+  TokenCreateRequest,
+  TokenListParams,
+} from '@/services/platformTokenService'
 
-export { type PlatformToken, type PlatformTokenCreateResponse, type TokenCreateRequest, type TokenListParams } from '@/services/platformTokenService'
+export {
+  type PlatformToken,
+  type PlatformTokenCreateResponse,
+  type TokenCreateRequest,
+  type TokenListParams,
+} from '@/services/platformTokenService'
 
 export const platformTokenKeys = {
   all: ['platform-tokens'] as const,
@@ -23,8 +33,7 @@ export function usePlatformTokens(params?: TokenListParams) {
 export function useCreateToken() {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: (payload: TokenCreateRequest) =>
-      platformTokenService.createToken(payload),
+    mutationFn: (payload: TokenCreateRequest) => platformTokenService.createToken(payload),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: platformTokenKeys.all })
     },
diff --git a/frontend/hooks/queries/runs.ts b/frontend/hooks/queries/runs.ts
deleted file mode 100644
index 01690d6b7..000000000
--- a/frontend/hooks/queries/runs.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-
-import { agentService } from '@/app/workspace/[workspaceId]/[agentId]/services/agentService'
-import { runService, type AgentListResponse, type RunListResponse, type RunSummary } from '@/services/runService'
-
-import { STALE_TIME } from './constants'
-import { useWorkspaces } from './workspaces'
-
-export const runKeys = {
-  all: ['runs'] as const,
-  list: (filters?: { runType?: string; agentName?: string; status?: string; search?: string; limit?: number }) =>
-    [
-      ...runKeys.all,
-      'list',
-      filters?.runType || '',
-      filters?.agentName || '',
-      filters?.status || '',
-      filters?.search || '',
-      filters?.limit || 50,
-    ] as const,
-  agents: () => [...runKeys.all, 'agents'] as const,
-  activeSkillCreator: (workspaceId: string) =>
-    [...runKeys.all, 'active-skill-creator', workspaceId] as const,
-}
-
-const SKILL_CREATOR_GRAPH_NAME = 'Skill Creator'
-
-async function findSkillCreatorGraphId(workspaceId: string): Promise<string | null> {
-  const graphs = await agentService.listGraphs(workspaceId)
-  const match = graphs.find((graph) => graph.name === SKILL_CREATOR_GRAPH_NAME)
-  return match?.id || null
-}
-
-export function useActiveSkillCreatorRun() {
-  const { data: workspaces = [], isLoading: workspacesLoading } = useWorkspaces()
-  const personalWorkspace = workspaces.find((workspace) => workspace.type === 'personal')
-  const workspaceId = personalWorkspace?.id || ''
-
-  const query = useQuery<RunSummary | null>({
-    queryKey: runKeys.activeSkillCreator(workspaceId),
-    enabled: Boolean(workspaceId),
-    queryFn: async () => {
-      const graphId = await findSkillCreatorGraphId(workspaceId)
-      if (!graphId) {
-        return null
-      }
-      return runService.findActiveRun({ agentName: 'skill_creator', graphId })
-    },
-    staleTime: STALE_TIME.SHORT,
-    refetchInterval: 15000,
-    refetchOnWindowFocus: true,
-  })
-
-  return {
-    ...query,
-    isLoading: workspacesLoading || query.isLoading,
-  }
-}
-
-export function useAgents() {
-  return useQuery<AgentListResponse>({
-    queryKey: runKeys.agents(),
-    queryFn: () => runService.listAgents(),
-    staleTime: Infinity,
-    refetchOnWindowFocus: false,
-  })
-}
-
-export function useRuns(filters?: {
-  runType?: string
-  agentName?: string
-  status?: string
-  search?: string
-  limit?: number
-}) {
-  return useQuery<RunListResponse>({
-    queryKey: runKeys.list(filters),
-    queryFn: () =>
-      runService.listRuns({
-        runType: filters?.runType,
-        agentName: filters?.agentName,
-        status: filters?.status,
-        search: filters?.search,
-        limit: filters?.limit,
-      }),
-    staleTime: STALE_TIME.SHORT,
-    refetchInterval: 15000,
-    refetchOnWindowFocus: true,
-  })
-}
-
-export function useCancelRun() {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    mutationFn: async (runId: string) => runService.cancelRun(runId),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: runKeys.all })
-    },
-  })
-}
diff --git a/frontend/hooks/queries/skillCollaborators.ts b/frontend/hooks/queries/skillCollaborators.ts
index 2c2c13386..d10d8d2c3 100644
--- a/frontend/hooks/queries/skillCollaborators.ts
+++ b/frontend/hooks/queries/skillCollaborators.ts
@@ -3,9 +3,17 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { STALE_TIME } from './constants'
 import { skillKeys } from './skills'
 import { skillCollaboratorService } from '@/services/skillCollaboratorService'
-import type { SkillCollaborator, SkillOwnerInfo, CollaboratorRole } from '@/services/skillCollaboratorService'
+import type {
+  SkillCollaborator,
+  SkillOwnerInfo,
+  CollaboratorRole,
+} from '@/services/skillCollaboratorService'
 
-export { type SkillCollaborator, type SkillOwnerInfo, type CollaboratorRole } from '@/services/skillCollaboratorService'
+export {
+  type SkillCollaborator,
+  type SkillOwnerInfo,
+  type CollaboratorRole,
+} from '@/services/skillCollaboratorService'
 
 export const skillCollaboratorKeys = {
   all: ['skill-collaborators'] as const,
@@ -47,8 +55,7 @@ export function useUpdateCollaboratorRole(skillId: string) {
 export function useRemoveCollaborator(skillId: string) {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: (userId: string) =>
-      skillCollaboratorService.removeCollaborator(skillId, userId),
+    mutationFn: (userId: string) => skillCollaboratorService.removeCollaborator(skillId, userId),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: skillCollaboratorKeys.list(skillId) })
     },
diff --git a/frontend/hooks/queries/skillVersions.ts b/frontend/hooks/queries/skillVersions.ts
index 46b32d85c..164fc3186 100644
--- a/frontend/hooks/queries/skillVersions.ts
+++ b/frontend/hooks/queries/skillVersions.ts
@@ -60,8 +60,7 @@ export function useDeleteVersion(skillId: string) {
 export function useRestoreDraft(skillId: string) {
   const queryClient = useQueryClient()
   return useMutation({
-    mutationFn: (version: string) =>
-      skillVersionService.restoreDraft(skillId, { version }),
+    mutationFn: (version: string) => skillVersionService.restoreDraft(skillId, { version }),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: skillKeys.all })
     },
diff --git a/frontend/hooks/queries/taskActivities.ts b/frontend/hooks/queries/taskActivities.ts
new file mode 100644
index 000000000..7977bdcca
--- /dev/null
+++ b/frontend/hooks/queries/taskActivities.ts
@@ -0,0 +1,83 @@
+/**
+ * Task Activities Queries
+ */
+import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query'
+
+import { taskActivityService } from '@/services/taskActivityService'
+import type { CreateTaskActivityRequest } from '@/types/task-activities'
+
+import { taskKeys } from './tasks'
+import { STALE_TIME } from './constants'
+
+// ==================== Query Keys ====================
+
+export const taskActivityKeys = {
+  all: ['taskActivities'] as const,
+  list: (taskId: string, workspaceId: string) =>
+    [...taskActivityKeys.all, 'list', taskId, workspaceId] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useTaskActivities(taskId: string, workspaceId: string) {
+  return useInfiniteQuery({
+    queryKey: taskActivityKeys.list(taskId, workspaceId),
+    queryFn: async ({ pageParam }) => {
+      return taskActivityService.list(taskId, workspaceId, {
+        cursor: pageParam ?? undefined,
+        limit: 50,
+      })
+    },
+    initialPageParam: null as string | null,
+    getNextPageParam: (lastPage) => (lastPage.has_more ? lastPage.next_cursor : undefined),
+    enabled: Boolean(taskId) && Boolean(workspaceId),
+    staleTime: STALE_TIME.SHORT,
+  })
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateTaskActivity() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      taskId,
+      workspaceId,
+      ...data
+    }: CreateTaskActivityRequest & { taskId: string; workspaceId: string }) => {
+      return taskActivityService.create(taskId, workspaceId, data)
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: taskActivityKeys.list(variables.taskId, variables.workspaceId),
+      })
+      queryClient.invalidateQueries({
+        queryKey: taskKeys.detail(variables.taskId, variables.workspaceId),
+      })
+    },
+  })
+}
+
+export function useDeleteTaskActivity() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      taskId,
+      activityId,
+      workspaceId,
+    }: {
+      taskId: string
+      activityId: string
+      workspaceId: string
+    }) => {
+      return taskActivityService.delete(taskId, activityId, workspaceId)
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({
+        queryKey: taskActivityKeys.list(variables.taskId, variables.workspaceId),
+      })
+    },
+  })
+}
diff --git a/frontend/hooks/queries/tasks.ts b/frontend/hooks/queries/tasks.ts
new file mode 100644
index 000000000..0693097d6
--- /dev/null
+++ b/frontend/hooks/queries/tasks.ts
@@ -0,0 +1,211 @@
+/**
+ * Tasks Queries
+ *
+ * Follow project standards:
+ * - Use camelCase for types
+ * - API response: { success: true, data: {...} }
+ */
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+
+import { taskService } from '@/services/taskService'
+import type { Task, CreateTaskRequest, UpdateTaskRequest, TaskStatus } from '@/types/tasks'
+import { INACTIVE_TASK_STATUSES, DEFAULT_MANUAL_TRANSITIONS } from '@/types/tasks'
+
+import { STALE_TIME } from './constants'
+import { agentRunKeys } from './agentRuns'
+
+// ==================== Query Keys ====================
+
+export const taskKeys = {
+  all: ['tasks'] as const,
+  list: (workspaceId: string, filters?: { status?: string; limit?: number; agent_id?: string }) =>
+    [
+      ...taskKeys.all,
+      'list',
+      workspaceId,
+      filters?.status || '',
+      filters?.limit || 50,
+      filters?.agent_id || '',
+    ] as const,
+  detail: (taskId: string, workspaceId: string) =>
+    [...taskKeys.all, 'detail', taskId, workspaceId] as const,
+  transitions: (workspaceId: string) =>
+    [...taskKeys.all, 'meta', 'transitions', workspaceId] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useTasks(
+  workspaceId: string,
+  filters?: { status?: string; limit?: number; agent_id?: string },
+  options?: { enabled?: boolean },
+) {
+  return useQuery({
+    queryKey: taskKeys.list(workspaceId, filters),
+    queryFn: async (): Promise<Task[]> => {
+      const tasks = await taskService.list(workspaceId, filters)
+      return tasks || []
+    },
+    enabled: Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: 15_000,
+    refetchOnWindowFocus: true,
+    placeholderData: keepPreviousData,
+  })
+}
+
+export function useTask(taskId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: taskKeys.detail(taskId, workspaceId),
+    queryFn: () => taskService.get(taskId, workspaceId),
+    enabled: Boolean(taskId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchInterval: (query) => {
+      const status = query.state.data?.status
+      if (status && INACTIVE_TASK_STATUSES.includes(status)) return false
+      return 10_000
+    },
+  })
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateTask() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async (data: CreateTaskRequest) => {
+      return taskService.create(data)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+    },
+  })
+}
+
+export function useUpdateTask() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      taskId,
+      workspaceId,
+      ...updates
+    }: UpdateTaskRequest & { taskId: string; workspaceId: string }) => {
+      return taskService.update(taskId, workspaceId, updates)
+    },
+    onMutate: async (variables) => {
+      await queryClient.cancelQueries({ queryKey: taskKeys.all })
+      const previous = queryClient.getQueriesData<Task[]>({ queryKey: taskKeys.all })
+
+      const { taskId: _id, workspaceId: _ws, ...updates } = variables
+
+      queryClient.setQueriesData<Task[]>({ queryKey: taskKeys.all }, (old) => {
+        if (!old || !Array.isArray(old)) return old
+        return old.map((m) => (m.id === variables.taskId ? ({ ...m, ...updates } as Task) : m))
+      })
+
+      const previousDetail = queryClient.getQueryData<Task>(
+        taskKeys.detail(variables.taskId, variables.workspaceId),
+      )
+      if (previousDetail) {
+        queryClient.setQueryData<Task>(taskKeys.detail(variables.taskId, variables.workspaceId), {
+          ...previousDetail,
+          ...updates,
+        } as Task)
+      }
+
+      return { previous, previousDetail }
+    },
+    onError: (_err, variables, context) => {
+      if (context?.previous) {
+        for (const [key, data] of context.previous) {
+          queryClient.setQueryData(key, data)
+        }
+      }
+      if (context?.previousDetail) {
+        queryClient.setQueryData(
+          taskKeys.detail(variables.taskId, variables.workspaceId),
+          context.previousDetail,
+        )
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+    },
+  })
+}
+
+export function useAssignTask() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({
+      taskId,
+      workspaceId,
+      agentId,
+    }: {
+      taskId: string
+      workspaceId: string
+      agentId: string
+    }) => {
+      return taskService.assign(taskId, workspaceId, agentId)
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+    },
+  })
+}
+
+export function useDispatchTask() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ taskId, workspaceId }: { taskId: string; workspaceId: string }) => {
+      return taskService.dispatch(taskId, workspaceId)
+    },
+    onSuccess: (data, variables) => {
+      queryClient.setQueryData(taskKeys.detail(variables.taskId, variables.workspaceId), data)
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+      queryClient.invalidateQueries({
+        queryKey: agentRunKeys.list({
+          workspace_id: variables.workspaceId,
+          task_id: variables.taskId,
+        }),
+      })
+    },
+  })
+}
+
+export function useCancelTask() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: async ({ taskId, workspaceId }: { taskId: string; workspaceId: string }) => {
+      return taskService.cancel(taskId, workspaceId)
+    },
+    onSuccess: (_data, variables) => {
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+      queryClient.invalidateQueries({
+        queryKey: agentRunKeys.list({
+          workspace_id: variables.workspaceId,
+          task_id: variables.taskId,
+        }),
+      })
+    },
+  })
+}
+
+// ==================== Task Meta ====================
+
+export function useTaskTransitions(workspaceId: string) {
+  return useQuery({
+    queryKey: taskKeys.transitions(workspaceId),
+    queryFn: async (): Promise<Record<TaskStatus, TaskStatus[]>> => {
+      const res = await taskService.getTransitions(workspaceId)
+      return (res ?? DEFAULT_MANUAL_TRANSITIONS) as Record<TaskStatus, TaskStatus[]>
+    },
+    enabled: Boolean(workspaceId),
+    staleTime: Infinity,
+  })
+}
diff --git a/frontend/hooks/queries/threads.ts b/frontend/hooks/queries/threads.ts
new file mode 100644
index 000000000..fa5457920
--- /dev/null
+++ b/frontend/hooks/queries/threads.ts
@@ -0,0 +1,86 @@
+/**
+ * Thread Queries
+ *
+ * React Query hooks for Thread entities.
+ * Message-related hooks removed — messages are now execution events.
+ */
+import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+
+import { threadService } from '@/services/threadService'
+import type { CreateThreadRequest, UpdateThreadRequest } from '@/types/thread'
+
+import { STALE_TIME } from './constants'
+
+// ==================== Query Keys ====================
+
+export const threadKeys = {
+  all: ['threads'] as const,
+  list: (agentId: string, workspaceId: string) =>
+    [...threadKeys.all, 'list', agentId, workspaceId] as const,
+  detail: (threadId: string, workspaceId: string) =>
+    [...threadKeys.all, 'detail', threadId, workspaceId] as const,
+}
+
+// ==================== Query Hooks ====================
+
+export function useThreads(agentId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: threadKeys.list(agentId, workspaceId),
+    queryFn: () => threadService.list(agentId, workspaceId),
+    enabled: Boolean(agentId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+    refetchOnWindowFocus: true,
+    placeholderData: keepPreviousData,
+  })
+}
+
+export function useThread(threadId: string, workspaceId: string, options?: { enabled?: boolean }) {
+  return useQuery({
+    queryKey: threadKeys.detail(threadId, workspaceId),
+    queryFn: () => threadService.get(threadId, workspaceId),
+    enabled: Boolean(threadId) && Boolean(workspaceId) && options?.enabled !== false,
+    staleTime: STALE_TIME.SHORT,
+  })
+}
+
+// ==================== Mutation Hooks ====================
+
+export function useCreateThread() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: (data: CreateThreadRequest & { workspace_id: string }) =>
+      threadService.create(data),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: threadKeys.all })
+    },
+  })
+}
+
+export function useUpdateThread() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: ({
+      threadId,
+      workspaceId,
+      ...updates
+    }: UpdateThreadRequest & { threadId: string; workspaceId: string }) =>
+      threadService.update(threadId, workspaceId, updates),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: threadKeys.all })
+    },
+  })
+}
+
+export function useArchiveThread() {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationFn: ({ threadId, workspaceId }: { threadId: string; workspaceId: string }) =>
+      threadService.archive(threadId, workspaceId),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: threadKeys.all })
+    },
+  })
+}
diff --git a/frontend/hooks/queries/workspace.ts b/frontend/hooks/queries/workspace.ts
index b77712fbb..1a118c33e 100644
--- a/frontend/hooks/queries/workspace.ts
+++ b/frontend/hooks/queries/workspace.ts
@@ -10,7 +10,7 @@
  */
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 
-import { apiGet, apiPatch, API_ENDPOINTS } from '@/lib/api-client'
+import { apiGet, apiPatch, API_ENDPOINTS, createApiError } from '@/lib/api-client'
 import { createLogger } from '@/lib/logs/console/logger'
 
 import { STALE_TIME } from './constants'
@@ -78,10 +78,16 @@ async function fetchWorkspaceSettings(workspaceId: string) {
 
   const settings = settingsResult.status === 'fulfilled' ? settingsResult.value : null
   const permissions =
-    permissionsResult.status === 'fulfilled' ? permissionsResult.value : { users: [] as BackendPermissionUser[] }
+    permissionsResult.status === 'fulfilled'
+      ? permissionsResult.value
+      : { users: [] as BackendPermissionUser[] }
 
   if (!settings) {
-    throw new Error('Failed to fetch workspace settings')
+    throw createApiError(500, 'Workspace Settings Fetch Failed', {
+      code: 'WORKSPACE_SETTINGS_FETCH_FAILED',
+      message: 'Failed to fetch workspace settings',
+      data: { workspace_id: workspaceId },
+    })
   }
 
   return {
@@ -160,18 +166,16 @@ async function fetchAdminWorkspaces(userId: string | undefined): Promise<AdminWo
   const workspacesData = await apiGet<{ workspaces: BackendWorkspace[] }>(API_ENDPOINTS.workspaces)
   const allUserWorkspaces = workspacesData.workspaces || []
 
-  const permissionPromises = allUserWorkspaces.map(
-    async (workspace) => {
-      try {
-        const permissionData = await apiGet<BackendPermissions>(
-          `${API_ENDPOINTS.workspaces}/${workspace.id}/permissions`,
-        )
-        return { workspace, permissionData }
-      } catch {
-        return null
-      }
-    },
-  )
+  const permissionPromises = allUserWorkspaces.map(async (workspace) => {
+    try {
+      const permissionData = await apiGet<BackendPermissions>(
+        `${API_ENDPOINTS.workspaces}/${workspace.id}/permissions`,
+      )
+      return { workspace, permissionData }
+    } catch {
+      return null
+    }
+  })
 
   const results = await Promise.all(permissionPromises)
 
@@ -189,7 +193,8 @@ async function fetchAdminWorkspaces(userId: string | undefined): Promise<AdminWo
       hasAdminAccess = currentUserPermission?.permissionType === 'admin'
     }
 
-    const isOwner = workspace.isOwner || workspace.ownerId === userId || workspace.owner_id === userId
+    const isOwner =
+      workspace.isOwner || workspace.ownerId === userId || workspace.owner_id === userId
 
     if (hasAdminAccess || isOwner) {
       adminWorkspaces.push({
diff --git a/frontend/hooks/queries/workspaces.ts b/frontend/hooks/queries/workspaces.ts
index 212c1c220..c4d3c892e 100644
--- a/frontend/hooks/queries/workspaces.ts
+++ b/frontend/hooks/queries/workspaces.ts
@@ -7,10 +7,11 @@
  */
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 
-import { apiGet, apiPost, apiPut, apiDelete, API_ENDPOINTS } from '@/lib/api-client'
+import { apiGet, apiPost, apiPut, apiDelete, API_ENDPOINTS, createApiError } from '@/lib/api-client'
 import i18n from '@/lib/i18n/config'
 import { createLogger } from '@/lib/logs/console/logger'
 import { toastError, toastSuccess } from '@/lib/utils/toast'
+import { ApiError } from '@/lib/api-client'
 
 import { STALE_TIME } from './constants'
 
@@ -100,7 +101,9 @@ export function useWorkspaces() {
  * Fetch single workspace
  */
 async function fetchWorkspace(id: string): Promise<Workspace> {
-  const response = await apiGet<{ workspace: BackendWorkspace }>(`${API_ENDPOINTS.workspaces}/${id}`)
+  const response = await apiGet<{ workspace: BackendWorkspace }>(
+    `${API_ENDPOINTS.workspaces}/${id}`,
+  )
   return mapWorkspace(response.workspace)
 }
 
@@ -133,7 +136,10 @@ export function useCreateWorkspace() {
 
   return useMutation({
     mutationFn: async (variables: CreateWorkspaceVariables): Promise<Workspace> => {
-      const response = await apiPost<{ workspace: BackendWorkspace }>(API_ENDPOINTS.workspaces, variables)
+      const response = await apiPost<{ workspace: BackendWorkspace }>(
+        API_ENDPOINTS.workspaces,
+        variables,
+      )
       return mapWorkspace(response.workspace)
     },
     onSuccess: (newWorkspace) => {
@@ -179,7 +185,11 @@ export function useUpdateWorkspace() {
         )
         const workspaceData = response.workspace || response
         if (!workspaceData) {
-          throw new Error('Invalid response format: workspace data not found')
+          throw createApiError(500, 'Workspace Update Response Invalid', {
+            code: 'WORKSPACE_RESPONSE_INVALID',
+            message: 'Invalid response format: workspace data not found',
+            data: { workspace_id: variables.id },
+          })
         }
         return mapWorkspace(workspaceData)
       } catch (error) {
@@ -255,13 +265,13 @@ export function useDeleteWorkspace() {
 
       // Show error message to user
       let errorMessage = 'Failed to delete workspace'
-      if (error instanceof Error) {
+      if (error instanceof ApiError) {
+        errorMessage =
+          error.code === 'PERSONAL_WORKSPACE_DELETE_FORBIDDEN'
+            ? i18n.t('workspace.personalSpaceCannotBeDeleted')
+            : error.message
+      } else if (error instanceof Error) {
         errorMessage = error.message
-        // Check if it's a personal space deletion error (backend returns Chinese message)
-        if (errorMessage.includes('Personal workspace cannot be deleted')) {
-          // Use i18n to get translated message
-          errorMessage = i18n.t('workspace.personalSpaceCannotBeDeleted')
-        }
       }
 
       toastError(errorMessage)
@@ -297,16 +307,15 @@ export function useDuplicateWorkspace() {
     onError: (error) => {
       logger.error('Failed to duplicate workspace', { error })
 
-      // Show error message to user
       let errorMessage = 'Failed to duplicate workspace'
-      if (error instanceof Error) {
+      if (error instanceof ApiError) {
+        errorMessage =
+          error.code === 'PERSONAL_WORKSPACE_DUPLICATE_FORBIDDEN'
+            ? i18n.t('workspace.personalSpaceCannotBeDuplicated') ||
+              'Personal space cannot be duplicated'
+            : error.message
+      } else if (error instanceof Error) {
         errorMessage = error.message
-        // Check if it's a personal space duplication error
-        if (errorMessage.includes('Personal workspace cannot be duplicated')) {
-          errorMessage =
-            i18n.t('workspace.personalSpaceCannotBeDuplicated') ||
-            'Personal space cannot be duplicated'
-        }
       }
       toastError(errorMessage)
     },
diff --git a/frontend/hooks/use-chat-send.ts b/frontend/hooks/use-chat-send.ts
new file mode 100644
index 000000000..615420e3c
--- /dev/null
+++ b/frontend/hooks/use-chat-send.ts
@@ -0,0 +1,69 @@
+'use client'
+
+import { useCallback, useState } from 'react'
+import { useQueryClient } from '@tanstack/react-query'
+
+import { threadService } from '@/services/threadService'
+import { apiUpload } from '@/lib/api-client'
+import { threadEventKeys } from './use-thread-events'
+import type { ChatAttachment, ThreadEvent } from '@/types/thread'
+
+export function useChatSend(threadId: string, workspaceId: string) {
+  const queryClient = useQueryClient()
+  const [isSending, setIsSending] = useState(false)
+  const [executionId, setExecutionId] = useState<string | null>(null)
+
+  const send = useCallback(
+    async (message: string, files: File[] = []) => {
+      if (!threadId || isSending) return null
+      setIsSending(true)
+
+      try {
+        const attachments: ChatAttachment[] = []
+        for (const file of files) {
+          const result = await apiUpload<{
+            filename: string
+            path: string
+            size: number
+          }>('files/upload', file)
+          attachments.push({
+            filename: result.filename,
+            storage_ref: result.path,
+            mime_type: file.type || 'application/octet-stream',
+            size_bytes: result.size,
+          })
+        }
+
+        const optimisticEvent: ThreadEvent = {
+          id: `optimistic-${Date.now()}`,
+          run_id: '',
+          execution_id: '',
+          sequence_no: -1,
+          event_type: 'user_message',
+          payload: {
+            text: message,
+            ...(attachments.length ? { attachments } : {}),
+          },
+          execution_status: 'running',
+          created_at: new Date().toISOString(),
+        }
+        queryClient.setQueryData(
+          threadEventKeys.events(threadId, workspaceId),
+          (old: { events: ThreadEvent[]; total: number } | undefined) => ({
+            events: [...(old?.events ?? []), optimisticEvent],
+            total: (old?.total ?? 0) + 1,
+          }),
+        )
+
+        const res = await threadService.sendChat(threadId, workspaceId, message, attachments)
+        setExecutionId(res.execution_id)
+        return res
+      } finally {
+        setIsSending(false)
+      }
+    },
+    [threadId, workspaceId, isSending, queryClient],
+  )
+
+  return { send, isSending, executionId }
+}
diff --git a/frontend/hooks/use-chat-stream.ts b/frontend/hooks/use-chat-stream.ts
new file mode 100644
index 000000000..53f3dc6b6
--- /dev/null
+++ b/frontend/hooks/use-chat-stream.ts
@@ -0,0 +1,74 @@
+'use client'
+
+import { useEffect, useRef } from 'react'
+import { useQueryClient } from '@tanstack/react-query'
+
+import { useExecutionStream } from './use-execution-stream'
+import { threadEventKeys } from './use-thread-events'
+import { TERMINAL_EXECUTION_STATUSES } from '@/types/agent-run'
+import type { ThreadEvent } from '@/types/thread'
+
+export function useChatStream(executionId: string | null, threadId: string, workspaceId: string) {
+  const queryClient = useQueryClient()
+  const { events, status } = useExecutionStream({
+    executionId: executionId || '',
+    enabled: Boolean(executionId),
+  })
+
+  const lastSeenSeqRef = useRef(-1)
+
+  useEffect(() => {
+    if (!executionId || !events.length) return
+
+    const newEvents = events.filter((e) => e.seq > lastSeenSeqRef.current)
+    if (!newEvents.length) return
+
+    lastSeenSeqRef.current = Math.max(...newEvents.map((e) => e.seq))
+
+    queryClient.setQueryData(
+      threadEventKeys.events(threadId, workspaceId),
+      (old: { events: ThreadEvent[]; total: number } | undefined) => {
+        const existing = old?.events ?? []
+        const mapped: ThreadEvent[] = newEvents.map((e) => ({
+          id: e.id || `stream-${e.seq}`,
+          run_id: '',
+          execution_id: executionId,
+          sequence_no: e.seq,
+          event_type: e.event_type,
+          payload: e.payload,
+          execution_status: status || 'running',
+          created_at: e.created_at || new Date().toISOString(),
+        }))
+        return {
+          events: [...existing, ...mapped],
+          total: (old?.total ?? 0) + mapped.length,
+        }
+      },
+    )
+  }, [events, executionId, threadId, workspaceId, status, queryClient])
+
+  const prevStatusRef = useRef<string | null>(null)
+  useEffect(() => {
+    const prev = prevStatusRef.current
+    prevStatusRef.current = status
+    if (
+      prev &&
+      !TERMINAL_EXECUTION_STATUSES.includes(prev as never) &&
+      status &&
+      TERMINAL_EXECUTION_STATUSES.includes(status as never)
+    ) {
+      lastSeenSeqRef.current = -1
+      setTimeout(() => {
+        queryClient.invalidateQueries({
+          queryKey: threadEventKeys.events(threadId, workspaceId),
+        })
+      }, 500)
+    }
+  }, [status, threadId, workspaceId, queryClient])
+
+  const isExecuting = Boolean(
+    executionId && status && !TERMINAL_EXECUTION_STATUSES.includes(status as never),
+  )
+
+  return { isExecuting, status }
+}
diff --git a/frontend/hooks/use-execution-stream.ts b/frontend/hooks/use-execution-stream.ts
new file mode 100644
index 000000000..56bc98ea8
--- /dev/null
+++ b/frontend/hooks/use-execution-stream.ts
@@ -0,0 +1,116 @@
+'use client'
+
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+import { getExecutionWsClient } from '@/lib/ws/executions/executionWsClient'
+import type {
+  ExecutionCompletedFrame,
+  ExecutionEventFrame,
+  ExecutionSnapshotFrame,
+} from '@/lib/ws/executions/types'
+import type { AppErrorPayload, ExecutionEvent } from '@/types/agent-run'
+
+interface UseExecutionStreamOptions {
+  executionId: string
+  enabled?: boolean
+}
+
+interface UseExecutionStreamResult {
+  events: ExecutionEvent[]
+  status: string | null
+  error: AppErrorPayload | null
+  isConnected: boolean
+  /** True if WS failed and we should fall back to polling */
+  wsFailed: boolean
+}
+
+/**
+ * WebSocket hook for real-time execution events.
+ * Connects to /ws/executions, subscribes to a single execution,
+ * receives snapshot + live events. Falls back to polling if WS fails.
+ */
+export function useExecutionStream({
+  executionId,
+  enabled = true,
+}: UseExecutionStreamOptions): UseExecutionStreamResult {
+  const [events, setEvents] = useState<ExecutionEvent[]>([])
+  const [status, setStatus] = useState<string | null>(null)
+  const [error, setError] = useState<AppErrorPayload | null>(null)
+  const [isConnected, setIsConnected] = useState(false)
+  const [wsFailed, setWsFailed] = useState(false)
+  const seqRef = useRef(0)
+  const failCountRef = useRef(0)
+  const mountedRef = useRef(true)
+
+  const handleSnapshot = useCallback((frame: ExecutionSnapshotFrame) => {
+    if (!mountedRef.current) return
+    seqRef.current = frame.last_seq
+    setStatus(frame.status)
+    setEvents(frame.events ?? [])
+    setError(null)
+    failCountRef.current = 0
+  }, [])
+
+  const handleEvent = useCallback((frame: ExecutionEventFrame) => {
+    if (!mountedRef.current) return
+    const newEvent: ExecutionEvent = {
+      id: `${frame.execution_id}-${frame.seq}`,
+      execution_id: frame.execution_id,
+      seq: frame.seq,
+      event_type: frame.event_type,
+      payload: frame.payload,
+      created_at: frame.created_at,
+    }
+    setEvents((prev) => {
+      if (prev.some((e) => e.seq === newEvent.seq)) return prev
+      return [...prev, newEvent]
+    })
+    failCountRef.current = 0
+  }, [])
+
+  const handleCompleted = useCallback((frame: ExecutionCompletedFrame) => {
+    if (!mountedRef.current) return
+    setStatus(frame.status)
+    setError(frame.error ?? null)
+  }, [])
+
+  const handleError = useCallback((wsError: AppErrorPayload) => {
+    if (!mountedRef.current) return
+    console.warn('[ExecStream] WS error:', wsError)
+    setError(wsError)
+    failCountRef.current += 1
+    if (failCountRef.current >= 3) {
+      setWsFailed(true)
+    }
+  }, [])
+
+  useEffect(() => {
+    if (!enabled || !executionId) return
+
+    mountedRef.current = true
+
+    const client = getExecutionWsClient()
+    const unsub = client.subscribeConnectionState((state) => {
+      if (mountedRef.current) setIsConnected(state.isConnected)
+    })
+
+    client
+      .subscribe(executionId, seqRef.current, {
+        onSnapshot: handleSnapshot,
+        onEvent: handleEvent,
+        onCompleted: handleCompleted,
+        onError: handleError,
+      })
+      .catch(() => {
+        if (mountedRef.current) setWsFailed(true)
+      })
+
+    return () => {
+      mountedRef.current = false
+      unsub()
+      client.unsubscribe(executionId)
+    }
+  }, [executionId, enabled, handleSnapshot, handleEvent, handleCompleted, handleError])
+
+  return { events, status, error, isConnected, wsFailed }
+}
diff --git a/frontend/hooks/use-model-selector.ts b/frontend/hooks/use-model-selector.ts
index 4979d6bee..16a218564 100644
--- a/frontend/hooks/use-model-selector.ts
+++ b/frontend/hooks/use-model-selector.ts
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { useAvailableModels } from '@/hooks/queries/models'
 import { splitModelId } from '@/lib/utils'
@@ -66,9 +66,16 @@ export function useModelSelector() {
     [modelOptions],
   )
 
-  const selectedModel = selected
-    ? `${selected.provider_name}:${selected.model_name}`
-    : undefined
+  const selectedModel = selected ? `${selected.provider_name}:${selected.model_name}` : undefined
+
+  useEffect(() => {
+    if (selected || modelOptions.length === 0) return
+    const first = modelOptions[0]
+    setSelected({
+      provider_name: first.provider_name,
+      model_name: first.name,
+    })
+  }, [modelOptions, selected])
 
   const modelLabel = useMemo(() => {
     if (selectedModel) {
@@ -78,5 +85,12 @@ export function useModelSelector() {
     return modelOptions[0]?.label ?? ''
   }, [modelOptions, selectedModel])
 
-  return { modelOptions, selectedModel, setSelectedModel, selectedProviderName: selected?.provider_name, selectedModelName: selected?.model_name, modelLabel }
+  return {
+    modelOptions,
+    selectedModel,
+    setSelectedModel,
+    selectedProviderName: selected?.provider_name,
+    selectedModelName: selected?.model_name,
+    modelLabel,
+  }
 }
diff --git a/frontend/hooks/use-skill-creator-run.ts b/frontend/hooks/use-skill-creator-run.ts
deleted file mode 100644
index 593b7dced..000000000
--- a/frontend/hooks/use-skill-creator-run.ts
+++ /dev/null
@@ -1,786 +0,0 @@
-/**
- * Hook encapsulating the full Skill Creator run lifecycle:
- * projection/reducer state, WS subscriptions, graph resolution,
- * history merging, and send/stop actions.
- */
-
-import { useRouter, useSearchParams } from 'next/navigation'
-import { useCallback, useEffect, useRef, useState } from 'react'
-
-import { findOrCreateGraphByTemplate } from '@/app/chat/services/utils/graphLookup'
-import { formatToolDisplay } from '@/app/chat/shared/ToolCallDisplay'
-import { generateId, type Message, type ToolCall } from '@/app/chat/types'
-import { apiGet, API_ENDPOINTS } from '@/lib/api-client'
-import { getChatWsClient } from '@/lib/ws/chat/chatWsClient'
-import type { IncomingChatAcceptedEvent } from '@/lib/ws/chat/types'
-import { getRunWsClient } from '@/lib/ws/runs/runWsClient'
-import type { RunEventFrame, RunSnapshotFrame, RunStatusFrame } from '@/lib/ws/runs/types'
-import { generateUUID } from '@/lib/utils/uuid'
-import { toastError } from '@/lib/utils/toast'
-import { conversationService, type ConversationMessage } from '@/services/conversationService'
-import { runService } from '@/services/runService'
-
-import type { SkillPreviewData } from '@/app/skills/creator/page'
-
-// ---------------------------------------------------------------------------
-// Projection types & helpers
-// ---------------------------------------------------------------------------
-
-interface SkillCreatorRunProjection {
-  version: number
-  run_type: string
-  status: string
-  graph_id: string | null
-  thread_id: string | null
-  edit_skill_id: string | null
-  messages: Array<Record<string, any>>
-  current_assistant_message_id: string | null
-  preview_data: Record<string, any> | string | null
-  file_tree: Record<string, { action: string; size?: number; timestamp?: number }>
-  interrupt: Record<string, any> | null
-  meta: Record<string, any>
-}
-
-const EMPTY_PROJECTION: SkillCreatorRunProjection = {
-  version: 1,
-  run_type: 'skill_creator',
-  status: 'idle',
-  graph_id: null,
-  thread_id: null,
-  edit_skill_id: null,
-  messages: [],
-  current_assistant_message_id: null,
-  preview_data: null,
-  file_tree: {},
-  interrupt: null,
-  meta: {},
-}
-
-function cloneProjection(projection?: SkillCreatorRunProjection | null): SkillCreatorRunProjection {
-  const source = projection || EMPTY_PROJECTION
-  return {
-    ...EMPTY_PROJECTION,
-    ...source,
-    messages: (source.messages || []).map((message) => ({
-      ...message,
-      tool_calls: Array.isArray(message.tool_calls)
-        ? message.tool_calls.map((tool: Record<string, any>) => ({
-            ...tool,
-            args: tool?.args && typeof tool.args === 'object' ? { ...tool.args } : {},
-          }))
-        : [],
-    })),
-    file_tree: { ...(source.file_tree || {}) },
-    meta: { ...(source.meta || {}) },
-  }
-}
-
-function normalizeProjection(input?: Record<string, any> | null): SkillCreatorRunProjection {
-  const candidate = input && typeof input === 'object' ? input : {}
-  return cloneProjection({
-    version: typeof candidate.version === 'number' ? candidate.version : 1,
-    run_type: typeof candidate.run_type === 'string' ? candidate.run_type : 'skill_creator',
-    status: typeof candidate.status === 'string' ? candidate.status : 'idle',
-    graph_id: typeof candidate.graph_id === 'string' ? candidate.graph_id : null,
-    thread_id: typeof candidate.thread_id === 'string' ? candidate.thread_id : null,
-    edit_skill_id: typeof candidate.edit_skill_id === 'string' ? candidate.edit_skill_id : null,
-    messages: Array.isArray(candidate.messages) ? candidate.messages : [],
-    current_assistant_message_id:
-      typeof candidate.current_assistant_message_id === 'string'
-        ? candidate.current_assistant_message_id
-        : null,
-    preview_data:
-      candidate.preview_data && typeof candidate.preview_data === 'object'
-        ? candidate.preview_data
-        : typeof candidate.preview_data === 'string'
-          ? candidate.preview_data
-          : null,
-    file_tree:
-      candidate.file_tree && typeof candidate.file_tree === 'object' ? candidate.file_tree : {},
-    interrupt: candidate.interrupt && typeof candidate.interrupt === 'object' ? candidate.interrupt : null,
-    meta: candidate.meta && typeof candidate.meta === 'object' ? candidate.meta : {},
-  })
-}
-
-// ---------------------------------------------------------------------------
-// Event reducer
-// ---------------------------------------------------------------------------
-
-function applySkillCreatorEvent(
-  projection: SkillCreatorRunProjection,
-  eventType: string,
-  payload: Record<string, any>,
-): SkillCreatorRunProjection {
-  const next = cloneProjection(projection)
-
-  if (eventType === 'run_initialized') {
-    next.graph_id = typeof payload.graph_id === 'string' ? payload.graph_id : next.graph_id
-    next.thread_id = typeof payload.thread_id === 'string' ? payload.thread_id : next.thread_id
-    next.edit_skill_id =
-      typeof payload.edit_skill_id === 'string' ? payload.edit_skill_id : next.edit_skill_id
-    return next
-  }
-
-  if (eventType === 'user_message_added') {
-    if (payload.message && typeof payload.message === 'object') {
-      next.messages.push(payload.message)
-    }
-    return next
-  }
-
-  if (eventType === 'assistant_message_started') {
-    if (payload.message && typeof payload.message === 'object') {
-      next.messages.push(payload.message)
-      next.current_assistant_message_id = String(payload.message.id || '')
-    }
-    return next
-  }
-
-  if (eventType === 'content_delta') {
-    const messageId = String(payload.message_id || '')
-    const delta = String(payload.delta || '')
-    if (!messageId || !delta) return next
-    next.messages = next.messages.map((message) =>
-      String(message.id || '') === messageId
-        ? { ...message, content: `${String(message.content || '')}${delta}` }
-        : message,
-    )
-    return next
-  }
-
-  if (eventType === 'tool_start') {
-    const messageId = String(payload.message_id || '')
-    const tool = payload.tool
-    if (!messageId || !tool || typeof tool !== 'object') return next
-    next.messages = next.messages.map((message) => {
-      if (String(message.id || '') !== messageId) return message
-      const toolCalls = Array.isArray(message.tool_calls) ? [...message.tool_calls, tool] : [tool]
-      return { ...message, tool_calls: toolCalls }
-    })
-    return next
-  }
-
-  if (eventType === 'tool_end') {
-    const messageId = String(payload.message_id || '')
-    const toolId = typeof payload.tool_id === 'string' ? payload.tool_id : null
-    next.messages = next.messages.map((message) => {
-      if (String(message.id || '') !== messageId) return message
-      const toolCalls = Array.isArray(message.tool_calls) ? [...message.tool_calls] : []
-      const targetIndex = toolId
-        ? toolCalls.findIndex((tool) => String(tool?.id || '') === toolId)
-        : toolCalls.findIndex((tool) => tool?.status === 'running')
-      if (targetIndex < 0) return message
-      toolCalls[targetIndex] = {
-        ...toolCalls[targetIndex],
-        status: 'completed',
-        result: payload.tool_output,
-        endTime: typeof payload.end_time === 'number' ? payload.end_time : toolCalls[targetIndex]?.endTime,
-      }
-      return { ...message, tool_calls: toolCalls }
-    })
-    if (payload.tool_name === 'preview_skill' && payload.tool_output != null) {
-      next.preview_data =
-        typeof payload.tool_output === 'object' || typeof payload.tool_output === 'string'
-          ? payload.tool_output
-          : next.preview_data
-    }
-    return next
-  }
-
-  if (eventType === 'file_event') {
-    const path = typeof payload.path === 'string' ? payload.path : ''
-    const action = typeof payload.action === 'string' ? payload.action : ''
-    if (!path || !action) return next
-    if (action === 'delete') {
-      delete next.file_tree[path]
-    } else {
-      next.file_tree[path] = {
-        action,
-        size: typeof payload.size === 'number' ? payload.size : undefined,
-        timestamp: typeof payload.timestamp === 'number' ? payload.timestamp : undefined,
-      }
-    }
-    return next
-  }
-
-  if (eventType === 'interrupt') {
-    next.interrupt = payload.interrupt && typeof payload.interrupt === 'object' ? payload.interrupt : null
-    next.current_assistant_message_id = null
-    return next
-  }
-
-  if (eventType === 'error') {
-    next.meta = { ...next.meta, error: payload.message }
-    return next
-  }
-
-  if (eventType === 'done') {
-    next.meta = { ...next.meta, completed: true }
-    next.current_assistant_message_id = null
-    return next
-  }
-
-  if (eventType === 'status') {
-    next.meta = { ...next.meta, status_message: payload.message }
-    return next
-  }
-
-  return next
-}
-
-// ---------------------------------------------------------------------------
-// Message mapping helpers
-// ---------------------------------------------------------------------------
-
-function normalizePreviewData(value: Record<string, any> | string | null): SkillPreviewData | null {
-  if (!value) return null
-  try {
-    const parsed = typeof value === 'string' ? JSON.parse(value) : value
-    if (!parsed || typeof parsed !== 'object' || !Array.isArray(parsed.files)) {
-      return null
-    }
-    return parsed as SkillPreviewData
-  } catch {
-    return null
-  }
-}
-
-function mapProjectionMessages(projection: SkillCreatorRunProjection): Message[] {
-  const isStreamingRun = projection.status === 'queued' || projection.status === 'running'
-  return projection.messages.map((message) => {
-    const role =
-      message.role === 'user' || message.role === 'assistant' || message.role === 'system'
-        ? message.role
-        : 'assistant'
-    const toolCalls = Array.isArray(message.tool_calls)
-      ? message.tool_calls.map((tool: Record<string, any>): ToolCall => {
-          const rawName = String(tool?.name || 'tool')
-          const rawArgs = tool?.args && typeof tool.args === 'object' ? tool.args : {}
-          const { label, detail } = formatToolDisplay(rawName, rawArgs)
-          const status =
-            tool?.status === 'completed' || tool?.status === 'failed' ? tool.status : 'running'
-          return {
-            id: String(tool?.id || generateId()),
-            name: label,
-            args: {
-              ...rawArgs,
-              _detail: detail,
-              _rawName: rawName,
-            },
-            status,
-            result: tool?.result,
-            startTime: typeof tool?.startTime === 'number' ? tool.startTime : Date.now(),
-            endTime: typeof tool?.endTime === 'number' ? tool.endTime : undefined,
-          }
-        })
-      : undefined
-
-    return {
-      id: String(message.id || generateId()),
-      role,
-      content: String(message.content || ''),
-      timestamp: typeof message.timestamp === 'number' ? message.timestamp : Date.now(),
-      tool_calls: toolCalls,
-      isStreaming:
-        projection.current_assistant_message_id === String(message.id || '') && isStreamingRun,
-    }
-  })
-}
-
-function mapConversationMessageToUi(message: ConversationMessage): Message {
-  const metadata = message.metadata && typeof message.metadata === 'object' ? message.metadata : {}
-  const toolCalls = Array.isArray(metadata.tool_calls)
-    ? metadata.tool_calls.map((tool: Record<string, any>): ToolCall => {
-        const rawName = String(tool?.name || 'tool')
-        const rawArgs = tool?.arguments && typeof tool.arguments === 'object' ? tool.arguments : {}
-        const { label, detail } = formatToolDisplay(rawName, rawArgs)
-        const timestamp = new Date(message.created_at).getTime() || Date.now()
-        return {
-          id: String(tool?.id || generateId()),
-          name: label,
-          args: {
-            ...rawArgs,
-            _detail: detail,
-            _rawName: rawName,
-          },
-          status: 'completed',
-          startTime: timestamp,
-          endTime: timestamp,
-        }
-      })
-    : undefined
-
-  return {
-    id: `history-${message.id}`,
-    role:
-      message.role === 'user' || message.role === 'assistant' || message.role === 'system'
-        ? message.role
-        : 'assistant',
-    content: String(message.content || ''),
-    timestamp: new Date(message.created_at).getTime() || Date.now(),
-    tool_calls: toolCalls,
-  }
-}
-
-function areMessagesEquivalent(left: Message, right: Message): boolean {
-  const leftToolNames = (left.tool_calls || []).map((tool) => tool.args?._rawName || tool.name).join('|')
-  const rightToolNames = (right.tool_calls || []).map((tool) => tool.args?._rawName || tool.name).join('|')
-  return left.role === right.role && left.content === right.content && leftToolNames === rightToolNames
-}
-
-function mergeHistoryWithRunMessages(historyMessages: Message[], runMessages: Message[]): Message[] {
-  if (!historyMessages.length) return runMessages
-  if (!runMessages.length) return historyMessages
-
-  let overlap = 0
-  const maxOverlap = Math.min(historyMessages.length, runMessages.length)
-  for (let size = maxOverlap; size > 0; size -= 1) {
-    let matched = true
-    for (let index = 0; index < size; index += 1) {
-      if (!areMessagesEquivalent(historyMessages[historyMessages.length - size + index], runMessages[index])) {
-        matched = false
-        break
-      }
-    }
-    if (matched) {
-      overlap = size
-      break
-    }
-  }
-
-  return [...historyMessages, ...runMessages.slice(overlap)]
-}
-
-function buildSkillCreatorUrl(runId: string, editSkillId: string | null): string {
-  const params = new URLSearchParams()
-  params.set('run', runId)
-  if (editSkillId) {
-    params.set('edit', editSkillId)
-  }
-  return `/skills/creator?${params.toString()}`
-}
-
-// ---------------------------------------------------------------------------
-// Hook
-// ---------------------------------------------------------------------------
-
-export interface UseSkillCreatorRunReturn {
-  messages: Message[]
-  isProcessing: boolean
-  isSubmitting: boolean
-  threadId: string | null
-  previewData: SkillPreviewData | null
-  fileTree: Record<string, { action: string; size?: number; timestamp?: number }>
-  graphReady: boolean
-  graphError: string | null
-  effectiveEditSkillId: string | null
-  hasRunState: boolean
-  showSaveDialog: boolean
-  setShowSaveDialog: (open: boolean) => void
-  sendMessage: (userPrompt: string) => Promise<boolean>
-  stopMessage: () => void
-  handleRegenerate: () => void
-  handleSaved: (skillId: string) => void
-}
-
-interface PendingRunAcceptance {
-  requestId: string
-  runId: string
-  timeoutId: number
-  resolve: () => void
-  reject: (error: Error) => void
-}
-
-export function useSkillCreatorRun(): UseSkillCreatorRunReturn {
-  const searchParams = useSearchParams()
-  const router = useRouter()
-  const routeEditSkillId = searchParams.get('edit') || null
-  const runParam = searchParams.get('run') || null
-
-  const [messages, setMessages] = useState<Message[]>([])
-  const [isProcessing, setIsProcessing] = useState(false)
-  const [threadId, setThreadId] = useState<string | null>(null)
-  const [previewData, setPreviewData] = useState<SkillPreviewData | null>(null)
-  const [fileTree, setFileTree] = useState<Record<string, { action: string; size?: number; timestamp?: number }>>({})
-  const [showSaveDialog, setShowSaveDialog] = useState(false)
-  const [graphReady, setGraphReady] = useState(false)
-  const [graphError, setGraphError] = useState<string | null>(null)
-  const [projection, setProjection] = useState<SkillCreatorRunProjection>(EMPTY_PROJECTION)
-  const [runId, setRunId] = useState<string | null>(runParam)
-  const [historyMessages, setHistoryMessages] = useState<Message[]>([])
-  const [isSubmitting, setIsSubmitting] = useState(false)
-
-  const graphIdRef = useRef<string | null>(null)
-  const threadIdRef = useRef<string | null>(null)
-  const currentRequestIdRef = useRef<string | null>(null)
-  const clientRef = useRef(getChatWsClient())
-  const runWsClientRef = useRef(getRunWsClient())
-  const lastSeqRef = useRef(0)
-  const activeRunIdRef = useRef<string | null>(runParam)
-  const isMountedRef = useRef(true)
-  const sendLockRef = useRef(false)
-  const pendingAcceptanceRef = useRef<PendingRunAcceptance | null>(null)
-
-  const resolvePendingAcceptance = useCallback((runId?: string | null) => {
-    const pending = pendingAcceptanceRef.current
-    if (!pending) return false
-    if (runId && pending.runId !== runId) return false
-    clearTimeout(pending.timeoutId)
-    pendingAcceptanceRef.current = null
-    pending.resolve()
-    return true
-  }, [])
-
-  const rejectPendingAcceptance = useCallback((error: Error, runId?: string | null) => {
-    const pending = pendingAcceptanceRef.current
-    if (!pending) return false
-    if (runId && pending.runId !== runId) return false
-    clearTimeout(pending.timeoutId)
-    pendingAcceptanceRef.current = null
-    pending.reject(error)
-    return true
-  }, [])
-
-  // ---- lifecycle ----
-  useEffect(() => {
-    isMountedRef.current = true
-    return () => {
-      isMountedRef.current = false
-      currentRequestIdRef.current = null
-      activeRunIdRef.current = null
-      rejectPendingAcceptance(new Error('Skill creator page unmounted'))
-    }
-  }, [rejectPendingAcceptance])
-
-  useEffect(() => {
-    setRunId(runParam)
-  }, [runParam])
-
-  // ---- graph resolution ----
-  useEffect(() => {
-    async function resolveGraphId() {
-      try {
-        const response = await apiGet<{ workspaces: Array<{ id: string; type?: string }> }>(
-          API_ENDPOINTS.workspaces,
-        )
-        const personal = (response.workspaces || []).find((workspace) => workspace.type === 'personal')
-        if (!personal) {
-          if (isMountedRef.current) setGraphError('Personal workspace not found')
-          return
-        }
-
-        const graph = await findOrCreateGraphByTemplate('Skill Creator', 'skill-creator', personal.id)
-        graphIdRef.current = graph.id
-        if (isMountedRef.current) setGraphReady(true)
-      } catch (error) {
-        console.error('Failed to resolve skill-creator graph:', error)
-        if (isMountedRef.current) {
-          setGraphError(error instanceof Error ? error.message : 'Failed to initialize Skill Creator')
-        }
-      }
-    }
-
-    void resolveGraphId()
-  }, [])
-
-  // ---- derive UI state from projection ----
-  useEffect(() => {
-    const normalized = normalizeProjection(projection)
-    const nextMessages = mergeHistoryWithRunMessages(historyMessages, mapProjectionMessages(normalized))
-    const nextPreviewData = normalizePreviewData(normalized.preview_data)
-    const nextThreadId = normalized.thread_id || null
-    const nextStatus = normalized.status || 'idle'
-
-    threadIdRef.current = nextThreadId
-    setMessages(nextMessages)
-    setPreviewData(nextPreviewData)
-    setFileTree(normalized.file_tree || {})
-    setThreadId(nextThreadId)
-    setIsProcessing(nextStatus === 'queued' || nextStatus === 'running')
-  }, [historyMessages, projection])
-
-  const effectiveEditSkillId = routeEditSkillId || projection.edit_skill_id || null
-
-  // ---- auto-discover active run ----
-  useEffect(() => {
-    if (!graphReady || !graphIdRef.current || runParam) return
-
-    let cancelled = false
-    void runService
-      .findActiveSkillCreatorRun({ graphId: graphIdRef.current })
-      .then((activeRun) => {
-        if (cancelled || !activeRun?.run_id) return
-        setRunId(activeRun.run_id)
-        router.replace(buildSkillCreatorUrl(activeRun.run_id, effectiveEditSkillId))
-      })
-      .catch((error) => {
-        if (!cancelled) {
-          console.error('Failed to discover active skill creator run:', error)
-        }
-      })
-
-    return () => {
-      cancelled = true
-    }
-  }, [effectiveEditSkillId, graphReady, router, runParam])
-
-  // ---- load conversation history ----
-  useEffect(() => {
-    if (!threadId) {
-      setHistoryMessages([])
-      return
-    }
-
-    let cancelled = false
-    void conversationService
-      .getConversationHistory(threadId, { pageSize: 200 })
-      .then((items) => {
-        if (cancelled) return
-        setHistoryMessages(items.map(mapConversationMessageToUi))
-      })
-      .catch((error) => {
-        if (!cancelled) {
-          console.error('Failed to load skill creator conversation history:', error)
-        }
-      })
-
-    return () => {
-      cancelled = true
-    }
-  }, [threadId])
-
-  // ---- run WS handlers ----
-  const handleRunSnapshot = useCallback((frame: RunSnapshotFrame) => {
-    if (activeRunIdRef.current !== frame.run_id) return
-    lastSeqRef.current = frame.last_seq
-    setIsSubmitting(false)
-    resolvePendingAcceptance(frame.run_id)
-    setProjection(normalizeProjection(frame.data))
-  }, [resolvePendingAcceptance])
-
-  const handleRunEvent = useCallback((frame: RunEventFrame) => {
-    if (activeRunIdRef.current !== frame.run_id) return
-    lastSeqRef.current = frame.seq
-    setProjection((current) => applySkillCreatorEvent(current, frame.event_type, frame.data || {}))
-  }, [])
-
-  const handleRunStatus = useCallback((frame: RunStatusFrame) => {
-    if (activeRunIdRef.current !== frame.run_id) return
-    setIsSubmitting(false)
-    resolvePendingAcceptance(frame.run_id)
-    setProjection((current) => {
-      const next = cloneProjection(current)
-      next.status = frame.status
-      if (frame.error_message) {
-        next.meta = { ...next.meta, error: frame.error_message }
-      }
-      return next
-    })
-  }, [resolvePendingAcceptance])
-
-  // ---- run subscription ----
-  useEffect(() => {
-    if (!runId) {
-      activeRunIdRef.current = null
-      lastSeqRef.current = 0
-      setIsSubmitting(false)
-      rejectPendingAcceptance(new Error('Skill creator run reset before acceptance'))
-      setProjection(EMPTY_PROJECTION)
-      return
-    }
-
-    activeRunIdRef.current = runId
-    lastSeqRef.current = 0
-
-    void runWsClientRef.current.subscribe(runId, 0, {
-      onSnapshot: handleRunSnapshot,
-      onEvent: handleRunEvent,
-      onStatus: handleRunStatus,
-      onError: (message) => {
-        if (activeRunIdRef.current !== runId) return
-        setIsSubmitting(false)
-        rejectPendingAcceptance(new Error(message), runId)
-        console.error('Skill creator run ws error:', message)
-      },
-    })
-
-    return () => {
-      runWsClientRef.current.unsubscribe(runId)
-      if (activeRunIdRef.current === runId) {
-        activeRunIdRef.current = null
-      }
-    }
-  }, [handleRunEvent, handleRunSnapshot, handleRunStatus, runId])
-
-  // ---- actions ----
-  const sendMessage = useCallback(
-    async (userPrompt: string) => {
-      if (!userPrompt.trim() || sendLockRef.current || !graphReady || !graphIdRef.current) return false
-      sendLockRef.current = true
-      setIsSubmitting(true)
-      let pendingRunId: string | null = null
-
-      try {
-        await clientRef.current.connect()
-
-        const createdRun = await runService.createSkillCreatorRun({
-          message: userPrompt,
-          graph_id: graphIdRef.current,
-          thread_id: threadIdRef.current,
-          edit_skill_id: effectiveEditSkillId,
-        })
-
-        const nextRunId = createdRun.run_id
-        pendingRunId = nextRunId
-        const requestId = generateUUID()
-
-        currentRequestIdRef.current = requestId
-        activeRunIdRef.current = nextRunId
-        lastSeqRef.current = 0
-        setRunId(nextRunId)
-        router.replace(buildSkillCreatorUrl(nextRunId, effectiveEditSkillId))
-
-        const acceptedPromise = new Promise<void>((resolve, reject) => {
-          const timeoutId = window.setTimeout(() => {
-            if (!rejectPendingAcceptance(new Error('Timed out waiting for Skill Creator acceptance'), nextRunId)) {
-              reject(new Error('Timed out waiting for Skill Creator acceptance'))
-            }
-          }, 10000)
-          pendingAcceptanceRef.current = {
-            requestId,
-            runId: nextRunId,
-            timeoutId,
-            resolve,
-            reject,
-          }
-        })
-
-        const handleAccepted = (event: IncomingChatAcceptedEvent) => {
-          if (event.request_id !== requestId) return
-          resolvePendingAcceptance(nextRunId)
-        }
-
-        void clientRef.current
-          .sendChat({
-            requestId,
-            threadId: createdRun.thread_id,
-            graphId: graphIdRef.current,
-            input: { message: userPrompt },
-            extension: {
-              kind: 'skill_creator',
-              runId: nextRunId,
-              editSkillId: effectiveEditSkillId,
-            },
-            metadata: {},
-            onAccepted: handleAccepted,
-            onEvent: (evt) => {
-              if (evt.type === 'error') {
-                const msg = evt.data.message || 'Unknown error'
-                toastError(msg)
-                setIsProcessing(false)
-                setIsSubmitting(false)
-              }
-            },
-          })
-          .then(async (result) => {
-            if (result.terminal === 'error') {
-              rejectPendingAcceptance(
-                new Error('Skill creator execution failed'),
-                nextRunId,
-              )
-              setIsProcessing(false)
-              setIsSubmitting(false)
-              try {
-                await runService.cancelRun(nextRunId)
-              } catch (cancelError) {
-                console.error('Failed to cancel queued skill creator run:', cancelError)
-              }
-            }
-          })
-          .catch(async (error) => {
-            rejectPendingAcceptance(
-              error instanceof Error ? error : new Error('Failed to dispatch skill creator chat command'),
-              nextRunId,
-            )
-            console.error('Failed to dispatch skill creator chat command:', error)
-            setIsSubmitting(false)
-            try {
-              await runService.cancelRun(nextRunId)
-            } catch (cancelError) {
-              console.error('Failed to cancel queued skill creator run:', cancelError)
-            }
-          })
-          .finally(() => {
-            if (currentRequestIdRef.current === requestId) {
-              currentRequestIdRef.current = null
-            }
-            sendLockRef.current = false
-          })
-
-        await acceptedPromise
-        return true
-      } catch (error) {
-        console.error('Failed to start skill creator run:', error)
-        setIsSubmitting(false)
-        rejectPendingAcceptance(
-          error instanceof Error ? error : new Error('Failed to start skill creator run'),
-        )
-        if (pendingRunId) {
-          try {
-            await runService.cancelRun(pendingRunId)
-          } catch (cancelError) {
-            console.error('Failed to cancel skill creator run after start failure:', cancelError)
-          }
-        }
-        sendLockRef.current = false
-        return false
-      }
-    },
-    [effectiveEditSkillId, graphReady, rejectPendingAcceptance, resolvePendingAcceptance, router],
-  )
-
-  const stopMessage = useCallback(() => {
-    const requestId = currentRequestIdRef.current
-    if (requestId) {
-      clientRef.current.stopByRequestId(requestId)
-    }
-    if (runId) {
-      void runService.cancelRun(runId).catch((error) => {
-        console.error('Failed to cancel skill creator run:', error)
-      })
-    }
-    currentRequestIdRef.current = null
-  }, [runId])
-
-  const handleRegenerate = useCallback(() => {
-    void sendMessage('Please regenerate the skill with improvements based on the validation feedback.')
-  }, [sendMessage])
-
-  const handleSaved = useCallback(
-    (_skillId: string) => {
-      router.push('/skills')
-    },
-    [router],
-  )
-
-  const hasRunState = !!runId || messages.length > 0 || !!threadId
-
-  return {
-    messages,
-    isProcessing,
-    isSubmitting,
-    threadId,
-    previewData,
-    fileTree,
-    graphReady,
-    graphError,
-    effectiveEditSkillId,
-    hasRunState,
-    showSaveDialog,
-    setShowSaveDialog,
-    sendMessage,
-    stopMessage,
-    handleRegenerate,
-    handleSaved,
-  }
-}
diff --git a/frontend/hooks/use-test-model-stream.ts b/frontend/hooks/use-test-model-stream.ts
index a64eaf4aa..b2848f4ac 100644
--- a/frontend/hooks/use-test-model-stream.ts
+++ b/frontend/hooks/use-test-model-stream.ts
@@ -2,7 +2,7 @@
 
 import { useCallback, useRef, useState } from 'react'
 
-import { apiStream } from '@/lib/api-client'
+import { ApiError, apiStream, createApiError, type ApiErrorPayload } from '@/lib/api-client'
 import type {
   TestModelStreamMetrics,
   TestModelStreamRequest,
@@ -32,7 +32,13 @@ export function useTestModelStream() {
       })
 
       const reader = response.body?.getReader()
-      if (!reader) throw new Error('No response body')
+      if (!reader) {
+        throw createApiError(500, 'Invalid Stream Response', {
+          code: 'MODEL_STREAM_RESPONSE_INVALID',
+          message: 'No response body',
+          data: null,
+        })
+      }
 
       const decoder = new TextDecoder()
       let buffer = ''
@@ -50,7 +56,7 @@ export function useTestModelStream() {
           if (!eventMatch) continue
 
           const [, eventType, dataStr] = eventMatch
-          let data: any
+          let data: unknown
           try {
             data = JSON.parse(dataStr)
           } catch {
@@ -58,11 +64,17 @@ export function useTestModelStream() {
           }
 
           if (eventType === 'token') {
-            setState((prev) => ({ ...prev, output: prev.output + (data.token ?? '') }))
+            const tokenData = data as { token?: string }
+            setState((prev) => ({ ...prev, output: prev.output + (tokenData.token ?? '') }))
           } else if (eventType === 'metrics') {
             setState((prev) => ({ ...prev, metrics: data as TestModelStreamMetrics }))
           } else if (eventType === 'error') {
-            setState((prev) => ({ ...prev, error: data.error ?? 'Unknown error', isStreaming: false }))
+            const errorPayload = data as ApiErrorPayload
+            setState((prev) => ({
+              ...prev,
+              error: errorPayload,
+              isStreaming: false,
+            }))
             return
           } else if (eventType === 'done') {
             // handled below
@@ -71,7 +83,29 @@ export function useTestModelStream() {
       }
     } catch (err: unknown) {
       if (err instanceof Error && err.name === 'AbortError') return
-      setState((prev) => ({ ...prev, error: err instanceof Error ? err.message : 'Request failed', isStreaming: false }))
+      const apiError =
+        err instanceof ApiError
+          ? err
+          : err instanceof Error
+            ? createApiError(0, 'Stream Error', {
+                code: 'MODEL_STREAM_CLIENT_ERROR',
+                message: err.message,
+                data: null,
+              })
+            : createApiError(0, 'Stream Error', {
+                code: 'MODEL_STREAM_CLIENT_ERROR',
+                message: 'Request failed',
+                data: null,
+              })
+      setState((prev) => ({
+        ...prev,
+        error: {
+          code: apiError.code || 'MODEL_STREAM_CLIENT_ERROR',
+          message: apiError.message,
+          data: apiError.data,
+        },
+        isStreaming: false,
+      }))
       return
     }
 
diff --git a/frontend/hooks/use-thread-events.ts b/frontend/hooks/use-thread-events.ts
new file mode 100644
index 000000000..259b663f0
--- /dev/null
+++ b/frontend/hooks/use-thread-events.ts
@@ -0,0 +1,23 @@
+'use client'
+
+import { useQuery } from '@tanstack/react-query'
+
+import { threadService } from '@/services/threadService'
+
+export const threadEventKeys = {
+  events: (threadId: string, workspaceId: string) =>
+    ['thread-events', threadId, workspaceId] as const,
+}
+
+export function useThreadEvents(
+  threadId: string,
+  workspaceId: string,
+  options?: { enabled?: boolean },
+) {
+  return useQuery({
+    queryKey: threadEventKeys.events(threadId, workspaceId),
+    queryFn: () => threadService.listThreadEvents(threadId, workspaceId),
+    enabled: Boolean(threadId) && Boolean(workspaceId) && options?.enabled !== false,
+    refetchOnWindowFocus: false,
+  })
+}
diff --git a/frontend/hooks/use-workspace-permissions.ts b/frontend/hooks/use-workspace-permissions.ts
index 8524052e8..c6146a711 100644
--- a/frontend/hooks/use-workspace-permissions.ts
+++ b/frontend/hooks/use-workspace-permissions.ts
@@ -111,11 +111,11 @@ export function useWorkspacePermissions(workspaceId: string | null): UseWorkspac
     const userId = session?.user?.id || ''
     const userName = session?.user?.name || null
 
-    if (!userEmail) {
-      throw new Error('User session not found')
+    if (!userEmail || !workspaceId) {
+      return null
     }
 
-    return () => fetchMyPermission(workspaceId!, userEmail, userId, userName)
+    return () => fetchMyPermission(workspaceId, userEmail, userId, userName)
   }, [workspaceId, session])
 
   const {
@@ -125,7 +125,7 @@ export function useWorkspacePermissions(workspaceId: string | null): UseWorkspac
     refetch: queryRefetch,
   } = useQuery({
     queryKey: [...workspacePermissionKeys.detail(workspaceId || ''), 'my-permission'],
-    queryFn: fetchFn,
+    queryFn: fetchFn ?? (() => Promise.reject(new Error('disabled'))),
     enabled: !!workspaceId && !!session?.user?.email,
     staleTime: 60 * 1000,
     gcTime: 5 * 60 * 1000,
diff --git a/frontend/hooks/useCopyToClipboard.ts b/frontend/hooks/useCopyToClipboard.ts
new file mode 100644
index 000000000..315c1719e
--- /dev/null
+++ b/frontend/hooks/useCopyToClipboard.ts
@@ -0,0 +1,23 @@
+'use client'
+
+import { useCallback, useState } from 'react'
+
+export function useCopyToClipboard(timeout = 2000) {
+  const [copied, setCopied] = useState(false)
+
+  const handleCopy = useCallback(
+    async (text: string) => {
+      try {
+        await navigator.clipboard.writeText(text)
+        setCopied(true)
+        setTimeout(() => setCopied(false), timeout)
+        return true
+      } catch {
+        return false
+      }
+    },
+    [timeout],
+  )
+
+  return { copied, handleCopy }
+}
diff --git a/frontend/lib/agents/agent-list-filters.test.ts b/frontend/lib/agents/agent-list-filters.test.ts
new file mode 100644
index 000000000..6ac82b28b
--- /dev/null
+++ b/frontend/lib/agents/agent-list-filters.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from 'vitest'
+
+import type { Agent } from '@/types/agent'
+
+import {
+  AGENT_LIST_ENGINE_FILTERS,
+  AGENT_LIST_RUNTIME_FILTERS,
+  filterAgentsForList,
+} from './agent-list-filters'
+
+function makeAgent(overrides: Partial<Agent>): Agent {
+  return {
+    id: overrides.id ?? 'agent-1',
+    workspace_id: 'workspace-1',
+    name: 'Agent',
+    slug: 'agent',
+    description: null,
+    avatar: null,
+    status: 'draft',
+    has_custom_env: false,
+    current_draft_version_id: 'version-1',
+    active_release_id: null,
+    engine_kind: null,
+    runtime_kind: null,
+    created_by: 'user-1',
+    created_at: '2026-01-01T00:00:00Z',
+    updated_at: '2026-01-01T00:00:00Z',
+    ...overrides,
+  }
+}
+
+describe('agent list filters', () => {
+  it('exposes only supported product engine filters', () => {
+    expect(AGENT_LIST_ENGINE_FILTERS.map((option) => option.value)).toEqual([
+      'all',
+      'langgraph_visual',
+      'langgraph_code',
+      'claude_code',
+      'codex',
+      'openclaw',
+    ])
+  })
+
+  it('exposes only supported runtime filters', () => {
+    expect(AGENT_LIST_RUNTIME_FILTERS.map((option) => option.value)).toEqual([
+      'all',
+      'sandbox',
+      'server',
+    ])
+  })
+
+  it('filters by engine kind and runtime kind', () => {
+    const graphAgent = makeAgent({
+      id: 'graph',
+      engine_kind: 'langgraph_visual',
+      runtime_kind: 'server',
+    })
+    const codexAgent = makeAgent({ id: 'codex', engine_kind: 'codex', runtime_kind: 'sandbox' })
+    const codeDraft = makeAgent({ id: 'code', engine_kind: 'langgraph_code', runtime_kind: null })
+
+    expect(
+      filterAgentsForList([graphAgent, codexAgent, codeDraft], {
+        engineKind: 'codex',
+        runtimeKind: 'all',
+      }).map((agent) => agent.id),
+    ).toEqual(['codex'])
+
+    expect(
+      filterAgentsForList([graphAgent, codexAgent, codeDraft], {
+        engineKind: 'all',
+        runtimeKind: 'sandbox',
+      }).map((agent) => agent.id),
+    ).toEqual(['codex'])
+
+    expect(
+      filterAgentsForList([graphAgent, codexAgent, codeDraft], {
+        engineKind: 'langgraph_code',
+        runtimeKind: 'sandbox',
+      }),
+    ).toEqual([])
+  })
+})
diff --git a/frontend/lib/agents/agent-list-filters.ts b/frontend/lib/agents/agent-list-filters.ts
new file mode 100644
index 000000000..e5338523d
--- /dev/null
+++ b/frontend/lib/agents/agent-list-filters.ts
@@ -0,0 +1,41 @@
+import type { Agent, EngineKind, RuntimeKind } from '@/types/agent'
+
+export type AgentListEngineFilter = 'all' | EngineKind
+export type AgentListRuntimeFilter = 'all' | RuntimeKind
+
+export interface AgentListFilterOption<T extends string> {
+  value: T
+  labelKey: string
+  defaultLabel: string
+}
+
+export const AGENT_LIST_ENGINE_FILTERS: readonly AgentListFilterOption<AgentListEngineFilter>[] = [
+  { value: 'all', labelKey: 'agents.filters.allBuildTypes', defaultLabel: 'All build types' },
+  { value: 'langgraph_visual', labelKey: 'agents.graph.shortLabel', defaultLabel: 'Graph' },
+  { value: 'langgraph_code', labelKey: 'agents.code.shortLabel', defaultLabel: 'Code' },
+  { value: 'claude_code', labelKey: 'agents.claudeCode.shortLabel', defaultLabel: 'Claude Code' },
+  { value: 'codex', labelKey: 'agents.codex.shortLabel', defaultLabel: 'Codex' },
+  { value: 'openclaw', labelKey: 'agents.openclaw.shortLabel', defaultLabel: 'OpenClaw' },
+] as const
+
+export const AGENT_LIST_RUNTIME_FILTERS: readonly AgentListFilterOption<AgentListRuntimeFilter>[] =
+  [
+    { value: 'all', labelKey: 'agents.filters.allRuntimeTypes', defaultLabel: 'All runtime types' },
+    { value: 'sandbox', labelKey: 'agents.runtime.sandbox', defaultLabel: 'Sandbox' },
+    { value: 'server', labelKey: 'agents.runtime.server', defaultLabel: 'Server' },
+  ] as const
+
+export function filterAgentsForList(
+  agents: readonly Agent[],
+  filters: {
+    engineKind: AgentListEngineFilter
+    runtimeKind: AgentListRuntimeFilter
+  },
+): Agent[] {
+  return agents.filter((agent) => {
+    const matchesEngine = filters.engineKind === 'all' || agent.engine_kind === filters.engineKind
+    const matchesRuntime =
+      filters.runtimeKind === 'all' || agent.runtime_kind === filters.runtimeKind
+    return matchesEngine && matchesRuntime
+  })
+}
diff --git a/frontend/lib/api-client.ts b/frontend/lib/api-client.ts
index 15e8bef9a..9c611604c 100644
--- a/frontend/lib/api-client.ts
+++ b/frontend/lib/api-client.ts
@@ -24,6 +24,7 @@
 import { env as runtimeEnv } from 'next-runtime-env'
 
 import { getCsrfToken } from '@/lib/auth/csrf'
+import type { ErrorSource, UserAction } from '@/types/agent-run'
 
 // ==================== Configuration ====================
 const getBaseUrl = (): string => {
@@ -42,17 +43,10 @@ export const API_BASE = `${API_BASE_URL}/${API_VERSION}`
 export const API_ENDPOINTS = {
   auth: 'auth',
   workspaces: 'workspaces',
-  folders: 'folders',
-  workflows: 'workflows',
   agents: 'agents',
-  graphs: 'graphs',
   chat: 'chat',
-  studio: 'studio',
-  toolsets: 'toolsets',
-  knowledgebases: 'knowledgebases',
   environments: 'environments',
   users: 'users',
-  conversations: 'conversations',
   skills: 'skills',
   runs: 'runs',
 } as const
@@ -66,20 +60,67 @@ export interface ApiResponse<T> {
   timestamp?: string
 }
 
+export interface ApiErrorPayload {
+  code: string
+  message: string
+  data?: Record<string, unknown> | null
+  source?: ErrorSource
+  retryable?: boolean
+  user_action?: UserAction
+  detail?: string
+}
+
+export function createApiError(
+  status: number,
+  statusText: string,
+  payload?: ApiErrorPayload,
+): ApiError {
+  const normalizedPayload: ApiErrorPayload = payload ?? {
+    code: status > 0 ? `HTTP_${status}` : 'UNKNOWN_ERROR',
+    message: statusText || `API Error: ${status}`,
+    data: null,
+  }
+  return new ApiError(status, statusText, normalizedPayload)
+}
+
 export class ApiError extends Error {
   /** Error code, used to identify specific error types (e.g., 'EMAIL_NOT_VERIFIED', 'BAD_REQUEST') */
-  public readonly code?: string
+  public readonly code: string
+  public readonly payload: ApiErrorPayload
+  public readonly data?: Record<string, unknown> | null
+  public readonly source: ErrorSource
+  public readonly retryable: boolean
+  public readonly userAction?: UserAction
 
   constructor(
     public readonly status: number,
     public readonly statusText: string,
-    public readonly detail?: string,
-    code?: string,
+    payload: ApiErrorPayload,
   ) {
-    super(detail || statusText || `API Error: ${status}`)
+    super(payload.message || statusText || `API Error: ${status}`)
     this.name = 'ApiError'
-    this.code = code || statusText
+    this.code = payload.code
+    this.payload = payload
+    this.data = payload.data ?? null
+    this.source = payload.source ?? 'internal'
+    this.retryable = payload.retryable ?? false
+    this.userAction = payload.user_action
+  }
+}
+
+async function extractErrorFromResponse(response: Response): Promise<ApiError> {
+  let payload: ApiErrorPayload | undefined
+  try {
+    const text = await response.text()
+    const errorData = JSON.parse(text)
+    payload =
+      errorData && typeof errorData === 'object' && 'code' in errorData && 'message' in errorData
+        ? (errorData as ApiErrorPayload)
+        : undefined
+  } catch {
+    /* not JSON or empty body */
   }
+  return createApiError(response.status, response.statusText, payload)
 }
 
 export interface ApiRequestOptions extends Omit<RequestInit, 'body'> {
@@ -111,18 +152,17 @@ async function parseResponse<T>(response: Response): Promise<T> {
   try {
     const json = JSON.parse(text)
 
-    // Standard API response format: { success?, data }
-    // Auto-unwrap `data` whether or not `success` is present,
-    // so callers always receive the inner payload directly.
+    if (
+      json &&
+      typeof json === 'object' &&
+      'code' in json &&
+      'message' in json &&
+      !('success' in json)
+    ) {
+      throw createApiError(response.status, response.statusText, json as ApiErrorPayload)
+    }
+
     if (json && typeof json === 'object' && 'data' in json) {
-      if ('success' in json && !json.success) {
-        throw new ApiError(
-          response.status,
-          response.statusText,
-          json.message || 'API request failed',
-          json.code,
-        )
-      }
       return json.data
     }
 
@@ -139,7 +179,11 @@ let refreshPromise: Promise<void> | null = null
 
 export async function refreshAccessTokenOrRelogin(timeout = 10000): Promise<void> {
   if (typeof window === 'undefined') {
-    throw new Error('Cannot refresh token in server environment')
+    throw createApiError(500, 'Server Environment Unsupported', {
+      code: 'REFRESH_UNAVAILABLE',
+      message: 'Cannot refresh token in server environment',
+      data: null,
+    })
   }
 
   if (isRefreshing && refreshPromise) {
@@ -162,17 +206,26 @@ export async function refreshAccessTokenOrRelogin(timeout = 10000): Promise<void
       clearTimeout(timeoutId)
 
       if (response.status === 401) {
-        throw new Error('Refresh token expired, please login again')
+        throw createApiError(401, 'Unauthorized', {
+          code: 'REFRESH_TOKEN_INVALID',
+          message: 'Refresh token expired, please login again',
+          data: null,
+        })
       }
 
       if (!response.ok) {
-        throw new Error(`Token refresh failed: ${response.statusText}`)
+        throw await extractErrorFromResponse(response)
       }
     } catch (error) {
       clearTimeout(timeoutId)
       if (error instanceof Error && error.name === 'AbortError') {
-        throw new Error('Token refresh timed out')
+        throw createApiError(408, 'Request Timeout', {
+          code: 'REQUEST_TIMEOUT',
+          message: 'Token refresh timed out',
+          data: null,
+        })
       }
+      if (error instanceof ApiError) throw error
       throw error
     } finally {
       isRefreshing = false
@@ -238,16 +291,7 @@ export async function apiFetch<T>(url: string, options: ApiRequestOptions = {}):
       }
 
       if (!response.ok) {
-        let errorMessage = response.statusText
-        let errorCode: string | undefined
-        try {
-          const errorData = await response.json()
-          errorMessage = errorData.detail || errorData.message || errorMessage
-          errorCode = errorData.code
-        } catch {
-          /* ignore */
-        }
-        throw new ApiError(response.status, response.statusText, errorMessage, errorCode)
+        throw await extractErrorFromResponse(response)
       }
 
       return response
@@ -255,11 +299,23 @@ export async function apiFetch<T>(url: string, options: ApiRequestOptions = {}):
       if (e instanceof ApiError) throw e
       if (e instanceof Error) {
         if (e.name === 'AbortError') {
-          throw new ApiError(408, 'Request Timeout', 'Request timed out')
+          throw createApiError(408, 'Request Timeout', {
+            code: 'REQUEST_TIMEOUT',
+            message: 'Request timed out',
+            data: null,
+          })
         }
-        throw new ApiError(0, 'Network Error', e.message)
+        throw createApiError(0, 'Network Error', {
+          code: 'NETWORK_ERROR',
+          message: e.message,
+          data: null,
+        })
       }
-      throw new ApiError(0, 'Unknown Error', String(e))
+      throw createApiError(0, 'Unknown Error', {
+        code: 'UNKNOWN_ERROR',
+        message: String(e),
+        data: null,
+      })
     } finally {
       clearTimeout(timeoutId)
     }
@@ -369,8 +425,7 @@ export async function apiStream(
     }
 
     if (!response.ok) {
-      const errorText = await response.text().catch(() => response.statusText)
-      throw new ApiError(response.status, response.statusText, errorText)
+      throw await extractErrorFromResponse(response)
     }
 
     return response
diff --git a/frontend/lib/auth/api-client.ts b/frontend/lib/auth/api-client.ts
index 0810ca16b..8ee2efd67 100644
--- a/frontend/lib/auth/api-client.ts
+++ b/frontend/lib/auth/api-client.ts
@@ -5,16 +5,19 @@
  */
 import CryptoJS from 'crypto-js'
 
-import { apiGet, apiPost, ApiError, refreshAccessTokenOrRelogin } from '@/lib/api-client'
+import {
+  apiGet,
+  apiPost,
+  ApiError,
+  createApiError,
+  refreshAccessTokenOrRelogin,
+} from '@/lib/api-client'
 import { createLogger } from '@/lib/logs/console/logger'
 
 import { setCsrfToken, getCsrfToken, clearCsrfToken } from './csrf'
 
 const logger = createLogger('AuthAPI')
 
-// ==================== Re-export CSRF functions (maintain backward compatibility) ====================
-export { setCsrfToken, getCsrfToken, clearCsrfToken }
-
 // ==================== Type Definitions ====================
 export interface AuthUser {
   id: string
@@ -265,7 +268,13 @@ export const signIn = {
       return { data: result, error: null }
     } catch (error) {
       const apiError =
-        error instanceof ApiError ? error : new ApiError(0, 'Unknown Error', String(error))
+        error instanceof ApiError
+          ? error
+          : createApiError(0, 'Unknown Error', {
+              code: 'UNKNOWN_ERROR',
+              message: String(error),
+              data: null,
+            })
       options?.onError?.({ error: apiError })
       return { data: null, error: apiError }
     }
@@ -279,7 +288,13 @@ export const signIn = {
       return { data: result, error: null }
     } catch (error) {
       const apiError =
-        error instanceof ApiError ? error : new ApiError(0, 'Unknown Error', String(error))
+        error instanceof ApiError
+          ? error
+          : createApiError(0, 'Unknown Error', {
+              code: 'UNKNOWN_ERROR',
+              message: String(error),
+              data: null,
+            })
       options?.onError?.({ error: apiError })
       return { data: null, error: apiError }
     }
@@ -296,7 +311,13 @@ export const signUp = {
       return { data: result, error: null }
     } catch (error) {
       const apiError =
-        error instanceof ApiError ? error : new ApiError(0, 'Unknown Error', String(error))
+        error instanceof ApiError
+          ? error
+          : createApiError(0, 'Unknown Error', {
+              code: 'UNKNOWN_ERROR',
+              message: String(error),
+              data: null,
+            })
       options?.onError?.({ error: apiError })
       return { data: null, error: apiError }
     }
diff --git a/frontend/lib/auth/auth-client.ts b/frontend/lib/auth/auth-client.ts
index f6344d68d..2fb5d53f8 100644
--- a/frontend/lib/auth/auth-client.ts
+++ b/frontend/lib/auth/auth-client.ts
@@ -13,7 +13,6 @@ import {
   signUp,
   signOut,
   onSessionChange,
-  clearCsrfToken,
   type AuthUser,
   type AuthSession,
 } from './api-client'
@@ -92,11 +91,6 @@ export const client = {
 // ==================== Exports ====================
 export { signIn, signUp, signOut, authApi, onSessionChange }
 
-/** @deprecated Use clearCsrfToken instead */
-export function clearTokens(): void {
-  clearCsrfToken()
-}
-
 /**
  * useActiveOrganization placeholder
  */
diff --git a/frontend/lib/auth/index.ts b/frontend/lib/auth/index.ts
index ae07be122..95099fa45 100644
--- a/frontend/lib/auth/index.ts
+++ b/frontend/lib/auth/index.ts
@@ -1,13 +1,5 @@
 // Export JWT authentication system
-export {
-  client as auth,
-  useSession,
-  signIn,
-  signUp,
-  signOut,
-  authApi,
-  clearTokens,
-} from './auth-client'
+export { client as auth, useSession, signIn, signUp, signOut, authApi } from './auth-client'
 
 // CSRF Token management
 export { setCsrfToken, getCsrfToken, clearCsrfToken } from './csrf'
diff --git a/frontend/lib/core/constants/routes.ts b/frontend/lib/core/constants/routes.ts
index e83d30269..1d561343b 100644
--- a/frontend/lib/core/constants/routes.ts
+++ b/frontend/lib/core/constants/routes.ts
@@ -24,7 +24,7 @@ export function isPublicRoute(pathname: string | null): boolean {
 /**
  * Default redirect route after login
  */
-export const DEFAULT_AUTHENTICATED_ROUTE = '/chat'
+export const DEFAULT_AUTHENTICATED_ROUTE = '/dashboard'
 
 /**
  * Default sign-in route
diff --git a/frontend/lib/core/utils/cn.ts b/frontend/lib/core/utils/cn.ts
deleted file mode 100644
index 952d546a7..000000000
--- a/frontend/lib/core/utils/cn.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { type ClassValue, clsx } from 'clsx'
-import { twMerge } from 'tailwind-merge'
-
-/**
- * Combines class names using clsx and tailwind-merge
- */
-export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
-}
diff --git a/frontend/lib/core/utils/request.ts b/frontend/lib/core/utils/request.ts
deleted file mode 100644
index 92080acb3..000000000
--- a/frontend/lib/core/utils/request.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { generateUUID } from '@/lib/utils/uuid'
-
-/**
- * Generate a short request ID for correlation
- */
-export function generateRequestId(): string {
-  return generateUUID().slice(0, 8)
-}
-
-/**
- * No-operation function for use as default callback
- */
-export const noop = () => {}
diff --git a/frontend/lib/core/utils/sse.ts b/frontend/lib/core/utils/sse.ts
deleted file mode 100644
index 9ea205827..000000000
--- a/frontend/lib/core/utils/sse.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Server-Sent Events utilities
- */
-
-export interface SSEEvent {
-  event?: string
-  data: unknown
-  id?: string
-  retry?: number
-}
-
-export function encodeSSE(event: SSEEvent): Uint8Array {
-  let message = ''
-
-  if (event.event) {
-    message += `event: ${event.event}\n`
-  }
-
-  if (event.id) {
-    message += `id: ${event.id}\n`
-  }
-
-  if (event.retry) {
-    message += `retry: ${event.retry}\n`
-  }
-
-  const data = typeof event.data === 'string' ? event.data : JSON.stringify(event.data)
-
-  message += `data: ${data}\n\n`
-
-  return new TextEncoder().encode(message)
-}
-
-export function decodeSSE(message: string): SSEEvent | null {
-  const lines = message.split('\n')
-  const event: Partial<SSEEvent> = {}
-
-  for (const line of lines) {
-    if (line.startsWith('event:')) {
-      event.event = line.slice(6).trim()
-    } else if (line.startsWith('data:')) {
-      const data = line.slice(5).trim()
-      try {
-        event.data = JSON.parse(data)
-      } catch {
-        event.data = data
-      }
-    } else if (line.startsWith('id:')) {
-      event.id = line.slice(3).trim()
-    } else if (line.startsWith('retry:')) {
-      event.retry = parseInt(line.slice(6).trim(), 10)
-    }
-  }
-
-  return event.data !== undefined ? (event as SSEEvent) : null
-}
-
-export function createSSEStream() {
-  let controller: ReadableStreamDefaultController<Uint8Array> | null = null
-
-  const stream = new ReadableStream<Uint8Array>({
-    start(c) {
-      controller = c
-    },
-  })
-
-  return {
-    stream,
-    send: (event: SSEEvent) => {
-      if (controller) {
-        controller.enqueue(encodeSSE(event))
-      }
-    },
-    close: () => {
-      if (controller) {
-        controller.close()
-      }
-    },
-  }
-}
diff --git a/frontend/lib/i18n/locales/en.ts b/frontend/lib/i18n/locales/en.ts
index 8313b378e..32c0a0e3a 100644
--- a/frontend/lib/i18n/locales/en.ts
+++ b/frontend/lib/i18n/locales/en.ts
@@ -18,44 +18,48 @@ const en = {
       operationFailed: 'Operation failed',
     },
     sidebar: {
-      dashboard: 'AgentSpark',
-      chatCanvas: 'Chat',
-      agentBuilder: 'Workbench',
-      knowledge: 'Knowledge',
-      memory: 'Memory',
-      discover: 'Agent Store',
-      skillsHub: 'Skills Store',
-      runCenter: 'Run Center',
-      toolsAndMcp: 'Tools & MCP',
+      dashboard: 'Dashboard',
+      agents: 'Agents',
+      tasks: 'Tasks',
+      skillsHub: 'Skills',
+      toolsAndMcp: 'Tools',
+      settings: 'Settings',
       collapse: 'Collapse sidebar',
       expand: 'Expand sidebar',
-      knowledgeComingSoon: 'Knowledge base feature is under development, stay tuned...',
-      discoverComingSoon: 'Discover feature is under development, stay tuned...',
-      notifications: 'Notifications',
-      openclaw: 'OpenClaw',
       version: 'Version',
     },
-    runs: {
-      title: 'Run Center',
-      description: 'Track active and recent long-running agent tasks in one place.',
-      loading: 'Loading runs...',
-      emptyTitle: 'No runs yet',
+    copilot: {
+      userMessage: 'User Message',
+      assistantResponse: 'Assistant Response',
+      toolCalls: 'Tool Calls',
+      files: 'Files',
+      preview: 'Preview',
+      executionLog: 'Execution Log',
+    },
+    execution: {
+      title: 'Execution Monitor',
+      description: 'Track active and recent agent executions and task runs.',
+      loading: 'Loading executions...',
+      emptyTitle: 'No executions yet',
       emptyDescription: 'Long-running agent tasks will appear here once they start.',
       filterAll: 'All',
       filterActive: 'Active',
       filterFinished: 'Finished',
       statusQueued: 'Queued',
+      statusPending: 'Pending',
       statusRunning: 'Running',
       statusInterruptWait: 'Waiting Input',
       statusCompleted: 'Completed',
+      statusSucceeded: 'Completed',
       statusFailed: 'Failed',
       statusCancelled: 'Cancelled',
+      statusApprovalWait: 'Awaiting Approval',
       startedAt: 'Started',
       finishedAt: 'Finished',
       lastHeartbeat: 'Heartbeat',
       open: 'Open',
       details: 'Details',
-      detailTitle: 'Run Details',
+      detailTitle: 'Execution Details',
       eventsTab: 'Events',
       snapshotTab: 'Snapshot',
       overviewTab: 'Overview',
@@ -65,7 +69,7 @@ const en = {
       errorLabel: 'Error',
       noEvents: 'No events recorded yet.',
       cancel: 'Cancel',
-      untitled: 'Untitled Run',
+      untitled: 'Untitled Execution',
       skillCreatorInProgress: 'Skill Creator in progress',
       untitledSkillCreatorRun: 'Untitled Skill Creator run',
       resume: 'Resume',
@@ -73,9 +77,9 @@ const en = {
       minutesSuffix: 'm ago',
       hoursSuffix: 'h ago',
       daysSuffix: 'd ago',
-      searchPlaceholder: 'Search run titles',
+      searchPlaceholder: 'Search execution titles',
       filterAllAgents: 'All Agents',
-      backToList: 'Back to runs',
+      backToList: 'Back to executions',
       stage: 'Stage',
       mode: 'Mode',
       content: 'Content',
@@ -83,13 +87,390 @@ const en = {
       toolCalls: 'Tool Calls',
       result: 'Result',
       error: 'Error',
-      chat: {
-        userMessage: 'User Message',
-        assistantResponse: 'Assistant Response',
-        toolCalls: 'Tool Calls',
-        files: 'Files',
-        preview: 'Preview',
-        executionLog: 'Execution Log',
+      tabAgentRuns: 'Instant Runs',
+      tabExecutions: 'Task Executions',
+      executionEmpty: 'No executions yet',
+      executionEmptyDesc: 'Task-dispatched executions will appear here.',
+      linkedTask: 'Task',
+      viewInMissions: 'View in Task Board',
+      viewInRunCenter: 'View in Execution Monitor',
+      dispatchedToast: 'Task dispatched',
+      dispatchedToastLink: 'Go to Execution Monitor',
+      dispatch: 'Dispatch',
+      dispatching: 'Dispatching...',
+      statusDispatched: 'Dispatched',
+      pastExecutions: 'Past Executions',
+      pastExecutionsCount: '{{count}} past execution(s)',
+      pastExecutionsLink: 'View in Execution Monitor',
+      tabAgentRunsDesc: 'Instant runs from chat, skill creator, etc.',
+      tabExecutionsDesc: 'Containerized executions dispatched from Task Board',
+      filteredByTask: 'Filtered by task',
+      filteredByMission: 'Filtered by task',
+      clearFilter: 'Clear',
+      notLinkedToTask: 'Not linked to a task — actions unavailable',
+    },
+    tasks: {
+      title: 'Tasks',
+      allAgents: 'All Agents',
+      boardView: 'Board',
+      listView: 'List',
+      newTask: 'New Task',
+      filterBy: 'Filter: {{name}}',
+      clearFilter: 'Clear',
+      emptyTitle: 'No Tasks yet',
+      emptyDescription: 'Pick an Agent and assign it a task',
+      emptyAction: 'View Agents',
+      stopRun: 'Stop Run',
+      stoppingRun: 'Stopping...',
+      archive: 'Archive',
+      archiveConfirmTitle: 'Archive Task',
+      archiveConfirmDesc:
+        'Task will be moved to Archived status. You can restore it by changing the status back.',
+      archiveConfirm: 'Archive',
+      currentExecution: 'Current Execution',
+      expandTimeline: 'Show execution logs',
+      collapseTimeline: 'Collapse',
+      viewFullLogs: 'View full logs in Run Monitor',
+      running: 'Running',
+      noTasks: 'No tasks',
+      detailTitle: 'Task Detail',
+      objective: 'Objective',
+      description: 'Description',
+      tags: 'Tags',
+      settings: 'Settings',
+      dueDate: 'Due Date',
+      agent: 'Agent',
+      comments: 'Comments',
+      lastRun: 'Last Run',
+      viewRunHistory: 'View run history',
+      activities: 'Activities',
+      inProgress: 'In Progress',
+      noInProgress: 'No tasks in progress',
+      recentlyDone: 'Recently Done',
+      noRecentlyDone: 'No recently completed tasks',
+      unassigned: 'Unassigned',
+      changeAgent: 'Change',
+      assignAgent: 'Assign agent...',
+      autoApprove: 'Auto Approve',
+      autoApproveOnDesc: 'Auto-approve tool calls, mark as done on completion',
+      autoApproveOffDesc: 'Tool calls require manual approval, mark as needs-review on completion',
+      searchAgents: 'Search agents...',
+      noAgentsFound: 'No agents found',
+      unassignAgent: 'Unassign',
+      createTitle: 'New Task',
+      createDescription: 'Create a new task and assign it to an agent.',
+      taskTitleLabel: 'Task Title',
+      taskTitlePlaceholder: 'e.g. Analyze quarterly sales data',
+      assignAgentLabel: 'Assign Agent',
+      assignAgentPlaceholder: 'Select an agent (optional)',
+      noAssignment: 'None',
+      goalLabel: 'Goal',
+      goalPlaceholder: 'Success criteria for the task...',
+      descriptionLabel: 'Detailed Description',
+      descriptionPlaceholder: 'Additional notes (optional)',
+      priorityLabel: 'Priority',
+      tagsLabel: 'Tags',
+      tagsPlaceholder: 'Comma separated',
+      autoApproveLabel: 'Auto Approve',
+      autoApproveHint: 'Skip manual review, auto-approve tool calls',
+      creating: 'Creating...',
+      createTask: 'Create Task',
+      priorityNone: 'None',
+      priorityLow: 'Low',
+      priorityMedium: 'Medium',
+      priorityHigh: 'High',
+      priorityUrgent: 'Urgent',
+      needsAttention: 'Needs Attention',
+      executionFailed: 'Execution failed',
+      awaitingReview: 'Awaiting review',
+      details: 'Details',
+      retry: 'Retry',
+    },
+    agents: {
+      title: 'My Agents',
+      newAgent: 'New Agent',
+      editAgent: 'Edit Agent',
+      newAgentDescription: 'Create a new agent to handle specific tasks.',
+      editAgentDescription: 'Update the basic information of your agent.',
+      name: 'Name',
+      namePlaceholder: 'e.g. Data Analysis Assistant',
+      description: 'Description',
+      descriptionPlaceholder: 'What is this assistant responsible for?',
+      avatar: 'Avatar URL',
+      avatarPlaceholder: 'https://...',
+      buildMethod: 'Build Method',
+      create: 'Create',
+      save: 'Save',
+      creating: 'Creating...',
+      saving: 'Saving...',
+      cancel: 'Cancel',
+      loading: 'Loading agents...',
+      emptyTitle: 'No agents yet',
+      emptyDescription: 'Create your first AI agent to start automating your work.',
+      noDescription: 'No description',
+      edit: 'Edit',
+      status: {
+        draft: 'Draft',
+        active: 'Active',
+        archived: 'Archived',
+      },
+      studio: {
+        title: 'Agent Studio',
+        visualAgent: 'Visual Agent',
+        stageOverview: 'Current stage: {{activeStage}}. Default stage: {{defaultStage}}',
+        rightPanel: {
+          copilot: 'Build Copilot',
+          inspector: 'Inspector',
+          edgeInspector: 'Edge Inspector',
+        },
+        addNode: {
+          button: 'Add',
+          search: 'Search nodes...',
+          empty: 'No nodes found',
+        },
+        stages: {
+          brief: 'Brief',
+          canvas: 'Canvas',
+          testLab: 'Test Lab',
+          release: 'Release',
+          usage: 'Usage',
+        },
+        stageDescriptions: {
+          brief: 'Define the goal',
+          canvas: 'Build the workflow',
+          testLab: 'Run the draft',
+          release: 'Publish safely',
+          usage: 'Use in business',
+        },
+        brief: {
+          kicker: 'First build step',
+          title: 'Describe the Agent you want to build',
+          subtitle:
+            'Copilot will turn this brief into an editable visual workflow. You can still skip and build manually on the canvas.',
+          goal: 'Goal',
+          input: 'Input',
+          output: 'Output',
+          tools: 'Tools / Skills',
+          constraints: 'Safety / approval rules',
+          scenario: 'Business scenario',
+          skip: 'Build manually',
+          generate: 'Generate with Copilot',
+        },
+        testLab: {
+          kicker: 'Draft validation',
+          title: 'Test the current draft',
+          subtitle:
+            'Run draft behavior before publishing. These tests do not affect the active release.',
+          inputLabel: 'Test input',
+          inputPlaceholder: 'Enter a sample request for this draft...',
+          runDraft: 'Run Draft',
+          running: 'Running...',
+          stop: 'Stop',
+          backToCanvas: 'Back to Canvas',
+          openRelease: 'Open Release',
+        },
+        actions: {
+          openCanvas: 'Open Canvas',
+          openTestLab: 'Open Test Lab',
+          generateDraft: 'Generate Draft',
+          runDraft: 'Run Draft',
+          openRelease: 'Open Release',
+          publish: 'Publish',
+          openUsage: 'Open Usage',
+          createTask: 'Create Task',
+        },
+        status: {
+          emptyDraft: 'Empty draft',
+          unsavedDraft: 'Draft changed',
+          savedDraft: 'Draft saved',
+          published: 'Published',
+          notPublished: 'Not published',
+        },
+        release: {
+          title: 'Publish your Agent',
+          subtitle: 'Once published, your Agent is available via chat, tasks, and API.',
+          publish: 'Publish',
+          history: 'Version history',
+          empty: 'No releases yet.',
+          publishNew: 'Publish new version',
+          currentActive: 'Currently published',
+          rollback: 'Roll back to this version',
+          publishSuccess: 'Published successfully',
+          publishFailed: 'Publish failed',
+          retireRelease: 'Retire',
+          unpublish: 'Unpublish',
+          unpublishConfirm: 'Take this Agent offline?',
+          showArchived: 'Show {{num}} archived',
+          hideArchived: 'Hide archived',
+          releaseVersion: 'Version {{version}}',
+          publishedAt: 'Published',
+          status: {
+            live: 'Live',
+            superseded: 'Superseded',
+            ready: 'Ready',
+            failed: 'Failed',
+            retired: 'Archived',
+          },
+        },
+        usage: {
+          kicker: 'Business usage',
+          title: 'Use this Agent in business scenarios',
+          subtitleReady:
+            'The active release can now be connected to chat, tasks, API calls, and business workflows.',
+          subtitleNoRelease:
+            'Publish and activate a release before connecting this Agent to business usage.',
+          chat: 'Chat',
+          chatDesc: 'Start conversations against the active release.',
+          tasks: 'Tasks and workflows',
+          tasksDesc: 'Attach this Agent to task execution and operational flows.',
+        },
+      },
+      build: {
+        stages: {
+          brief: 'Goal',
+          build: 'Build',
+          testLab: 'Test',
+          release: 'Release',
+          usage: 'Usage',
+        },
+        stageDescriptions: {
+          brief: 'Define what this Agent should do',
+          build: 'Build the Agent logic',
+          testLab: 'Test the current draft',
+          release: 'Publish and manage releases',
+          usage: 'Connect to business scenarios',
+        },
+        status: {
+          published: 'Published',
+          notPublished: 'Not published',
+        },
+        release: {
+          title: 'Publish your Agent',
+          subtitle: 'Once published, your Agent is available via chat, tasks, and API.',
+          publish: 'Publish',
+          history: 'Version history',
+          empty: 'No releases yet.',
+          publishNew: 'Publish new version',
+          currentActive: 'Currently published',
+          rollback: 'Roll back to this version',
+          publishSuccess: 'Published successfully',
+          publishFailed: 'Publish failed',
+          retireRelease: 'Retire',
+          unpublish: 'Unpublish',
+          unpublishConfirm: 'Take this Agent offline?',
+          showArchived: 'Show {{num}} archived',
+          hideArchived: 'Hide archived',
+          releaseVersion: 'Version {{version}}',
+          publishedAt: 'Published',
+          status: {
+            live: 'Live',
+            superseded: 'Superseded',
+            ready: 'Ready',
+            failed: 'Failed',
+            retired: 'Archived',
+          },
+        },
+        usage: {
+          kicker: 'Business usage',
+          title: 'Use this Agent in business scenarios',
+          subtitleReady:
+            'The active release can now be connected to chat, tasks, API calls, and business workflows.',
+          subtitleNoRelease:
+            'Publish and activate a release before connecting this Agent to business usage.',
+          chat: 'Chat',
+          chatDesc: 'Start conversations against the active release.',
+          tasks: 'Tasks and workflows',
+          tasksDesc: 'Attach this Agent to task execution and operational flows.',
+        },
+      },
+      filters: {
+        allBuildTypes: 'All build types',
+        allRuntimeTypes: 'All runtime types',
+        emptyTitle: 'No matching agents',
+        emptySubtitle: 'Adjust the build type or runtime filters.',
+      },
+      runtime: {
+        graph: 'Graph',
+        code: 'Code',
+        sandbox: 'Sandbox',
+      },
+      graph: {
+        shortLabel: 'Graph',
+        label: 'Visual Orchestration',
+        description: 'Build workflows by dragging and dropping nodes',
+      },
+      code: {
+        shortLabel: 'Code',
+        label: 'Code Definition',
+        description: 'Define agent logic via code (Coming Soon)',
+      },
+      claudeCode: {
+        shortLabel: 'Claude Code',
+        label: 'Claude Code',
+        description: 'Run a Claude Code CLI agent in a sandbox',
+      },
+      codex: {
+        shortLabel: 'Codex',
+        label: 'Codex',
+        description: 'Run a Codex CLI agent in a sandbox',
+      },
+      openclaw: {
+        shortLabel: 'OpenClaw',
+        label: 'OpenClaw',
+        description: 'Run an OpenClaw CLI agent in a sandbox',
+      },
+      detail: {
+        tabs: {
+          overview: 'Overview',
+          chat: 'Chat',
+          builder: 'Builder',
+          settings: 'Settings',
+        },
+        assignTask: 'Assign Task',
+        startChat: 'Chat',
+        recentActivity: 'Recent Activity',
+        noActivity: 'No recent activity',
+        about: 'About',
+        noDescription: 'No description provided for this agent.',
+        quickActions: 'Quick Actions',
+        openBuilder: 'Open Builder',
+        openBuilderDesc: 'Edit graph configuration',
+        settings: 'Settings',
+        settingsDesc: 'Manage agent configuration',
+        metrics: 'Usage Metrics',
+        totalRuns: 'Total Runs',
+        totalThreads: 'Threads',
+        createdAt: 'Created At',
+        updatedAt: 'Last Updated',
+        basicInfo: 'Basic Info',
+        definitionMethod: 'Definition Method',
+        releaseHistory: 'Release History',
+        goToPublish: 'Go to publish',
+        publishedAt: 'Published At',
+        releaseVersion: 'Release Version',
+        retireRelease: 'Retire',
+        rollbackToVersion: 'Roll back to this version',
+        createVersion: 'New Version',
+        creatingVersion: 'Creating...',
+        editVersion: 'Edit Version',
+        changelog: 'Changelog',
+        changelogPlaceholder: 'Describe what changed in this version',
+        definitionPayload: 'Definition Payload',
+        capabilityManifest: 'Capability Manifest',
+        selectDefinitionKind: 'Select build method',
+        versionStatus: {
+          draft: 'Draft',
+          frozen: 'Frozen',
+        },
+        releaseStatus: {
+          ready: 'Ready',
+          failed: 'Failed',
+          retired: 'Retired',
+        },
+        confirmFreezeTitle: 'Freeze Version',
+        confirmFreezeMessage: 'Once frozen, this version cannot be edited. Continue?',
+        confirmUnfreezeTitle: 'Unfreeze Version',
+        confirmUnfreezeMessage: 'This will revert the version to draft status. Continue?',
       },
     },
     user: {
@@ -101,6 +482,10 @@ const en = {
     settings: {
       title: 'Settings',
       description: 'Manage your account settings, workspace configuration, and MCP servers',
+      modelConfig: 'Model Configuration',
+      modelConfigDesc: 'Manage model providers, credentials, and configurations',
+      membersManagementTitle: 'Members Management',
+      membersManagementDesc: 'Manage workspace members and permissions',
       account: 'Account',
       workspace: 'Workspace',
       profile: 'Profile',
@@ -301,8 +686,7 @@ const en = {
         create: 'Create Token',
         revoke: 'Revoke',
         revokeConfirmTitle: 'Revoke Token',
-        revokeConfirmMessage:
-          'API calls using this token will fail immediately after revoking.',
+        revokeConfirmMessage: 'API calls using this token will fail immediately after revoking.',
         name: 'Token Name',
         namePlaceholder: 'e.g. CI deploy token',
         scopes: 'Scopes',
@@ -313,8 +697,7 @@ const en = {
         createdSuccess: 'Token created successfully',
         revokedSuccess: 'Token revoked',
         tokenCreatedTitle: 'Token Created',
-        tokenCreatedMessage:
-          "Copy this token now. You won't be able to see it again.",
+        tokenCreatedMessage: "Copy this token now. You won't be able to see it again.",
         copyToken: 'Copy Token',
         copied: 'Copied!',
         emptyState: 'No API tokens created yet',
@@ -423,6 +806,12 @@ const en = {
       oauthError: 'Authentication failed. Please try again.',
       oauthDenied: 'Authentication was cancelled.',
       oauthInvalidState: 'Invalid authentication state. Please try again.',
+      oauthProviderNotFound: 'The selected authentication provider is unavailable.',
+      oauthDiscoveryFailed:
+        'Failed to initialize the authentication provider. Please try again later.',
+      oauthAuthorizeUrlMissing: 'The authentication provider is not configured correctly.',
+      oauthTokenUrlMissing: 'The authentication token endpoint is not configured correctly.',
+      oauthUserinfoUrlMissing: 'The authentication user info endpoint is not configured correctly.',
       oauthFailed: 'Authentication failed. Please try again.',
     },
     workspace: {
@@ -568,6 +957,8 @@ const en = {
       savingEllipsis: 'Saving...',
       runningEllipsis: 'Running...',
       runButton: 'Run',
+      stopButton: 'Stop',
+      codeRunNoRelease: 'No active release found. Publish a release first to run code.',
       error: 'Error',
       result: 'Result',
       close: 'Close',
@@ -625,6 +1016,7 @@ const en = {
       // Properties Panel
       general: 'General',
       displayName: 'Display Name',
+      behavior: 'Behavior',
       capabilities: 'Capabilities',
       knowledgeMemory: 'Knowledge & Memory',
       enableLongTermMemory: 'Enable Long-term Memory',
@@ -702,10 +1094,10 @@ const en = {
         docker_image: 'Docker Image',
       },
       // Copilot Panel
-      copilotSubtitle: 'AI-powered Production-grade MultiAgent',
-      copilotEmptyHeading: 'AI-powered Production-grade Multiagent',
+      copilotSubtitle: 'Build Copilot for draft workflows',
+      copilotEmptyHeading: 'Build Copilot for your draft agent',
       copilotConnected:
-        "Give me a concrete task (not chitchat)—I'll update the canvas directly. I'm connected to the graph and can modify it.",
+        "Give me a concrete build task and I'll update the draft canvas directly. I'm connected to the graph builder and can modify the draft.",
       copilotStartWithBlueprint: 'Classic Build Cases',
       copilotBlueprintRagTitle: 'UEM Alert Analysis System',
       copilotBlueprintRagDesc:
@@ -725,6 +1117,18 @@ const en = {
       copilotModeDeepAgents: 'DeepAgents',
       copilotStatusMode: 'Mode: Production Graph Builder',
       copilotStatusModelPlaceholder: '—',
+      copilotError: {
+        auth: 'Authentication error. Please check your credentials.',
+        network: 'Network error. Please check your connection and try again.',
+        credentialNotConfigured:
+          'No model configured. Please set up your LLM credentials in settings.',
+        buildCopilotModelRequired:
+          'Build Copilot has no model configured. Select a model and try again.',
+        modelNotFound: 'Model not found. Please check your model configuration.',
+        modelNameRequired: 'No model selected. Please select a model first.',
+        credential: 'Authentication error. Please check API credentials.',
+        connection: 'Connection error. Please check your network.',
+      },
       // Copilot stage labels
       'copilot.stage.thinking': 'Thinking',
       'copilot.stage.processing': 'Processing',
@@ -799,12 +1203,9 @@ const en = {
       rename: 'Rename',
       duplicate: 'Duplicate',
       delete: 'Delete',
-      newSubfolder: 'New Subfolder',
-      createFolder: 'Create folder',
       createWorkflow: 'Create workflow',
       createAgent: 'Create agent',
       defaultAgentName: "My's agent",
-      defaultFolderName: 'New Folder',
       defaultGraphName: 'My Agent',
       defaultGraphDescription: 'Default agent',
       creatingDefaultGraph: 'Creating default agent...',
@@ -815,7 +1216,6 @@ const en = {
       running: 'Running',
       synchronizing: 'Synchronizing...',
       dropHereToAdd: 'Drop here to add',
-      dropHereToRemoveFromFolder: 'Drop here to remove from folder',
       ungrouped: 'Ungrouped',
       noAgentsYet: 'No agents yet',
       searchAgents: 'Search agents...',
@@ -863,8 +1263,6 @@ const en = {
       noPermission: 'No Permission',
       cannotCreateAgent: 'Viewers cannot create agents in this workspace',
       cannotDeleteAgent: 'Viewers cannot delete agents in this workspace',
-      cannotCreateFolder: 'Viewers cannot create folders in this workspace',
-      cannotDeleteFolder: 'Viewers cannot delete folders in this workspace',
       cannotDeleteNode: 'Viewers cannot delete nodes',
       cannotCopyNode: 'Viewers cannot copy nodes',
       cannotEditNode: 'Viewers cannot edit nodes',
@@ -941,15 +1339,6 @@ const en = {
       agentDeleteFailed: 'Failed to delete agent',
       agentDuplicateSuccess: 'Agent duplicated successfully',
       agentDuplicateFailed: 'Failed to duplicate agent',
-      // Folder CRUD
-      folderCreateSuccess: 'Folder created successfully',
-      folderCreateFailed: 'Failed to create folder',
-      folderUpdateSuccess: 'Folder updated successfully',
-      folderUpdateFailed: 'Failed to update folder',
-      folderDeleteSuccess: 'Folder deleted successfully',
-      folderDeleteFailed: 'Failed to delete folder',
-      folderDuplicateSuccess: 'Folder duplicated successfully',
-      folderDuplicateFailed: 'Failed to duplicate folder',
       // Workspace CRUD (supplement)
       workspaceCreateFailed: 'Failed to create workspace',
       workspaceUpdateFailed: 'Failed to update workspace',
@@ -965,7 +1354,8 @@ const en = {
       baseUrl: 'Base URL',
       endpoint: 'ENDPOINT',
       authentication: 'Authentication',
-      authenticationDescription: 'Authenticate your API requests by including your API Token in the {{header}} HTTP header as a Bearer token.',
+      authenticationDescription:
+        'Authenticate your API requests by including your API Token in the {{header}} HTTP header as a Bearer token.',
       exampleRequest: 'Example Request',
       viewFullApiDocs: 'View Full API Documentation',
       copy: 'Copy',
@@ -1095,7 +1485,8 @@ const en = {
       baseUrl: 'Base URL',
       endpoint: 'ENDPOINT',
       authentication: 'Authentication',
-      authDescription: 'Authenticate your API requests by including your API Token in the Authorization HTTP header as a Bearer token.',
+      authDescription:
+        'Authenticate your API requests by including your API Token in the Authorization HTTP header as a Bearer token.',
       exampleRequest: 'Example Request',
       curl: 'cURL',
       skillApiTokens: 'Skill API Tokens',
@@ -1117,8 +1508,7 @@ const en = {
       restoreConfirmMessage:
         'This will overwrite the current draft with version {{version}}. Continue?',
       deleteConfirmTitle: 'Delete Version',
-      deleteConfirmMessage:
-        'This version will be permanently deleted. This cannot be undone.',
+      deleteConfirmMessage: 'This version will be permanently deleted. This cannot be undone.',
       publishedBy: 'by {{user}}',
       publishedSuccess: 'Version {{version}} published',
       restoredSuccess: 'Draft restored from version {{version}}',
@@ -1153,6 +1543,13 @@ const en = {
       emptyState: 'No collaborators yet',
     },
     chat: {
+      noChats: 'No chats yet',
+      noMessages: 'No messages yet. Start a conversation.',
+      untitled: 'Untitled chat',
+      status: {
+        active: 'Active',
+        archived: 'Archived',
+      },
       // Structured model error codes (from backend error_code)
       'error.MODEL_NOT_FOUND':
         'Model "{{model}}" in node "{{node}}" of agent "{{graph}}" is not registered or has been removed. Please check Settings → Model Providers.',
@@ -1204,7 +1601,7 @@ const en = {
       clearAgent: 'Clear Agent',
       defaultAgent: 'Default Agent',
       noDeployedAgents: 'No deployed agents available',
-      autoRedirectToCopilot: 'Auto build agent',
+      autoRedirectToCopilot: 'Open Build Copilot',
       agentModeOn: 'AGENT BUILDER',
       agentModeOff: 'AGENT BUILDER',
       deepThinking: 'Deep Thinking',
@@ -1268,7 +1665,7 @@ const en = {
       copyToClipboard: 'Copy to clipboard',
       copy: 'Copy',
       // CodeViewer
-      untitled: 'untitled',
+      untitledCode: 'untitled',
       lines: 'lines',
       moreLines: '+{{count}} more lines',
       // ToolCallDetail
@@ -1377,6 +1774,26 @@ const en = {
       noMemoriesFilteredDescription: 'Try adjusting your search or filter criteria',
       moreOptions: 'More options',
     },
+    dashboard: {
+      title: 'Dashboard',
+      welcome: 'Welcome back, {{name}}',
+      needsAttention: 'Needs Attention',
+      recentTasks: 'Recent Tasks',
+      activeAgents: 'Active Agents',
+      allClear: 'All clear',
+      idle: 'idle',
+      viewAll: 'View all',
+      awaitingApproval: 'Awaiting Approval',
+      failedCount: 'Failed',
+      onboarding: {
+        title: 'Welcome to JoySafeter',
+        subtitle: 'Create your first Agent to start automating workflows',
+        createAgent: 'Create Agent',
+        step1: 'Create Agent',
+        step2: 'Assign Task',
+        step3: 'View Results',
+      },
+    },
     openclaw: {
       manageInstancesAndDevices: 'Manage Instances & Devices',
       instance: 'OpenClaw Instance',
@@ -1408,9 +1825,15 @@ const en = {
       syncSkillsFailed: 'Failed to sync skills',
       confirmDeleteInstance: 'Delete Instance?',
       confirmDeleteInstanceDesc: 'Are you sure you want to delete this OpenClaw instance?',
-      deleteInstanceWarning: 'Warning: Deleting the instance will clear all of its execution history.',
+      deleteInstanceWarning:
+        'Warning: Deleting the instance will clear all of its execution history.',
       syncSkillsDesc: 'Manually synchronize skills between the OpenClaw instance and the platform.',
     },
+    graph: {
+      copilot: {
+        placeholder: 'Ask Build Copilot to build or modify your graph...',
+      },
+    },
   },
 }
 
diff --git a/frontend/lib/i18n/locales/zh.ts b/frontend/lib/i18n/locales/zh.ts
index dd036d700..a058b8343 100644
--- a/frontend/lib/i18n/locales/zh.ts
+++ b/frontend/lib/i18n/locales/zh.ts
@@ -18,44 +18,48 @@ const zh = {
       operationFailed: '操作失败',
     },
     sidebar: {
-      dashboard: 'AgentSpark',
-      chatCanvas: '对话',
-      agentBuilder: '工作台',
-      knowledge: '知识库',
-      memory: '记忆',
-      discover: '智能体商店',
-      skillsHub: '技能商店',
-      runCenter: '运行中心',
-      toolsAndMcp: '工具与 MCP',
-      openclaw: 'OpenClaw',
+      dashboard: 'Dashboard',
+      agents: 'Agents',
+      tasks: 'Tasks',
+      skillsHub: '技能',
+      toolsAndMcp: '工具',
+      settings: '设置',
       collapse: '折叠侧边栏',
       expand: '展开侧边栏',
-      knowledgeComingSoon: '知识库功能正在开发中，敬请期待...',
-      discoverComingSoon: '发现功能正在开发中，敬请期待...',
-      notifications: '消息通知',
       version: '版本',
     },
-    runs: {
-      title: '运行中心',
-      description: '在一个地方查看活跃和最近的长任务。',
-      loading: '正在加载任务...',
-      emptyTitle: '暂无任务',
+    copilot: {
+      userMessage: '用户消息',
+      assistantResponse: '智能体回复',
+      toolCalls: '工具调用',
+      files: '文件',
+      preview: '预览',
+      executionLog: '执行日志',
+    },
+    execution: {
+      title: '执行监控',
+      description: '跟踪活跃和近期的即时运行与任务执行。',
+      loading: '正在加载执行...',
+      emptyTitle: '暂无执行',
       emptyDescription: '长任务启动后会出现在这里。',
       filterAll: '全部',
       filterActive: '进行中',
       filterFinished: '已结束',
       statusQueued: '排队中',
-      statusRunning: '运行中',
+      statusPending: '待执行',
+      statusRunning: '执行中',
       statusInterruptWait: '等待输入',
       statusCompleted: '已完成',
+      statusSucceeded: '已完成',
       statusFailed: '失败',
       statusCancelled: '已取消',
+      statusApprovalWait: '等待审批',
       startedAt: '开始于',
       finishedAt: '结束于',
       lastHeartbeat: '最近心跳',
       open: '打开',
       details: '详情',
-      detailTitle: '运行详情',
+      detailTitle: '执行详情',
       eventsTab: '事件',
       snapshotTab: '快照',
       overviewTab: '概览',
@@ -65,7 +69,7 @@ const zh = {
       errorLabel: '错误',
       noEvents: '暂时没有事件记录。',
       cancel: '取消',
-      untitled: '未命名任务',
+      untitled: '未命名执行',
       skillCreatorInProgress: '技能创建进行中',
       untitledSkillCreatorRun: '未命名的技能创建任务',
       resume: '继续',
@@ -73,7 +77,7 @@ const zh = {
       minutesSuffix: '分钟前',
       hoursSuffix: '小时前',
       daysSuffix: '天前',
-      searchPlaceholder: '搜索运行标题',
+      searchPlaceholder: '搜索执行标题',
       filterAllAgents: '所有智能体',
       backToList: '返回列表',
       stage: '阶段',
@@ -83,13 +87,384 @@ const zh = {
       toolCalls: '工具调用',
       result: '结果',
       error: '错误',
-      chat: {
-        userMessage: '用户消息',
-        assistantResponse: '助手回复',
-        toolCalls: '工具调用',
-        files: '文件',
-        preview: '预览',
-        executionLog: '执行日志',
+      tabAgentRuns: '即时运行',
+      tabExecutions: '任务执行',
+      executionEmpty: '暂无执行记录',
+      executionEmptyDesc: '任务派发后的执行记录会出现在这里。',
+      linkedTask: '关联任务',
+      viewInMissions: '在任务看板中查看',
+      viewInRunCenter: '前往执行监控查看',
+      dispatchedToast: '任务已派发',
+      dispatchedToastLink: '前往执行监控',
+      dispatch: '派发',
+      dispatching: '派发中...',
+      statusDispatched: '已派发',
+      pastExecutions: '历史执行',
+      pastExecutionsCount: '{{count}} 条历史执行',
+      pastExecutionsLink: '前往执行监控查看',
+      tabAgentRunsDesc: '来自对话、技能创建器等的即时运行',
+      tabExecutionsDesc: '任务看板派发的容器化执行',
+      filteredByTask: '按任务筛选',
+      filteredByMission: '按任务筛选',
+      clearFilter: '清除',
+      notLinkedToTask: '未关联任务，操作不可用',
+    },
+    tasks: {
+      title: 'Tasks',
+      allAgents: '所有 Agents',
+      boardView: '看板',
+      listView: '列表',
+      newTask: '新建任务',
+      filterBy: '筛选：{{name}}',
+      clearFilter: '清除',
+      emptyTitle: '暂无任务',
+      emptyDescription: '选择一个 Agent，给它派个任务',
+      emptyAction: '查看 Agents',
+      stopRun: '停止运行',
+      stoppingRun: '正在停止...',
+      archive: '归档',
+      archiveConfirmTitle: '归档任务',
+      archiveConfirmDesc: '任务将移至归档状态，可随时恢复。',
+      archiveConfirm: '确认归档',
+      currentExecution: '当前执行',
+      expandTimeline: '展开执行日志',
+      collapseTimeline: '收起',
+      viewFullLogs: '在运行监控查看完整日志',
+      running: '运行中',
+      noTasks: '暂无任务',
+      detailTitle: '任务详情',
+      objective: '目标',
+      description: '描述',
+      tags: '标签',
+      settings: '设置',
+      dueDate: '截止日期',
+      agent: '智能体',
+      comments: '评论',
+      lastRun: '最近一次运行',
+      viewRunHistory: '查看运行历史',
+      activities: '活动记录',
+      inProgress: '进行中',
+      noInProgress: '暂无正在执行的任务',
+      recentlyDone: '最近完成',
+      noRecentlyDone: '暂无最近完成的任务',
+      unassigned: '未分配',
+      changeAgent: '更换',
+      assignAgent: '分配智能体...',
+      autoApprove: '自动审批',
+      autoApproveOnDesc: '自动批准工具调用，完成后标记为已完成',
+      autoApproveOffDesc: '工具调用需要人工审批，完成后标记为需检查',
+      searchAgents: '搜索智能体...',
+      noAgentsFound: '未找到智能体',
+      unassignAgent: '取消分配',
+      createTitle: '新建任务',
+      createDescription: '创建一个新任务，分配给智能体执行。',
+      taskTitleLabel: '任务标题',
+      taskTitlePlaceholder: '例如：分析本季度销售数据',
+      assignAgentLabel: '分配智能体',
+      assignAgentPlaceholder: '选择一个智能体（可选）',
+      noAssignment: '不分配',
+      goalLabel: '目标',
+      goalPlaceholder: '任务的成功标准...',
+      descriptionLabel: '详细描述',
+      descriptionPlaceholder: '补充说明（可选）',
+      priorityLabel: '优先级',
+      tagsLabel: '标签',
+      tagsPlaceholder: '用逗号分隔',
+      autoApproveLabel: '自动审批',
+      autoApproveHint: '跳过人工审核，自动批准工具调用',
+      creating: '创建中...',
+      createTask: '创建任务',
+      priorityNone: '无',
+      priorityLow: '低',
+      priorityMedium: '中',
+      priorityHigh: '高',
+      priorityUrgent: '紧急',
+      needsAttention: '需要关注',
+      executionFailed: '执行失败',
+      awaitingReview: '等待审核',
+      details: '详情',
+      retry: '重试',
+    },
+    agents: {
+      title: '我的智能体',
+      newAgent: '新建智能体',
+      editAgent: '编辑智能体',
+      newAgentDescription: '创建新的智能体来处理特定任务。',
+      editAgentDescription: '更新智能体的基本信息。',
+      name: '名称',
+      namePlaceholder: '例如：数据分析智能体',
+      description: '描述',
+      descriptionPlaceholder: '这个智能体负责做什么？',
+      avatar: '头像 URL',
+      avatarPlaceholder: 'https://...',
+      buildMethod: '构建方式',
+      create: '创建',
+      save: '保存',
+      creating: '创建中...',
+      saving: '保存中...',
+      cancel: '取消',
+      loading: '加载智能体...',
+      emptyTitle: '还没有智能体',
+      emptyDescription: '创建你的第一个 AI 智能体，开始自动化工作。',
+      noDescription: '暂无描述',
+      edit: '编辑',
+      status: {
+        draft: '初版',
+        active: '已发布',
+        archived: '已归档',
+      },
+      studio: {
+        title: 'Agent Studio',
+        visualAgent: 'Visual Agent',
+        stageOverview: '当前阶段：{{activeStage}}。默认阶段：{{defaultStage}}',
+        rightPanel: {
+          copilot: '构建助手',
+          inspector: '属性面板',
+          edgeInspector: '连线属性',
+        },
+        addNode: {
+          button: '添加',
+          search: '搜索节点...',
+          empty: '未找到节点',
+        },
+        stages: {
+          brief: '需求',
+          canvas: '编排',
+          testLab: '测试',
+          release: '发布',
+          usage: '使用',
+        },
+        stageDescriptions: {
+          brief: '定义目标',
+          canvas: '构建流程',
+          testLab: '运行初版',
+          release: '安全发布',
+          usage: '接入业务',
+        },
+        brief: {
+          kicker: '第一步',
+          title: '描述你想打造的 Agent',
+          subtitle:
+            'Copilot 会把需求转换成可编辑的可视化流程。你也可以跳过并直接在画布上手动构建。',
+          goal: '目标',
+          input: '输入',
+          output: '输出',
+          tools: '工具 / Skills',
+          constraints: '安全 / 审批规则',
+          scenario: '业务场景',
+          skip: '手动构建',
+          generate: '用 Copilot 生成',
+        },
+        testLab: {
+          kicker: '初版验证',
+          title: '测试当前初版',
+          subtitle: '发布前先运行初版行为。这些测试不会影响当前已发布版本。',
+          inputLabel: '测试输入',
+          inputPlaceholder: '输入一个用于测试初版的请求...',
+          runDraft: '运行初版',
+          running: '运行中...',
+          stop: '停止',
+          backToCanvas: '回到编排',
+          openRelease: '打开发布',
+        },
+        actions: {
+          openCanvas: '打开编排',
+          openTestLab: '打开测试',
+          generateDraft: '生成初版',
+          runDraft: '运行初版',
+          openRelease: '打开发布',
+          publish: '发布',
+          openUsage: '打开使用',
+          createTask: '创建任务',
+        },
+        status: {
+          emptyDraft: '空初版',
+          unsavedDraft: '初版已变更',
+          savedDraft: '初版已保存',
+          published: '已发布',
+          notPublished: '未发布',
+        },
+        release: {
+          title: '发布你的 Agent',
+          subtitle: '发布后即可通过对话、任务和 API 使用',
+          publish: '发布',
+          history: '历史版本',
+          empty: '暂无发布版本。',
+          publishNew: '发布新版本',
+          currentActive: '当前已发布',
+          rollback: '回滚到此版本',
+          publishSuccess: '发布成功',
+          publishFailed: '发布失败',
+          retireRelease: '归档',
+          unpublish: '下线',
+          unpublishConfirm: '确认将此 Agent 下线?',
+          showArchived: '显示 {{num}} 个已归档',
+          hideArchived: '隐藏已归档',
+          releaseVersion: '版本 {{version}}',
+          publishedAt: '发布于',
+          status: {
+            live: '线上',
+            superseded: '已被替换',
+            ready: '就绪',
+            failed: '失败',
+            retired: '已归档',
+          },
+        },
+        usage: {
+          kicker: '业务使用',
+          title: '把这个 Agent 用到业务场景',
+          subtitleReady: '当前激活版本可以接入对话、任务、API 调用和业务流程。',
+          subtitleNoRelease: '先发布并激活一个版本，再把这个 Agent 接入业务使用。',
+          chat: '对话',
+          chatDesc: '基于当前激活版本开始对话。',
+          tasks: '任务和流程',
+          tasksDesc: '把这个 Agent 绑定到任务执行和运营流程。',
+        },
+      },
+      build: {
+        stages: {
+          brief: '目标',
+          build: '构建',
+          testLab: '测试',
+          release: '发布',
+          usage: '使用',
+        },
+        stageDescriptions: {
+          brief: '定义 Agent 的目标和行为',
+          build: '构建 Agent 逻辑',
+          testLab: '测试当前初版',
+          release: '发布和管理版本',
+          usage: '接入业务场景',
+        },
+        status: {
+          published: '已发布',
+          notPublished: '未发布',
+        },
+        release: {
+          title: '发布你的 Agent',
+          subtitle: '发布后即可通过对话、任务和 API 使用',
+          publish: '发布',
+          history: '历史版本',
+          empty: '暂无发布版本。',
+          publishNew: '发布新版本',
+          currentActive: '当前已发布',
+          rollback: '回滚到此版本',
+          publishSuccess: '发布成功',
+          publishFailed: '发布失败',
+          retireRelease: '归档',
+          unpublish: '下线',
+          unpublishConfirm: '确认将此 Agent 下线?',
+          showArchived: '显示 {{num}} 个已归档',
+          hideArchived: '隐藏已归档',
+          releaseVersion: '版本 {{version}}',
+          publishedAt: '发布于',
+          status: {
+            live: '线上',
+            superseded: '已被替换',
+            ready: '就绪',
+            failed: '失败',
+            retired: '已归档',
+          },
+        },
+        usage: {
+          kicker: '业务使用',
+          title: '把这个 Agent 用到业务场景',
+          subtitleReady: '当前激活版本可以接入对话、任务、API 调用和业务流程。',
+          subtitleNoRelease: '先发布并激活一个版本，再把这个 Agent 接入业务使用。',
+          chat: '对话',
+          chatDesc: '基于当前激活版本开始对话。',
+          tasks: '任务和流程',
+          tasksDesc: '把这个 Agent 绑定到任务执行和运营流程。',
+        },
+      },
+      filters: {
+        allBuildTypes: '全部构建类型',
+        allRuntimeTypes: '全部运行环境',
+        emptyTitle: '没有匹配的智能体',
+        emptySubtitle: '调整构建类型或运行环境筛选条件。',
+      },
+      runtime: {
+        graph: 'Graph',
+        code: 'Code',
+        sandbox: 'Sandbox',
+      },
+      graph: {
+        shortLabel: 'Graph',
+        label: '可视化编排',
+        description: '通过拖拽节点构建工作流',
+      },
+      code: {
+        shortLabel: 'Code',
+        label: '代码定义',
+        description: '通过代码定义智能体逻辑（即将推出）',
+      },
+      claudeCode: {
+        shortLabel: 'Claude Code',
+        label: 'Claude Code',
+        description: '在沙箱中运行 Claude Code CLI 智能体',
+      },
+      codex: {
+        shortLabel: 'Codex',
+        label: 'Codex',
+        description: '在沙箱中运行 Codex CLI 智能体',
+      },
+      openclaw: {
+        shortLabel: 'OpenClaw',
+        label: 'OpenClaw',
+        description: '在沙箱中运行 OpenClaw CLI 智能体',
+      },
+      detail: {
+        tabs: {
+          overview: '概览',
+          chat: '对话',
+          builder: '可视化编排',
+          settings: '设置',
+        },
+        assignTask: '派任务',
+        startChat: '开始对话',
+        recentActivity: '最近活动',
+        noActivity: '暂无最近活动',
+        about: '关于智能体',
+        noDescription: '暂无描述',
+        quickActions: '快速操作',
+        openBuilder: '打开编排',
+        openBuilderDesc: '编辑可视化流程',
+        settings: '设置',
+        settingsDesc: '管理智能体配置',
+        metrics: '使用指标',
+        totalRuns: '总运行次数',
+        totalThreads: '对话数',
+        createdAt: '创建时间',
+        updatedAt: '最近更新',
+        basicInfo: '基本信息',
+        definitionMethod: '定义方式',
+        releaseHistory: '发布历史',
+        goToPublish: '前往发布阶段',
+        publishedAt: '发布时间',
+        releaseVersion: '发布版本',
+        retireRelease: '下线',
+        rollbackToVersion: '回滚到此版本',
+        createVersion: '新建版本',
+        creatingVersion: '创建中...',
+        editVersion: '编辑版本',
+        changelog: '变更日志',
+        changelogPlaceholder: '描述此版本的变更内容',
+        definitionPayload: '定义配置',
+        capabilityManifest: '能力清单',
+        selectDefinitionKind: '选择构建方式',
+        versionStatus: {
+          draft: '初版',
+          frozen: '已冻结',
+        },
+        releaseStatus: {
+          ready: '就绪',
+          failed: '失败',
+          retired: '已下线',
+        },
+        confirmFreezeTitle: '冻结版本',
+        confirmFreezeMessage: '冻结后此版本将无法编辑，是否继续？',
+        confirmUnfreezeTitle: '解冻版本',
+        confirmUnfreezeMessage: '将把此版本恢复为初版状态，是否继续？',
       },
     },
     user: {
@@ -101,6 +476,10 @@ const zh = {
     settings: {
       title: '设置',
       description: '管理您的账户设置、工作空间配置和 MCP 服务器',
+      modelConfig: '模型配置',
+      modelConfigDesc: '管理模型供应商、凭据和配置',
+      membersManagementTitle: '成员管理',
+      membersManagementDesc: '管理工作空间成员和权限',
       account: '账户',
       workspace: '工作空间',
       profile: '个人资料',
@@ -416,6 +795,11 @@ const zh = {
       oauthError: '认证失败，请重试。',
       oauthDenied: '认证已取消。',
       oauthInvalidState: '认证状态无效，请重试。',
+      oauthProviderNotFound: '所选认证提供方当前不可用。',
+      oauthDiscoveryFailed: '认证提供方初始化失败，请稍后重试。',
+      oauthAuthorizeUrlMissing: '认证提供方配置不完整。',
+      oauthTokenUrlMissing: '认证令牌端点配置不完整。',
+      oauthUserinfoUrlMissing: '认证用户信息端点配置不完整。',
       oauthFailed: '认证失败，请重试。',
     },
     workspace: {
@@ -557,6 +941,8 @@ const zh = {
       savingEllipsis: '保存中...',
       runningEllipsis: '运行中...',
       runButton: '运行',
+      stopButton: '停止',
+      codeRunNoRelease: '未找到活跃版本。请先发布版本后再运行代码。',
       error: '错误',
       result: '结果',
       close: '关闭',
@@ -612,6 +998,7 @@ const zh = {
       // Properties Panel
       general: '常规',
       displayName: '显示名称',
+      behavior: '行为',
       capabilities: '能力',
       knowledgeMemory: '知识与记忆',
       enableLongTermMemory: '启用长期记忆',
@@ -688,10 +1075,10 @@ const zh = {
         docker_image: 'Docker 镜像',
       },
       // Copilot Panel
-      copilotSubtitle: 'AI打造生产级智能体',
-      copilotEmptyHeading: 'AI打造生产级智能体',
+      copilotSubtitle: '用于初版工作流的构建助手',
+      copilotEmptyHeading: '为你的初版智能体使用构建助手',
       copilotConnected:
-        '请给出具体任务（不是闲聊），我会直接修改画布。我已连接到核心系统，可修改图表结构。',
+        '请给出具体的构建任务，我会直接修改初版画布。我已连接到图构建器，可修改当前初版。',
       copilotStartWithBlueprint: '经典构建案例',
       copilotBlueprintRagTitle: 'UEM 告警研判系统',
       copilotBlueprintRagDesc:
@@ -711,6 +1098,16 @@ const zh = {
       copilotModeDeepAgents: 'DeepAgents 模式',
       copilotStatusMode: '模式：生产级图构建',
       copilotStatusModelPlaceholder: '—',
+      copilotError: {
+        auth: '认证错误。请检查你的凭据。',
+        network: '网络错误。请检查连接后重试。',
+        credentialNotConfigured: '未配置模型。请先在设置中配置你的模型凭据。',
+        buildCopilotModelRequired: '构建助手未配置模型。请选择一个模型后再试。',
+        modelNotFound: '未找到模型。请检查模型配置。',
+        modelNameRequired: '未选择模型。请先选择一个模型。',
+        credential: '认证错误。请检查 API 凭据。',
+        connection: '连接错误。请检查网络。',
+      },
       // Copilot stage labels
       'copilot.stage.thinking': '思考中',
       'copilot.stage.processing': '处理中',
@@ -782,12 +1179,9 @@ const zh = {
       rename: '重命名',
       duplicate: '复制',
       delete: '删除',
-      newSubfolder: '新建子文件夹',
-      createFolder: '创建文件夹',
       createWorkflow: '创建工作流',
       createAgent: '创建智能体',
       defaultAgentName: '我的智能体',
-      defaultFolderName: '新文件夹',
       defaultGraphName: '我的智能体',
       defaultGraphDescription: '默认智能体',
       creatingDefaultGraph: '正在创建默认智能体...',
@@ -798,7 +1192,6 @@ const zh = {
       running: '运行中',
       synchronizing: '同步中...',
       dropHereToAdd: '拖放到此处添加',
-      dropHereToRemoveFromFolder: '拖放到此处从文件夹中移除',
       ungrouped: '未分组',
       noAgentsYet: '暂无智能体',
       searchAgents: '搜索智能体...',
@@ -845,8 +1238,6 @@ const zh = {
       noPermission: '无权限',
       cannotCreateAgent: '查看者不能在此工作空间创建智能体',
       cannotDeleteAgent: '查看者不能在此工作空间删除智能体',
-      cannotCreateFolder: '查看者不能在此工作空间创建文件夹',
-      cannotDeleteFolder: '查看者不能在此工作空间删除文件夹',
       cannotDeleteNode: '查看者不能删除节点',
       cannotCopyNode: '查看者不能复制节点',
       cannotEditNode: '查看者不能编辑节点',
@@ -863,7 +1254,7 @@ const zh = {
       deployed: '已发布',
       notDeployed: '未发布',
       needsRedeployment: '待更新',
-      currentDraft: '当前草稿',
+      currentDraft: '当前初版',
       current: '当前',
       noDeployments: '暂无部署记录',
       active: '活跃',
@@ -921,15 +1312,6 @@ const zh = {
       agentDeleteFailed: '智能体删除失败',
       agentDuplicateSuccess: '智能体复制成功',
       agentDuplicateFailed: '智能体复制失败',
-      // Folder CRUD
-      folderCreateSuccess: '文件夹创建成功',
-      folderCreateFailed: '文件夹创建失败',
-      folderUpdateSuccess: '文件夹更新成功',
-      folderUpdateFailed: '文件夹更新失败',
-      folderDeleteSuccess: '文件夹删除成功',
-      folderDeleteFailed: '文件夹删除失败',
-      folderDuplicateSuccess: '文件夹复制成功',
-      folderDuplicateFailed: '文件夹复制失败',
       // Workspace CRUD (补充)
       workspaceCreateFailed: '工作空间创建失败',
       workspaceUpdateFailed: '工作空间更新失败',
@@ -945,7 +1327,8 @@ const zh = {
       baseUrl: '基础 URL',
       endpoint: '端点',
       authentication: '认证',
-      authenticationDescription: '在 {{header}} HTTP 请求头中以 Bearer Token 的形式包含您的 API Token 来认证 API 请求。',
+      authenticationDescription:
+        '在 {{header}} HTTP 请求头中以 Bearer Token 的形式包含您的 API Token 来认证 API 请求。',
       exampleRequest: '请求示例',
       viewFullApiDocs: '查看完整 API 文档',
       copy: '复制',
@@ -1091,13 +1474,13 @@ const zh = {
       releaseNotesPlaceholder: '描述变更内容...',
       restore: '恢复',
       delete: '删除',
-      restoreConfirmTitle: '恢复 Draft',
-      restoreConfirmMessage: '这将用版本 {{version}} 覆盖当前 Draft。是否继续？',
+      restoreConfirmTitle: '恢复初版',
+      restoreConfirmMessage: '这将用版本 {{version}} 覆盖当前初版。是否继续？',
       deleteConfirmTitle: '删除版本',
       deleteConfirmMessage: '此版本将被永久删除，此操作不可撤销。',
       publishedBy: '由 {{user}}',
       publishedSuccess: '版本 {{version}} 已发布',
-      restoredSuccess: '已从版本 {{version}} 恢复 Draft',
+      restoredSuccess: '已从版本 {{version}} 恢复初版',
       deletedSuccess: '版本 {{version}} 已删除',
       emptyState: '尚未发布任何版本',
       invalidVersion: '格式须为 MAJOR.MINOR.PATCH（如 1.0.0）',
@@ -1128,6 +1511,13 @@ const zh = {
       emptyState: '暂无协作者',
     },
     chat: {
+      noChats: '还没有对话',
+      noMessages: '还没有消息，开始对话吧。',
+      untitled: '未命名对话',
+      status: {
+        active: '进行中',
+        archived: '已归档',
+      },
       // Structured model error codes (from backend error_code)
       'error.MODEL_NOT_FOUND':
         'Agent「{{graph}}」的节点「{{node}}」中，模型 "{{model}}" 未注册或已被删除，请前往「设置 → 模型供应商」检查配置。',
@@ -1155,13 +1545,13 @@ const zh = {
       apkVulnerability: 'APK Detecter',
       apkVulnerabilityDescription: 'Android应用安全分析',
       skillCreator: 'Skill Creator',
-      skillCreatorDescription: 'AI 驱动的技能创建助手',
+      skillCreatorDescription: 'AI 驱动的技能创建智能体',
       examplePrompts: '示例提示',
       exploreAgentModeCases: '探索智能体模式案例',
       deepResearch: '深度研究',
       deepResearchDesc: '深入分析市场趋势',
       deepResearchPrompt: '对AI初创公司的当前市场趋势进行深度研究。',
-      codeAssistant: '代码助手',
+      codeAssistant: '代码智能体',
       codeAssistantDesc: '生成样板代码',
       codeAssistantPrompt: '为仪表板小部件创建一个React组件样板。',
       creativeWriting: '创意写作',
@@ -1179,7 +1569,7 @@ const zh = {
       clearAgent: '清除智能体',
       defaultAgent: '默认Agent',
       noDeployedAgents: '暂无已发布的Agent',
-      autoRedirectToCopilot: '自动构建智能体',
+      autoRedirectToCopilot: '打开构建助手',
       agentModeOn: '智能体自动编排',
       agentModeOff: '智能体自动编排',
       deepThinking: '深度思考',
@@ -1242,7 +1632,7 @@ const zh = {
       copyToClipboard: 'Copy to clipboard',
       copy: '复制',
       // CodeViewer
-      untitled: '未命名',
+      untitledCode: '未命名',
       lines: '行',
       moreLines: '+{{count}} 更多行',
       // ToolCallDetail
@@ -1337,6 +1727,26 @@ const zh = {
       noMemoriesFilteredDescription: '请尝试调整搜索条件或筛选标准',
       moreOptions: '更多选项',
     },
+    dashboard: {
+      title: 'Dashboard',
+      welcome: '欢迎回来, {{name}}',
+      needsAttention: '需要关注',
+      recentTasks: '最近任务',
+      activeAgents: '活跃 Agents',
+      allClear: '一切正常',
+      idle: '空闲',
+      viewAll: '查看全部',
+      awaitingApproval: '等待审批',
+      failedCount: '失败',
+      onboarding: {
+        title: '欢迎使用 JoySafeter',
+        subtitle: '创建你的第一个 Agent，开始自动化工作流',
+        createAgent: '创建 Agent',
+        step1: '创建 Agent',
+        step2: '派任务',
+        step3: '看结果',
+      },
+    },
     openclaw: {
       manageInstancesAndDevices: '管理实例与设备',
       instance: 'OpenClaw 实例',
diff --git a/frontend/lib/utils/__tests__/runHelpers.test.ts b/frontend/lib/utils/__tests__/runHelpers.test.ts
deleted file mode 100644
index b5c5c8fae..000000000
--- a/frontend/lib/utils/__tests__/runHelpers.test.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { buildRunHref } from '../runHelpers'
-
-describe('buildRunHref', () => {
-  it('routes by agent_name for skill creator runs', () => {
-    expect(
-      buildRunHref({
-        run_id: 'run-123',
-        run_type: 'generic_agent',
-        agent_name: 'skill_creator',
-      }),
-    ).toBe('/skills/creator?run=run-123')
-  })
-})
diff --git a/frontend/lib/utils/copilot/__tests__/actionProcessor.contract.test.ts b/frontend/lib/utils/copilot/__tests__/actionProcessor.contract.test.ts
deleted file mode 100644
index b600ce0f7..000000000
--- a/frontend/lib/utils/copilot/__tests__/actionProcessor.contract.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Contract tests for ActionProcessor.processActions.
- * Uses shared fixtures from docs/schemas/copilot-apply-fixtures.json so that
- * frontend apply logic stays consistent with backend (and with the contract).
- */
-
-import { readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
-
-import type { Node, Edge } from 'reactflow'
-import { describe, expect, it } from 'vitest'
-
-import type { GraphAction } from '@/types/copilot'
-
-import { ActionProcessor } from '../actionProcessor'
-
-const FIXTURES_PATH = resolve(__dirname, '../../../../docs/schemas/copilot-apply-fixtures.json')
-
-interface ApplyCase {
-  name: string
-  initial_nodes: Node[]
-  initial_edges: Edge[]
-  actions: GraphAction[]
-  expected_nodes: Node[]
-  expected_edges: Edge[]
-}
-
-function loadFixtures(): ApplyCase[] {
-  try {
-    const raw = readFileSync(FIXTURES_PATH, 'utf-8')
-    return JSON.parse(raw) as ApplyCase[]
-  } catch {
-    return []
-  }
-}
-
-const FIXTURES = loadFixtures()
-
-function normalizeNodes(nodes: Node[]): Node[] {
-  return [...nodes].sort((a, b) => (a.id || '').localeCompare(b.id || ''))
-}
-
-function normalizeEdges(edges: Edge[]): Edge[] {
-  return [...edges].sort((a, b) => (a.id || '').localeCompare(b.id || ''))
-}
-
-function nodeContractMatch(got: Node, want: Node): boolean {
-  if (got.id !== want.id) return false
-  if (got.type !== want.type) return false
-  if (JSON.stringify(got.position) !== JSON.stringify(want.position)) return false
-  const gotData = got.data as Record<string, unknown> | undefined
-  const wantData = want.data as Record<string, unknown> | undefined
-  if ((gotData?.label as string) !== (wantData?.label as string)) return false
-  if ((gotData?.type as string) !== (wantData?.type as string)) return false
-  const wantConfig = (wantData?.config as Record<string, unknown>) || {}
-  const gotConfig = (gotData?.config as Record<string, unknown>) || {}
-  for (const [k, v] of Object.entries(wantConfig)) {
-    if (gotConfig[k] !== v) return false
-  }
-  return true
-}
-
-function edgeContractMatch(got: Edge, want: Edge): boolean {
-  return got.id === want.id && got.source === want.source && got.target === want.target
-}
-
-describe('ActionProcessor contract', () => {
-  if (FIXTURES.length === 0) {
-    it.skip('skips when fixtures not found', () => {})
-    return
-  }
-
-  FIXTURES.forEach((data, _caseIndex) => {
-    it(data.name, () => {
-      const { initial_nodes, initial_edges, actions, expected_nodes, expected_edges } = data
-      const { nodes: gotNodes, edges: gotEdges } = ActionProcessor.processActions(
-        actions,
-        initial_nodes as Node[],
-        initial_edges as Edge[],
-      )
-      const gotN = normalizeNodes(gotNodes)
-      const gotE = normalizeEdges(gotEdges)
-      const expN = normalizeNodes(expected_nodes as Node[])
-      const expE = normalizeEdges(expected_edges as Edge[])
-
-      expect(gotN.length).toBe(expN.length)
-      expect(gotE.length).toBe(expE.length)
-      gotN.forEach((g, i) => {
-        expect(nodeContractMatch(g, expN[i])).toBe(true)
-      })
-      gotE.forEach((g, i) => {
-        expect(edgeContractMatch(g, expE[i])).toBe(true)
-      })
-    })
-  })
-})
diff --git a/frontend/lib/utils/copilot/actionProcessor.ts b/frontend/lib/utils/copilot/actionProcessor.ts
index 872f49ab3..b9130c1a0 100644
--- a/frontend/lib/utils/copilot/actionProcessor.ts
+++ b/frontend/lib/utils/copilot/actionProcessor.ts
@@ -7,7 +7,7 @@
 
 import { Node, Edge } from 'reactflow'
 
-import { nodeRegistry } from '@/app/workspace/[workspaceId]/[agentId]/services/nodeRegistry'
+import { nodeRegistry } from '@/components/editors/graph-builder/services/nodeRegistry'
 import type { GraphAction } from '@/types/copilot'
 
 export interface ProcessedGraph {
diff --git a/frontend/lib/utils/dateHelpers.ts b/frontend/lib/utils/dateHelpers.ts
new file mode 100644
index 000000000..e87da5c05
--- /dev/null
+++ b/frontend/lib/utils/dateHelpers.ts
@@ -0,0 +1,31 @@
+/**
+ * General-purpose date/time formatting utilities.
+ */
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type TFn = (key: string, fallback?: any) => string
+
+export function formatDuration(startedAt?: string | null, endedAt?: string | null): string | null {
+  if (!startedAt) return null
+  const start = new Date(startedAt).getTime()
+  const end = endedAt ? new Date(endedAt).getTime() : Date.now()
+  const secs = Math.floor((end - start) / 1000)
+  const m = Math.floor(secs / 60)
+  const s = secs % 60
+  return `${m}m ${s.toString().padStart(2, '0')}s`
+}
+
+export function formatRelativeTime(value: string, t?: TFn): string {
+  const date = new Date(value)
+  const diffMs = Date.now() - date.getTime()
+  const diffMinutes = Math.floor(diffMs / 60000)
+  const diffHours = Math.floor(diffMs / 3600000)
+  const diffDays = Math.floor(diffMs / 86400000)
+  const tr: TFn = t || ((_, f) => f || '')
+
+  if (diffMinutes < 1) return tr('execution.justNow', 'just now')
+  if (diffMinutes < 60) return `${diffMinutes}${tr('execution.minutesSuffix', 'm ago')}`
+  if (diffHours < 24) return `${diffHours}${tr('execution.hoursSuffix', 'h ago')}`
+  if (diffDays < 30) return `${diffDays}${tr('execution.daysSuffix', 'd ago')}`
+  return date.toLocaleDateString()
+}
diff --git a/frontend/lib/utils/formatRunStatus.ts b/frontend/lib/utils/formatRunStatus.ts
deleted file mode 100644
index 2d827d3cb..000000000
--- a/frontend/lib/utils/formatRunStatus.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Re-export from the consolidated runHelpers module.
-export { formatRunStatus } from './runHelpers'
diff --git a/frontend/lib/utils/graphStateHash.ts b/frontend/lib/utils/graphStateHash.ts
index ce233be54..07a7efbda 100644
--- a/frontend/lib/utils/graphStateHash.ts
+++ b/frontend/lib/utils/graphStateHash.ts
@@ -7,7 +7,7 @@
 
 import type { Node, Edge } from 'reactflow'
 
-import type { StateField } from '@/app/workspace/[workspaceId]/[agentId]/types/graph'
+import type { StateField } from '@/components/editors/graph-builder/types/graph'
 
 /**
  * Compute a hash of the graph state for comparison
diff --git a/frontend/lib/utils/is-permission-error.ts b/frontend/lib/utils/is-permission-error.ts
deleted file mode 100644
index 37b956c2d..000000000
--- a/frontend/lib/utils/is-permission-error.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Check if an error is a permission/authorization error
- */
-export function isPermissionError(error: unknown): boolean {
-  const message = error instanceof Error ? error.message : String(error)
-  return (
-    message.includes('403') ||
-    message.includes('permission') ||
-    message.includes('Forbidden') ||
-    message.includes('insufficient') ||
-    message.includes('Insufficient')
-  )
-}
diff --git a/frontend/lib/utils/runHelpers.ts b/frontend/lib/utils/runHelpers.ts
deleted file mode 100644
index 521ff2c66..000000000
--- a/frontend/lib/utils/runHelpers.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Shared helpers for run-related UI: status formatting, relative time,
- * active-status check, URL building, and summary reducers for WS frames.
- */
-
-import type { RunEventFrame, RunSnapshotFrame, RunStatusFrame } from '@/lib/ws/runs/types'
-import type { RunSummary } from '@/services/runService'
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type TFn = (key: string, fallback?: any) => string
-
-// ---------------------------------------------------------------------------
-// Constants
-// ---------------------------------------------------------------------------
-
-export const ACTIVE_RUN_STATUSES = new Set(['queued', 'running', 'interrupt_wait'])
-
-// ---------------------------------------------------------------------------
-// Formatters
-// ---------------------------------------------------------------------------
-
-export function formatRunStatus(status: string, t: TFn): string {
-  const map: Record<string, string> = {
-    queued: t('runs.statusQueued', 'Queued'),
-    running: t('runs.statusRunning', 'Running'),
-    interrupt_wait: t('runs.statusInterruptWait', 'Waiting Input'),
-    completed: t('runs.statusCompleted', 'Completed'),
-    failed: t('runs.statusFailed', 'Failed'),
-    cancelled: t('runs.statusCancelled', 'Cancelled'),
-  }
-  return map[status] || status
-}
-
-export function formatRelativeTime(value: string, t?: TFn): string {
-  const date = new Date(value)
-  const diffMs = Date.now() - date.getTime()
-  const diffMinutes = Math.floor(diffMs / 60000)
-  const diffHours = Math.floor(diffMs / 3600000)
-  const diffDays = Math.floor(diffMs / 86400000)
-  const tr: TFn = t || ((_, f) => f || '')
-
-  if (diffMinutes < 1) return tr('runs.justNow', 'just now')
-  if (diffMinutes < 60) return `${diffMinutes}${tr('runs.minutesSuffix', 'm ago')}`
-  if (diffHours < 24) return `${diffHours}${tr('runs.hoursSuffix', 'h ago')}`
-  if (diffDays < 30) return `${diffDays}${tr('runs.daysSuffix', 'd ago')}`
-  return date.toLocaleDateString()
-}
-
-// ---------------------------------------------------------------------------
-// URL helpers
-// ---------------------------------------------------------------------------
-
-export function buildRunHref(run: { run_id: string; run_type?: string; agent_name?: string | null }): string {
-  if (run.agent_name === 'skill_creator' || run.run_type === 'skill_creator') {
-    return `/skills/creator?run=${encodeURIComponent(run.run_id)}`
-  }
-  if (run.agent_name === 'chat' || run.run_type === 'chat_turn') {
-    return `/runs/${encodeURIComponent(run.run_id)}`
-  }
-  if (run.agent_name === 'copilot' || run.run_type === 'copilot_turn') {
-    return `/runs/${encodeURIComponent(run.run_id)}`
-  }
-  return '#'
-}
-
-// ---------------------------------------------------------------------------
-// RunSummary reducers for WS frames
-// ---------------------------------------------------------------------------
-
-export function applyRunSnapshot(current: RunSummary, frame: RunSnapshotFrame): RunSummary {
-  return {
-    ...current,
-    status: typeof frame.data?.status === 'string' ? frame.data.status : current.status,
-    thread_id: typeof frame.data?.thread_id === 'string' ? frame.data.thread_id : current.thread_id,
-    title: typeof frame.data?.title === 'string' ? frame.data.title : current.title,
-    last_seq: frame.last_seq,
-  }
-}
-
-export function applyRunEvent(current: RunSummary, frame: RunEventFrame): RunSummary {
-  return {
-    ...current,
-    last_seq: frame.seq,
-    updated_at: frame.created_at || new Date().toISOString(),
-    error_message:
-      frame.event_type === 'error' && typeof frame.data?.message === 'string'
-        ? frame.data.message
-        : current.error_message,
-  }
-}
-
-export function applyRunStatus(current: RunSummary, frame: RunStatusFrame): RunSummary {
-  return {
-    ...current,
-    status: frame.status,
-    error_code: frame.error_code ?? current.error_code,
-    error_message: frame.error_message ?? current.error_message,
-    updated_at: new Date().toISOString(),
-  }
-}
diff --git a/frontend/lib/utils/skillValidationI18n.ts b/frontend/lib/utils/skillValidationI18n.ts
index 3955adc9a..a172306f8 100644
--- a/frontend/lib/utils/skillValidationI18n.ts
+++ b/frontend/lib/utils/skillValidationI18n.ts
@@ -30,27 +30,37 @@ function extractNameMatchDirectory(detail: string): { name: string; directory: s
  * @returns Localized message, or empty string if not a skill validation error / no detail
  */
 export function getSkillValidationMessage(error: unknown, t: TFunction): string {
-  if (!(error instanceof ApiError) || !error.detail) {
+  if (!(error instanceof ApiError)) {
     return ''
   }
 
-  const d = error.detail
+  const code = error.code
+  const validationError =
+    typeof error.data?.validation_error === 'string' ? error.data.validation_error : null
 
-  if (d.includes('name is required')) {
+  if (code === 'SKILL_NAME_ALREADY_EXISTS') {
+    return t('skills.validationErrors.nameExists')
+  }
+
+  if (code !== 'SKILL_NAME_INVALID' || !validationError) {
+    return code ? t('skills.validationErrors.generic') : ''
+  }
+
+  if (validationError.includes('name is required')) {
     return t('skills.validationErrors.nameRequired')
   }
 
-  if (d.includes('name exceeds 64 characters')) {
-    const name = extractGot(d) ?? '?'
+  if (validationError.includes('name exceeds 64 characters')) {
+    const name = extractGot(validationError) ?? '?'
     return t('skills.validationErrors.nameTooLong', { max: 64, name })
   }
 
-  if (d.includes('name must be lowercase alphanumeric')) {
-    const name = extractGot(d) ?? '?'
+  if (validationError.includes('name must be lowercase alphanumeric')) {
+    const name = extractGot(validationError) ?? '?'
     return t('skills.validationErrors.nameFormat', { name })
   }
 
-  const nm = extractNameMatchDirectory(d)
+  const nm = extractNameMatchDirectory(validationError)
   if (nm) {
     return t('skills.validationErrors.nameMatchDirectory', {
       name: nm.name,
@@ -58,21 +68,5 @@ export function getSkillValidationMessage(error: unknown, t: TFunction): string
     })
   }
 
-  if (d.includes('description is required')) {
-    return t('skills.validationErrors.descriptionRequired')
-  }
-
-  if (d.includes('description exceeds 1024 characters')) {
-    return t('skills.validationErrors.descriptionTooLong', { max: 1024 })
-  }
-
-  if (d.includes('compatibility exceeds 500 characters')) {
-    return t('skills.validationErrors.compatibilityTooLong', { max: 500 })
-  }
-
-  if (d.includes('already exists for this owner')) {
-    return t('skills.validationErrors.nameExists')
-  }
-
   return t('skills.validationErrors.generic')
 }
diff --git a/frontend/lib/utils/toast.ts b/frontend/lib/utils/toast.ts
index 9fb22fc98..ae3327d90 100644
--- a/frontend/lib/utils/toast.ts
+++ b/frontend/lib/utils/toast.ts
@@ -1,15 +1,11 @@
-/**
- * Global Toast utility functions
- * Used to display error and success messages anywhere in the application
- */
-
 import { toast as showToast } from '@/hooks/use-toast'
 
-/**
- * Display error toast
- * @param message Error message
- * @param title Optional title
- */
+export function getErrorMessage(err: unknown, fallback = 'Operation failed'): string {
+  if (err instanceof Error) return err.message || fallback
+  if (typeof err === 'string') return err
+  return fallback
+}
+
 export function toastError(message: string, title?: string) {
   showToast({
     variant: 'destructive',
@@ -19,11 +15,6 @@ export function toastError(message: string, title?: string) {
   })
 }
 
-/**
- * Display success toast
- * @param message Success message
- * @param title Optional title
- */
 export function toastSuccess(message: string, title?: string) {
   showToast({
     variant: 'success',
diff --git a/frontend/lib/utils/uuid.ts b/frontend/lib/utils/uuid.ts
index 0aba45f03..c3c98f88d 100644
--- a/frontend/lib/utils/uuid.ts
+++ b/frontend/lib/utils/uuid.ts
@@ -13,7 +13,7 @@ export function generateUUID(): string {
     crypto.getRandomValues(bytes)
     bytes[6] = (bytes[6] & 0x0f) | 0x40 // version 4
     bytes[8] = (bytes[8] & 0x3f) | 0x80 // variant 10
-    const hex = [...bytes].map(b => b.toString(16).padStart(2, '0')).join('')
+    const hex = [...bytes].map((b) => b.toString(16).padStart(2, '0')).join('')
     return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`
   }
   // Last resort: Math.random (not cryptographically secure)
@@ -37,5 +37,9 @@ export function generateNonce(size = 16): string {
     }
     return btoa(String.fromCharCode(...bytes))
   }
-  return Array.from({ length: size }, () => Math.floor(Math.random() * 256).toString(16).padStart(2, '0')).join('')
+  return Array.from({ length: size }, () =>
+    Math.floor(Math.random() * 256)
+      .toString(16)
+      .padStart(2, '0'),
+  ).join('')
 }
diff --git a/frontend/lib/utils/wsUrl.ts b/frontend/lib/utils/wsUrl.ts
index 3cd3c3c76..1219066c1 100644
--- a/frontend/lib/utils/wsUrl.ts
+++ b/frontend/lib/utils/wsUrl.ts
@@ -1,5 +1,7 @@
 import { env as runtimeEnv } from 'next-runtime-env'
 
+import { apiGet, createApiError } from '@/lib/api-client'
+
 /**
  * Returns the WebSocket base URL derived from NEXT_PUBLIC_API_URL (preferred)
  * or the current window origin as a fallback for co-hosted deployments.
@@ -20,27 +22,24 @@ export function getWsBaseUrl(): string {
 
 /** Fetch a short-lived WS token from the backend and return a ready-to-use WS URL for the given path. */
 async function getWsTokenUrl(path: string): Promise<string> {
-  const apiUrl = runtimeEnv('NEXT_PUBLIC_API_URL') || process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000/api'
-  const base = apiUrl.replace(/\/api\/?$/, '')
-  const res = await fetch(`${base}/api/v1/auth/ws-token`, { credentials: 'include' })
-  if (!res.ok) throw new Error('Failed to obtain WS token')
-  const json = await res.json()
-  const token: string = json?.data?.token
-  if (!token) throw new Error('No WS token in response')
+  const response = await apiGet<{ token?: string }>('auth/ws-token')
+  const token = response?.token
+  if (!token) {
+    throw createApiError(500, 'Invalid WebSocket Token Response', {
+      code: 'WEBSOCKET_TOKEN_MISSING',
+      message: 'No WebSocket token in response',
+      data: { path },
+    })
+  }
   return `${getWsBaseUrl()}${path}?token=${encodeURIComponent(token)}`
 }
 
-/** Fetch a short-lived WS token from the backend and return a ready-to-use WS URL. */
-export async function getWsChatUrl(): Promise<string> {
-  return getWsTokenUrl('/ws/chat')
-}
-
-/** Fetch a short-lived WS token from the backend and return a ready-to-use run WS URL. */
-export async function getWsRunsUrl(): Promise<string> {
-  return getWsTokenUrl('/ws/runs')
-}
-
 /** Fetch a short-lived WS token from the backend and return a ready-to-use notification WS URL. */
 export async function getWsNotificationUrl(): Promise<string> {
   return getWsTokenUrl('/ws/notifications')
 }
+
+/** Fetch a short-lived WS token from the backend and return a ready-to-use executions WS URL. */
+export async function getWsExecutionsUrl(): Promise<string> {
+  return getWsTokenUrl('/ws/executions')
+}
diff --git a/frontend/lib/ws/base/BaseWsClient.ts b/frontend/lib/ws/base/BaseWsClient.ts
index a6c9a196d..ada4896cf 100644
--- a/frontend/lib/ws/base/BaseWsClient.ts
+++ b/frontend/lib/ws/base/BaseWsClient.ts
@@ -1,5 +1,7 @@
 'use client'
 
+import { createApiError } from '@/lib/api-client'
+
 import { HEARTBEAT, RECONNECT, UNRECOVERABLE_CLOSE_CODES, WS_CLOSE_CODE } from '../constants'
 
 export interface BaseConnectionState {
@@ -125,7 +127,11 @@ export abstract class BaseWsClient<TState extends BaseConnectionState = BaseConn
 
               this.onUnexpectedClose()
 
-              if (UNRECOVERABLE_CLOSE_CODES.includes(event.code as (typeof UNRECOVERABLE_CLOSE_CODES)[number])) {
+              if (
+                UNRECOVERABLE_CLOSE_CODES.includes(
+                  event.code as (typeof UNRECOVERABLE_CLOSE_CODES)[number],
+                )
+              ) {
                 return
               }
 
@@ -202,7 +208,15 @@ export abstract class BaseWsClient<TState extends BaseConnectionState = BaseConn
   protected onUnexpectedClose(): void {}
   protected onParseError(): void {}
   protected createConnectionError(message: string): Error {
-    return new Error(message)
+    const code =
+      message === 'WebSocket not connected'
+        ? 'WEBSOCKET_UNAVAILABLE'
+        : 'WEBSOCKET_CONNECTION_FAILED'
+    return createApiError(0, 'WebSocket Error', {
+      code,
+      message,
+      data: null,
+    })
   }
 
   // === Private internals ===
@@ -213,7 +227,9 @@ export abstract class BaseWsClient<TState extends BaseConnectionState = BaseConn
     this.heartbeatTimer = setInterval(() => {
       if (this.ws?.readyState !== WebSocket.OPEN) return
       if (Date.now() - this.lastPongTime > this.config.pongTimeoutMs) {
-        console.warn(`${this.config.name} Heartbeat timeout — no pong in ${this.config.pongTimeoutMs}ms, reconnecting`)
+        console.warn(
+          `${this.config.name} Heartbeat timeout — no pong in ${this.config.pongTimeoutMs}ms, reconnecting`,
+        )
         this.ws.close()
         return
       }
diff --git a/frontend/lib/ws/chat/chatWsClient.ts b/frontend/lib/ws/chat/chatWsClient.ts
deleted file mode 100644
index 3d07f2382..000000000
--- a/frontend/lib/ws/chat/chatWsClient.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-'use client'
-
-import { generateUUID } from '@/lib/utils/uuid'
-import { getWsChatUrl } from '@/lib/utils/wsUrl'
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-import { BaseWsClient } from '../base'
-import { ChatWsError } from './errors'
-import type {
-  ChatExtension,
-  ChatResumeParams,
-  ChatSendParams,
-  ChatTerminalResult,
-  ChatWsClient,
-  ConnectionState,
-  CopilotExtension,
-  IncomingChatAcceptedEvent,
-  IncomingChatWsEvent,
-  SkillCreatorExtension,
-} from './types'
-
-interface PendingRequest {
-  requestId: string
-  threadId?: string
-  onEvent?: (evt: ChatStreamEvent) => void
-  onAccepted?: (evt: IncomingChatAcceptedEvent) => void
-  resolve: (value: ChatTerminalResult) => void
-  reject: (error: Error) => void
-}
-
-class SharedChatWsClient extends BaseWsClient<ConnectionState> implements ChatWsClient {
-  private static readonly MAX_PARSE_FAILURES = 10
-  private consecutiveParseFailures = 0
-  private pending = new Map<string, PendingRequest>()
-  private threadToRequest = new Map<string, string>()
-
-  constructor() {
-    super({
-      maxReconnectAttempts: 20,
-      name: '[ChatWS]',
-    })
-  }
-
-  protected createInitialState(): ConnectionState {
-    return { isConnected: false }
-  }
-
-  protected async getWsUrl(): Promise<string> {
-    return getWsChatUrl()
-  }
-
-  protected handleMessage(evt: IncomingChatWsEvent): void {
-    this.consecutiveParseFailures = 0
-    this.handleInboundMessage(evt)
-  }
-
-  protected override onParseError(): void {
-    this.consecutiveParseFailures++
-    console.warn(`[ChatWS] Malformed frame (${this.consecutiveParseFailures} consecutive)`)
-    if (this.consecutiveParseFailures >= SharedChatWsClient.MAX_PARSE_FAILURES) {
-      console.error('[ChatWS] Too many consecutive parse failures, reconnecting')
-      this.consecutiveParseFailures = 0
-      this.ws?.close()
-    }
-  }
-
-  protected override onAuthExpired(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Authentication expired'))
-  }
-
-  protected override onUnexpectedClose(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'WebSocket disconnected'))
-  }
-
-  protected override onReconnectExhausted(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Connection lost. Please refresh the page.'))
-  }
-
-  protected override onDispose(): void {
-    this.rejectAllPending(new ChatWsError('WS_CONNECTION_LOST', 'Chat session closed'))
-  }
-
-  protected override createConnectionError(message: string): Error {
-    return new ChatWsError('WS_CONNECTION_FAILED', message)
-  }
-
-  async sendChat(params: ChatSendParams): Promise<ChatTerminalResult> {
-    const message = params.input.message
-    if (!message.trim()) {
-      throw new Error('Message cannot be empty')
-    }
-    await this.connect()
-    const requestId = params.requestId || generateUUID()
-    return new Promise((resolve, reject) => {
-      this.pending.set(requestId, {
-        requestId,
-        threadId: params.threadId || undefined,
-        onEvent: params.onEvent,
-        onAccepted: params.onAccepted,
-        resolve,
-        reject,
-      })
-      if (params.threadId) {
-        this.threadToRequest.set(params.threadId, requestId)
-      }
-      try {
-        this.sendFrame({
-          type: 'chat.start',
-          request_id: requestId,
-          thread_id: params.threadId || null,
-          graph_id: params.graphId || null,
-          input: serializeInput(params.input),
-          extension: serializeExtension(params.extension),
-          metadata: params.metadata || {},
-        })
-      } catch (error) {
-        this.clearPending(requestId)
-        reject(error instanceof Error ? error : new ChatWsError('WS_NOT_CONNECTED', 'WebSocket not connected'))
-      }
-    })
-  }
-
-  async sendResume(params: ChatResumeParams): Promise<ChatTerminalResult> {
-    await this.connect()
-    const requestId = params.requestId || generateUUID()
-    return new Promise((resolve, reject) => {
-      this.pending.set(requestId, {
-        requestId,
-        threadId: params.threadId,
-        onEvent: params.onEvent,
-        onAccepted: params.onAccepted,
-        resolve,
-        reject,
-      })
-      this.threadToRequest.set(params.threadId, requestId)
-      try {
-        this.sendFrame({
-          type: 'chat.resume',
-          request_id: requestId,
-          thread_id: params.threadId,
-          command: params.command,
-        })
-      } catch (error) {
-        this.clearPending(requestId)
-        reject(error instanceof Error ? error : new ChatWsError('WS_NOT_CONNECTED', 'WebSocket not connected'))
-      }
-    })
-  }
-
-  stopByThreadId(threadId: string): void {
-    const requestId = this.threadToRequest.get(threadId)
-    if (!requestId) return
-    this.stopByRequestId(requestId)
-  }
-
-  stopByRequestId(requestId: string): void {
-    if (!requestId) return
-    try {
-      this.sendFrame({ type: 'chat.stop', request_id: requestId })
-    } catch {
-      // Ignore stop failures
-    }
-  }
-
-  private handleInboundMessage(evt: IncomingChatWsEvent) {
-    const type: string | undefined = evt.type
-    if (!type) return
-
-    const requestId = evt.request_id
-    if (type === 'ws_error') {
-      if (requestId) {
-        this.rejectPending(
-          requestId,
-          new ChatWsError('WS_PROTOCOL_ERROR', evt.message || 'WebSocket protocol error', { evt }),
-        )
-      }
-      return
-    }
-
-    if (!requestId) return
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-
-    if (evt.thread_id) {
-      pending.threadId = evt.thread_id
-      this.threadToRequest.set(evt.thread_id, requestId)
-    }
-
-    if (type === 'accepted') {
-      pending.onAccepted?.(evt as IncomingChatAcceptedEvent)
-      return
-    }
-
-    pending.onEvent?.(evt as ChatStreamEvent)
-
-    if (type === 'interrupt') {
-      this.resolvePending(requestId, 'interrupt')
-      return
-    }
-    if (type === 'done') {
-      this.resolvePending(requestId, 'done')
-      return
-    }
-    if (type === 'error') {
-      const message = (typeof evt.data?.message === 'string' ? evt.data.message : null) || 'Unknown error'
-      if (message === 'Stream stopped' || message.includes('stopped')) {
-        this.resolvePending(requestId, 'stopped')
-      } else {
-        this.resolvePending(requestId, 'error')
-      }
-    }
-  }
-
-  private resolvePending(requestId: string, terminal: ChatTerminalResult['terminal']) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.clearPending(requestId)
-    pending.resolve({ requestId, threadId: pending.threadId, terminal })
-  }
-
-  private rejectPending(requestId: string, error: Error) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.clearPending(requestId)
-    pending.reject(error)
-  }
-
-  private clearPending(requestId: string) {
-    const pending = this.pending.get(requestId)
-    if (!pending) return
-    this.pending.delete(requestId)
-    if (pending.threadId) {
-      this.threadToRequest.delete(pending.threadId)
-    }
-  }
-
-  private rejectAllPending(error: Error) {
-    const requestIds = Array.from(this.pending.keys())
-    requestIds.forEach((requestId) => this.rejectPending(requestId, error))
-  }
-}
-
-function serializeInput(input: ChatSendParams['input']): Record<string, unknown> {
-  const result: Record<string, unknown> = { message: input.message }
-  if (input.files && input.files.length > 0) {
-    result.files = input.files
-  }
-  if (input.provider_name) {
-    result.provider_name = input.provider_name
-  }
-  if (input.model_name) {
-    result.model_name = input.model_name
-  }
-  return result
-}
-
-function serializeExtension(extension?: SkillCreatorExtension | ChatExtension | CopilotExtension | null): Record<string, unknown> | null {
-  if (!extension) return null
-  if (extension.kind === 'skill_creator') {
-    return { kind: extension.kind, run_id: extension.runId ?? null, edit_skill_id: extension.editSkillId ?? null }
-  }
-  if (extension.kind === 'chat') {
-    return { kind: extension.kind, run_id: extension.runId ?? null }
-  }
-  if (extension.kind === 'copilot') {
-    return {
-      kind: extension.kind, run_id: extension.runId ?? null,
-      graph_context: extension.graphContext,
-      conversation_history: extension.conversationHistory,
-      mode: extension.mode,
-    }
-  }
-  return null
-}
-
-let singleton: SharedChatWsClient | null = null
-
-export function getChatWsClient(): ChatWsClient {
-  if (!singleton) {
-    singleton = new SharedChatWsClient()
-  }
-  return singleton
-}
diff --git a/frontend/lib/ws/chat/errors.ts b/frontend/lib/ws/chat/errors.ts
deleted file mode 100644
index fa75ad412..000000000
--- a/frontend/lib/ws/chat/errors.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export type ChatWsErrorCode =
-  | 'WS_PROTOCOL_ERROR'
-  | 'WS_NOT_CONNECTED'
-  | 'WS_CONNECTION_FAILED'
-  | 'WS_CONNECTION_LOST'
-  | 'CHAT_EXECUTION_ERROR'
-
-export class ChatWsError extends Error {
-  code: ChatWsErrorCode
-  details?: Record<string, unknown>
-
-  constructor(code: ChatWsErrorCode, message: string, details?: Record<string, unknown>) {
-    super(message)
-    this.name = 'ChatWsError'
-    this.code = code
-    this.details = details
-  }
-}
diff --git a/frontend/lib/ws/chat/types.ts b/frontend/lib/ws/chat/types.ts
deleted file mode 100644
index 008141dad..000000000
--- a/frontend/lib/ws/chat/types.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import type { ChatStreamEvent } from '@/services/chatBackend'
-
-export interface IncomingChatAcceptedEvent {
-  type: 'accepted'
-  request_id: string
-  thread_id?: string
-  run_id?: string
-  timestamp?: number
-  data?: {
-    status?: string
-  }
-}
-
-export type IncomingChatWsEvent = Partial<ChatStreamEvent> & {
-  type?: string
-  request_id?: string
-  message?: string
-  thread_id?: string
-  data?: Record<string, unknown>
-  run_id?: string
-  node_name?: string
-  timestamp?: number
-}
-
-export interface ChatResumeCommand {
-  update?: Record<string, unknown>
-  goto?: string | null
-}
-
-export interface ChatSendFile {
-  filename: string
-  path: string
-  size: number
-}
-
-export interface ChatSendInput {
-  message: string
-  files?: ChatSendFile[]
-  provider_name?: string
-  model_name?: string
-}
-
-export interface SkillCreatorExtension {
-  kind: 'skill_creator'
-  runId?: string | null
-  editSkillId?: string | null
-}
-
-export interface ChatExtension {
-  kind: 'chat'
-  runId?: string | null
-}
-
-export interface CopilotExtension {
-  kind: 'copilot'
-  runId?: string | null
-  graphContext: Record<string, unknown>
-  conversationHistory: Array<Record<string, unknown>>
-  mode: string
-}
-
-export interface ChatSendParams {
-  requestId?: string
-  threadId?: string | null
-  graphId?: string | null
-  input: ChatSendInput
-  extension?: SkillCreatorExtension | ChatExtension | CopilotExtension | null
-  metadata?: Record<string, unknown>
-  onEvent?: (evt: ChatStreamEvent) => void
-  onAccepted?: (evt: IncomingChatAcceptedEvent) => void
-}
-
-export interface ChatResumeParams {
-  requestId?: string
-  threadId: string
-  command: ChatResumeCommand
-  onEvent?: (evt: ChatStreamEvent) => void
-  onAccepted?: (evt: IncomingChatAcceptedEvent) => void
-}
-
-export type ChatTerminal = 'done' | 'interrupt' | 'stopped' | 'error'
-
-export interface ChatTerminalResult {
-  requestId: string
-  threadId?: string
-  terminal: ChatTerminal
-}
-
-export interface ConnectionState {
-  isConnected: boolean
-  authExpired?: boolean
-}
-
-export interface ChatWsClient {
-  connect(): Promise<void>
-  getConnectionState(): ConnectionState
-  subscribeConnectionState(listener: (state: ConnectionState) => void): () => void
-  sendChat(params: ChatSendParams): Promise<ChatTerminalResult>
-  sendResume(params: ChatResumeParams): Promise<ChatTerminalResult>
-  stopByThreadId(threadId: string): void
-  stopByRequestId(requestId: string): void
-  disconnect(): void
-}
diff --git a/frontend/lib/ws/executions/executionWsClient.ts b/frontend/lib/ws/executions/executionWsClient.ts
new file mode 100644
index 000000000..3f2599699
--- /dev/null
+++ b/frontend/lib/ws/executions/executionWsClient.ts
@@ -0,0 +1,120 @@
+'use client'
+
+import { getWsExecutionsUrl } from '@/lib/utils/wsUrl'
+
+import { BaseWsClient } from '../base'
+import type {
+  ExecutionConnectionState,
+  ExecutionSubscriptionCallbacks,
+  IncomingExecutionWsFrame,
+} from './types'
+
+interface ExecutionSubscriptionState {
+  afterSeq: number
+  callbacks: ExecutionSubscriptionCallbacks
+}
+
+class SharedExecutionWsClient extends BaseWsClient<ExecutionConnectionState> {
+  private subscriptions = new Map<string, ExecutionSubscriptionState>()
+
+  constructor() {
+    super({
+      maxReconnectAttempts: null,
+      name: '[ExecWS]',
+    })
+  }
+
+  protected createInitialState(): ExecutionConnectionState {
+    return { isConnected: false }
+  }
+
+  protected async getWsUrl(): Promise<string> {
+    return getWsExecutionsUrl()
+  }
+
+  protected handleMessage(frame: IncomingExecutionWsFrame): void {
+    if (frame.type === 'ws_error') {
+      this.subscriptions.forEach(({ callbacks }) => callbacks.onError?.(frame.error))
+      return
+    }
+
+    const execId = 'execution_id' in frame ? frame.execution_id : undefined
+    if (!execId) return
+    const subscription = this.subscriptions.get(execId)
+    if (!subscription) return
+    const { callbacks } = subscription
+
+    switch (frame.type) {
+      case 'snapshot':
+        subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
+        callbacks.onSnapshot?.(frame)
+        break
+      case 'event':
+        if (frame.seq <= subscription.afterSeq) return
+        subscription.afterSeq = frame.seq
+        callbacks.onEvent?.(frame)
+        break
+      case 'execution_completed':
+        callbacks.onCompleted?.(frame)
+        break
+      case 'replay_done':
+        subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
+        callbacks.onReplayDone?.(frame)
+        break
+      case 'observation':
+        callbacks.onObservation?.(frame)
+        break
+    }
+  }
+
+  protected override onReconnected(): void {
+    for (const [execId, subscription] of this.subscriptions) {
+      try {
+        this.sendFrame({
+          type: 'subscribe',
+          execution_id: execId,
+          after_seq: subscription.afterSeq,
+        })
+      } catch {
+        // Next reconnect will retry.
+      }
+    }
+  }
+
+  async subscribe(
+    executionId: string,
+    afterSeq: number,
+    callbacks: ExecutionSubscriptionCallbacks,
+  ): Promise<void> {
+    await this.connect()
+    const existing = this.subscriptions.get(executionId)
+    const normalizedAfterSeq = existing ? Math.max(existing.afterSeq, afterSeq) : afterSeq
+    this.subscriptions.set(executionId, {
+      afterSeq: normalizedAfterSeq,
+      callbacks,
+    })
+    this.sendFrame({
+      type: 'subscribe',
+      execution_id: executionId,
+      after_seq: normalizedAfterSeq,
+    })
+  }
+
+  unsubscribe(executionId: string): void {
+    this.subscriptions.delete(executionId)
+    try {
+      this.sendFrame({ type: 'unsubscribe', execution_id: executionId })
+    } catch {
+      // Ignore connection errors on unsubscribe.
+    }
+  }
+}
+
+let singleton: SharedExecutionWsClient | null = null
+
+export function getExecutionWsClient(): SharedExecutionWsClient {
+  if (!singleton) {
+    singleton = new SharedExecutionWsClient()
+  }
+  return singleton
+}
diff --git a/frontend/lib/ws/executions/types.ts b/frontend/lib/ws/executions/types.ts
new file mode 100644
index 000000000..ecffc8151
--- /dev/null
+++ b/frontend/lib/ws/executions/types.ts
@@ -0,0 +1,70 @@
+import type { ExecutionEvent, ExecutionEventType } from '@/types/agent-run'
+import type { AppErrorPayload } from '@/types/agent-run'
+
+export interface ExecutionConnectionState {
+  isConnected: boolean
+  authExpired?: boolean
+}
+
+export interface ExecutionSnapshotFrame {
+  type: 'snapshot'
+  execution_id: string
+  last_seq: number
+  status: string
+  events: ExecutionEvent[]
+  error?: AppErrorPayload | null
+}
+
+export interface ExecutionEventFrame {
+  type: 'event'
+  execution_id: string
+  seq: number
+  event_type: ExecutionEventType
+  payload: Record<string, unknown>
+  created_at: string
+}
+
+export interface ExecutionCompletedFrame {
+  type: 'execution_completed'
+  execution_id: string
+  run_id: string
+  status: string
+  error?: AppErrorPayload
+}
+
+export interface ExecutionReplayDoneFrame {
+  type: 'replay_done'
+  execution_id: string
+  last_seq: number
+}
+
+export interface ExecutionWsErrorFrame {
+  type: 'ws_error'
+  error: AppErrorPayload
+}
+
+export interface ExecutionObservationFrame {
+  type: 'observation'
+  execution_id: string
+  event: 'span_open' | 'span_close' | 'span_update' | 'trace_complete' | 'streaming_text'
+  observation: Record<string, unknown> | null
+  data: Record<string, unknown>
+  timestamp: string
+}
+
+export type IncomingExecutionWsFrame =
+  | ExecutionSnapshotFrame
+  | ExecutionEventFrame
+  | ExecutionCompletedFrame
+  | ExecutionReplayDoneFrame
+  | ExecutionWsErrorFrame
+  | ExecutionObservationFrame
+
+export interface ExecutionSubscriptionCallbacks {
+  onSnapshot?: (frame: ExecutionSnapshotFrame) => void
+  onEvent?: (frame: ExecutionEventFrame) => void
+  onCompleted?: (frame: ExecutionCompletedFrame) => void
+  onReplayDone?: (frame: ExecutionReplayDoneFrame) => void
+  onObservation?: (frame: ExecutionObservationFrame) => void
+  onError?: (error: AppErrorPayload) => void
+}
diff --git a/frontend/lib/ws/runs/runWsClient.ts b/frontend/lib/ws/runs/runWsClient.ts
deleted file mode 100644
index 8c2a1cda7..000000000
--- a/frontend/lib/ws/runs/runWsClient.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-'use client'
-
-import { getWsRunsUrl } from '@/lib/utils/wsUrl'
-
-import { BaseWsClient } from '../base'
-import type {
-  IncomingRunWsFrame,
-  RunConnectionState,
-  RunSubscriptionCallbacks,
-  RunWsClient,
-} from './types'
-
-interface RunSubscriptionState {
-  afterSeq: number
-  callbacks: RunSubscriptionCallbacks
-}
-
-class SharedRunWsClient extends BaseWsClient<RunConnectionState> implements RunWsClient {
-  private subscriptions = new Map<string, RunSubscriptionState>()
-
-  constructor() {
-    super({
-      maxReconnectAttempts: null, // unlimited
-      name: '[RunsWS]',
-    })
-  }
-
-  protected createInitialState(): RunConnectionState {
-    return { isConnected: false }
-  }
-
-  protected async getWsUrl(): Promise<string> {
-    return getWsRunsUrl()
-  }
-
-  protected handleMessage(frame: IncomingRunWsFrame): void {
-    if (frame.type === 'ws_error') {
-      const targetRunId = 'run_id' in frame ? (frame as { run_id?: string }).run_id : undefined
-      if (targetRunId) {
-        const sub = this.subscriptions.get(targetRunId)
-        sub?.callbacks.onError?.(frame.message)
-      } else {
-        this.subscriptions.forEach(({ callbacks }) => callbacks.onError?.(frame.message))
-      }
-      return
-    }
-
-    const subscription = 'run_id' in frame ? this.subscriptions.get(frame.run_id) : undefined
-    if (!subscription) return
-    const { callbacks } = subscription
-
-    if (frame.type === 'snapshot') {
-      subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
-      callbacks.onSnapshot?.(frame)
-    }
-    if (frame.type === 'event') {
-      if (frame.seq <= subscription.afterSeq) return
-      subscription.afterSeq = frame.seq
-      callbacks.onEvent?.(frame)
-    }
-    if (frame.type === 'replay_done') {
-      subscription.afterSeq = Math.max(subscription.afterSeq, frame.last_seq)
-      callbacks.onReplayDone?.(frame)
-    }
-    if (frame.type === 'run_status') callbacks.onStatus?.(frame)
-  }
-
-  protected override onReconnected(): void {
-    const current = Array.from(this.subscriptions.entries())
-    current.forEach(([runId, subscription]) => {
-      try {
-        this.sendFrame({
-          type: 'subscribe',
-          run_id: runId,
-          after_seq: subscription.afterSeq,
-        })
-      } catch {
-        // Next reconnect or caller recovery can re-subscribe.
-      }
-    })
-  }
-
-  async subscribe(runId: string, afterSeq: number, callbacks?: RunSubscriptionCallbacks): Promise<void> {
-    await this.connect()
-    const existing = this.subscriptions.get(runId)
-    const normalizedAfterSeq = existing ? Math.max(existing.afterSeq, afterSeq) : afterSeq
-    this.subscriptions.set(runId, {
-      afterSeq: normalizedAfterSeq,
-      callbacks: callbacks || {},
-    })
-    this.sendFrame({
-      type: 'subscribe',
-      run_id: runId,
-      after_seq: normalizedAfterSeq,
-    })
-  }
-
-  unsubscribe(runId: string): void {
-    this.subscriptions.delete(runId)
-    try {
-      this.sendFrame({ type: 'unsubscribe', run_id: runId })
-    } catch {
-      // Ignore connection errors on unsubscribe.
-    }
-  }
-}
-
-let singleton: SharedRunWsClient | null = null
-
-export function getRunWsClient(): RunWsClient {
-  if (!singleton) {
-    singleton = new SharedRunWsClient()
-  }
-  return singleton
-}
diff --git a/frontend/lib/ws/runs/types.ts b/frontend/lib/ws/runs/types.ts
deleted file mode 100644
index 3d07512d1..000000000
--- a/frontend/lib/ws/runs/types.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-export interface RunConnectionState {
-  isConnected: boolean
-  authExpired?: boolean
-}
-
-export interface RunSnapshotFrame {
-  type: 'snapshot'
-  run_id: string
-  last_seq: number
-  data: Record<string, unknown>
-}
-
-export interface RunEventFrame {
-  type: 'event'
-  run_id: string
-  seq: number
-  event_type: string
-  data: Record<string, unknown>
-  trace_id?: string | null
-  observation_id?: string | null
-  parent_observation_id?: string | null
-  created_at?: string
-}
-
-export interface RunReplayDoneFrame {
-  type: 'replay_done'
-  run_id: string
-  last_seq: number
-}
-
-export interface RunStatusFrame {
-  type: 'run_status'
-  run_id: string
-  status: string
-  error_code?: string | null
-  error_message?: string | null
-}
-
-export interface RunWsErrorFrame {
-  type: 'ws_error'
-  message: string
-}
-
-export interface RunPongFrame {
-  type: 'pong'
-}
-
-export type IncomingRunWsFrame =
-  | RunSnapshotFrame
-  | RunEventFrame
-  | RunReplayDoneFrame
-  | RunStatusFrame
-  | RunWsErrorFrame
-  | RunPongFrame
-
-export interface RunSubscriptionCallbacks {
-  onSnapshot?: (frame: RunSnapshotFrame) => void
-  onEvent?: (frame: RunEventFrame) => void
-  onReplayDone?: (frame: RunReplayDoneFrame) => void
-  onStatus?: (frame: RunStatusFrame) => void
-  onError?: (message: string) => void
-}
-
-export interface RunWsClient {
-  connect(): Promise<void>
-  disconnect(): void
-  subscribeConnectionState(listener: (state: RunConnectionState) => void): () => void
-  getConnectionState(): RunConnectionState
-  subscribe(runId: string, afterSeq: number, callbacks?: RunSubscriptionCallbacks): Promise<void>
-  unsubscribe(runId: string): void
-}
diff --git a/frontend/middleware.ts b/frontend/middleware.ts
index 3c6c57bdf..6e93510c7 100644
--- a/frontend/middleware.ts
+++ b/frontend/middleware.ts
@@ -7,16 +7,22 @@ import { generateNonce } from '@/lib/utils/uuid'
 const logger = createLogger('Middleware')
 
 // Necessary third-party domains (for CSP)
-const NECESSARY_DOMAIN = process.env.NEXT_PUBLIC_CSP_NECESSARY_DOMAIN || 'http://localhost:* http://127.0.0.1:*'
+const NECESSARY_DOMAIN =
+  process.env.NEXT_PUBLIC_CSP_NECESSARY_DOMAIN || 'http://localhost:* http://127.0.0.1:*'
 
 // Paths allowed to be embedded in iframe (whitelist)
 const EMBEDDABLE_PATHS = ['']
 
 // Allowed redirect paths (prevent open redirect attacks)
 const ALLOWED_REDIRECT_PATHS = [
-  '/chat',
-  '/workspace',
   '/dashboard',
+  '/agents',
+  '/tasks',
+  '/skills',
+  '/tools',
+  '/memory',
+  '/settings',
+  '/runs',
   '/signin',
   '/signup',
   '/verify',
diff --git a/frontend/next.config.ts b/frontend/next.config.ts
index 9ce9d4c83..a2322b738 100644
--- a/frontend/next.config.ts
+++ b/frontend/next.config.ts
@@ -1,6 +1,25 @@
 import type { NextConfig } from 'next'
 
 const nextConfig: NextConfig = {
+  async redirects() {
+    return [
+      {
+        source: '/workspace/:path*',
+        destination: '/agents',
+        permanent: true,
+      },
+      {
+        source: '/runs',
+        destination: '/dashboard',
+        permanent: true,
+      },
+      {
+        source: '/memory',
+        destination: '/settings',
+        permanent: true,
+      },
+    ]
+  },
   devIndicators: false,
   output: 'standalone',
   // Next config is loaded by Node; path.join is standard
diff --git a/frontend/package.json b/frontend/package.json
index 28486a55e..7b8fdd2c8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -19,10 +19,6 @@
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,css,md}\""
   },
   "dependencies": {
-    "@azure/communication-email": "^1.1.0",
-    "@better-auth/sso": "^1.4.7",
-    "@better-auth/stripe": "^1.4.7",
-    "@cerebras/cerebras_cloud_sdk": "^1.59.0",
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/lint": "^6.8.4",
     "@codemirror/view": "^6.36.5",
@@ -30,7 +26,6 @@
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@hookform/resolvers": "^4.1.3",
-    "@mistralai/mistralai": "^1.10.0",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-avatar": "^1.1.11",
     "@radix-ui/react-checkbox": "^1.3.3",
@@ -54,25 +49,21 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@t3-oss/env-nextjs": "^0.13.8",
     "@tanstack/react-query": "^5.90.12",
+    "@tanstack/react-table": "^8.21.3",
     "@tanstack/react-virtual": "^3.11.1",
     "@types/dompurify": "^3.0.5",
     "@types/markdown-it": "^14.1.2",
     "@types/prismjs": "^1.26.6",
-    "@types/react-window": "^2.0.0",
     "@uiw/codemirror-theme-vscode": "^4.23.7",
     "@uiw/react-codemirror": "^4.23.7",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
-    "cohere-ai": "^7.20.0",
     "critters": "^0.0.25",
-    "croner": "^9.1.0",
-    "cronstrue": "^3.9.0",
     "crypto-js": "^4.2.0",
     "date-fns": "4.1.0",
     "dompurify": "^3.3.1",
     "framer-motion": "^12.5.0",
-    "groq-sdk": "^0.37.0",
     "i18next": "^25.7.3",
     "i18next-browser-languagedetector": "^8.2.0",
     "input-otp": "^1.4.2",
@@ -84,20 +75,15 @@
     "next-themes": "^0.4.6",
     "prismjs": "^1.30.0",
     "react": "19.2.1",
-    "react-colorful": "^5.6.1",
     "react-dom": "19.2.1",
     "react-hook-form": "^7.54.2",
     "react-i18next": "^16.5.0",
     "react-markdown": "^10.1.0",
     "react-resizable-panels": "^3.0.6",
-    "react-simple-code-editor": "^0.14.1",
     "react-syntax-highlighter": "^16.1.0",
-    "react-window": "^2.2.3",
     "reactflow": "^11.11.4",
     "recharts": "^3.8.1",
     "remark-gfm": "^4.0.1",
-    "resend": "^6.6.0",
-    "serializer": "^0.0.3",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.24.2",
diff --git a/frontend/providers/notification-provider.tsx b/frontend/providers/notification-provider.tsx
index 029434271..f920e95ed 100644
--- a/frontend/providers/notification-provider.tsx
+++ b/frontend/providers/notification-provider.tsx
@@ -1,8 +1,11 @@
 'use client'
 
 import { createContext, ReactNode } from 'react'
+import { useQueryClient } from '@tanstack/react-query'
 
 import { useNotificationWebSocket, NotificationMessage } from '@/hooks/use-notification-websocket'
+import { taskKeys } from '@/hooks/queries/tasks'
+import { taskActivityKeys } from '@/hooks/queries/taskActivities'
 import { useAuthStore } from '@/stores/auth/store'
 
 interface NotificationContextValue {
@@ -21,8 +24,16 @@ interface NotificationProviderProps {
 export function NotificationProvider({ children }: NotificationProviderProps) {
   const user = useAuthStore((state) => state.user)
 
-  const handleNotification = (_notification: NotificationMessage) => {
-    // Future notification types can be handled here
+  const queryClient = useQueryClient()
+
+  const handleNotification = (notification: NotificationMessage) => {
+    const { type } = notification
+    if (type === 'task_updated' || type === 'execution_status_changed') {
+      queryClient.invalidateQueries({ queryKey: taskKeys.all })
+    }
+    if (type === 'task_activity_added') {
+      queryClient.invalidateQueries({ queryKey: taskActivityKeys.all })
+    }
   }
 
   const { isConnected, lastNotification, reconnect, disconnect } = useNotificationWebSocket({
diff --git a/frontend/providers/query-provider.tsx b/frontend/providers/query-provider.tsx
index 8499594da..792b5bd6d 100644
--- a/frontend/providers/query-provider.tsx
+++ b/frontend/providers/query-provider.tsx
@@ -1,8 +1,10 @@
 'use client'
 
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { useState } from 'react'
 
+import { toastError } from '@/lib/utils/toast'
+
 interface QueryProviderProps {
   children: React.ReactNode
 }
@@ -14,12 +16,26 @@ export function QueryProvider({ children }: QueryProviderProps) {
   const [queryClient] = useState(
     () =>
       new QueryClient({
+        queryCache: new QueryCache({
+          onError: (error, query) => {
+            // Only toast background refetch failures (data was previously loaded).
+            // Fresh loads should show error state in the component, not a toast.
+            if (query.state.data !== undefined) {
+              toastError(error.message)
+            }
+          },
+        }),
         defaultOptions: {
           queries: {
             staleTime: 60 * 1000, // 1 minute
             gcTime: 10 * 60 * 1000, // 10 minutes (formerly cacheTime)
             refetchOnWindowFocus: false,
           },
+          mutations: {
+            onError: (error) => {
+              toastError(error.message)
+            },
+          },
         },
       }),
   )
diff --git a/frontend/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx b/frontend/providers/workspace-permissions-provider.tsx
similarity index 92%
rename from frontend/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
rename to frontend/providers/workspace-permissions-provider.tsx
index 72c45b485..ae609b227 100644
--- a/frontend/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
+++ b/frontend/providers/workspace-permissions-provider.tsx
@@ -18,7 +18,7 @@
  * - canManageMembers: whether the user can manage members
  * - isOfflineMode: offline mode flag
  *
- * Integrated in workspace layout.tsx as a top-level provider.
+ * Integrated in WorkspaceProvider as an inner provider.
  */
 
 import { useParams } from 'next/navigation'
@@ -67,15 +67,20 @@ const WorkspacePermissionsContext = createContext<WorkspacePermissionsContextTyp
 
 interface WorkspacePermissionsProviderProps {
   children: React.ReactNode
+  /** Optional workspaceId override. Falls back to `workspaceId` from route params. */
+  workspaceId?: string
 }
 
 /**
  * Provider that manages workspace permissions and user access
  * Also provides connection-aware permissions that enforce read-only mode when offline
  */
-export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsProviderProps) {
+export function WorkspacePermissionsProvider({
+  children,
+  workspaceId: workspaceIdProp,
+}: WorkspacePermissionsProviderProps) {
   const params = useParams()
-  const workspaceId = params?.workspaceId as string
+  const workspaceId = workspaceIdProp ?? (params?.workspaceId as string)
 
   // Manage offline mode state locally
   const [isOfflineMode, setIsOfflineMode] = useState(false)
diff --git a/frontend/providers/workspace-provider.tsx b/frontend/providers/workspace-provider.tsx
new file mode 100644
index 000000000..ee840577b
--- /dev/null
+++ b/frontend/providers/workspace-provider.tsx
@@ -0,0 +1,70 @@
+'use client'
+
+import { createContext, useContext, useEffect, useMemo } from 'react'
+
+import { useWorkspaces, type Workspace } from '@/hooks/queries/workspaces'
+import { useWorkspaceStore } from '@/stores/workspace/store'
+
+import { WorkspacePermissionsProvider } from './workspace-permissions-provider'
+
+interface WorkspaceContextType {
+  workspaceId: string
+  workspace: Workspace | null
+  workspaces: Workspace[]
+  switchWorkspace: (id: string) => void
+  isLoading: boolean
+}
+
+const WorkspaceContext = createContext<WorkspaceContextType | null>(null)
+
+export function WorkspaceProvider({ children }: { children: React.ReactNode }) {
+  const { data: workspaces = [], isLoading } = useWorkspaces()
+  const currentWorkspaceId = useWorkspaceStore((s) => s.currentWorkspaceId)
+  const setCurrentWorkspaceId = useWorkspaceStore((s) => s.setCurrentWorkspaceId)
+
+  const resolvedWorkspaceId = useMemo(() => {
+    if (workspaces.length === 0) return ''
+    const persisted = workspaces.find((w) => w.id === currentWorkspaceId)
+    if (persisted) return persisted.id
+    const personal = workspaces.find((w) => w.type === 'personal')
+    return personal?.id ?? workspaces[0]?.id ?? ''
+  }, [workspaces, currentWorkspaceId])
+
+  useEffect(() => {
+    if (resolvedWorkspaceId && resolvedWorkspaceId !== currentWorkspaceId) {
+      setCurrentWorkspaceId(resolvedWorkspaceId)
+    }
+  }, [resolvedWorkspaceId, currentWorkspaceId, setCurrentWorkspaceId])
+
+  const workspace = useMemo(
+    () => workspaces.find((w) => w.id === resolvedWorkspaceId) ?? null,
+    [workspaces, resolvedWorkspaceId],
+  )
+
+  const value = useMemo<WorkspaceContextType>(
+    () => ({
+      workspaceId: resolvedWorkspaceId,
+      workspace,
+      workspaces,
+      switchWorkspace: setCurrentWorkspaceId,
+      isLoading,
+    }),
+    [resolvedWorkspaceId, workspace, workspaces, setCurrentWorkspaceId, isLoading],
+  )
+
+  return (
+    <WorkspaceContext.Provider value={value}>
+      <WorkspacePermissionsProvider workspaceId={resolvedWorkspaceId}>
+        {children}
+      </WorkspacePermissionsProvider>
+    </WorkspaceContext.Provider>
+  )
+}
+
+export function useCurrentWorkspace(): WorkspaceContextType {
+  const ctx = useContext(WorkspaceContext)
+  if (!ctx) {
+    throw new Error('useCurrentWorkspace must be used within a WorkspaceProvider')
+  }
+  return ctx
+}
diff --git a/frontend/services/__tests__/runService.test.ts b/frontend/services/__tests__/runService.test.ts
deleted file mode 100644
index 6bf53a3c9..000000000
--- a/frontend/services/__tests__/runService.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  apiGet: vi.fn(),
-  apiPost: vi.fn(),
-}))
-
-vi.mock('next-runtime-env', () => ({ env: vi.fn(() => undefined) }))
-vi.mock('@/lib/auth/csrf', () => ({ getCsrfToken: vi.fn(() => null) }))
-vi.mock('@/lib/api-client', async () => {
-  const actual = await vi.importActual<typeof import('@/lib/api-client')>('@/lib/api-client')
-  return {
-    ...actual,
-    apiGet: mocks.apiGet,
-    apiPost: mocks.apiPost,
-  }
-})
-
-import { runService } from '../runService'
-
-describe('runService', () => {
-  beforeEach(() => {
-    mocks.apiGet.mockReset()
-    mocks.apiPost.mockReset()
-  })
-
-  it('includes agent_name and search in listRuns query params', async () => {
-    mocks.apiGet.mockResolvedValue({ items: [] })
-
-    await runService.listRuns({
-      runType: 'generic_agent',
-      agentName: 'skill_creator',
-      status: 'running',
-      search: 'skill',
-      limit: 20,
-    })
-
-    expect(mocks.apiGet).toHaveBeenCalledWith(
-      'runs?run_type=generic_agent&agent_name=skill_creator&status=running&search=skill&limit=20',
-    )
-  })
-
-  it('calls the generic active-run endpoint', async () => {
-    mocks.apiGet.mockResolvedValue(null)
-
-    await runService.findActiveRun({
-      agentName: 'skill_creator',
-      graphId: 'graph-123',
-      threadId: 'thread-456',
-    })
-
-    expect(mocks.apiGet).toHaveBeenCalledWith(
-      'runs/active?agent_name=skill_creator&graph_id=graph-123&thread_id=thread-456',
-    )
-  })
-
-  it('calls the generic create-run endpoint', async () => {
-    mocks.apiPost.mockResolvedValue({ run_id: 'run-1', thread_id: 'thread-1', status: 'queued' })
-
-    await runService.createRun({
-      agent_name: 'skill_creator',
-      graph_id: 'graph-123',
-      message: 'Build a skill',
-      thread_id: 'thread-456',
-      input: { edit_skill_id: 'skill-789' },
-    })
-
-    expect(mocks.apiPost).toHaveBeenCalledWith('runs', {
-      agent_name: 'skill_creator',
-      graph_id: 'graph-123',
-      message: 'Build a skill',
-      thread_id: 'thread-456',
-      input: { edit_skill_id: 'skill-789' },
-    })
-  })
-})
diff --git a/frontend/services/agentPublishService.ts b/frontend/services/agentPublishService.ts
new file mode 100644
index 000000000..1ab1b9c5f
--- /dev/null
+++ b/frontend/services/agentPublishService.ts
@@ -0,0 +1,42 @@
+'use client'
+
+import { apiGet, apiPost } from '@/lib/api-client'
+import type { AgentRelease } from '@/types/agent-release'
+
+export const agentPublishService = {
+  async publish(agentId: string, workspaceId: string) {
+    const res = await apiPost<{ agent: any; release: AgentRelease }>(
+      `agents/${agentId}/publish?workspace_id=${workspaceId}`,
+    )
+    return res
+  },
+
+  async rollback(agentId: string, releaseId: string, workspaceId: string) {
+    const res = await apiPost<{ agent: any }>(
+      `agents/${agentId}/rollback?workspace_id=${workspaceId}`,
+      { release_id: releaseId },
+    )
+    return res
+  },
+
+  async retire(agentId: string, releaseId: string, workspaceId: string) {
+    const res = await apiPost<AgentRelease>(
+      `agents/${agentId}/releases/${releaseId}/retire?workspace_id=${workspaceId}`,
+    )
+    return res
+  },
+
+  async unpublish(agentId: string, workspaceId: string) {
+    const res = await apiPost<{ agent: any; release: AgentRelease | null }>(
+      `agents/${agentId}/unpublish?workspace_id=${workspaceId}`,
+    )
+    return res
+  },
+
+  async list(agentId: string, workspaceId: string): Promise<AgentRelease[]> {
+    const res = await apiGet<AgentRelease[]>(
+      `agents/${agentId}/releases?workspace_id=${workspaceId}`,
+    )
+    return res
+  },
+}
diff --git a/frontend/services/agentReleaseService.ts b/frontend/services/agentReleaseService.ts
new file mode 100644
index 000000000..8f9df0716
--- /dev/null
+++ b/frontend/services/agentReleaseService.ts
@@ -0,0 +1,19 @@
+'use client'
+
+import { apiGet } from '@/lib/api-client'
+import type { AgentRelease } from '@/types/agent-release'
+
+export const agentReleaseService = {
+  list: async (agentId: string, workspaceId: string): Promise<AgentRelease[]> => {
+    const res = await apiGet<AgentRelease[]>(
+      `agents/${agentId}/releases?workspace_id=${workspaceId}`,
+    )
+    return res ?? []
+  },
+
+  get: async (agentId: string, releaseId: string, workspaceId: string): Promise<AgentRelease> => {
+    return apiGet<AgentRelease>(
+      `agents/${agentId}/releases/${releaseId}?workspace_id=${workspaceId}`,
+    )
+  },
+}
diff --git a/frontend/services/agentRunService.ts b/frontend/services/agentRunService.ts
new file mode 100644
index 000000000..9eeede9fe
--- /dev/null
+++ b/frontend/services/agentRunService.ts
@@ -0,0 +1,69 @@
+'use client'
+
+import { apiGet, apiPost } from '@/lib/api-client'
+import type {
+  AgentRun,
+  CreateAgentRunRequest,
+  Execution,
+  ExecutionEvent,
+  ExecutionEventsPage,
+  TriggerMedium,
+  RunPurpose,
+} from '@/types/agent-run'
+
+export const agentRunService = {
+  list: async (params: {
+    workspace_id?: string
+    release_id?: string
+    task_id?: string
+    agent_id?: string
+    trigger_medium?: TriggerMedium
+    run_purpose?: RunPurpose
+    status?: string
+  }): Promise<AgentRun[]> => {
+    const searchParams = new URLSearchParams()
+    if (params.workspace_id) searchParams.set('workspace_id', params.workspace_id)
+    if (params.release_id) searchParams.set('release_id', params.release_id)
+    if (params.task_id) searchParams.set('task_id', params.task_id)
+    if (params.agent_id) searchParams.set('agent_id', params.agent_id)
+    if (params.trigger_medium) searchParams.set('trigger_medium', params.trigger_medium)
+    if (params.run_purpose) searchParams.set('run_purpose', params.run_purpose)
+    if (params.status) searchParams.set('status', params.status)
+    const res = await apiGet<AgentRun[]>(`runs?${searchParams}`)
+    return res ?? []
+  },
+
+  get: async (runId: string): Promise<AgentRun> => {
+    return apiGet<AgentRun>(`runs/${runId}`)
+  },
+
+  create: async (data: CreateAgentRunRequest): Promise<AgentRun> => {
+    return apiPost<AgentRun>('runs', data)
+  },
+
+  cancel: async (runId: string): Promise<AgentRun> => {
+    return apiPost<AgentRun>(`runs/${runId}/cancel`, {})
+  },
+
+  retry: async (runId: string): Promise<AgentRun> => {
+    return apiPost<AgentRun>(`runs/${runId}/retry`, {})
+  },
+
+  listExecutions: async (runId: string): Promise<Execution[]> => {
+    const res = await apiGet<Execution[]>(`executions?run_id=${runId}`)
+    return res ?? []
+  },
+
+  getExecution: async (executionId: string): Promise<Execution> => {
+    return apiGet<Execution>(`executions/${executionId}`)
+  },
+
+  listExecutionEvents: async (executionId: string): Promise<ExecutionEvent[]> => {
+    const res = await apiGet<ExecutionEventsPage>(`executions/${executionId}/events`)
+    return res?.events ?? []
+  },
+
+  sendMessage: async (executionId: string, message: string): Promise<void> => {
+    await apiPost(`executions/${executionId}/message`, { message })
+  },
+}
diff --git a/frontend/services/agentService.ts b/frontend/services/agentService.ts
new file mode 100644
index 000000000..d33bf72bd
--- /dev/null
+++ b/frontend/services/agentService.ts
@@ -0,0 +1,32 @@
+'use client'
+
+import { apiGet, apiPost, apiPatch, apiDelete } from '@/lib/api-client'
+import type { Agent, CreateAgentRequest, UpdateAgentRequest } from '@/types/agent'
+
+export const agentService = {
+  list: async (workspaceId: string): Promise<Agent[]> => {
+    const res = await apiGet<Agent[]>(`agents?workspace_id=${workspaceId}`)
+    return res ?? []
+  },
+
+  get: async (agentId: string, workspaceId: string): Promise<Agent> => {
+    return apiGet<Agent>(`agents/${agentId}?workspace_id=${workspaceId}`)
+  },
+
+  create: async (data: CreateAgentRequest & { workspace_id: string }): Promise<Agent> => {
+    const { workspace_id, ...body } = data
+    return apiPost<Agent>(`agents?workspace_id=${workspace_id}`, body)
+  },
+
+  update: async (
+    agentId: string,
+    workspaceId: string,
+    data: UpdateAgentRequest,
+  ): Promise<Agent> => {
+    return apiPatch<Agent>(`agents/${agentId}?workspace_id=${workspaceId}`, data)
+  },
+
+  delete: async (agentId: string, workspaceId: string): Promise<void> => {
+    await apiDelete(`agents/${agentId}?workspace_id=${workspaceId}`)
+  },
+}
diff --git a/frontend/services/agentVersionService.ts b/frontend/services/agentVersionService.ts
new file mode 100644
index 000000000..718a6f3b0
--- /dev/null
+++ b/frontend/services/agentVersionService.ts
@@ -0,0 +1,43 @@
+'use client'
+
+import { apiGet, apiPost, apiPatch } from '@/lib/api-client'
+import type {
+  AgentVersion,
+  CreateAgentVersionRequest,
+  UpdateAgentVersionRequest,
+} from '@/types/agent'
+
+export const agentVersionService = {
+  list: async (agentId: string, workspaceId: string): Promise<AgentVersion[]> => {
+    const res = await apiGet<AgentVersion[]>(
+      `agents/${agentId}/versions?workspace_id=${workspaceId}`,
+    )
+    return res ?? []
+  },
+
+  get: async (agentId: string, versionId: string, workspaceId: string): Promise<AgentVersion> => {
+    return apiGet<AgentVersion>(
+      `agents/${agentId}/versions/${versionId}?workspace_id=${workspaceId}`,
+    )
+  },
+
+  create: async (
+    agentId: string,
+    workspaceId: string,
+    data: CreateAgentVersionRequest,
+  ): Promise<AgentVersion> => {
+    return apiPost<AgentVersion>(`agents/${agentId}/versions?workspace_id=${workspaceId}`, data)
+  },
+
+  update: async (
+    agentId: string,
+    versionId: string,
+    workspaceId: string,
+    data: UpdateAgentVersionRequest,
+  ): Promise<AgentVersion> => {
+    return apiPatch<AgentVersion>(
+      `agents/${agentId}/versions/${versionId}?workspace_id=${workspaceId}`,
+      data,
+    )
+  },
+}
diff --git a/frontend/services/artifactService.ts b/frontend/services/artifactService.ts
index 09ce4cd60..81900c96d 100644
--- a/frontend/services/artifactService.ts
+++ b/frontend/services/artifactService.ts
@@ -7,7 +7,7 @@
  * produced during an agent run.
  */
 
-import { API_BASE, apiFetch, apiDelete } from '@/lib/api-client'
+import { API_BASE, apiFetch, apiDelete, createApiError } from '@/lib/api-client'
 
 // ==================== Types ====================
 
@@ -93,7 +93,13 @@ export const artifactService = {
   async downloadFile(threadId: string, runId: string, filePath: string): Promise<Blob> {
     const url = getArtifactDownloadUrl(threadId, runId, filePath)
     const res = await fetch(url, { credentials: 'include' })
-    if (!res.ok) throw new Error(`Download failed: ${res.statusText}`)
+    if (!res.ok) {
+      throw createApiError(res.status, res.statusText, {
+        code: 'ARTIFACT_DOWNLOAD_FAILED',
+        message: 'Download failed',
+        data: { thread_id: threadId, run_id: runId, file_path: filePath },
+      })
+    }
     return res.blob()
   },
 
@@ -112,7 +118,13 @@ export const artifactService = {
     const encodedPath = filePath.split('/').map(encodeURIComponent).join('/')
     const url = `${API_BASE}/artifacts/${encodeURIComponent(threadId)}/live/${encodedPath}`
     const res = await fetch(url, { credentials: 'include' })
-    if (!res.ok) throw new Error(`Live read failed: ${res.statusText}`)
+    if (!res.ok) {
+      throw createApiError(res.status, res.statusText, {
+        code: 'ARTIFACT_LIVE_READ_FAILED',
+        message: 'Live read failed',
+        data: { thread_id: threadId, file_path: filePath },
+      })
+    }
     return res.text()
   },
 
diff --git a/frontend/services/chatBackend.ts b/frontend/services/chatBackend.ts
deleted file mode 100644
index 1721166c3..000000000
--- a/frontend/services/chatBackend.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- * Command event data structure
- */
-export interface CommandEventData {
-  update?: Record<string, unknown>
-  goto?: string
-  reason?: string
-}
-
-/**
- * Route decision event data structure
- */
-export interface RouteDecisionEventData {
-  node_id: string
-  node_type: 'condition' | 'router' | 'loop'
-  result: boolean | string
-  reason: string
-  goto: string
-  evaluated_rules?: Array<{
-    rule: string
-    condition: string
-    matched: boolean
-  }>
-  expression?: string // Expression for Condition node
-}
-
-/**
- * Loop iteration event data structure
- */
-export interface LoopIterationEventData {
-  loop_node_id: string
-  iteration: number
-  max_iterations: number
-  condition_met: boolean
-  reason: string
-  condition_type?: 'while' | 'forEach' | 'doWhile'
-  condition?: string
-}
-
-/**
- * Parallel task event data structure
- */
-export interface ParallelTaskEventData {
-  task_id: string
-  status: 'started' | 'completed' | 'error'
-  result?: unknown
-  error_msg?: string
-}
-
-/**
- * State update event data structure
- */
-export interface StateUpdateEventData {
-  updated_fields: string[]
-  state_snapshot: Record<string, unknown>
-}
-
-/**
- * Content event data structure
- */
-export interface ContentEventData {
-  delta: string // Incremental text
-}
-
-/**
- * Tool Start event data structure
- */
-export interface ToolStartEventData {
-  tool_name: string
-  tool_input: Record<string, unknown>
-}
-
-/**
- * Tool End event data structure
- */
-export interface ToolEndEventData {
-  tool_name: string
-  tool_output: string | Record<string, unknown>
-  duration?: number
-  status?: 'success' | 'error'
-  files_changed?: Array<{ path: string; action: string }> | null
-}
-
-/**
- * Node Start event data structure
- */
-export interface NodeStartEventData {
-  node_name: string
-  node_label?: string
-  node_id?: string
-}
-
-/**
- * Node End event data structure
- */
-export interface NodeEndEventData {
-  node_name: string
-  node_label?: string
-  node_id?: string
-  duration?: number
-  status?: 'success' | 'error'
-}
-
-/**
- * Error event data structure
- */
-export interface ErrorEventData {
-  message: string
-  error_code?: string // Structured error code for i18n (e.g., MODEL_NOT_FOUND, MODEL_NO_CREDENTIALS)
-  code?: string // Legacy: e.g., "stopped" indicates user stopped
-  params?: Record<string, string> // Parameters for i18n interpolation (e.g., {model: "gpt-4o", provider: "openai"})
-}
-
-/**
- * Status event data structure
- */
-export interface StatusEventData {
-  status: string
-  [key: string]: unknown
-}
-
-/**
- * Thread ID event data structure
- */
-export interface ThreadIdEventData {
-  thread_id: string
-  [key: string]: unknown
-}
-
-/**
- * File event data structure
- */
-export interface FileEventData {
-  path: string
-  action: string
-  [key: string]: unknown
-}
-
-/**
- * Model Input event data structure
- */
-export interface ModelInputEventData {
-  messages: Array<Record<string, unknown>> // LangChain message objects
-  model_name: string
-  model_provider: string
-}
-
-/**
- * Model Output event data structure
- */
-export interface ModelOutputEventData {
-  output: Record<string, unknown> // AIMessage object
-  model_name: string
-  model_provider: string
-  usage_metadata?: { input_tokens?: number; output_tokens?: number; total_tokens?: number }
-  prompt_tokens?: number
-  completion_tokens?: number
-  total_tokens?: number
-}
-
-/**
- * Interrupt event data structure
- */
-export interface InterruptEventData {
-  node_name: string
-  node_label?: string
-  state: Record<string, unknown> // Current state snapshot
-  thread_id: string
-}
-
-/**
- * CodeAgent Thought event data structure
- */
-export interface CodeAgentThoughtEventData {
-  node_name: string
-  step: number
-  content: string
-}
-
-/**
- * CodeAgent Code event data structure
- */
-export interface CodeAgentCodeEventData {
-  node_name: string
-  step: number
-  code: string
-}
-
-/**
- * CodeAgent Observation event data structure
- */
-export interface CodeAgentObservationEventData {
-  node_name: string
-  step: number
-  observation: string
-  has_error?: boolean
-}
-
-/**
- * CodeAgent Final Answer event data structure
- */
-export interface CodeAgentFinalAnswerEventData {
-  node_name: string
-  step: number
-  answer: string | Record<string, unknown>
-}
-
-/**
- * CodeAgent Planning event data structure
- */
-export interface CodeAgentPlanningEventData {
-  node_name: string
-  step: number
-  plan: string
-  is_update?: boolean
-}
-
-/**
- * CodeAgent Error event data structure
- */
-export interface CodeAgentErrorEventData {
-  node_name: string
-  step: number
-  error: string
-}
-
-// --- Shared envelope fields (excluding type and data) ---
-interface ChatWsFrameBase {
-  node_name: string
-  run_id: string
-  timestamp: number
-  thread_id: string
-  // trace / observation hierarchy info (Phase D)
-  trace_id?: string
-  observation_id?: string
-  parent_observation_id?: string
-}
-
-/**
- * Discriminated union WebSocket event frame.
- * TypeScript narrows `data` automatically when you switch on `type`.
- */
-export type ChatWsFrame =
-  | (ChatWsFrameBase & { type: 'content'; data: ContentEventData })
-  | (ChatWsFrameBase & { type: 'tool_start'; data: ToolStartEventData })
-  | (ChatWsFrameBase & { type: 'tool_end'; data: ToolEndEventData })
-  | (ChatWsFrameBase & { type: 'node_start'; data: NodeStartEventData })
-  | (ChatWsFrameBase & { type: 'node_end'; data: NodeEndEventData })
-  | (ChatWsFrameBase & { type: 'status'; data: StatusEventData })
-  | (ChatWsFrameBase & { type: 'error'; data: ErrorEventData })
-  | (ChatWsFrameBase & { type: 'done'; data: Record<string, unknown> })
-  | (ChatWsFrameBase & { type: 'thread_id'; data: ThreadIdEventData })
-  | (ChatWsFrameBase & { type: 'model_input'; data: ModelInputEventData })
-  | (ChatWsFrameBase & { type: 'model_output'; data: ModelOutputEventData })
-  | (ChatWsFrameBase & { type: 'interrupt'; data: InterruptEventData })
-  | (ChatWsFrameBase & { type: 'command'; data: CommandEventData })
-  | (ChatWsFrameBase & { type: 'route_decision'; data: RouteDecisionEventData })
-  | (ChatWsFrameBase & { type: 'loop_iteration'; data: LoopIterationEventData })
-  | (ChatWsFrameBase & { type: 'parallel_task'; data: ParallelTaskEventData })
-  | (ChatWsFrameBase & { type: 'state_update'; data: StateUpdateEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_thought'; data: CodeAgentThoughtEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_code'; data: CodeAgentCodeEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_observation'; data: CodeAgentObservationEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_final_answer'; data: CodeAgentFinalAnswerEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_planning'; data: CodeAgentPlanningEventData })
-  | (ChatWsFrameBase & { type: 'code_agent_error'; data: CodeAgentErrorEventData })
-  | (ChatWsFrameBase & { type: 'file_event'; data: FileEventData })
-
-/**
- * Unified streaming event type (using standardized envelope structure)
- */
-export type ChatStreamEvent = ChatWsFrame
diff --git a/frontend/services/conversationService.ts b/frontend/services/conversationService.ts
deleted file mode 100644
index b21606ef3..000000000
--- a/frontend/services/conversationService.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-'use client'
-
-/**
- * Conversation Service
- *
- * Encapsulates conversation-related API calls, including:
- * - Get conversation list
- * - Get conversation history messages
- * - Delete conversation
- */
-
-import { API_ENDPOINTS, apiGet, apiDelete } from '@/lib/api-client'
-
-// ==================== Types ====================
-
-export interface Conversation {
-  id: string
-  thread_id: string
-  title: string
-  updated_at: string
-  message_count: number
-}
-
-export interface ConversationMessage {
-  id: string
-  role: string
-  content: string
-  metadata: Record<string, any>
-  created_at: string
-}
-
-export interface PaginatedConversationsResponse {
-  items: Array<{
-    id: string
-    thread_id: string
-    user_id: string
-    title: string
-    metadata: Record<string, any>
-    created_at: string
-    updated_at: string
-    message_count: number
-  }>
-  total: number
-  page: number
-  page_size: number
-  pages: number
-}
-
-export interface PaginatedMessagesResponse {
-  items: ConversationMessage[]
-  total: number
-  page: number
-  page_size: number
-  pages: number
-}
-
-// ==================== Service ====================
-
-export const conversationService = {
-  /**
-   * Get conversation list
-   */
-  async listConversations(params?: {
-    graphId?: string
-    page?: number
-    pageSize?: number
-  }): Promise<Conversation[]> {
-    const { graphId, page = 1, pageSize = 100 } = params || {}
-
-    let url = `${API_ENDPOINTS.conversations}?page=${page}&page_size=${pageSize}`
-    if (graphId) {
-      url += `&graph_id=${graphId}`
-    }
-
-    try {
-      const response = await apiGet<PaginatedConversationsResponse>(url)
-
-      return (response?.items || []).map((item) => ({
-        id: item.id,
-        thread_id: item.thread_id,
-        title: item.title,
-        updated_at: item.updated_at,
-        message_count: item.message_count,
-      }))
-    } catch (error) {
-      console.error('Failed to load conversations:', error)
-      return []
-    }
-  },
-
-  /**
-   * Get conversation history messages
-   */
-  async getConversationHistory(
-    threadId: string,
-    params?: {
-      page?: number
-      pageSize?: number
-    },
-  ): Promise<ConversationMessage[]> {
-    const { page = 1, pageSize = 100 } = params || {}
-
-    const response = await apiGet<PaginatedMessagesResponse>(
-      `${API_ENDPOINTS.conversations}/${threadId}/messages?page=${page}&page_size=${pageSize}`,
-    )
-
-    return response?.items || []
-  },
-
-  /**
-   * Delete conversation
-   */
-  async deleteConversation(threadId: string): Promise<void> {
-    await apiDelete(`${API_ENDPOINTS.conversations}/${threadId}`)
-  },
-}
diff --git a/frontend/services/copilotService.ts b/frontend/services/draftCopilotService.ts
similarity index 51%
rename from frontend/services/copilotService.ts
rename to frontend/services/draftCopilotService.ts
index 170d4d102..7bcf29e87 100644
--- a/frontend/services/copilotService.ts
+++ b/frontend/services/draftCopilotService.ts
@@ -1,31 +1,21 @@
 'use client'
 
 /**
- * Copilot Service
+ * Draft Copilot Service
  *
- * Encapsulates Copilot-related API calls, including:
- * - Clear Copilot history
- * - Convert conversation history format
+ * Encapsulates Build-stage draft copilot helpers.
  */
 
-import { apiDelete } from '@/lib/api-client'
 import type {
   GraphAction,
   CopilotResponse,
   ConversationMessage,
   StreamGraphActionsCallbacks,
 } from '@/types/copilot'
+import { apiPost } from '@/lib/api-client'
 
-// Re-export types
 export type { GraphAction, CopilotResponse, ConversationMessage, StreamGraphActionsCallbacks }
 
-// ==================== Helper Functions ====================
-
-/**
- * Convert frontend conversation history to API format.
- * Filters out error messages and empty content.
- * Includes actions for context in multi-turn conversations.
- */
 function convertConversationHistory(
   history: Array<{ role: 'user' | 'model'; text: string; actions?: GraphAction[] }>,
 ): Array<ConversationMessage> {
@@ -33,13 +23,11 @@ function convertConversationHistory(
 
   return history
     .filter((msg) => {
-      // Skip error/cancelled messages
       const isError = ERROR_KEYWORDS.some((keyword) =>
         msg.text.toLowerCase().includes(keyword.toLowerCase()),
       )
       if (isError) return false
 
-      // Only include messages with actual content
       return msg.text && msg.text.trim().length > 0
     })
     .map((msg) => {
@@ -47,7 +35,6 @@ function convertConversationHistory(
         role: msg.role === 'user' ? 'user' : 'assistant',
         content: msg.text,
       }
-      // Include actions if present (for assistant messages)
       if (msg.role === 'model' && msg.actions && msg.actions.length > 0) {
         result.actions = msg.actions
       }
@@ -55,24 +42,30 @@ function convertConversationHistory(
     })
 }
 
-// ==================== Service ====================
+export const draftCopilotService = {
+  convertConversationHistory,
 
-export const copilotService = {
-  /**
-   * Clear Copilot history
-   */
-  async clearHistory(graphId: string): Promise<boolean> {
-    try {
-      await apiDelete(`graphs/${graphId}/copilot/history`)
-      return true
-    } catch (error) {
-      console.error('Failed to clear copilot history:', error)
-      return false
-    }
+  async dispatchRun(params: {
+    agentId: string
+    versionId: string
+    workspaceId: string
+    prompt: string
+    graphContext: Record<string, unknown>
+    conversationHistory: Array<{ role: 'user' | 'model'; text: string; actions?: GraphAction[] }>
+    mode?: string
+    providerName?: string
+    modelName?: string
+  }): Promise<{ run_id: string; execution_id: string }> {
+    return apiPost<{ run_id: string; execution_id: string }>('copilot/run', {
+      agent_id: params.agentId,
+      version_id: params.versionId,
+      workspace_id: params.workspaceId,
+      prompt: params.prompt,
+      graph_context: params.graphContext,
+      conversation_history: convertConversationHistory(params.conversationHistory),
+      mode: params.mode || 'deepagents',
+      provider_name: params.providerName,
+      model_name: params.modelName,
+    })
   },
-
-  /**
-   * Convert conversation history format (helper method)
-   */
-  convertConversationHistory,
 }
diff --git a/frontend/services/email/mailer.ts b/frontend/services/email/mailer.ts
index 76adb7b13..7822fb90f 100644
--- a/frontend/services/email/mailer.ts
+++ b/frontend/services/email/mailer.ts
@@ -1,415 +1,9 @@
-import { EmailClient, type EmailMessage } from '@azure/communication-email'
-import { Resend } from 'resend'
-
-import { apiGet, apiPost } from '@/lib/api-client'
 import { env } from '@/lib/core/config/env'
-import { getBaseUrl, getEmailDomain } from '@/lib/core/utils/urls'
-import { createLogger } from '@/lib/logs/console/logger'
-
-const logger = createLogger('Mailer')
-
-export type EmailType = 'transactional' | 'marketing' | 'updates' | 'notifications'
-type UnsubscribeEmailType = Exclude<EmailType, 'transactional'>
-
-const EMAIL_API_BASE = 'email'
-
-export interface EmailAttachment {
-  filename: string
-  content: string | Buffer
-  contentType: string
-  disposition?: 'attachment' | 'inline'
-}
-
-export interface EmailOptions {
-  to: string | string[]
-  subject: string
-  html?: string
-  text?: string
-  from?: string
-  emailType?: EmailType
-  includeUnsubscribe?: boolean
-  attachments?: EmailAttachment[]
-  replyTo?: string
-}
-
-export interface BatchEmailOptions {
-  emails: EmailOptions[]
-}
-
-export interface SendEmailResult {
-  success: boolean
-  message: string
-  data?: any
-}
-
-export interface BatchSendEmailResult {
-  success: boolean
-  message: string
-  results: SendEmailResult[]
-  data?: any
-}
-
-interface ProcessedEmailData {
-  to: string | string[]
-  subject: string
-  html?: string
-  text?: string
-  senderEmail: string
-  headers: Record<string, string>
-  attachments?: EmailAttachment[]
-  replyTo?: string
-}
-
-function getFromEmailAddress(): string {
-  if (env.FROM_EMAIL_ADDRESS?.trim()) {
-    return env.FROM_EMAIL_ADDRESS
-  }
 
-  return `noreply@${env.EMAIL_DOMAIN || getEmailDomain()}`
-}
-
-async function generateUnsubscribeToken(
-  email: string,
-  emailType: UnsubscribeEmailType,
-): Promise<string> {
-  const result = await apiPost<{ token: string }>(`${EMAIL_API_BASE}/generate-token`, {
-    email,
-    email_type: emailType,
-  })
-
-  return result.token
-}
-
-async function isUnsubscribed(
-  email: string,
-  emailType: 'all' | UnsubscribeEmailType = 'all',
-): Promise<boolean> {
-  try {
-    const result = await apiGet<{ is_unsubscribed: boolean }>(
-      `${EMAIL_API_BASE}/check-unsubscribed?email=${encodeURIComponent(email)}&email_type=${emailType}`,
-    )
-    return result?.is_unsubscribed || false
-  } catch (error) {
-    logger.error('Error checking unsubscribe status:', error)
-    return false
-  }
-}
-
-const resendApiKey = env.RESEND_API_KEY
-const azureConnectionString = env.AZURE_ACS_CONNECTION_STRING
-
-const resend =
-  resendApiKey && resendApiKey !== 'placeholder' && resendApiKey.trim() !== ''
-    ? new Resend(resendApiKey)
-    : null
-
-const azureEmailClient =
-  azureConnectionString && azureConnectionString.trim() !== ''
-    ? new EmailClient(azureConnectionString)
-    : null
-
-/**
- * Check if any email service is configured and available
- */
 export function hasEmailService(): boolean {
-  return !!(resend || azureEmailClient)
-}
-
-export async function sendEmail(options: EmailOptions): Promise<SendEmailResult> {
-  try {
-    // Check if user has unsubscribed (skip for critical transactional emails)
-    if (options.emailType !== 'transactional') {
-      const unsubscribeType = options.emailType as 'marketing' | 'updates' | 'notifications'
-      // For arrays, check the first email address (batch emails typically go to similar recipients)
-      const primaryEmail = Array.isArray(options.to) ? options.to[0] : options.to
-      const hasUnsubscribed = await isUnsubscribed(primaryEmail, unsubscribeType)
-      if (hasUnsubscribed) {
-        logger.info('Email not sent (user unsubscribed):', {
-          to: options.to,
-          subject: options.subject,
-          emailType: options.emailType,
-        })
-        return {
-          success: true,
-          message: 'Email skipped (user unsubscribed)',
-          data: { id: 'skipped-unsubscribed' },
-        }
-      }
-    }
-
-    // Process email data with unsubscribe tokens and headers
-    const processedData = await processEmailData(options)
-
-    // Try Resend first if configured
-    if (resend) {
-      try {
-        return await sendWithResend(processedData)
-      } catch (error) {
-        logger.warn('Resend failed, attempting Azure Communication Services fallback:', error)
-      }
-    }
-
-    // Fallback to Azure Communication Services if configured
-    if (azureEmailClient) {
-      try {
-        return await sendWithAzure(processedData)
-      } catch (error) {
-        logger.error('Azure Communication Services also failed:', error)
-        return {
-          success: false,
-          message: 'Both Resend and Azure Communication Services failed',
-        }
-      }
-    }
-
-    // No email service configured
-    logger.info('Email not sent (no email service configured):', {
-      to: options.to,
-      subject: options.subject,
-      from: processedData.senderEmail,
-    })
-    return {
-      success: true,
-      message: 'Email logging successful (no email service configured)',
-      data: { id: 'mock-email-id' },
-    }
-  } catch (error) {
-    logger.error('Error sending email:', error)
-    return {
-      success: false,
-      message: 'Failed to send email',
-    }
-  }
-}
-
-async function processEmailData(options: EmailOptions): Promise<ProcessedEmailData> {
-  const {
-    to,
-    subject,
-    html,
-    text,
-    from,
-    emailType = 'transactional',
-    includeUnsubscribe = true,
-    attachments,
-    replyTo,
-  } = options
-
-  const senderEmail = from || getFromEmailAddress()
-
-  // Generate unsubscribe token and add to content
-  let finalHtml = html
-  let finalText = text
-  const headers: Record<string, string> = {}
-
-  if (includeUnsubscribe && emailType !== 'transactional') {
-    // For arrays, use the first email for unsubscribe (batch emails typically go to similar recipients)
-    const primaryEmail = Array.isArray(to) ? to[0] : to
-    try {
-      const unsubscribeToken = await generateUnsubscribeToken(primaryEmail, emailType)
-      const baseUrl = getBaseUrl()
-      const unsubscribeUrl = `${baseUrl}/unsubscribe?token=${unsubscribeToken}&email=${encodeURIComponent(primaryEmail)}`
-
-      headers['List-Unsubscribe'] = `<${unsubscribeUrl}>`
-      headers['List-Unsubscribe-Post'] = 'List-Unsubscribe=One-Click'
-
-      if (html) {
-        finalHtml = html.replace(/\{\{UNSUBSCRIBE_TOKEN\}\}/g, unsubscribeToken)
-      }
-      if (text) {
-        finalText = text.replace(/\{\{UNSUBSCRIBE_TOKEN\}\}/g, unsubscribeToken)
-      }
-    } catch (error) {
-      logger.warn(
-        'Failed to generate unsubscribe token, continuing without unsubscribe link:',
-        error,
-      )
-      // Continue sending email, but without unsubscribe link
-    }
-  }
-
-  return {
-    to,
-    subject,
-    html: finalHtml,
-    text: finalText,
-    senderEmail,
-    headers,
-    attachments,
-    replyTo,
-  }
-}
-
-async function sendWithResend(data: ProcessedEmailData): Promise<SendEmailResult> {
-  if (!resend) throw new Error('Resend not configured')
-
-  const fromAddress = data.senderEmail
-
-  const emailData: any = {
-    from: fromAddress,
-    to: data.to,
-    subject: data.subject,
-    headers: Object.keys(data.headers).length > 0 ? data.headers : undefined,
-  }
-
-  if (data.html) emailData.html = data.html
-  if (data.text) emailData.text = data.text
-  if (data.replyTo) emailData.replyTo = data.replyTo
-  if (data.attachments) {
-    emailData.attachments = data.attachments.map((att) => ({
-      filename: att.filename,
-      content: typeof att.content === 'string' ? att.content : att.content.toString('base64'),
-      contentType: att.contentType,
-      disposition: att.disposition || 'attachment',
-    }))
-  }
-
-  const { data: responseData, error } = await resend.emails.send(emailData)
-
-  if (error) {
-    throw new Error(error.message || 'Failed to send email via Resend')
-  }
-
-  return {
-    success: true,
-    message: 'Email sent successfully via Resend',
-    data: responseData,
-  }
-}
-
-async function sendWithAzure(data: ProcessedEmailData): Promise<SendEmailResult> {
-  if (!azureEmailClient) throw new Error('Azure Communication Services not configured')
-
-  // Azure Communication Services requires at least one content type
-  if (!data.html && !data.text) {
-    throw new Error('Azure Communication Services requires either HTML or text content')
-  }
-
-  // For Azure, use just the email address part (no display name)
-  // Azure will use the display name configured in the portal for the sender address
-  const senderEmailOnly = data.senderEmail.includes('<')
-    ? data.senderEmail.match(/<(.+)>/)?.[1] || data.senderEmail
-    : data.senderEmail
-
-  const message: EmailMessage = {
-    senderAddress: senderEmailOnly,
-    content: data.html
-      ? {
-          subject: data.subject,
-          html: data.html,
-        }
-      : {
-          subject: data.subject,
-          plainText: data.text!,
-        },
-    recipients: {
-      to: Array.isArray(data.to)
-        ? data.to.map((email) => ({ address: email }))
-        : [{ address: data.to }],
-    },
-    headers: data.headers,
-  }
-
-  const poller = await azureEmailClient.beginSend(message)
-  const result = await poller.pollUntilDone()
-
-  if (result.status === 'Succeeded') {
-    return {
-      success: true,
-      message: 'Email sent successfully via Azure Communication Services',
-      data: { id: result.id },
-    }
-  }
-  throw new Error(`Azure Communication Services failed with status: ${result.status}`)
-}
-
-export async function sendBatchEmails(options: BatchEmailOptions): Promise<BatchSendEmailResult> {
-  try {
-    const results: SendEmailResult[] = []
-
-    // Try Resend first for batch emails if available
-    if (resend) {
-      try {
-        return await sendBatchWithResend(options.emails)
-      } catch (error) {
-        logger.warn('Resend batch failed, falling back to individual sends:', error)
-      }
-    }
-
-    // Fallback to individual sends (works with both Azure and Resend)
-    logger.info('Sending batch emails individually')
-    for (const email of options.emails) {
-      try {
-        const result = await sendEmail(email)
-        results.push(result)
-      } catch (error) {
-        results.push({
-          success: false,
-          message: error instanceof Error ? error.message : 'Failed to send email',
-        })
-      }
-    }
-
-    const successCount = results.filter((r) => r.success).length
-    return {
-      success: successCount === results.length,
-      message:
-        successCount === results.length
-          ? 'All batch emails sent successfully'
-          : `${successCount}/${results.length} emails sent successfully`,
-      results,
-      data: { count: successCount },
-    }
-  } catch (error) {
-    logger.error('Error in batch email sending:', error)
-    return {
-      success: false,
-      message: 'Failed to send batch emails',
-      results: [],
-    }
-  }
-}
-
-async function sendBatchWithResend(emails: EmailOptions[]): Promise<BatchSendEmailResult> {
-  if (!resend) throw new Error('Resend not configured')
-
-  const results: SendEmailResult[] = []
-  const batchEmails = emails.map((email) => {
-    const senderEmail = email.from || getFromEmailAddress()
-    const emailData: any = {
-      from: senderEmail,
-      to: email.to,
-      subject: email.subject,
-    }
-    if (email.html) emailData.html = email.html
-    if (email.text) emailData.text = email.text
-    return emailData
-  })
-
-  try {
-    const response = await resend.batch.send(batchEmails as any)
-
-    if (response.error) {
-      throw new Error(response.error.message || 'Resend batch API error')
-    }
-
-    // Success - create results for each email
-    batchEmails.forEach((_, index) => {
-      results.push({
-        success: true,
-        message: 'Email sent successfully via Resend batch',
-        data: { id: `batch-${index}` },
-      })
-    })
-
-    return {
-      success: true,
-      message: 'All batch emails sent successfully via Resend',
-      results,
-      data: { count: results.length },
-    }
-  } catch (error) {
-    logger.error('Resend batch send failed:', error)
-    throw error // Let the caller handle fallback
-  }
+  const resendKey = env.RESEND_API_KEY
+  const azureConn = env.AZURE_ACS_CONNECTION_STRING
+  const hasResend = !!(resendKey && resendKey !== 'placeholder' && resendKey.trim())
+  const hasAzure = !!(azureConn && azureConn.trim())
+  return hasResend || hasAzure
 }
diff --git a/frontend/services/email/validation.ts b/frontend/services/email/validation.ts
index 5dfd4b412..e4046fd2a 100644
--- a/frontend/services/email/validation.ts
+++ b/frontend/services/email/validation.ts
@@ -1,20 +1,17 @@
-import { createLogger } from '@/lib/logs/console/logger'
-
-const logger = createLogger('EmailValidation')
+interface EmailValidationChecks {
+  syntax: boolean
+  domain: boolean
+  mxRecord: boolean
+  disposable: boolean
+}
 
-export interface EmailValidationResult {
+interface QuickEmailValidationResult {
   isValid: boolean
   reason?: string
   confidence: 'high' | 'medium' | 'low'
-  checks: {
-    syntax: boolean
-    domain: boolean
-    mxRecord: boolean
-    disposable: boolean
-  }
+  checks: EmailValidationChecks
 }
 
-// Common disposable email domains (subset - can be expanded)
 const DISPOSABLE_DOMAINS = new Set([
   '10minutemail.com',
   'tempmail.org',
@@ -37,171 +34,29 @@ const DISPOSABLE_DOMAINS = new Set([
   'emailondeck.com',
 ])
 
-/**
- * Validates email syntax using RFC 5322 compliant regex
- */
 function validateEmailSyntax(email: string): boolean {
   const emailRegex =
     /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
   return emailRegex.test(email) && email.length <= 254
 }
 
-/**
- * Checks if domain has valid MX records (server-side only)
- */
-async function checkMXRecord(domain: string): Promise<boolean> {
-  // Skip MX check on client-side (browser)
-  if (typeof window !== 'undefined') {
-    return true // Assume valid on client-side
-  }
-
-  try {
-    const { promisify } = await import('util')
-    const dns = await import('dns')
-    const resolveMx = promisify(dns.resolveMx)
-
-    const mxRecords = await resolveMx(domain)
-    return mxRecords && mxRecords.length > 0
-  } catch (error) {
-    logger.debug('MX record check failed', { domain, error })
-    return false
-  }
-}
-
-/**
- * Checks if email is from a known disposable email provider
- */
 function isDisposableEmail(email: string): boolean {
   const domain = email.split('@')[1]?.toLowerCase()
   return domain ? DISPOSABLE_DOMAINS.has(domain) : false
 }
 
-/**
- * Checks for obvious patterns that indicate invalid emails
- */
 function hasInvalidPatterns(email: string): boolean {
-  // Check for consecutive dots (RFC violation)
   if (email.includes('..')) return true
-
-  // Check for local part length (RFC limit is 64 characters)
   const localPart = email.split('@')[0]
   if (localPart && localPart.length > 64) return true
-
   return false
 }
 
-/**
- * Validates an email address comprehensively
- */
-export async function validateEmail(email: string): Promise<EmailValidationResult> {
-  const checks = {
-    syntax: false,
-    domain: false,
-    mxRecord: false,
-    disposable: false,
-  }
-
-  try {
-    // 1. Basic syntax validation
-    checks.syntax = validateEmailSyntax(email)
-    if (!checks.syntax) {
-      return {
-        isValid: false,
-        reason: 'Invalid email format',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    const domain = email.split('@')[1]?.toLowerCase()
-    if (!domain) {
-      return {
-        isValid: false,
-        reason: 'Missing domain',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    // 2. Check for disposable email first (more specific)
-    checks.disposable = !isDisposableEmail(email)
-    if (!checks.disposable) {
-      return {
-        isValid: false,
-        reason: 'Disposable email addresses are not allowed',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    // 3. Check for invalid patterns
-    if (hasInvalidPatterns(email)) {
-      return {
-        isValid: false,
-        reason: 'Email contains suspicious patterns',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    // 4. Domain validation - check for obvious invalid domains
-    checks.domain = domain.includes('.') && !domain.startsWith('.') && !domain.endsWith('.')
-    if (!checks.domain) {
-      return {
-        isValid: false,
-        reason: 'Invalid domain format',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    // 5. MX record check (with timeout)
-    try {
-      const mxCheckPromise = checkMXRecord(domain)
-      const timeoutPromise = new Promise<boolean>((_, reject) =>
-        setTimeout(() => reject(new Error('MX check timeout')), 5000),
-      )
-
-      checks.mxRecord = await Promise.race([mxCheckPromise, timeoutPromise])
-    } catch (error) {
-      logger.debug('MX record check failed or timed out', { domain, error })
-      checks.mxRecord = false
-    }
-
-    // Determine overall validity and confidence
-    if (!checks.mxRecord) {
-      return {
-        isValid: false,
-        reason: 'Domain does not accept emails (no MX records)',
-        confidence: 'high',
-        checks,
-      }
-    }
-
-    return {
-      isValid: true,
-      confidence: 'high',
-      checks,
-    }
-  } catch (error) {
-    logger.error('Email validation error', { email, error })
-    return {
-      isValid: false,
-      reason: 'Validation service temporarily unavailable',
-      confidence: 'low',
-      checks,
-    }
-  }
-}
-
-/**
- * Quick validation for high-volume scenarios (skips MX check)
- */
-export function quickValidateEmail(email: string): EmailValidationResult {
-  const checks = {
+export function quickValidateEmail(email: string): QuickEmailValidationResult {
+  const checks: EmailValidationChecks = {
     syntax: false,
     domain: false,
-    mxRecord: true, // Skip MX check for performance
+    mxRecord: true,
     disposable: false,
   }
 
diff --git a/frontend/services/graphDeploymentService.ts b/frontend/services/graphDeploymentService.ts
deleted file mode 100644
index 9274e37ed..000000000
--- a/frontend/services/graphDeploymentService.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Graph deployment version service
- */
-import { apiGet, apiPost, apiDelete, apiPatch, API_BASE } from '@/lib/api-client'
-
-export interface GraphDeploymentVersion {
-  id: string
-  version: number
-  name?: string | null
-  isActive: boolean
-  createdAt: string
-  createdBy?: string | null
-  createdByName?: string | null // Creator username
-}
-
-export interface GraphVersionState {
-  nodes: Array<{
-    id: string
-    type: string
-    position: { x: number; y: number }
-    positionAbsolute?: { x: number; y: number }
-    data: Record<string, unknown>
-    width?: number
-    height?: number
-  }>
-  edges: Array<{
-    id: string
-    source: string
-    target: string
-  }>
-  variables?: Record<string, unknown>
-}
-
-export interface GraphDeploymentVersionWithState extends GraphDeploymentVersion {
-  state: GraphVersionState
-}
-
-export interface GraphDeploymentStatus {
-  isDeployed: boolean
-  deployedAt: string | null
-  deployment: GraphDeploymentVersion | null
-  needsRedeployment: boolean
-}
-
-export interface GraphDeployResponse {
-  success: boolean
-  message: string
-  version: number
-  isActive: boolean
-  needsRedeployment: boolean
-}
-
-export interface GraphDeploymentVersionsResponse {
-  versions: GraphDeploymentVersion[]
-  total: number
-  page: number
-  pageSize: number
-  totalPages: number
-}
-
-class GraphDeploymentService {
-  private getBaseUrl(graphId: string) {
-    return `${API_BASE}/graphs/${graphId}`
-  }
-
-  /**
-   * Get deployment status
-   */
-  async getDeploymentStatus(graphId: string): Promise<GraphDeploymentStatus> {
-    return apiGet<GraphDeploymentStatus>(`${this.getBaseUrl(graphId)}/deploy`)
-  }
-
-  /**
-   * Deploy graph
-   */
-  async deploy(graphId: string, name?: string): Promise<GraphDeployResponse> {
-    return apiPost<GraphDeployResponse>(`${this.getBaseUrl(graphId)}/deploy`, { name })
-  }
-
-  /**
-   * Undeploy graph
-   */
-  async undeploy(graphId: string): Promise<{ isDeployed: boolean; deployedAt: null }> {
-    return apiDelete<{ isDeployed: boolean; deployedAt: null }>(
-      `${this.getBaseUrl(graphId)}/deploy`,
-    )
-  }
-
-  /**
-   * Get all deployment versions (paginated)
-   */
-  async getVersions(
-    graphId: string,
-    page: number = 1,
-    pageSize: number = 10,
-  ): Promise<GraphDeploymentVersionsResponse> {
-    return apiGet<GraphDeploymentVersionsResponse>(
-      `${this.getBaseUrl(graphId)}/deployments?page=${page}&page_size=${pageSize}`,
-    )
-  }
-
-  /**
-   * Get specific version
-   */
-  async getVersion(graphId: string, version: number): Promise<GraphDeploymentVersion> {
-    return apiGet<GraphDeploymentVersion>(`${this.getBaseUrl(graphId)}/deployments/${version}`)
-  }
-
-  /**
-   * Get complete state of specific version (for preview)
-   */
-  async getVersionState(
-    graphId: string,
-    version: number,
-  ): Promise<GraphDeploymentVersionWithState> {
-    return apiGet<GraphDeploymentVersionWithState>(
-      `${this.getBaseUrl(graphId)}/deployments/${version}/state`,
-    )
-  }
-
-  /**
-   * Rename version
-   */
-  async renameVersion(
-    graphId: string,
-    version: number,
-    name: string,
-  ): Promise<GraphDeploymentVersion> {
-    return apiPatch<GraphDeploymentVersion>(`${this.getBaseUrl(graphId)}/deployments/${version}`, {
-      name,
-    })
-  }
-
-  /**
-   * Activate version
-   */
-  async activateVersion(
-    graphId: string,
-    version: number,
-  ): Promise<{ success: boolean; deployedAt: string }> {
-    return apiPost<{ success: boolean; deployedAt: string }>(
-      `${this.getBaseUrl(graphId)}/deployments/${version}/activate`,
-    )
-  }
-
-  /**
-   * Revert to specified version
-   */
-  async revertToVersion(
-    graphId: string,
-    version: number,
-  ): Promise<{
-    success: boolean
-    message: string
-    version: number
-    isActive: boolean
-  }> {
-    return apiPost(`${this.getBaseUrl(graphId)}/deployments/${version}/revert`)
-  }
-
-  /**
-   * Delete version
-   */
-  async deleteVersion(
-    graphId: string,
-    version: number,
-  ): Promise<{ success: boolean; message: string }> {
-    return apiDelete<{ success: boolean; message: string }>(
-      `${this.getBaseUrl(graphId)}/deployments/${version}`,
-    )
-  }
-}
-
-export const graphDeploymentService = new GraphDeploymentService()
diff --git a/frontend/services/runService.ts b/frontend/services/runService.ts
deleted file mode 100644
index 0282ad1c8..000000000
--- a/frontend/services/runService.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-'use client'
-
-import { API_ENDPOINTS, apiGet, apiPost } from '@/lib/api-client'
-
-export interface RunSummary {
-  run_id: string
-  status: string
-  run_type: string
-  agent_name: string
-  agent_display_name?: string | null
-  source: string
-  thread_id?: string | null
-  graph_id?: string | null
-  title?: string | null
-  started_at: string
-  finished_at?: string | null
-  last_seq: number
-  error_code?: string | null
-  error_message?: string | null
-  last_heartbeat_at?: string | null
-  updated_at: string
-}
-
-export interface RunSnapshot {
-  run_id: string
-  status: string
-  last_seq: number
-  projection: Record<string, unknown>
-}
-
-export interface RunEvent {
-  seq: number
-  event_type: string
-  payload: Record<string, unknown>
-  trace_id?: string | null
-  observation_id?: string | null
-  parent_observation_id?: string | null
-  created_at: string
-}
-
-export interface RunEventsPage {
-  run_id: string
-  events: RunEvent[]
-  next_after_seq: number
-}
-
-export interface RunListResponse {
-  items: RunSummary[]
-}
-
-export interface AgentDefinition {
-  agent_name: string
-  display_name: string
-}
-
-export interface AgentListResponse {
-  items: AgentDefinition[]
-}
-
-export interface CreateRunPayload {
-  agent_name: string
-  graph_id?: string | null
-  message: string
-  thread_id?: string | null
-  input?: Record<string, unknown> | null
-}
-
-export interface CreateSkillCreatorRunPayload {
-  message: string
-  graph_id: string
-  thread_id?: string | null
-  edit_skill_id?: string | null
-}
-
-export interface CreateRunResponse {
-  run_id: string
-  thread_id: string
-  status: string
-}
-
-export const runService = {
-  async createRun(payload: CreateRunPayload): Promise<CreateRunResponse> {
-    return apiPost<CreateRunResponse>(API_ENDPOINTS.runs, payload)
-  },
-
-  async createSkillCreatorRun(payload: CreateSkillCreatorRunPayload): Promise<CreateRunResponse> {
-    return this.createRun({
-      agent_name: 'skill_creator',
-      graph_id: payload.graph_id,
-      message: payload.message,
-      thread_id: payload.thread_id,
-      input: { edit_skill_id: payload.edit_skill_id },
-    })
-  },
-
-  async getRun(runId: string): Promise<RunSummary> {
-    return apiGet<RunSummary>(`${API_ENDPOINTS.runs}/${runId}`)
-  },
-
-  async listRuns(params?: {
-    runType?: string
-    agentName?: string
-    status?: string
-    search?: string
-    limit?: number
-  }): Promise<RunListResponse> {
-    const query = new URLSearchParams()
-    if (params?.runType) query.set('run_type', params.runType)
-    if (params?.agentName) query.set('agent_name', params.agentName)
-    if (params?.status) query.set('status', params.status)
-    if (params?.search) query.set('search', params.search)
-    if (params?.limit) query.set('limit', String(params.limit))
-    const suffix = query.toString() ? `?${query.toString()}` : ''
-    return apiGet<RunListResponse>(`${API_ENDPOINTS.runs}${suffix}`)
-  },
-
-  async listAgents(): Promise<AgentListResponse> {
-    return apiGet<AgentListResponse>(`${API_ENDPOINTS.runs}/agents`)
-  },
-
-  async getRunSnapshot(runId: string): Promise<RunSnapshot> {
-    return apiGet<RunSnapshot>(`${API_ENDPOINTS.runs}/${runId}/snapshot`)
-  },
-
-  async getRunEvents(runId: string, params?: { afterSeq?: number; limit?: number }): Promise<RunEventsPage> {
-    const afterSeq = params?.afterSeq ?? 0
-    const limit = params?.limit ?? 500
-    return apiGet<RunEventsPage>(
-      `${API_ENDPOINTS.runs}/${runId}/events?after_seq=${afterSeq}&limit=${limit}`,
-    )
-  },
-
-  async findActiveRun(params: {
-    agentName: string
-    graphId?: string | null
-    threadId?: string | null
-  }): Promise<RunSummary | null> {
-    const query = new URLSearchParams({
-      agent_name: params.agentName,
-    })
-    if (params.graphId) query.set('graph_id', params.graphId)
-    if (params.threadId) query.set('thread_id', params.threadId)
-    return apiGet<RunSummary | null>(`${API_ENDPOINTS.runs}/active?${query.toString()}`)
-  },
-
-  async findActiveSkillCreatorRun(params: { graphId: string; threadId?: string | null }): Promise<RunSummary | null> {
-    return this.findActiveRun({
-      agentName: 'skill_creator',
-      graphId: params.graphId,
-      threadId: params.threadId,
-    })
-  },
-
-  async findActiveChatRun(params: { threadId: string }): Promise<RunSummary | null> {
-    return this.findActiveRun({
-      agentName: 'chat',
-      threadId: params.threadId,
-    })
-  },
-
-  async cancelRun(runId: string): Promise<RunSummary> {
-    return apiPost<RunSummary>(`${API_ENDPOINTS.runs}/${runId}/cancel`, {})
-  },
-}
diff --git a/frontend/services/skillCollaboratorService.ts b/frontend/services/skillCollaboratorService.ts
index 7aa37769d..37ad0de5c 100644
--- a/frontend/services/skillCollaboratorService.ts
+++ b/frontend/services/skillCollaboratorService.ts
@@ -61,18 +61,30 @@ export const skillCollaboratorService = {
       owner: { id: string; name: string | null; email: string | null }
     }>(`skills/${skillId}/collaborators`)
     return {
-      collaborators: (Array.isArray(data.collaborators) ? data.collaborators : []).map(normalizeCollaborator),
+      collaborators: (Array.isArray(data.collaborators) ? data.collaborators : []).map(
+        normalizeCollaborator,
+      ),
       owner: data.owner ?? { id: '', name: null, email: null },
     }
   },
 
-  async addCollaborator(skillId: string, payload: { email: string; role: CollaboratorRole }): Promise<SkillCollaborator> {
+  async addCollaborator(
+    skillId: string,
+    payload: { email: string; role: CollaboratorRole },
+  ): Promise<SkillCollaborator> {
     const data = await apiPost<BackendCollaborator>(`skills/${skillId}/collaborators`, payload)
     return normalizeCollaborator(data)
   },
 
-  async updateRole(skillId: string, userId: string, payload: { role: CollaboratorRole }): Promise<SkillCollaborator> {
-    const data = await apiPut<BackendCollaborator>(`skills/${skillId}/collaborators/${userId}`, payload)
+  async updateRole(
+    skillId: string,
+    userId: string,
+    payload: { role: CollaboratorRole },
+  ): Promise<SkillCollaborator> {
+    const data = await apiPut<BackendCollaborator>(
+      `skills/${skillId}/collaborators/${userId}`,
+      payload,
+    )
     return normalizeCollaborator(data)
   },
 
diff --git a/frontend/services/skillService.ts b/frontend/services/skillService.ts
index 1a8984c1f..52e78f093 100644
--- a/frontend/services/skillService.ts
+++ b/frontend/services/skillService.ts
@@ -1,4 +1,12 @@
-import { API_BASE, apiGet, apiPost, apiPut, apiDelete, ApiResponse } from '@/lib/api-client'
+import {
+  API_BASE,
+  apiGet,
+  apiPost,
+  apiPut,
+  apiDelete,
+  ApiResponse,
+  createApiError,
+} from '@/lib/api-client'
 
 import {
   Skill,
@@ -1017,7 +1025,11 @@ export const skillService = {
       if (skillData) {
         return normalizeSkill(skillData)
       }
-      throw new Error('Failed to save skill')
+      throw createApiError(500, 'Invalid Skill Save Response', {
+        code: 'SKILL_SAVE_RESPONSE_INVALID',
+        message: 'Failed to save skill',
+        data: { skill_id: skill.id ?? null, name: skill.name },
+      })
     } catch (error) {
       console.error('Failed to save skill:', error)
       throw error
@@ -1086,7 +1098,9 @@ export const skillService = {
    */
   async togglePublic(skillId: string, isPublic: boolean): Promise<Skill> {
     try {
-      const response = await apiPut<BackendSkill>(`${SKILLS_ENDPOINT}/${skillId}`, { is_public: isPublic })
+      const response = await apiPut<BackendSkill>(`${SKILLS_ENDPOINT}/${skillId}`, {
+        is_public: isPublic,
+      })
       return normalizeSkill(response)
     } catch (error) {
       console.error('Failed to toggle skill public status:', error)
@@ -1102,7 +1116,11 @@ export const skillService = {
       // First get the original skill with all files
       const originalSkill = await this.getSkill(skillId)
       if (!originalSkill) {
-        throw new Error('Skill not found')
+        throw createApiError(404, 'Skill Not Found', {
+          code: 'SKILL_NOT_FOUND',
+          message: 'Skill not found',
+          data: { skill_id: skillId },
+        })
       }
 
       // Generate a unique name with timestamp to avoid duplicates
diff --git a/frontend/services/skillVersionService.ts b/frontend/services/skillVersionService.ts
index 541d34011..cbe432d79 100644
--- a/frontend/services/skillVersionService.ts
+++ b/frontend/services/skillVersionService.ts
@@ -112,17 +112,18 @@ function normalizeVersion(raw: BackendVersion): SkillVersion {
     publishedById: raw.published_by_id,
     publishedAt: raw.published_at ?? null,
     createdAt: raw.created_at ?? null,
-    files: raw.files?.map((f) => ({
-      id: f.id,
-      versionId: f.version_id,
-      path: f.path,
-      fileName: f.file_name,
-      fileType: f.file_type,
-      content: f.content ?? null,
-      storageType: f.storage_type,
-      storageKey: f.storage_key ?? null,
-      size: f.size ?? 0,
-    })) ?? null,
+    files:
+      raw.files?.map((f) => ({
+        id: f.id,
+        versionId: f.version_id,
+        path: f.path,
+        fileName: f.file_name,
+        fileType: f.file_type,
+        content: f.content ?? null,
+        storageType: f.storage_type,
+        storageKey: f.storage_key ?? null,
+        size: f.size ?? 0,
+      })) ?? null,
   }
 }
 
@@ -144,7 +145,10 @@ export const skillVersionService = {
     return normalizeVersion(data)
   },
 
-  async publishVersion(skillId: string, payload: { version: string; release_notes?: string }): Promise<SkillVersion> {
+  async publishVersion(
+    skillId: string,
+    payload: { version: string; release_notes?: string },
+  ): Promise<SkillVersion> {
     const data = await apiPost<BackendVersion>(`skills/${skillId}/versions`, payload)
     return normalizeVersion(data)
   },
@@ -153,7 +157,10 @@ export const skillVersionService = {
     await apiDelete<void>(`skills/${skillId}/versions/${version}`)
   },
 
-  async restoreDraft(skillId: string, payload: { version: string }): Promise<Record<string, unknown>> {
+  async restoreDraft(
+    skillId: string,
+    payload: { version: string },
+  ): Promise<Record<string, unknown>> {
     return await apiPost<Record<string, unknown>>(`skills/${skillId}/restore`, payload)
   },
 }
diff --git a/frontend/services/taskActivityService.ts b/frontend/services/taskActivityService.ts
new file mode 100644
index 000000000..84a09e74d
--- /dev/null
+++ b/frontend/services/taskActivityService.ts
@@ -0,0 +1,43 @@
+import { apiGet, apiPost, apiPatch, apiDelete } from '@/lib/api-client'
+import type {
+  TaskActivity,
+  CreateTaskActivityRequest,
+  TaskActivityListResponse,
+} from '@/types/task-activities'
+
+export const taskActivityService = {
+  list: async (
+    taskId: string,
+    workspaceId: string,
+    params?: { cursor?: string; limit?: number },
+  ): Promise<TaskActivityListResponse> => {
+    const searchParams = new URLSearchParams({ workspace_id: workspaceId })
+    if (params?.cursor) searchParams.set('cursor', params.cursor)
+    if (params?.limit) searchParams.set('limit', String(params.limit))
+    return apiGet<TaskActivityListResponse>(`tasks/${taskId}/activities?${searchParams}`)
+  },
+
+  create: async (
+    taskId: string,
+    workspaceId: string,
+    data: CreateTaskActivityRequest,
+  ): Promise<TaskActivity> => {
+    return apiPost<TaskActivity>(`tasks/${taskId}/activities?workspace_id=${workspaceId}`, data)
+  },
+
+  update: async (
+    taskId: string,
+    activityId: string,
+    workspaceId: string,
+    content: string,
+  ): Promise<TaskActivity> => {
+    return apiPatch<TaskActivity>(
+      `tasks/${taskId}/activities/${activityId}?workspace_id=${workspaceId}`,
+      { content },
+    )
+  },
+
+  delete: async (taskId: string, activityId: string, workspaceId: string): Promise<void> => {
+    return apiDelete(`tasks/${taskId}/activities/${activityId}?workspace_id=${workspaceId}`)
+  },
+}
diff --git a/frontend/services/taskService.ts b/frontend/services/taskService.ts
new file mode 100644
index 000000000..0be4c4140
--- /dev/null
+++ b/frontend/services/taskService.ts
@@ -0,0 +1,91 @@
+'use client'
+
+import { apiGet, apiPost, apiPatch } from '@/lib/api-client'
+import type { ExecutionSnapshot, ExecutionEventsPage } from '@/types/agent-run'
+import type { Task, CreateTaskRequest, UpdateTaskRequest } from '@/types/tasks'
+
+export interface TaskListResponse {
+  items: Task[]
+}
+
+export const taskService = {
+  list: async (
+    workspaceId: string,
+    params?: { status?: string; limit?: number; agent_id?: string },
+  ): Promise<Task[]> => {
+    const searchParams = new URLSearchParams({ workspace_id: workspaceId })
+    if (params?.status) searchParams.set('status', params.status)
+    if (params?.limit) searchParams.set('limit', String(params.limit))
+    if (params?.agent_id) searchParams.set('agent_id', params.agent_id)
+    const res = await apiGet<{ items: Task[] }>(`tasks?${searchParams}`)
+    return res?.items ?? []
+  },
+
+  get: async (taskId: string, workspaceId: string): Promise<Task> => {
+    return apiGet<Task>(`tasks/${taskId}?workspace_id=${workspaceId}`)
+  },
+
+  create: async (data: CreateTaskRequest): Promise<Task> => {
+    return apiPost<Task>('tasks', data)
+  },
+
+  update: async (taskId: string, workspaceId: string, data: UpdateTaskRequest): Promise<Task> => {
+    return apiPatch<Task>(`tasks/${taskId}?workspace_id=${workspaceId}`, data)
+  },
+
+  assign: async (taskId: string, workspaceId: string, agentId: string): Promise<Task> => {
+    return apiPost<Task>(`tasks/${taskId}/assign?workspace_id=${workspaceId}`, {
+      agent_id: agentId,
+    })
+  },
+
+  dispatch: async (taskId: string, workspaceId: string): Promise<Task> => {
+    return apiPost<Task>(`tasks/${taskId}/dispatch?workspace_id=${workspaceId}`, {})
+  },
+
+  cancel: async (taskId: string, workspaceId: string): Promise<Task> => {
+    return apiPost<Task>(`tasks/${taskId}/cancel?workspace_id=${workspaceId}`, {})
+  },
+
+  getTransitions: async (workspaceId: string): Promise<Record<string, string[]>> => {
+    return apiGet<Record<string, string[]>>(`tasks/meta/transitions?workspace_id=${workspaceId}`)
+  },
+
+  // --- Task-scoped execution operations ---
+
+  getExecutionEvents: async (
+    taskId: string,
+    workspaceId: string,
+    afterSeq?: number,
+  ): Promise<ExecutionEventsPage> => {
+    const params = new URLSearchParams({ workspace_id: workspaceId })
+    if (afterSeq !== undefined) params.set('after_seq', String(afterSeq))
+    return apiGet<ExecutionEventsPage>(`tasks/${taskId}/execution/events?${params}`)
+  },
+
+  getExecutionSnapshot: async (taskId: string, workspaceId: string): Promise<ExecutionSnapshot> => {
+    return apiGet<ExecutionSnapshot>(
+      `tasks/${taskId}/execution/snapshot?workspace_id=${workspaceId}`,
+    )
+  },
+
+  injectExecutionMessage: async (
+    taskId: string,
+    workspaceId: string,
+    message: string,
+  ): Promise<void> => {
+    await apiPost(`tasks/${taskId}/execution/message?workspace_id=${workspaceId}`, {
+      message,
+    })
+  },
+
+  approveExecutionAction: async (
+    taskId: string,
+    workspaceId: string,
+    approved: boolean,
+  ): Promise<void> => {
+    await apiPost(`tasks/${taskId}/execution/approve?workspace_id=${workspaceId}`, {
+      approved,
+    })
+  },
+}
diff --git a/frontend/services/threadService.ts b/frontend/services/threadService.ts
new file mode 100644
index 000000000..2dc7de445
--- /dev/null
+++ b/frontend/services/threadService.ts
@@ -0,0 +1,62 @@
+'use client'
+
+import { apiGet, apiPost, apiPatch, apiDelete } from '@/lib/api-client'
+import type {
+  Thread,
+  ThreadEvent,
+  ChatAttachment,
+  ChatResponse,
+  CreateThreadRequest,
+  UpdateThreadRequest,
+} from '@/types/thread'
+
+export const threadService = {
+  list: async (agentId: string, workspaceId: string): Promise<Thread[]> => {
+    const res = await apiGet<Thread[]>(`threads?agent_id=${agentId}&workspace_id=${workspaceId}`)
+    return res ?? []
+  },
+
+  get: async (threadId: string, workspaceId: string): Promise<Thread> => {
+    return apiGet<Thread>(`threads/${threadId}?workspace_id=${workspaceId}`)
+  },
+
+  create: async (data: CreateThreadRequest & { workspace_id: string }): Promise<Thread> => {
+    const { workspace_id, ...body } = data
+    return apiPost<Thread>(`threads?workspace_id=${workspace_id}`, body)
+  },
+
+  update: async (
+    threadId: string,
+    workspaceId: string,
+    data: UpdateThreadRequest,
+  ): Promise<Thread> => {
+    return apiPatch<Thread>(`threads/${threadId}?workspace_id=${workspaceId}`, data)
+  },
+
+  archive: async (threadId: string, workspaceId: string): Promise<void> => {
+    await apiDelete(`threads/${threadId}?workspace_id=${workspaceId}`)
+  },
+
+  listThreadEvents: async (
+    threadId: string,
+    workspaceId: string,
+    options?: { after?: string; limit?: number },
+  ): Promise<{ events: ThreadEvent[]; total: number }> => {
+    const params = new URLSearchParams({ workspace_id: workspaceId })
+    if (options?.after) params.set('after', options.after)
+    if (options?.limit) params.set('limit', String(options.limit))
+    return apiGet(`threads/${threadId}/events?${params}`)
+  },
+
+  sendChat: async (
+    threadId: string,
+    workspaceId: string,
+    message: string,
+    attachments: ChatAttachment[] = [],
+  ): Promise<ChatResponse> => {
+    return apiPost<ChatResponse>(`threads/${threadId}/chat?workspace_id=${workspaceId}`, {
+      message,
+      attachments: attachments.length ? attachments : undefined,
+    })
+  },
+}
diff --git a/frontend/stores/custom-tools/store.ts b/frontend/stores/custom-tools/store.ts
deleted file mode 100644
index 87206155a..000000000
--- a/frontend/stores/custom-tools/store.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { create } from 'zustand'
-
-import type { CustomTool, CustomToolsActions, CustomToolsState } from './types'
-
-/**
- * Mock custom tools store
- * Uses mock data for development
- */
-
-const mockTools: CustomTool[] = [
-  {
-    id: 'custom-tool-1',
-    name: 'Custom API Tool',
-    description: 'A custom tool for API calls',
-    schema: {
-      id: 'custom-tool-1',
-      name: 'Custom API Tool',
-      description: 'A custom tool for API calls',
-      parameters: [
-        { name: 'url', type: 'string', required: true, description: 'API URL' },
-        { name: 'method', type: 'string', required: false, description: 'HTTP method' },
-      ],
-      endpoint: '/api/custom',
-      method: 'POST',
-    },
-    createdAt: new Date('2024-01-01'),
-    updatedAt: new Date(),
-  },
-]
-
-type CustomToolsStore = CustomToolsState & CustomToolsActions
-
-export const useCustomToolsStore = create<CustomToolsStore>((set, get) => ({
-  // State
-  tools: mockTools.reduce(
-    (acc, tool) => {
-      acc[tool.id] = tool
-      return acc
-    },
-    {} as Record<string, CustomTool>,
-  ),
-  isLoading: false,
-  error: null,
-
-  // Actions
-  setTools: (tools) => {
-    set({
-      tools: tools.reduce(
-        (acc, tool) => {
-          acc[tool.id] = tool
-          return acc
-        },
-        {} as Record<string, CustomTool>,
-      ),
-    })
-  },
-
-  addTool: (tool) => {
-    set((state) => ({
-      tools: { ...state.tools, [tool.id]: tool },
-    }))
-  },
-
-  updateTool: (id, updates) => {
-    set((state) => {
-      const existing = state.tools[id]
-      if (!existing) return state
-      return {
-        tools: {
-          ...state.tools,
-          [id]: { ...existing, ...updates, updatedAt: new Date() },
-        },
-      }
-    })
-  },
-
-  removeTool: (id) => {
-    set((state) => {
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { [id]: _, ...rest } = state.tools
-      return { tools: rest }
-    })
-  },
-
-  getTool: (id) => get().tools[id],
-
-  getToolAsync: async (id) => {
-    return get().tools[id]
-  },
-
-  getAllTools: () => Object.values(get().tools),
-
-  setLoading: (loading) => set({ isLoading: loading }),
-
-  setError: (error) => set({ error }),
-}))
diff --git a/frontend/stores/custom-tools/types.ts b/frontend/stores/custom-tools/types.ts
index c2d1decff..8acc47aee 100644
--- a/frontend/stores/custom-tools/types.ts
+++ b/frontend/stores/custom-tools/types.ts
@@ -2,15 +2,6 @@
  * Custom tools types
  */
 
-export interface CustomToolParameter {
-  name: string
-  type: 'string' | 'number' | 'boolean' | 'object' | 'array'
-  description?: string
-  required?: boolean
-  default?: unknown
-}
-
-// OpenAI-style function calling schema (used by custom-tools.ts)
 // OpenAI-style function calling schema (used by custom-tools.ts queries)
 export interface CustomToolSchema {
   type?: 'function'
@@ -25,17 +16,6 @@ export interface CustomToolSchema {
   }
 }
 
-// Legacy schema format (used by store)
-export interface LegacyCustomToolSchema {
-  id: string
-  name: string
-  description: string
-  parameters: CustomToolParameter[]
-  code?: string
-  endpoint?: string
-  method?: 'GET' | 'POST' | 'PUT' | 'DELETE'
-}
-
 // CustomToolDefinition - used by API queries (OpenAI function calling format)
 export interface CustomToolDefinition {
   id: string
@@ -46,32 +26,3 @@ export interface CustomToolDefinition {
   updatedAt?: string
   schema: CustomToolSchema
 }
-
-// Legacy CustomTool format (used by store)
-export interface CustomTool {
-  id: string
-  name: string
-  description: string
-  schema: LegacyCustomToolSchema
-  createdAt: Date
-  updatedAt: Date
-  userId?: string
-}
-
-export interface CustomToolsState {
-  tools: Record<string, CustomTool>
-  isLoading: boolean
-  error: string | null
-}
-
-export interface CustomToolsActions {
-  setTools: (tools: CustomTool[]) => void
-  addTool: (tool: CustomTool) => void
-  updateTool: (id: string, updates: Partial<CustomTool>) => void
-  removeTool: (id: string) => void
-  getTool: (id: string) => CustomTool | undefined
-  getToolAsync: (id: string) => Promise<CustomTool | undefined>
-  getAllTools: () => CustomTool[]
-  setLoading: (loading: boolean) => void
-  setError: (error: string | null) => void
-}
diff --git a/frontend/stores/deploymentStore.ts b/frontend/stores/deploymentStore.ts
deleted file mode 100644
index e264c6b29..000000000
--- a/frontend/stores/deploymentStore.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Graph Deployment Status Store
- *
- * Architecture description:
- * - Zustand is only used for managing UI state (isDeploying, isUndeploying, etc.)
- * - Server data (deploymentStatus, versions) is obtained through React Query hooks
- * - This leverages React Query's caching and deduplication mechanisms
- *
- * Recommended usage:
- * - Use useDeploymentStatus(graphId) to get deployment status (from hooks/queries/graphs.ts)
- * - Use useDeploymentVersions(graphId) to get version history
- * - Use useDeploymentActions() to get deploy/undeploy operations
- */
-import { create } from 'zustand'
-
-import { graphDeploymentService, GraphDeployResponse } from '@/services/graphDeploymentService'
-
-// ============================================================================
-// Types
-// ============================================================================
-
-interface DeploymentUIState {
-  // UI state
-  isDeploying: boolean
-  isUndeploying: boolean
-  isReverting: boolean
-  isRenaming: boolean
-  isDeleting: boolean
-
-  // Current operation graphId (for preventing concurrent operations)
-  activeGraphId: string | null
-}
-
-interface DeploymentActions {
-  // Deployment operations
-  deploy: (graphId: string, name?: string) => Promise<GraphDeployResponse>
-  undeploy: (graphId: string) => Promise<void>
-  revertToVersion: (graphId: string, version: number) => Promise<void>
-  renameVersion: (graphId: string, version: number, name: string) => Promise<void>
-  deleteVersion: (graphId: string, version: number) => Promise<void>
-
-  // Reset state
-  reset: () => void
-}
-
-type DeploymentStore = DeploymentUIState & DeploymentActions
-
-// ============================================================================
-// Initial State
-// ============================================================================
-
-const initialState: DeploymentUIState = {
-  isDeploying: false,
-  isUndeploying: false,
-  isReverting: false,
-  isRenaming: false,
-  isDeleting: false,
-  activeGraphId: null,
-}
-
-// ============================================================================
-// Store
-// ============================================================================
-
-/**
- * Deployment UI State Store
- *
- * Note: This store no longer stores server data (deploymentStatus, versions)
- * Please use React Query hooks to get this data:
- * - useDeploymentStatus(graphId)
- * - useDeploymentVersions(graphId)
- */
-export const useDeploymentStore = create<DeploymentStore>((set, _get) => ({
-  ...initialState,
-
-  deploy: async (graphId: string, name?: string) => {
-    set({ isDeploying: true, activeGraphId: graphId })
-    try {
-      const result = await graphDeploymentService.deploy(graphId, name)
-      return result
-    } catch (error) {
-      console.error('Failed to deploy:', error)
-      throw error
-    } finally {
-      set({ isDeploying: false, activeGraphId: null })
-    }
-  },
-
-  undeploy: async (graphId: string) => {
-    set({ isUndeploying: true, activeGraphId: graphId })
-    try {
-      await graphDeploymentService.undeploy(graphId)
-    } catch (error) {
-      console.error('Failed to undeploy:', error)
-      throw error
-    } finally {
-      set({ isUndeploying: false, activeGraphId: null })
-    }
-  },
-
-  revertToVersion: async (graphId: string, version: number) => {
-    set({ isReverting: true, activeGraphId: graphId })
-    try {
-      await graphDeploymentService.revertToVersion(graphId, version)
-    } catch (error) {
-      console.error('Failed to revert version:', error)
-      throw error
-    } finally {
-      set({ isReverting: false, activeGraphId: null })
-    }
-  },
-
-  renameVersion: async (graphId: string, version: number, name: string) => {
-    set({ isRenaming: true, activeGraphId: graphId })
-    try {
-      await graphDeploymentService.renameVersion(graphId, version, name)
-    } catch (error) {
-      console.error('Failed to rename version:', error)
-      throw error
-    } finally {
-      set({ isRenaming: false, activeGraphId: null })
-    }
-  },
-
-  deleteVersion: async (graphId: string, version: number) => {
-    set({ isDeleting: true, activeGraphId: graphId })
-    try {
-      await graphDeploymentService.deleteVersion(graphId, version)
-    } catch (error) {
-      console.error('Failed to delete version:', error)
-      throw error
-    } finally {
-      set({ isDeleting: false, activeGraphId: null })
-    }
-  },
-
-  reset: () => {
-    set(initialState)
-  },
-}))
-
-// ============================================================================
diff --git a/frontend/stores/folders/store.ts b/frontend/stores/folders/store.ts
deleted file mode 100644
index 992392065..000000000
--- a/frontend/stores/folders/store.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import { create } from 'zustand'
-import { devtools, persist } from 'zustand/middleware'
-
-/**
- * Maximum folder nesting depth (2 levels: root + 1 subfolder)
- */
-export const MAX_FOLDER_DEPTH = 2
-
-/**
- * Workflow folder interface
- */
-export interface WorkflowFolder {
-  id: string
-  name: string
-  workspaceId: string
-  parentId: string | null
-  color: string
-  isExpanded: boolean
-  sortOrder: number
-  createdAt: Date
-  updatedAt: Date
-}
-
-/**
- * Folder tree node with children
- */
-export interface FolderTreeNode extends WorkflowFolder {
-  children: FolderTreeNode[]
-  level: number
-}
-
-/**
- * Folder state interface
- */
-interface FolderState {
-  folders: Record<string, WorkflowFolder>
-  expandedFolders: Set<string>
-  isLoading: boolean
-  error: string | null
-
-  // Actions
-  setFolders: (folders: WorkflowFolder[]) => void
-  addFolder: (folder: WorkflowFolder) => void
-  updateFolder: (id: string, updates: Partial<WorkflowFolder>) => void
-  removeFolder: (id: string) => void
-  toggleExpanded: (folderId: string) => void
-  setExpanded: (folderId: string, expanded: boolean) => void
-  setLoading: (loading: boolean) => void
-  setError: (error: string | null) => void
-  reset: () => void
-
-  // Computed getters
-  getFolderTree: (workspaceId: string) => FolderTreeNode[]
-  getFolderById: (id: string) => WorkflowFolder | undefined
-  getChildFolders: (parentId: string | null, workspaceId: string) => WorkflowFolder[]
-  getRootFolders: (workspaceId: string) => WorkflowFolder[]
-  getFolderDepth: (folderId: string) => number
-  canCreateSubfolder: (parentId: string) => boolean
-}
-
-const initialState = {
-  folders: {},
-  expandedFolders: new Set<string>(),
-  isLoading: false,
-  error: null,
-}
-
-export const useFolderStore = create<FolderState>()(
-  devtools(
-    persist(
-      (set, get) => ({
-        ...initialState,
-
-        setFolders: (folders) =>
-          set(() => ({
-            folders: folders.reduce(
-              (acc, folder) => {
-                acc[folder.id] = folder
-                return acc
-              },
-              {} as Record<string, WorkflowFolder>,
-            ),
-          })),
-
-        addFolder: (folder) =>
-          set((state) => ({
-            folders: { ...state.folders, [folder.id]: folder },
-          })),
-
-        updateFolder: (id, updates) =>
-          set((state) => {
-            const existing = state.folders[id]
-            if (!existing) return state
-            return {
-              folders: {
-                ...state.folders,
-                [id]: { ...existing, ...updates, updatedAt: new Date() },
-              },
-            }
-          }),
-
-        removeFolder: (id) =>
-          set((state) => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const { [id]: _, ...rest } = state.folders
-            return { folders: rest }
-          }),
-
-        toggleExpanded: (folderId) =>
-          set((state) => {
-            const newExpanded = new Set(state.expandedFolders)
-            if (newExpanded.has(folderId)) {
-              newExpanded.delete(folderId)
-            } else {
-              newExpanded.add(folderId)
-            }
-            return { expandedFolders: newExpanded }
-          }),
-
-        setExpanded: (folderId, expanded) =>
-          set((state) => {
-            const newExpanded = new Set(state.expandedFolders)
-            if (expanded) {
-              newExpanded.add(folderId)
-            } else {
-              newExpanded.delete(folderId)
-            }
-            return { expandedFolders: newExpanded }
-          }),
-
-        setLoading: (isLoading) => set({ isLoading }),
-        setError: (error) => set({ error }),
-        reset: () => set(initialState),
-
-        getFolderTree: (workspaceId) => {
-          const folders = Object.values(get().folders).filter((f) => f.workspaceId === workspaceId)
-
-          const buildTree = (parentId: string | null, level = 0): FolderTreeNode[] => {
-            // Limit to MAX_FOLDER_DEPTH levels
-            if (level >= MAX_FOLDER_DEPTH) return []
-
-            return folders
-              .filter((folder) => folder.parentId === parentId)
-              .sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name))
-              .map((folder) => ({
-                ...folder,
-                children: buildTree(folder.id, level + 1),
-                level,
-              }))
-          }
-
-          return buildTree(null)
-        },
-
-        getFolderById: (id) => get().folders[id],
-
-        getChildFolders: (parentId, workspaceId) =>
-          Object.values(get().folders)
-            .filter((folder) => folder.parentId === parentId && folder.workspaceId === workspaceId)
-            .sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name)),
-
-        getRootFolders: (workspaceId) =>
-          Object.values(get().folders)
-            .filter((folder) => folder.parentId === null && folder.workspaceId === workspaceId)
-            .sort((a, b) => a.sortOrder - b.sortOrder || a.name.localeCompare(b.name)),
-
-        getFolderDepth: (folderId) => {
-          const allFolders = get().folders
-          let depth = 0
-          let currentId: string | null = folderId
-
-          while (currentId && allFolders[currentId]) {
-            const currentFolder: WorkflowFolder = allFolders[currentId]
-            if (currentFolder.parentId) {
-              depth++
-              currentId = currentFolder.parentId
-            } else {
-              break
-            }
-          }
-
-          return depth
-        },
-
-        canCreateSubfolder: (parentId) => {
-          const depth = get().getFolderDepth(parentId)
-          // Can create if parent is at depth 0 (root folder)
-          // Depth 0 = root folder, Depth 1 = subfolder (max allowed)
-          return depth < MAX_FOLDER_DEPTH - 1
-        },
-      }),
-      {
-        name: 'folder-store',
-        partialize: (state) => ({
-          expandedFolders: Array.from(state.expandedFolders),
-        }),
-        onRehydrateStorage: () => (state) => {
-          if (state && Array.isArray(state.expandedFolders)) {
-            state.expandedFolders = new Set(state.expandedFolders as unknown as string[])
-          }
-        },
-      },
-    ),
-    { name: 'folder-store' },
-  ),
-)
diff --git a/frontend/stores/sidebar/store.ts b/frontend/stores/sidebar/store.ts
index 49d6da743..90889e9e9 100644
--- a/frontend/stores/sidebar/store.ts
+++ b/frontend/stores/sidebar/store.ts
@@ -41,9 +41,9 @@ export const useSidebarStore = create<SidebarState>()(
       },
       setIsCollapsed: (isCollapsed) => {
         set({ isCollapsed })
-        // Set width to 0 when collapsed (floating UI doesn't need sidebar space)
+        // Set width to 64px when collapsed (icon-only mode)
         if (isCollapsed && typeof window !== 'undefined') {
-          document.documentElement.style.setProperty('--sidebar-width', '0px')
+          document.documentElement.style.setProperty('--sidebar-width', '64px')
         } else if (!isCollapsed && typeof window !== 'undefined') {
           // Restore to stored width when expanding
           const currentWidth = get().sidebarWidth
@@ -65,8 +65,8 @@ export const useSidebarStore = create<SidebarState>()(
           if (!state.isCollapsed && state.sidebarWidth < MIN_SIDEBAR_WIDTH) {
             state.sidebarWidth = MIN_SIDEBAR_WIDTH
           }
-          // Use 0 width if collapsed (floating UI), otherwise use stored width
-          const width = state.isCollapsed ? 0 : state.sidebarWidth
+          // Use 64px width if collapsed (icon-only), otherwise use stored width
+          const width = state.isCollapsed ? 64 : state.sidebarWidth
           document.documentElement.style.setProperty('--sidebar-width', `${width}px`)
         }
       },
diff --git a/frontend/stores/workspace/store.ts b/frontend/stores/workspace/store.ts
new file mode 100644
index 000000000..5d8895efa
--- /dev/null
+++ b/frontend/stores/workspace/store.ts
@@ -0,0 +1,19 @@
+import { create } from 'zustand'
+import { persist } from 'zustand/middleware'
+
+interface WorkspaceState {
+  currentWorkspaceId: string | null
+  setCurrentWorkspaceId: (id: string | null) => void
+}
+
+export const useWorkspaceStore = create<WorkspaceState>()(
+  persist(
+    (set) => ({
+      currentWorkspaceId: null,
+      setCurrentWorkspaceId: (id) => set({ currentWorkspaceId: id }),
+    }),
+    {
+      name: 'workspace-state',
+    },
+  ),
+)
diff --git a/frontend/styles/globals.css b/frontend/styles/globals.css
index e3e9d3627..1853b1258 100644
--- a/frontend/styles/globals.css
+++ b/frontend/styles/globals.css
@@ -6,7 +6,7 @@
  * CSS-based layout dimensions
  */
 :root {
-  --sidebar-width: 140px;
+  --sidebar-width: 160px;
   --sidebar-width-collapsed: 64px;
 }
 
@@ -68,7 +68,7 @@
     --border-focus: #7c3aed;
 
     /* Brand */
-    --brand-50:  #f5f3ff;
+    --brand-50: #f5f3ff;
     --brand-100: #ede9fe;
     --brand-200: #ddd6fe;
     --brand-400: #8e4cfb;
@@ -79,23 +79,23 @@
     --brand-tertiary: #22c55e;
 
     /* Status */
-    --status-success:        #16a34a;
-    --status-success-bg:     #f0fdf4;
+    --status-success: #16a34a;
+    --status-success-bg: #f0fdf4;
     --status-success-border: #bbf7d0;
-    --status-success-hover:  #15803d;
+    --status-success-hover: #15803d;
     --status-success-strong: #14532d;
-    --status-warning:        #d97706;
-    --status-warning-bg:     #fffbeb;
+    --status-warning: #d97706;
+    --status-warning-bg: #fffbeb;
     --status-warning-border: #fde68a;
-    --status-error:        #dc2626;
-    --status-error-bg:     #fef2f2;
+    --status-error: #dc2626;
+    --status-error-bg: #fef2f2;
     --status-error-border: #fecaca;
-    --status-error-hover:  #b91c1c;
+    --status-error-hover: #b91c1c;
     --status-error-strong: #991b1b;
 
     /* Skill brand (emerald) */
-    --skill-brand:     #059669;
-    --skill-brand-50:  #ecfdf5;
+    --skill-brand: #059669;
+    --skill-brand-50: #ecfdf5;
     --skill-brand-100: #d1fae5;
     --skill-brand-200: #a7f3d0;
     --skill-brand-600: #059669;
@@ -162,7 +162,7 @@
     --border-focus: #38bdf8;
 
     /* Brand (sky/cyan) */
-    --brand-50:  #0c1a24;
+    --brand-50: #0c1a24;
     --brand-100: #0d2535;
     --brand-200: #0f3347;
     --brand-400: #38bdf8;
@@ -173,23 +173,23 @@
     --brand-tertiary: #10b981;
 
     /* Status */
-    --status-success:        #4ade80;
-    --status-success-bg:     #052e16;
+    --status-success: #4ade80;
+    --status-success-bg: #052e16;
     --status-success-border: #166534;
-    --status-success-hover:  #86efac;
+    --status-success-hover: #86efac;
     --status-success-strong: #bbf7d0;
-    --status-warning:        #fbbf24;
-    --status-warning-bg:     #1c0f00;
+    --status-warning: #fbbf24;
+    --status-warning-bg: #1c0f00;
     --status-warning-border: #78350f;
-    --status-error:        #f87171;
-    --status-error-bg:     #1c0505;
+    --status-error: #f87171;
+    --status-error-bg: #1c0505;
     --status-error-border: #7f1d1d;
-    --status-error-hover:  #fca5a5;
+    --status-error-hover: #fca5a5;
     --status-error-strong: #fecaca;
 
     /* Skill brand (emerald) */
-    --skill-brand:     #34d399;
-    --skill-brand-50:  #022c22;
+    --skill-brand: #34d399;
+    --skill-brand-50: #022c22;
     --skill-brand-100: #064e3b;
     --skill-brand-200: #065f46;
     --skill-brand-600: #34d399;
@@ -232,10 +232,18 @@
 
 @layer utilities {
   .brand-gradient {
-    background-image: linear-gradient(to bottom right, var(--gradient-brand-from), var(--gradient-brand-to));
+    background-image: linear-gradient(
+      to bottom right,
+      var(--gradient-brand-from),
+      var(--gradient-brand-to)
+    );
   }
   .brand-gradient-text {
-    background-image: linear-gradient(to right, var(--gradient-brand-from), var(--gradient-brand-to));
+    background-image: linear-gradient(
+      to right,
+      var(--gradient-brand-from),
+      var(--gradient-brand-to)
+    );
     -webkit-background-clip: text;
     background-clip: text;
     -webkit-text-fill-color: transparent;
diff --git a/frontend/tailwind.config.ts b/frontend/tailwind.config.ts
index 4ea7ed06c..e8bbf7d12 100644
--- a/frontend/tailwind.config.ts
+++ b/frontend/tailwind.config.ts
@@ -10,14 +10,14 @@ export default {
   ],
   theme: {
     fontSize: {
-      '2xs': ['7px', { lineHeight: '10px' }],
-      'xs':  ['9px', { lineHeight: '14px' }],
-      'sm':  ['11px', { lineHeight: '16px' }],
-      'base': ['13px', { lineHeight: '18px' }],
-      'lg':  ['15px', { lineHeight: '22px' }],
-      'xl':  ['18px', { lineHeight: '26px' }],
-      '2xl': ['22px', { lineHeight: '30px' }],
-      '3xl': ['28px', { lineHeight: '36px' }],
+      '2xs': ['9px', { lineHeight: '12px' }],
+      xs: ['11px', { lineHeight: '16px' }],
+      sm: ['12px', { lineHeight: '18px' }],
+      base: ['14px', { lineHeight: '20px' }],
+      lg: ['16px', { lineHeight: '24px' }],
+      xl: ['20px', { lineHeight: '28px' }],
+      '2xl': ['24px', { lineHeight: '32px' }],
+      '3xl': ['30px', { lineHeight: '38px' }],
     },
     extend: {
       fontFamily: {
@@ -25,10 +25,10 @@ export default {
         mono: ['var(--font-geist-mono)'],
       },
       zIndex: {
-        'popover': '100',
-        'modal':   '200',
-        'sheet':   '250',
-        'top':     '300',
+        popover: '100',
+        modal: '200',
+        sheet: '250',
+        top: '300',
       },
       colors: {
         background: 'hsl(var(--background))',
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 6e0e889c9..6f2ed5768 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -3,41 +3,21 @@
     "target": "es2022",
     "module": "esnext",
     "moduleResolution": "bundler",
-    "lib": [
-      "es2022",
-      "dom",
-      "dom.iterable"
-    ],
+    "lib": ["es2022", "dom", "dom.iterable"],
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": [
-        "./*"
-      ],
-      "@/components/*": [
-        "components/*"
-      ],
-      "@/lib/*": [
-        "./lib/*"
-      ],
-      "@/stores": [
-        "./stores"
-      ],
-      "@/stores/*": [
-        "./stores/*"
-      ],
-      "@/hooks/*": [
-        "./hooks/*"
-      ],
-      "@/providers/*": [
-        "./providers/*"
-      ],
-      "@/providers": [
-        "./providers"
-      ]
+      "@/*": ["./*"],
+      "@/components/*": ["components/*"],
+      "@/lib/*": ["./lib/*"],
+      "@/stores": ["./stores"],
+      "@/stores/*": ["./stores/*"],
+      "@/hooks/*": ["./hooks/*"],
+      "@/providers/*": ["./providers/*"],
+      "@/providers": ["./providers"]
     },
     "allowJs": true,
     "noEmit": true,
@@ -52,12 +32,7 @@
       }
     ]
   },
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    ".next/dev/types/**/*.ts"
-  ],
+  "include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts"],
   "exclude": [
     "node_modules",
     "lib/auth/auth.ts",
diff --git a/frontend/types.ts b/frontend/types.ts
index b2ffb9ef7..538ab42c0 100644
--- a/frontend/types.ts
+++ b/frontend/types.ts
@@ -1,44 +1,3 @@
-export interface Position {
-  x: number
-  y: number
-}
-
-export interface Viewport {
-  x: number
-  y: number
-  zoom: number
-}
-
-export enum NodeType {
-  USER = 'USER',
-  AI = 'AI',
-}
-
-export interface Message {
-  id: string
-  role: 'user' | 'assistant' | 'system'
-  content: string
-  timestamp: number
-  tool_calls?: ToolCall[]
-  isStreaming?: boolean
-  metadata?: {
-    lastNode?: string
-    lastRunId?: string
-    lastUpdate?: number
-    [key: string]: unknown
-  }
-}
-
-export interface ToolCall {
-  id: string
-  name: string
-  args: Record<string, unknown>
-  status: 'running' | 'completed' | 'failed'
-  result?: string | Record<string, unknown>
-  startTime: number
-  endTime?: number
-}
-
 // File extensions that are commonly used and safe
 export const COMMON_EXTENSIONS = new Set([
   '.md',
@@ -159,32 +118,6 @@ export interface Skill {
   updatedAt?: number
 }
 
-export interface CanvasNode {
-  id: string
-  parentId: string | null
-  type: NodeType
-  content: string
-  position: Position
-  width: number
-  isStreaming?: boolean
-  createdAt: number
-  toolCalls?: ToolCall[]
-  data?: Record<string, unknown>
-}
-
-export interface Edge {
-  id: string
-  source: string
-  target: string
-}
-
-export interface ChatMessage {
-  role: 'user' | 'model'
-  parts: { text: string }[]
-}
-
-export type ViewMode = 'chat' | 'builder' | 'skills'
-
 // Execution Panel Types
 export type ExecutionStepType =
   | 'node_lifecycle'
@@ -192,6 +125,7 @@ export type ExecutionStepType =
   | 'tool_execution'
   | 'system_log'
   | 'model_io'
+  | 'artifact'
   | 'code_agent_thought'
   | 'code_agent_code'
   | 'code_agent_observation'
diff --git a/frontend/types/agent-release.ts b/frontend/types/agent-release.ts
new file mode 100644
index 000000000..16539bb2a
--- /dev/null
+++ b/frontend/types/agent-release.ts
@@ -0,0 +1,34 @@
+import type { RuntimeKind } from './agent'
+
+export type { RuntimeKind }
+
+export const RELEASE_STATUSES = ['ready', 'active', 'superseded', 'failed', 'retired'] as const
+
+export type ReleaseStatus = (typeof RELEASE_STATUSES)[number]
+
+export interface AgentRelease {
+  id: string
+  agent_version_id: string
+  release_number: number
+  status: ReleaseStatus
+  runtime_kind: RuntimeKind
+  builder_kind: string | null
+  executable_ref: Record<string, unknown> | null
+  runtime_binding: Record<string, unknown>
+  published_by: string | null
+  published_at: string | null
+  retired_at: string | null
+}
+
+export const canRollback = (status: ReleaseStatus): boolean =>
+  status === 'ready' || status === 'superseded'
+
+export const canRetire = (status: ReleaseStatus): boolean =>
+  status === 'ready' || status === 'superseded' || status === 'failed'
+
+export interface CreateAgentReleaseRequest {
+  agent_version_id: string
+  runtime_kind: RuntimeKind
+  builder_kind?: string
+  runtime_binding?: Record<string, unknown>
+}
diff --git a/frontend/types/agent-run.ts b/frontend/types/agent-run.ts
new file mode 100644
index 000000000..bd3f8430b
--- /dev/null
+++ b/frontend/types/agent-run.ts
@@ -0,0 +1,203 @@
+export const TRIGGER_MEDIUMS = ['api', 'scheduler', 'system', 'ui'] as const
+
+export type TriggerMedium = (typeof TRIGGER_MEDIUMS)[number]
+
+export const RUN_PURPOSES = ['production', 'draft_test', 'debug', 'internal_builder'] as const
+
+export type RunPurpose = (typeof RUN_PURPOSES)[number]
+
+export interface AgentRun {
+  id: string
+  release_id: string
+  workspace_id: string
+  thread_id: string | null
+  task_id: string | null
+  trigger_medium: TriggerMedium
+  run_purpose: RunPurpose
+  goal: string | null
+  input_payload: Record<string, unknown> | null
+  status: AgentRunStatus
+  current_execution_id: string | null
+  result_summary: string | null
+  started_at: string | null
+  ended_at: string | null
+  created_by: string | null
+  created_at: string
+}
+
+export const RUN_STATUSES = ['pending', 'running', 'succeeded', 'failed', 'cancelled'] as const
+
+export type AgentRunStatus = (typeof RUN_STATUSES)[number]
+
+export const ACTIVE_RUN_STATUSES: readonly AgentRunStatus[] = ['pending', 'running'] as const
+
+export const TERMINAL_RUN_STATUSES: readonly AgentRunStatus[] = [
+  'succeeded',
+  'failed',
+  'cancelled',
+] as const
+
+export const RUN_STATUS_STYLES: Record<AgentRunStatus, string> = {
+  pending: 'border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-secondary)]',
+  running:
+    'border-[var(--skill-brand-200)] bg-[var(--skill-brand-50)] text-[var(--skill-brand-700)]',
+  succeeded:
+    'border-[var(--status-success-bg)] bg-[var(--status-success-bg)] text-[var(--status-success)]',
+  failed: 'border-[var(--status-error)] bg-[var(--surface-2)] text-[var(--status-error)]',
+  cancelled: 'border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-muted)]',
+}
+
+export const RUN_STATUS_I18N: Record<AgentRunStatus, string> = {
+  pending: 'execution.statusPending',
+  running: 'execution.statusRunning',
+  succeeded: 'execution.statusSucceeded',
+  failed: 'execution.statusFailed',
+  cancelled: 'execution.statusCancelled',
+}
+
+export interface CreateAgentRunRequest {
+  release_id: string
+  thread_id?: string
+  task_id?: string
+  trigger_medium: TriggerMedium
+  run_purpose: RunPurpose
+  goal?: string
+  input_payload?: Record<string, unknown>
+}
+
+export const EXECUTION_STATUSES = [
+  'pending',
+  'dispatched',
+  'running',
+  'approval_wait',
+  'succeeded',
+  'failed',
+  'cancelled',
+] as const
+
+export type ExecutionStatus = (typeof EXECUTION_STATUSES)[number]
+
+export const ACTIVE_EXECUTION_STATUSES: readonly ExecutionStatus[] = [
+  'pending',
+  'dispatched',
+  'running',
+  'approval_wait',
+] as const
+
+export const TERMINAL_EXECUTION_STATUSES: readonly ExecutionStatus[] = [
+  'succeeded',
+  'failed',
+  'cancelled',
+] as const
+
+export const EXECUTION_STATUS_STYLES: Record<ExecutionStatus, string> = {
+  pending: 'border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-secondary)]',
+  dispatched: 'border-[var(--brand-200)] bg-[var(--brand-50)] text-[var(--brand-700)]',
+  running:
+    'border-[var(--skill-brand-200)] bg-[var(--skill-brand-50)] text-[var(--skill-brand-700)]',
+  approval_wait:
+    'border-[var(--status-warning-bg)] bg-[var(--status-warning-bg)] text-[var(--status-warning)]',
+  succeeded:
+    'border-[var(--status-success-bg)] bg-[var(--status-success-bg)] text-[var(--status-success)]',
+  failed: 'border-[var(--status-error)] bg-[var(--surface-2)] text-[var(--status-error)]',
+  cancelled: 'border-[var(--border)] bg-[var(--surface-2)] text-[var(--text-muted)]',
+}
+
+export const EXECUTION_STATUS_I18N: Record<ExecutionStatus, string> = {
+  pending: 'execution.statusPending',
+  dispatched: 'execution.statusDispatched',
+  running: 'execution.statusRunning',
+  approval_wait: 'execution.statusApprovalWait',
+  succeeded: 'execution.statusSucceeded',
+  failed: 'execution.statusFailed',
+  cancelled: 'execution.statusCancelled',
+}
+
+export type ExecutionEventType =
+  | 'assistant_text'
+  | 'thinking'
+  | 'tool_use_start'
+  | 'tool_use_end'
+  | 'error'
+  | 'artifact_created'
+  | 'approval_requested'
+  | 'approval_resolved'
+  | 'user_message'
+  | 'execution_started'
+  | 'execution_completed'
+  | 'execution_status_change'
+  | 'run_status_change'
+  | 'copilot_status'
+  | 'copilot_content'
+  | 'copilot_thought_step'
+  | 'copilot_tool_call'
+  | 'copilot_tool_result'
+  | 'copilot_result'
+
+export interface Execution {
+  id: string
+  run_id: string
+  parent_execution_id: string | null
+  attempt_index: number
+  engine_kind: string
+  runtime_session_ref: string | null
+  status: ExecutionStatus
+  error: AppErrorPayload | null
+  metrics: Record<string, unknown> | null
+  started_at: string | null
+  ended_at: string | null
+  created_at: string
+}
+
+export type ErrorSource =
+  | 'api'
+  | 'engine'
+  | 'runtime'
+  | 'node'
+  | 'tool'
+  | 'websocket'
+  | 'auth'
+  | 'validation'
+  | 'permission'
+  | 'internal'
+
+export type UserAction = 'retry' | 'configure_model' | 'relogin' | 'fix_input' | 'contact_support'
+
+export interface AppErrorPayload {
+  code: string
+  message: string
+  data: Record<string, unknown> | null
+  source?: ErrorSource
+  retryable?: boolean
+  user_action?: UserAction
+  detail?: string
+}
+
+export interface ExecutionEvent {
+  id: string
+  execution_id: string
+  seq: number
+  event_type: ExecutionEventType
+  payload: Record<string, unknown>
+  created_at: string
+}
+
+export interface ExecutionEventsPage {
+  execution_id: string
+  events: ExecutionEvent[]
+  next_after_seq: number
+}
+
+export interface ExecutionSnapshot {
+  execution_id: string
+  last_seq: number
+  status: string
+  projection: {
+    last_text?: string
+    tool_count?: number
+    current_tool?: string | null
+    artifacts?: Record<string, unknown>[]
+    approval_pending?: Record<string, unknown> | null
+    error?: string | null
+  }
+}
diff --git a/frontend/types/agent.ts b/frontend/types/agent.ts
new file mode 100644
index 000000000..76dcd2729
--- /dev/null
+++ b/frontend/types/agent.ts
@@ -0,0 +1,79 @@
+export const ENGINE_KINDS = [
+  'langgraph_visual',
+  'langgraph_code',
+  'claude_code',
+  'codex',
+  'openclaw',
+] as const
+
+export type EngineKind = (typeof ENGINE_KINDS)[number]
+
+export const RUNTIME_KINDS = ['sandbox', 'server'] as const
+
+export type RuntimeKind = (typeof RUNTIME_KINDS)[number]
+
+export function hasBuilderSupport(kind?: string): boolean {
+  return ENGINE_KINDS.includes(kind as EngineKind)
+}
+
+export interface Agent {
+  id: string
+  workspace_id: string
+  name: string
+  slug: string
+  description: string | null
+  avatar: string | null
+  status: 'draft' | 'active' | 'archived'
+  has_custom_env: boolean
+  current_draft_version_id: string | null
+  active_release_id: string | null
+  engine_kind: EngineKind | null
+  runtime_kind: RuntimeKind | null
+  created_by: string
+  created_at: string
+  updated_at: string
+}
+
+export interface CreateAgentRequest {
+  name: string
+  description?: string
+  avatar?: string
+  engine_kind: EngineKind
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+}
+
+export interface UpdateAgentRequest {
+  name?: string
+  description?: string
+  avatar?: string
+  status?: 'draft' | 'active' | 'archived'
+}
+
+export interface AgentVersion {
+  id: string
+  agent_id: string
+  version_number: number
+  status: 'draft' | 'frozen'
+  source_kind: string
+  engine_kind: EngineKind
+  definition_payload: Record<string, unknown>
+  capability_manifest: Record<string, unknown>
+  changelog: string | null
+  created_by: string
+  created_at: string
+}
+
+export interface CreateAgentVersionRequest {
+  source_kind?: string
+  engine_kind: EngineKind
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+  changelog?: string
+}
+
+export interface UpdateAgentVersionRequest {
+  definition_payload?: Record<string, unknown>
+  capability_manifest?: Record<string, unknown>
+  changelog?: string
+}
diff --git a/frontend/types/chat.ts b/frontend/types/chat.ts
new file mode 100644
index 000000000..36bf019d5
--- /dev/null
+++ b/frontend/types/chat.ts
@@ -0,0 +1,21 @@
+export interface Message {
+  id: string
+  role: 'user' | 'assistant' | 'system' | 'tool'
+  content: string
+  tool_calls?: ToolCall[]
+  created_at?: string
+  timestamp?: number
+  isStreaming?: boolean
+}
+
+export interface ToolCall {
+  id: string
+  name: string
+  args?: Record<string, unknown>
+  input?: Record<string, unknown>
+  output?: string
+  result?: unknown
+  status?: 'running' | 'completed' | 'failed'
+  startTime?: number
+  endTime?: number
+}
diff --git a/frontend/types/copilot.ts b/frontend/types/copilot.ts
index 7774529b8..4283c9245 100644
--- a/frontend/types/copilot.ts
+++ b/frontend/types/copilot.ts
@@ -8,6 +8,8 @@
  * UI presentation types are defined inline where used (e.g. in CopilotStreaming).
  */
 
+import type { AppErrorPayload } from '@/types/agent-run'
+
 export type GraphActionType =
   | 'CREATE_NODE'
   | 'CONNECT_NODES'
@@ -48,7 +50,7 @@ export interface ConversationMessage {
 export interface StreamGraphActionsCallbacks {
   onStatus: (stage: string, message: string) => void
   onResult: (response: CopilotResponse) => void
-  onError: (error: string) => void
+  onError: (error: AppErrorPayload) => void
   onThoughtStep: (step: { index: number; content: string }) => void
   onContent: (content: string) => void
   onToolCall: (tool: string, input: Record<string, unknown>) => void
diff --git a/frontend/types/models.ts b/frontend/types/models.ts
index 9cc34c708..b9942b656 100644
--- a/frontend/types/models.ts
+++ b/frontend/types/models.ts
@@ -106,7 +106,11 @@ export interface AvailableModel {
   description: string
   is_available: boolean
   model_parameters?: Record<string, unknown>
-  unavailable_reason?: 'no_credentials' | 'invalid_credentials' | 'model_not_found' | 'provider_error'
+  unavailable_reason?:
+    | 'no_credentials'
+    | 'invalid_credentials'
+    | 'model_not_found'
+    | 'provider_error'
 }
 
 // ==================== Provider Defaults ====================
@@ -214,6 +218,7 @@ export interface TestModelStreamMetrics {
 export interface TestModelStreamState {
   output: string
   metrics: TestModelStreamMetrics | null
-  error: string | null
+  error: ApiErrorPayload | null
   isStreaming: boolean
 }
+import type { ApiErrorPayload } from '@/lib/api-client'
diff --git a/frontend/types/task-activities.ts b/frontend/types/task-activities.ts
new file mode 100644
index 000000000..25c246ce9
--- /dev/null
+++ b/frontend/types/task-activities.ts
@@ -0,0 +1,26 @@
+export type ActivityAuthorType = 'member' | 'agent'
+export type ActivityType = 'comment' | 'status_change' | 'progress_update' | 'system'
+
+export interface TaskActivity {
+  id: string
+  task_id: string
+  workspace_id: string
+  author_type: ActivityAuthorType
+  author_id: string
+  content: string
+  type: ActivityType
+  parent_activity_id: string | null
+  created_at: string
+  updated_at: string
+}
+
+export interface CreateTaskActivityRequest {
+  content: string
+  parent_activity_id?: string
+}
+
+export interface TaskActivityListResponse {
+  items: TaskActivity[]
+  has_more: boolean
+  next_cursor: string | null
+}
diff --git a/frontend/types/tasks.ts b/frontend/types/tasks.ts
new file mode 100644
index 000000000..f561dd6af
--- /dev/null
+++ b/frontend/types/tasks.ts
@@ -0,0 +1,104 @@
+export interface Task {
+  id: string
+  workspace_id: string
+  title: string
+  description?: string | null
+  goal?: string | null
+  status: TaskStatus
+  priority: TaskPriority
+  /** Backend primary field for assigned agent */
+  agent_id?: string | null
+  creator_id: string
+  /** ID of the most recent AgentRun for this task */
+  latest_run_id?: string | null
+  /** ID of the current Execution for this task's active AgentRun */
+  current_execution_id?: string | null
+  parent_task_id?: string | null
+  tags?: string[] | null
+  position: number
+  auto_approve: boolean
+  due_date?: string | null
+  created_at: string
+  updated_at: string
+}
+
+export type TaskStatus = 'backlog' | 'todo' | 'in_progress' | 'in_review' | 'done' | 'cancelled'
+export type TaskPriority = 'none' | 'low' | 'medium' | 'high' | 'urgent'
+
+export interface CreateTaskRequest {
+  workspace_id: string
+  title: string
+  description?: string
+  goal?: string
+  priority?: TaskPriority
+  parent_task_id?: string
+  tags?: string[]
+  auto_approve?: boolean
+}
+
+export interface UpdateTaskRequest {
+  title?: string
+  description?: string
+  goal?: string
+  status?: TaskStatus
+  priority?: TaskPriority
+  position?: number
+  tags?: string[]
+  due_date?: string | null
+  agent_id?: string | null
+  auto_approve?: boolean
+}
+
+export interface AssignTaskRequest {
+  agent_id: string
+}
+
+export const TASK_STATUS_ORDER: TaskStatus[] = [
+  'backlog',
+  'todo',
+  'in_progress',
+  'in_review',
+  'done',
+  'cancelled',
+]
+
+/** Statuses treated as "inactive" in UI (hide dispatch button, etc.).
+ *  Note: Backend allows reopening these via backlog transition — they are NOT truly terminal. */
+export const INACTIVE_TASK_STATUSES: readonly TaskStatus[] = ['done', 'cancelled'] as const
+
+export const TASK_STATUS_LABELS: Record<TaskStatus, string> = {
+  backlog: '待处理',
+  todo: '待执行',
+  in_progress: '进行中',
+  in_review: '需检查',
+  done: '已完成',
+  cancelled: '已取消',
+}
+
+export const TASK_PRIORITY_LABELS: Record<TaskPriority, string> = {
+  none: '无',
+  low: '低',
+  medium: '中',
+  high: '高',
+  urgent: '紧急',
+}
+
+export const TASK_STATUS_STYLES: Record<string, string> = {
+  backlog: 'bg-[var(--surface-3)] text-[var(--text-secondary)]',
+  todo: 'bg-[var(--surface-3)] text-[var(--brand-400)]',
+  in_progress: 'bg-[var(--status-warning-bg)] text-[var(--status-warning)]',
+  in_review: 'bg-[var(--surface-3)] text-[var(--text-secondary)]',
+  done: 'bg-[var(--status-success-bg)] text-[var(--status-success)]',
+  cancelled: 'bg-[var(--surface-3)] text-[var(--text-muted)]',
+}
+
+/** Fallback transitions — used before API response arrives.
+ *  Must mirror backend TASK_STATES in core/state_machines/definitions.py */
+export const DEFAULT_MANUAL_TRANSITIONS: Record<TaskStatus, readonly TaskStatus[]> = {
+  backlog: ['todo', 'in_progress', 'cancelled'],
+  todo: ['in_progress', 'backlog', 'cancelled'],
+  in_progress: ['done', 'in_review', 'cancelled', 'backlog'],
+  in_review: ['in_progress', 'done', 'backlog', 'cancelled'],
+  done: ['backlog'],
+  cancelled: ['backlog'],
+}
diff --git a/frontend/types/thread.ts b/frontend/types/thread.ts
new file mode 100644
index 000000000..819cef120
--- /dev/null
+++ b/frontend/types/thread.ts
@@ -0,0 +1,43 @@
+export interface Thread {
+  id: string
+  agent_id: string
+  workspace_id: string
+  title: string | null
+  status: 'active' | 'archived'
+  created_by: string
+  created_at: string
+  updated_at: string
+}
+
+export interface ChatAttachment {
+  filename: string
+  storage_ref: string
+  mime_type: string
+  size_bytes: number
+}
+
+export interface ThreadEvent {
+  id: string
+  run_id: string
+  execution_id: string
+  sequence_no: number
+  event_type: string
+  payload: Record<string, unknown>
+  execution_status: string
+  created_at: string
+}
+
+export interface CreateThreadRequest {
+  agent_id: string
+  title?: string
+}
+
+export interface UpdateThreadRequest {
+  title?: string
+  status?: 'active' | 'archived'
+}
+
+export interface ChatResponse {
+  run_id: string
+  execution_id: string
+}
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index 6403abc95..ca0f35423 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -4,7 +4,6 @@ import react from '@vitejs/plugin-react'
 import tsconfigPaths from 'vite-tsconfig-paths'
 import { defineConfig } from 'vitest/config'
 
-
 export default defineConfig({
   plugins: [react(), tsconfigPaths()],
   resolve: {
diff --git a/skills/planning-with-files/scripts/session-catchup.py b/skills/planning-with-files/scripts/session-catchup.py
index 281cebb47..263024440 100755
--- a/skills/planning-with-files/scripts/session-catchup.py
+++ b/skills/planning-with-files/scripts/session-catchup.py
@@ -13,7 +13,6 @@
 import os
 from pathlib import Path
 from typing import List, Dict, Optional, Tuple
-from datetime import datetime
 
 PLANNING_FILES = ['task_plan.md', 'progress.md', 'findings.md']