Remove the data resource group helper, make sure views are exported by the template export command

Author: nblumhardt

src/SeqCli/Mcp/Data/DataResourceGroupHelper.cs

@@ -30,7 +30,6 @@
 using Seq.Api.Model.Signals;
 using Seq.Syntax.Templates;
 using SeqCli.Mapping;
-using SeqCli.Mcp.Data;
 using SeqCli.Output;
 using SeqCli.Signals;
 using Serilog;
@@ -278,10 +277,14 @@ public async Task<CallToolResult> QueryAsync(
                                     "To avoid consuming excessive resources, add a time bound such as `where @Timestamp >= now() - 1d`.", isError: true);
         }
 
+        SignalExpressionPart? parsedSignalExpression = null;
+        if (!string.IsNullOrWhiteSpace(signal))
+            parsedSignalExpression = SignalExpressionParser.ParseExpression(signal);
+        
         QueryResultPart result;
         try
         {
-            result = await DataResourceGroupHelper.QueryPreserveErrorResponsesAsync(connection, signal, query, cancellationToken);
+            result = await connection.Data.TryQueryAsync(query, signal: parsedSignalExpression, cancellationToken: cancellationToken);
         }
         catch (Exception ex)
         {
@@ -291,35 +294,12 @@ public async Task<CallToolResult> QueryAsync(
             }
 
             var error = ex.GetBaseException() is SeqApiException ? ex.GetBaseException().Message : ex.ToString();
-            return SimpleTextResult($"The search failed. {error}", isError: true);
-        }
-
-        if (result.Error != null)
-        {
-            return new CallToolResult
-            {
-                IsError = true,
-                Content =
-                [
-                    new TextContentBlock
-                    {
-                        Text = $"The query could not be executed. {result.Error}"
-                    },
-                    new TextContentBlock
-                    {
-                        Text = string.Join(" ", result.Reasons)
-                    },
-                    new TextContentBlock
-                    {
-                        Text = result.Suggestion != null ? $"Did you mean: {result.Suggestion}?" : ""
-                    }
-                ]
-            };
+            return SimpleTextResult($"The query failed. {error}", isError: true);
         }
-
+        
         var output = new StringWriter();
         NativeFormatter.WriteQueryResult(output, result);
-        return SimpleTextResult(output.ToString());
+        return SimpleTextResult(output.ToString(), isError: !string.IsNullOrWhiteSpace(result.Error));
     }
 
     [McpServerTool(Name = "seq_new_session", ReadOnly = true, Title = "Begin a new Search/Query Session")]

src/SeqCli/Mcp/Tools/Search/SearchAndQueryToolType.cs

@@ -9,6 +9,7 @@
 using Seq.Api.Model.Alerting;
 using Seq.Api.Model.Dashboarding;
 using Seq.Api.Model.Indexing;
+using Seq.Api.Model.Metrics;
 using Seq.Api.Model.Retention;
 using Seq.Api.Model.Signals;
 using Seq.Api.Model.Queries;
@@ -87,6 +88,12 @@ await ExportTemplates<ExpressionIndexEntity>(
                 ? expressionIndex.Expression 
                 : expressionIndex.Id.Replace("expressionindex-", ""),
             templateValueMap);
+        
+        await ExportTemplates<ViewEntity>(
+            id => _connection.Views.FindAsync(id),
+            () => _connection.Views.ListAsync(shared: true),
+            view => view.Title,
+            templateValueMap);
     }
 
     async Task ExportTemplates<TEntity>(

src/SeqCli/Templates/Export/TemplateSetExporter.cs

@@ -40,7 +40,7 @@ static class TemplateSetImporter
     {
         var ordering = new List<string> {"users", "signals", "apps", "appinstances",
             "dashboards", "sqlqueries", "workspaces", "retentionpolicies",
-            "alerts", "expressionindexes"};
+            "alerts", "expressionindexes", "views"};
 
         var sorted = templates.OrderBy(t => ordering.IndexOf(t.ResourceGroup));