@@ -134,7 +134,7 @@ report.save_html('output.html')
 
 ## MCP Server
 
-For structured tool calls (29 tools), start the MCP server:
+For structured tool calls (31 tools), start the MCP server:
 ```bash
 scomp-link mcp
 ```
@@ -156,7 +156,9 @@ For building custom branded HTML reports step-by-step:
 10. report_add_dark_mode_toggle(report_id) → floating dark/light toggle
 11. report_add_code(report_id, code, language, title, output, line_numbers, collapsed) → syntax-highlighted code block with copy button
 12. report_add_diff(report_id, old_code, new_code, language, title, old_label, new_label, collapsed) → side-by-side diff view
-13. report_save(report_id, output) → saves HTML, frees memory
+13. report_add_mermaid(report_id, diagram, title, collapsed) → Mermaid.js diagram (flowchart, sequence, gantt, etc.)
+14. report_add_terminal(report_id, cast_data, title, cols, rows, theme, collapsed) → embedded terminal replay (asciinema)
+15. report_save(report_id, output) → saves HTML, frees memory
 ```
 
 **Engines:** plotly (interactive), rawgraphs (SVG static), highcharts (time series)
 
@@ -14,7 +14,7 @@
 [![Security: CodeQL](https://img.shields.io/badge/security-CodeQL-green?logo=github)](https://github.com/GiacomoSaccaggi/scomp_link/security)
 [![Docker](https://img.shields.io/docker/v/jack15121/scomp-link?label=docker&logo=docker)](https://hub.docker.com/r/jack15121/scomp-link)
 [![Docs](https://img.shields.io/badge/docs-GitHub%20Pages-blue?logo=github)](https://giacomosaccaggi.github.io/scomp_link/)
-[![MCP](https://img.shields.io/badge/MCP-29_tools-blue?logo=anthropic)](https://modelcontextprotocol.io)
+[![MCP](https://img.shields.io/badge/MCP-31_tools-blue?logo=anthropic)](https://modelcontextprotocol.io)
 [![Smithery](https://img.shields.io/badge/Smithery-scomp--link-purple)](https://smithery.ai/servers/giacomosaccaggi/scomp-link)
 [![HuggingFace](https://img.shields.io/badge/%F0%9F%A4%97-MCP%20Space-yellow)](https://huggingface.co/spaces/Euribor512/scomp-link)
 [![Claude](https://img.shields.io/badge/Works_with-Claude-blueviolet?logo=anthropic)](AGENT_INTEGRATION.md)
@@ -389,7 +389,7 @@ scomp_link/
 
 scomp-link works natively with AI agents via **MCP (Model Context Protocol)** and **Agent Skills**.
 
-### MCP Server (29 tools for structured agent calls)
+### MCP Server (31 tools for structured agent calls)
 
 ```bash
 pip install scomp-link[mcp]
