Mcp

src/AasxServerBlazor/AasxServerBlazor.csproj

@@ -33,6 +33,7 @@
     </PackageReference>
     <PackageReference Include="ScottPlot" Version="4.1.74" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageReference Include="ModelContextProtocol.AspNetCore" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>

src/AasxServerBlazor/Configuration/ServerConfiguration.cs

@@ -15,6 +15,7 @@ namespace AasxServerBlazor.Configuration;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using AasSecurity;
 using AasxServerStandardBib.ServiceExtensions;
 using IO.Swagger.Controllers;
@@ -34,8 +35,10 @@ namespace AasxServerBlazor.Configuration;
 using Microsoft.OpenApi.Models;
 
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using AdminShellNS;
+using System.Text.Json.Serialization;
+using AdminShellNS;
+using Contracts;
+using IO.Swagger.Lib.V3.MCP;
 #if GRAPHQL
 using HotChocolate.AspNetCore;
 #endif
@@ -77,7 +80,127 @@ public static void ConfigureServer(IServiceCollection services)
                     IncludeExceptionDetails = true
                 });
 #endif
-    }
+
+        // MCP-Server (Streamable HTTP) als dünner Adapter über die Query-Pipeline. Immer aktiv.
+        // Zwei Endpunkte: /mcp (voll, alle Tools) und /mcp-basic (nur aas_find_product, für schwache Modelle).
+        // Die Aufteilung erfolgt über Request-Filter, die den Request-Pfad prüfen.
+        services.AddHttpContextAccessor();
+        services.AddMcpServer()
+            .WithHttpTransport()
+            .WithTools<McpQueryTools>()
+            // Exportdateien (CSV/XLSX) der Export-Tools als MCP-Resource: aas-export://{token}.
+            .WithResources<McpExportResources>()
+            .WithRequestFilters(filters =>
+            {
+                filters.AddListToolsFilter(next => async (context, ct) =>
+                {
+                    var result = await next(context, ct);
+                    var allowed = AllowedMcpTools(context.Services);
+                    if (result.Tools is not null)
+                    {
+                        if (allowed is not null)
+                        {
+                            result.Tools = result.Tools.Where(t => allowed.Contains(t.Name)).ToList();
+                        }
+
+                        // OpenAI Apps SDK / ChatGPT compatibility: declare each (read-only, public) tool as
+                        // no-auth and give it invocation status text. securitySchemes is mirrored into _meta
+                        // (the location ChatGPT reads; the typed SDK cannot emit a custom top-level field).
+                        // title + readOnly/idempotent/etc. annotations come from the [McpServerTool] attributes.
+                        foreach (var tool in result.Tools)
+                        {
+                            var meta = tool.Meta ?? new System.Text.Json.Nodes.JsonObject();
+                            meta["securitySchemes"] = new System.Text.Json.Nodes.JsonArray(
+                                new System.Text.Json.Nodes.JsonObject { ["type"] = "noauth" });
+                            if (McpToolStatus.TryGetValue(tool.Name, out var status))
+                            {
+                                meta["openai/toolInvocation/invoking"] = status.Invoking;
+                                meta["openai/toolInvocation/invoked"] = status.Invoked;
+                            }
+                            tool.Meta = meta;
+                        }
+                    }
+
+                    return result;
+                });
+
+                filters.AddCallToolFilter(next => async (context, ct) =>
+                {
+                    var allowed = AllowedMcpTools(context.Services);
+                    if (allowed is not null
+                        && context.Params is not null
+                        && !allowed.Contains(context.Params.Name))
+                    {
+                        throw new InvalidOperationException(
+                            $"Tool '{context.Params.Name}' ist auf diesem MCP-Endpunkt nicht verfügbar.");
+                    }
+
+                    var logSession = ExplicitLogSession(context.Services);
+                    if (!McpSessionLogStore.IsValidSessionId(logSession))
+                    {
+                        return await next(context, ct);
+                    }
+
+                    using var _ = DiagnosticsLog.BeginBrowserLogSession(logSession!);
+                    return await next(context, ct);
+                });
+            });
+    }
+
+    // Per-tool invocation status text (OpenAI Apps SDK _meta), kept <= 64 chars per the spec.
+    private static readonly IReadOnlyDictionary<string, (string Invoking, string Invoked)> McpToolStatus =
+        new Dictionary<string, (string, string)>(StringComparer.Ordinal)
+        {
+            ["aas_query"]               = ("Searching Voyager…", "Voyager search complete"),
+            ["aas_query_export_csv"]    = ("Exporting Voyager results…", "CSV export ready"),
+            ["aas_query_export_xlsx"]   = ("Exporting Voyager results…", "Excel export ready"),
+            ["aas_count"]               = ("Counting Voyager results…", "Voyager count complete"),
+            ["aas_get_submodel"]        = ("Reading AAS submodel…", "AAS submodel loaded"),
+            ["aas_get_submodels"]       = ("Reading AAS submodels…", "AAS submodels loaded"),
+            ["aas_get_shell"]           = ("Reading AAS shell…", "AAS shell loaded"),
+            ["aas_get_shells"]          = ("Reading AAS shells…", "AAS shells loaded"),
+            ["aas_get_product"]         = ("Reading AAS product…", "AAS product loaded"),
+            ["aas_find_product"]        = ("Finding AAS product…", "AAS product found"),
+            ["aas_find_product_simple"] = ("Finding product…", "Product found"),
+            ["aas_get_element"]         = ("Reading AAS element…", "AAS element loaded"),
+            ["aas_find_concepts"]       = ("Searching concept definitions…", "Concept definitions found"),
+            ["aas_describe_model"]      = ("Analyzing data structures…", "Data structure overview ready"),
+        };
+
+    // Erlaubter Tool-Satz je nach MCP-Endpunkt-Pfad (null = alle Tools, voller Endpunkt /mcp).
+    // /mcp-simple zuerst prüfen (Pfad enthält nicht "mcp-basic"), dann /mcp-basic, sonst voll.
+    private static HashSet<string>? AllowedMcpTools(IServiceProvider? services)
+    {
+        var path = services?.GetService<Microsoft.AspNetCore.Http.IHttpContextAccessor>()?.HttpContext?.Request.Path.Value;
+        if (path is null)
+        {
+            return null;
+        }
+
+        if (path.Contains("mcp-simple", StringComparison.OrdinalIgnoreCase))
+        {
+            return McpQueryTools.SimpleToolNames;
+        }
+
+        if (path.Contains("mcp-basic", StringComparison.OrdinalIgnoreCase))
+        {
+            return McpQueryTools.BasicToolNames;
+        }
+
+        return null;
+    }
+
+    private static string? ExplicitLogSession(IServiceProvider? services)
+    {
+        var request = services?
+            .GetService<Microsoft.AspNetCore.Http.IHttpContextAccessor>()?
+            .HttpContext?
+            .Request;
+
+        return request?.Query.TryGetValue("logSession", out var value) == true
+            ? value.FirstOrDefault()
+            : null;
+    }
 
         /// <summary>
         /// Adds framework-specific services required by the application.
