up

src/Scanner/StellaOps.Scanner.Worker/Processing/Surface/SurfaceManifestStageExecutor.cs

@@ -140,8 +140,15 @@ internal sealed class SurfaceManifestStageExecutor : IScanStageExecutor
     {
         var payloads = new List<SurfaceManifestPayload>();
 
+        EntryTracePlan? bestPlan = null;
+
         if (context.Analysis.TryGet<EntryTraceGraph>(ScanAnalysisKeys.EntryTraceGraph, out var graph) && graph is not null)
         {
+            bestPlan = graph.Plans
+                .OrderByDescending(p => p.Confidence)
+                .ThenBy(p => p.TerminalPath, StringComparer.Ordinal)
+                .FirstOrDefault();
+
             var graphJson = EntryTraceGraphSerializer.Serialize(graph);
             payloads.Add(new SurfaceManifestPayload(
                 ArtifactDocumentType.SurfaceEntryTrace,
@@ -149,12 +156,7 @@ internal sealed class SurfaceManifestStageExecutor : IScanStageExecutor
                 Kind: "entrytrace.graph",
                 MediaType: "application/json",
                 Content: Encoding.UTF8.GetBytes(graphJson),
-                Metadata: new Dictionary<string, string>
-                {
-                    ["artifact"] = "entrytrace.graph",
-                    ["nodes"] = graph.Nodes.Length.ToString(CultureInfoInvariant),
-                    ["edges"] = graph.Edges.Length.ToString(CultureInfoInvariant)
-                }));
+                Metadata: BuildEntryTraceMetadata(graph, bestPlan)));
         }
 
         if (context.Analysis.TryGet(ScanAnalysisKeys.EntryTraceNdjson, out ImmutableArray<string> ndjson) && !ndjson.IsDefaultOrEmpty)
@@ -174,7 +176,8 @@ internal sealed class SurfaceManifestStageExecutor : IScanStageExecutor
                 ArtifactDocumentFormat.EntryTraceNdjson,
                 Kind: "entrytrace.ndjson",
                 MediaType: "application/x-ndjson",
-                Content: Encoding.UTF8.GetBytes(builder.ToString())));
+                Content: Encoding.UTF8.GetBytes(builder.ToString()),
+                Metadata: BuildEntryTraceMetadata(graph: null, bestPlan)));
         }
 
         var fragments = context.Analysis.GetLayerFragments();
@@ -330,6 +333,30 @@ internal sealed class SurfaceManifestStageExecutor : IScanStageExecutor
             ? value.Trim()
             : null;
 
+    private static Dictionary<string, string> BuildEntryTraceMetadata(EntryTraceGraph? graph, EntryTracePlan? bestPlan)
+    {
+        var metadata = new Dictionary<string, string>
+        {
+            ["artifact"] = graph is null ? "entrytrace.ndjson" : "entrytrace.graph"
+        };
+
+        if (graph is not null)
+        {
+            metadata["nodes"] = graph.Nodes.Length.ToString(CultureInfoInvariant);
+            metadata["edges"] = graph.Edges.Length.ToString(CultureInfoInvariant);
+        }
+
+        if (bestPlan is not null)
+        {
+            metadata["best_terminal"] = bestPlan.Value.TerminalPath;
+            metadata["best_confidence"] = bestPlan.Value.Confidence.ToString("F4", CultureInfoInvariant);
+            metadata["best_user"] = bestPlan.Value.User;
+            metadata["best_workdir"] = bestPlan.Value.WorkingDirectory;
+        }
+
+        return metadata;
+    }
+
     private async Task PersistRubyPackagesAsync(ScanJobContext context, CancellationToken cancellationToken)
     {
         if (!context.Analysis.TryGet<ReadOnlyDictionary<string, LanguageAnalyzerResult>>(ScanAnalysisKeys.LanguageAnalyzerResults, out var results))