@@ -421,13 +421,13 @@ docker pull jack15121/scomp-link:latest
 docker run -i jack15121/scomp-link mcp
 ```
 
-**Available tools:** `describe_data`, `train_model`, `predict`, `validate_model`, `detect_drift`, `detect_anomalies`, `check_fairness`, `forecast_series`, `engineer_features`, `cluster_data`, `generate_report`, `create_visualization`, `compare_models`, `export_model`, `embed_text`, `select_backbone`, `report_create`, `report_add_section`, `report_add_text`, `report_add_table`, `report_add_chart`, `report_add_kpi_cards`, `report_add_tabs`, `report_add_comparison_table`, `report_add_summary_stats`, `report_add_dark_mode_toggle`, `report_add_code`, `report_add_diff`, `report_save`
+**Available tools:** `describe_data`, `train_model`, `predict`, `validate_model`, `detect_drift`, `detect_anomalies`, `check_fairness`, `forecast_series`, `engineer_features`, `cluster_data`, `generate_report`, `create_visualization`, `compare_models`, `export_model`, `embed_text`, `select_backbone`, `report_create`, `report_add_section`, `report_add_text`, `report_add_table`, `report_add_chart`, `report_add_kpi_cards`, `report_add_tabs`, `report_add_comparison_table`, `report_add_summary_stats`, `report_add_dark_mode_toggle`, `report_add_code`, `report_add_diff`, `report_add_mermaid`, `report_add_terminal`, `report_save`
 
 ### Quick Setup Prompt for AI Agents
 
 Copy-paste this prompt into your AI agent (Claude, ChatGPT, Cursor, etc.) to enable scomp-link capabilities:
 
-> You have access to scomp-link, an ML toolkit with 29 MCP tools. Use them for:
+> You have access to scomp-link, an ML toolkit with 31 MCP tools. Use them for:
 > - **Data profiling**: `describe_data(path)` — always start here
 > - **Training**: `train_model(data, target, task)` with optional `tune=true` for Optuna
 > - **Validation**: `validate_model(artifact, data, target)` for test evaluation
 
@@ -44,7 +44,7 @@ cp -r /path/to/scomp_link/skills/scomp-link .github/copilot/skills/
 
 ## 2. MCP Server — Model Context Protocol (Structured Tools)
 
-The MCP server exposes 29 tools, 3 resources, and 4 prompts over the standard MCP protocol. Any MCP-compatible client can discover and call them with typed inputs.
+The MCP server exposes 31 tools, 3 resources, and 4 prompts over the standard MCP protocol. Any MCP-compatible client can discover and call them with typed inputs.
 
 ### Install
 
 
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scomp-link"
-version = "2.1.2"
+version = "2.2.0"
 description = "The Astromech arm for your Python data projects — end-to-end ML toolkit"
 readme = "README.md"
 license = {text = "MIT"}
@@ -174,7 +174,7 @@ shap = [
 
 # MCP server for AI agent integration
 mcp = [
-    "mcp>=1.0.0,<2.0.0",
+    "mcp>=2.0.0,<3.0.0",
 ]
 
 # REST API serving
 
@@ -9,7 +9,7 @@
 
 from .utils.logger import set_verbosity
 
-__version__ = "2.1.2"
+__version__ = "2.2.0"
 
 __all__ = [
     "set_verbosity",
@@ -48,6 +48,8 @@
     "SaveStep",
     "CodeStep",
     "DiffStep",
+    "MermaidStep",
+    "TerminalStep",
 ]
 
 _LAZY_IMPORTS = {
@@ -96,6 +98,8 @@
     "LogStep": (".pipeline_dsl", "LogStep"),
     "CodeStep": (".pipeline_dsl", "CodeStep"),
     "DiffStep": (".pipeline_dsl", "DiffStep"),
+    "MermaidStep": (".pipeline_dsl", "MermaidStep"),
+    "TerminalStep": (".pipeline_dsl", "TerminalStep"),
 }
 
 
 
@@ -25,7 +25,7 @@
 from pathlib import Path
 from typing import Literal, Optional, cast
 
-from mcp.server.fastmcp import FastMCP
+from mcp.server.mcpserver import MCPServer
 
 # ═══════════════════════════════════════════════════════════════════
 # AUTO-UPDATE SYSTEM
@@ -151,7 +151,7 @@ def _maybe_auto_update() -> Optional[dict]:
     return update_result
 
 
-mcp = FastMCP(
+mcp = MCPServer(
     "scomp-link",
     instructions="End-to-end ML toolkit: train models, tune hyperparameters, detect drift, "
     "generate HTML reports with 39 chart types, detect anomalies, forecast time series, "
@@ -1423,6 +1423,71 @@ def report_add_diff(
     return json.dumps({"status": "diff_added", "language": language, "collapsed": collapsed})
 
 
+@mcp.tool()
+def report_add_mermaid(report_id: str, diagram: str, title: str = "", collapsed: bool = False) -> str:
+    """Add a Mermaid.js diagram to the report.
+
+    Renders flowcharts, sequence diagrams, class diagrams, gantt charts, state diagrams,
+    ER diagrams, and more. Uses Mermaid.js syntax.
+
+    Parameters:
+        report_id: The report ID returned by report_create.
+        diagram: Mermaid diagram definition string.
+                 Example: "graph TD; A[Start]-->B[Train]; B-->C[Validate]; C-->D[Deploy];"
+        title: Optional title above the diagram.
+        collapsed: Wrap in collapsible element (default: false).
+
+    Common diagram types:
+        - graph TD (top-down flowchart)
+        - graph LR (left-right flowchart)
+        - sequenceDiagram
+        - classDiagram
+        - gantt
+        - stateDiagram-v2
+        - erDiagram
+        - pie
+    """
+    report = _get_report(report_id)
+    if not report:
+        return json.dumps({"error": f"Report '{report_id}' not found. Use report_create first."})
+
+    report.add_mermaid(diagram, title, collapsed=collapsed)
+    return json.dumps({"status": "mermaid_added", "collapsed": collapsed})
+
+
+@mcp.tool()
+def report_add_terminal(
+    report_id: str,
+    cast_data: str,
+    title: str = "",
+    cols: int = 80,
+    rows: int = 24,
+    theme: str = "dracula",
+    collapsed: bool = False,
+) -> str:
+    """Add an embedded terminal replay (asciinema player) to the report.
+
+    Embeds an interactive terminal session that plays back recorded commands and output.
+    The user can play/pause/seek through the recording.
+
+    Parameters:
+        report_id: The report ID returned by report_create.
+        cast_data: Content of an asciinema .cast file (v2 format, JSON lines).
+                   Generate with: asciinema rec demo.cast
+        title: Optional title above the terminal.
+        cols: Terminal width in columns (default: 80).
+        rows: Terminal height in rows (default: 24).
+        theme: Player theme — "dracula", "monokai", "solarized-dark", "tango" (default: "dracula").
+        collapsed: Wrap in collapsible element (default: false).
+    """
+    report = _get_report(report_id)
+    if not report:
+        return json.dumps({"error": f"Report '{report_id}' not found. Use report_create first."})
+
+    report.add_terminal(cast_data, title, cols=cols, rows=rows, theme=theme, collapsed=collapsed)
+    return json.dumps({"status": "terminal_added", "cols": cols, "rows": rows, "collapsed": collapsed})
+
+
 # ═══════════════════════════════════════════════════════════════════
 # RESOURCES
 # ═══════════════════════════════════════════════════════════════════
 
@@ -534,6 +534,73 @@ def execute(self, report: "ScompLinkHTMLReport") -> "ScompLinkHTMLReport":
         return report
 
 
+class MermaidStep(ReportStep):
+    """
+    Adds a Mermaid.js diagram to the report.
+
+    Parameters
+    ----------
+    diagram : str
+        Mermaid diagram definition.
+    title : str
+        Optional title above the diagram.
+    collapsed : bool
+        Wrap in collapsible element (default: False).
+    """
+
+    def __init__(self, diagram: str, title: str = "", collapsed: bool = False):
+        self.diagram = diagram
+        self.title = title
+        self.collapsed = collapsed
+
+    def execute(self, report: "ScompLinkHTMLReport") -> "ScompLinkHTMLReport":
+        report.add_mermaid(self.diagram, self.title, collapsed=self.collapsed)
+        return report
+
+
+class TerminalStep(ReportStep):
+    """
+    Adds an embedded terminal replay (asciinema) to the report.
+
+    Parameters
+    ----------
+    cast_data : str
+        Asciinema cast file content (v2 format).
+    title : str
+        Optional title above the terminal.
+    cols : int
+        Terminal width (default: 80).
+    rows : int
+        Terminal height (default: 24).
+    theme : str
+        Player theme (default: "dracula").
+    collapsed : bool
+        Wrap in collapsible element (default: False).
+    """
+
+    def __init__(
+        self,
+        cast_data: str,
+        title: str = "",
+        cols: int = 80,
+        rows: int = 24,
+        theme: str = "dracula",
+        collapsed: bool = False,
+    ):
+        self.cast_data = cast_data
+        self.title = title
+        self.cols = cols
+        self.rows = rows
+        self.theme = theme
+        self.collapsed = collapsed
+
+    def execute(self, report: "ScompLinkHTMLReport") -> "ScompLinkHTMLReport":
+        report.add_terminal(
+            self.cast_data, self.title, cols=self.cols, rows=self.rows, theme=self.theme, collapsed=self.collapsed
+        )
+        return report
+
+
 class SaveStep(ReportStep):
     """
     Saves the report as HTML. Automatically closes any open section before saving.