@@ -169,6 +292,23 @@ private static void ConfigureEndpoints(IEndpointRouteBuilder endpoints)
             Tool = { Enable = true }
         });
 #endif
+        // MCP-Endpoints (Streamable HTTP). PathBase ist "/api/v3.0", real also "/api/v3.0/mcp" bzw. "/api/v3.0/mcp-basic".
+        // /mcp = voller Toolsatz (starke Modelle), /mcp-basic = nur aas_find_product (schwache Modelle); Filter s. ConfigureMcp.
+        endpoints.MapMcp("/mcp");
+        endpoints.MapMcp("/mcp-basic");
+        endpoints.MapMcp("/mcp-simple");
+
+        // Download-Endpunkt für die von aas_query_export_csv/xlsx erzeugten Dateien.
+        // Das Token stammt aus der Tool-Antwort (downloadUrl); die Dateien verfallen nach ca. 60 Minuten.
+        endpoints.MapGet("/mcp-exports/{token}", (string token) =>
+        {
+            if (!McpExportFileStore.TryGet(token, out var content, out var fileName, out var mimeType))
+            {
+                return Microsoft.AspNetCore.Http.Results.NotFound();
+            }
+
+            return Microsoft.AspNetCore.Http.Results.File(content, mimeType, fileName);
+        });
     }
 
 #endregion
@@ -286,4 +426,4 @@ private static void AddSwaggerGen(IServiceCollection services) =>
                                });
 
     #endregion
-}
+}

src/AasxServerBlazor/Pages/McpLog.razor

@@ -0,0 +1,180 @@
+@page "/McpLog"
+@using Contracts
+@using System.Threading
+@using System.Threading.Tasks
+@implements IDisposable
+@inject NavigationManager Nav
+
+<style>
+    .mcp-log-page {
+        max-width: 1200px;
+        margin: 0 auto;
+        padding: 16px 0 32px;
+    }
+
+    .mcp-log-toolbar {
+        display: flex;
+        gap: 8px;
+        align-items: center;
+        margin-bottom: 12px;
+    }
+
+    .mcp-log-toolbar input {
+        min-width: 280px;
+        max-width: 520px;
+        flex: 1;
+    }
+
+    .mcp-log-view {
+        height: calc(100vh - 220px);
+        min-height: 420px;
+        overflow: auto;
+        border: 1px solid #c8d0d8;
+        background: #0b1220;
+        color: #d9e7ff;
+        padding: 12px;
+        font-family: Consolas, "Liberation Mono", monospace;
+        font-size: 13px;
+        line-height: 1.4;
+        white-space: pre-wrap;
+    }
+
+    .mcp-log-muted {
+        color: #5f6c7a;
+        margin-bottom: 12px;
+    }
+</style>
+
+<div class="mcp-log-page">
+    <h3>MCP Log</h3>
+    <p class="mcp-log-muted">
+        Shows server-side MCP diagnostics only for the explicit <code>logSession</code> value.
+    </p>
+
+    <div class="mcp-log-toolbar">
+        <input class="form-control"
+               placeholder="logSession"
+               @bind="_sessionInput"
+               @bind:event="oninput" />
+        <button class="btn btn-primary" @onclick="ApplySession">Show</button>
+        <button class="btn btn-secondary" @onclick="ClearView" disabled="@(!HasSession)">Clear</button>
+    </div>
+
+    @if (!HasSession)
+    {
+        <p class="mcp-log-muted">
+            Open this page with <code>?logSession=your-token</code> or enter the same token used on the MCP endpoint.
+        </p>
+    }
+    else if (!McpSessionLogStore.IsValidSessionId(_session))
+    {
+        <p class="text-danger">
+            Invalid logSession. Use letters, digits, dash, underscore, dot or colon; max 128 characters.
+        </p>
+    }
+    else
+    {
+        <div class="mcp-log-muted">
+            MCP endpoint: <code>/api/v3.0/mcp?logSession=@_session</code>
+        </div>
+        <div class="mcp-log-view">
+@LogText
+        </div>
+    }
+</div>
+
+@code {
+    private readonly List<McpSessionLogEntry> _entries = new();
+    private PeriodicTimer? _timer;
+    private CancellationTokenSource? _cts;
+    private string? _session;
+    private string? _sessionInput;
+    private long _lastSequence;
+
+    private bool HasSession => !string.IsNullOrWhiteSpace(_session);
+
+    private string LogText => _entries.Count == 0
+        ? "Waiting for MCP log lines..."
+        : string.Join(Environment.NewLine, _entries.Select(e => e.Line));
+
+    protected override void OnInitialized()
+    {
+        _session = ReadQueryValue("logSession");
+        _sessionInput = _session;
+        _cts = new CancellationTokenSource();
+        _timer = new PeriodicTimer(TimeSpan.FromMilliseconds(750));
+        _ = PollAsync(_cts.Token);
+    }
+
+    private void ApplySession()
+    {
+        _session = string.IsNullOrWhiteSpace(_sessionInput) ? null : _sessionInput.Trim();
+        _entries.Clear();
+        _lastSequence = 0;
+    }
+
+    private void ClearView()
+    {
+        if (McpSessionLogStore.IsValidSessionId(_session))
+        {
+            McpSessionLogStore.Clear(_session!);
+        }
+
+        _entries.Clear();
+        _lastSequence = 0;
+    }
+
+    private async Task PollAsync(CancellationToken cancellationToken)
+    {
+        while (_timer is not null && await _timer.WaitForNextTickAsync(cancellationToken))
+        {
+            if (!McpSessionLogStore.IsValidSessionId(_session))
+            {
+                continue;
+            }
+
+            var next = McpSessionLogStore.Read(_session!, _lastSequence, 500);
+            if (next.Count == 0)
+            {
+                continue;
+            }
+
+            _entries.AddRange(next);
+            _lastSequence = _entries[^1].Sequence;
+
+            if (_entries.Count > 2000)
+            {
+                _entries.RemoveRange(0, _entries.Count - 2000);
+            }
+
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
+    private string? ReadQueryValue(string key)
+    {
+        var query = new Uri(Nav.Uri).Query.TrimStart('?');
+        if (query.Length == 0)
+        {
+            return null;
+        }
+
+        foreach (var part in query.Split('&', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var pair = part.Split('=', 2);
+            if (pair.Length == 2 && string.Equals(Uri.UnescapeDataString(pair[0]), key, StringComparison.Ordinal))
+            {
+                return Uri.UnescapeDataString(pair[1]);
+            }
+        }
+
+        return null;
+    }
+
+    public void Dispose()
+    {
+        _cts?.Cancel();
+        _timer?.Dispose();
+        _cts?.Dispose();
+    }
+}

src/AasxServerBlazor/Properties/launchSettings.json

@@ -10,7 +10,7 @@
     },
     "AasxServerBlazor": {
       "commandName": "Project",
-      "commandLineArgs": "--with-db --start-index 1000 --secret-string-api 1234 --data-path \"C:\\Development\\newdb1\" --edit --external-blazor http://localhost:5001",
+      "commandLineArgs": "--no-security --with-db --start-index 1000 --secret-string-api 1234 --data-path \"C:\\Development\\newdb1\" --edit --external-blazor http://localhost:5001",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",

src/AasxServerDB.Tests/DatabaseFixture.cs

@@ -67,6 +67,13 @@ public DatabaseFixture()
             VisitorAASX.ImportAASXIntoDB(file, createFilesOnly: false);
         }
 
+        // Production installs this during InitDB. Build it after fixture import so
+        // query execution exercises the same SQLite substring-search path.
+        using (var indexDb = new AasContext())
+        {
+            SqliteTrigramIndex.Initialize(indexDb);
+        }
+
         Console.WriteLine("[DatabaseFixture] Import done.");
         using var verify = new AasContext();
         Console.WriteLine($"  SMSets:  {verify.SMSets.Count()}");