Fix models to match actual persisted JSON format

The persisted ai-review JSON differs from the JSON schema:
- schema_version is top-level, not in meta
- meta uses flat snake_case fields (pr_number, pr_head_sha, etc.)
- SHAs are flat in meta, not nested in a 'shas' object
- companion_pr is a string ('#3560'), not an object
- meta includes enriched PR data (pr_title, pr_state, pr_author)

Update SkiaReviewReport, SkiaReviewMeta, GenerateCommand, and
SkiaUpdateDetail to match. Both 170.json and 171.json now parse.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mattleibow

src/SkiaSharp.Triage.Cli/Commands/GenerateCommand.cs

@@ -1032,30 +1032,30 @@ private async Task GenerateSkiaReviewsAsync(CacheService rootCache, DashboardCon
                     var review = JsonSerializer.Deserialize<SkiaReviewReport>(json, TriageJsonOptions.Default);
                     if (review is null) continue;
 
-                    if (review.Meta.SchemaVersion is not "1.0")
+                    if (review.SchemaVersion is not "1.0")
                     {
                         if (!settings.Quiet)
-                            AnsiConsole.MarkupLine($"[yellow]  ⚠ Skipping {Path.GetFileName(file)}: schema {review.Meta.SchemaVersion} (need 1.0)[/]");
+                            AnsiConsole.MarkupLine($"[yellow]  ⚠ Skipping {Path.GetFileName(file)}: schema {review.SchemaVersion} (need 1.0)[/]");
                         continue;
                     }
 
-                    var prNumber = review.Meta.SkiaPrNumber;
+                    var prNumber = review.Meta.PrNumber;
 
                     // Write detail file
                     var detailPath = Path.Combine(reviewOutputDir, $"{prNumber}.json");
                     await File.WriteAllTextAsync(detailPath, JsonSerializer.Serialize(review, TriageJsonOptions.Default));
 
                     // Look up PR info
-                    string? prTitle = null, prState = null, prUrl = null;
+                    string? prTitle = review.Meta.PrTitle, prState = review.Meta.PrState, prUrl = null;
                     if (prByNumber.TryGetValue(prNumber, out var prItem))
                     {
-                        prTitle = prItem.Title;
-                        prState = prItem.State;
-                        prUrl = $"https://github.com/{repoConfig?.FullName ?? review.Meta.Repo}/pull/{prNumber}";
+                        prTitle ??= prItem.Title;
+                        prState ??= prItem.State;
+                        prUrl = $"https://github.com/{repoConfig?.FullName ?? "mono/skia"}/pull/{prNumber}";
                     }
                     else
                     {
-                        prUrl = $"https://github.com/{review.Meta.Repo}/pull/{prNumber}";
+                        prUrl = $"https://github.com/{repoConfig?.FullName ?? "mono/skia"}/pull/{prNumber}";
                     }
 
                     // Stats
@@ -1072,9 +1072,9 @@ private async Task GenerateSkiaReviewsAsync(CacheService rootCache, DashboardCon
 
                     indexEntries.Add(new SkiaReviewIndexEntry(
                         PrNumber: prNumber,
-                        UpstreamBranch: review.Meta.UpstreamBranch,
+                        UpstreamBranch: review.Meta.NewUpstreamBranch,
                         OldUpstreamBranch: review.Meta.OldUpstreamBranch,
-                        AnalyzedAt: review.Meta.AnalyzedAt,
+                        AnalyzedAt: review.Meta.Timestamp,
                         RiskAssessment: review.RiskAssessment,
                         GeneratedFilesStatus: review.GeneratedFiles.Status,
                         UpstreamIntegrityStatus: review.UpstreamIntegrity.Status,
@@ -1089,7 +1089,7 @@ private async Task GenerateSkiaReviewsAsync(CacheService rootCache, DashboardCon
                         PrTitle: prTitle,
                         PrState: prState,
                         PrUrl: prUrl,
-                        SkiasharpPrNumber: review.Meta.SkiasharpPrNumber
+                        SkiasharpPrNumber: ParseCompanionPrNumber(review.Meta.CompanionPr)
                     ));
                 }
                 catch (Exception ex)
@@ -1129,6 +1129,15 @@ private async Task GenerateSkiaReviewsAsync(CacheService rootCache, DashboardCon
             AnsiConsole.MarkupLine($"[green]  ✓ {reviewOutputDir}/ ({total} files)[/]");
         }
     }
+
+    private static int? ParseCompanionPrNumber(string? companionPr)
+    {
+        if (companionPr is null) return null;
+        var hashIdx = companionPr.LastIndexOf('#');
+        if (hashIdx >= 0 && int.TryParse(companionPr[(hashIdx + 1)..], out var num))
+            return num;
+        return null;
+    }
 }
 
 // Helper class for building monthly trends with per-repo breakdown

src/SkiaSharp.Triage.Dashboard/Pages/SkiaUpdateDetail.razor

@@ -23,17 +23,17 @@ else
     <!-- Header -->
     <div class="triage-detail-header triage-detail-header-minimal">
         <div class="detail-title-row">
-            <a href="https://github.com/@_review.Meta.Repo/pull/@_review.Meta.SkiaPrNumber" target="_blank" rel="noopener noreferrer" class="issue-link-lg">#@_review.Meta.SkiaPrNumber</a>
-            <h1>@(_indexEntry?.PrTitle ?? $"Skia Update: {FormatBranch(_review.Meta.OldUpstreamBranch)} → {FormatBranch(_review.Meta.UpstreamBranch)}")</h1>
+            <a href="https://github.com/mono/skia/pull/@_review.Meta.PrNumber" target="_blank" rel="noopener noreferrer" class="issue-link-lg">#@_review.Meta.PrNumber</a>
+            <h1>@(_review.Meta.PrTitle ?? _indexEntry?.PrTitle ?? $"Skia Update: {FormatBranch(_review.Meta.OldUpstreamBranch)} → {FormatBranch(_review.Meta.NewUpstreamBranch)}")</h1>
         </div>
         <div class="detail-header-meta">
             <span class="badge-risk badge-risk-@_review.RiskAssessment.ToString().ToLower()">
                 @_review.RiskAssessment Risk
             </span>
             <span class="detail-meta-text">
-                @FormatBranch(_review.Meta.OldUpstreamBranch) → @FormatBranch(_review.Meta.UpstreamBranch)
-                · Analyzed: @_review.Meta.AnalyzedAt.ToString("yyyy-MM-dd HH:mm UTC")
-                · <a href="https://github.com/@_review.Meta.Repo" target="_blank" rel="noopener noreferrer">@_review.Meta.Repo</a>
+                @FormatBranch(_review.Meta.OldUpstreamBranch) → @FormatBranch(_review.Meta.NewUpstreamBranch)
+                · Analyzed: @_review.Meta.Timestamp.ToString("yyyy-MM-dd HH:mm UTC")
+                · <a href="https://github.com/mono/skia" target="_blank" rel="noopener noreferrer">mono/skia</a>
             </span>
         </div>
     </div>
@@ -71,12 +71,12 @@ else
                 @(_review.DepsAudit.Status == SkiaReviewStatus.Pass ? "✓ PASS" : "⚠ REVIEW")
             </span>
         </div>
-        @if (_review.Meta.SkiasharpPrNumber is not null)
+        @if (ParseCompanionPrNumber(_review.Meta.CompanionPr) is { } companionNum)
         {
             <div class="qf-group">
                 <span class="qf-label">Companion</span>
-                <a href="https://github.com/mono/SkiaSharp/pull/@_review.Meta.SkiasharpPrNumber" target="_blank" rel="noopener noreferrer" class="label">
-                    SkiaSharp #@_review.Meta.SkiasharpPrNumber
+                <a href="https://github.com/mono/SkiaSharp/pull/@companionNum" target="_blank" rel="noopener noreferrer" class="label">
+                    SkiaSharp #@companionNum
                 </a>
             </div>
         }
@@ -99,7 +99,7 @@ else
         <button type="button" class="content-tab @(_activeTab == "deps" ? "active" : "")" @onclick='() => _activeTab = "deps"'>
             DEPS (@(_review.DepsAudit.Added.Count + _review.DepsAudit.Changed.Count))
         </button>
-        @if (_review.CompanionPr is not null)
+        @if (_review.Meta.CompanionPr is not null)
         {
             <button type="button" class="content-tab @(_activeTab == "companion" ? "active" : "")" @onclick='() => _activeTab = "companion"'>
                 Companion PR
@@ -133,7 +133,7 @@ else
 
             <p>
                 This review covers the Skia upstream merge from
-                <strong>@_review.Meta.OldUpstreamBranch</strong> to <strong>@_review.Meta.UpstreamBranch</strong>.
+                <strong>@_review.Meta.OldUpstreamBranch</strong> to <strong>@_review.Meta.NewUpstreamBranch</strong>.
             </p>
 
             <div class="overview-grid">
@@ -201,9 +201,9 @@ else
 
             <h3 class="section-title">Commit SHAs</h3>
             <div class="skia-shas">
-                <span><strong>PR Head:</strong> <code>@Truncate(_review.Meta.Shas.PrHead)</code></span>
-                <span><strong>Base:</strong> <code>@Truncate(_review.Meta.Shas.Base)</code></span>
-                <span><strong>Upstream:</strong> <code>@Truncate(_review.Meta.Shas.Upstream)</code></span>
+                <span><strong>PR Head:</strong> <code>@Truncate(_review.Meta.PrHeadSha)</code></span>
+                <span><strong>Base:</strong> <code>@Truncate(_review.Meta.BaseSha)</code></span>
+                <span><strong>Upstream:</strong> <code>@Truncate(_review.Meta.UpstreamSha)</code></span>
             </div>
         </div>
     }
@@ -552,47 +552,26 @@ else
     }
 
     <!-- Tab: Companion PR -->
-    @if (_activeTab == "companion" && _review.CompanionPr is not null)
+    @if (_activeTab == "companion" && _review.Meta.CompanionPr is not null)
     {
-        var cp = _review.CompanionPr;
+        var companionPrNumber = ParseCompanionPrNumber(_review.Meta.CompanionPr);
         <div class="section-card">
             <h3 class="section-title">Companion PR</h3>
             <div class="quick-facts-row">
                 <div class="qf-group">
                     <span class="qf-label">PR</span>
-                    <a href="https://github.com/mono/SkiaSharp/pull/@cp.PrNumber" target="_blank" rel="noopener noreferrer" class="label">
-                        SkiaSharp #@cp.PrNumber
-                    </a>
-                </div>
-                @if (cp.FilesChanged is not null)
-                {
-                    <div class="qf-group">
-                        <span class="qf-label">Files Changed</span>
-                        <span class="qf-detail">@cp.FilesChanged</span>
-                    </div>
-                }
-            </div>
-            @if (cp.GeneratedFilesSkipped is { Count: > 0 })
-            {
-                <h4 class="change-category">Generated Files Skipped (@cp.GeneratedFilesSkipped.Count)</h4>
-                <ul class="skia-file-list">
-                    @foreach (var file in cp.GeneratedFilesSkipped)
+                    @if (companionPrNumber is not null)
                     {
-                        <li><code>@file</code></li>
+                        <a href="https://github.com/mono/SkiaSharp/pull/@companionPrNumber" target="_blank" rel="noopener noreferrer" class="label">
+                            @_review.Meta.CompanionPr
+                        </a>
                     }
-                </ul>
-            }
-            @if (cp.Findings is { Count: > 0 })
-            {
-                <h4 class="change-category">Findings (@cp.Findings.Count)</h4>
-                @foreach (var finding in cp.Findings)
-                {
-                    <div class="skia-file-entry">
-                        <div class="file-path"><code>@finding.File</code></div>
-                        <div class="file-summary">@finding.Finding</div>
-                    </div>
-                }
-            }
+                    else
+                    {
+                        <span class="label">@_review.Meta.CompanionPr</span>
+                    }
+                </div>
+            </div>
         </div>
     }
 }
@@ -624,6 +603,15 @@ else
     private static string Truncate(string sha) =>
         sha.Length > 12 ? sha[..12] : sha;
 
+    private static int? ParseCompanionPrNumber(string? companionPr)
+    {
+        if (companionPr is null) return null;
+        var hashIdx = companionPr.LastIndexOf('#');
+        if (hashIdx >= 0 && int.TryParse(companionPr[(hashIdx + 1)..], out var num))
+            return num;
+        return null;
+    }
+
     private void ToggleDiff(string key)
     {
         if (!_expandedDiffs.Remove(key))

src/SkiaSharp.Triage.Models/SkiaReviewModels.cs

@@ -5,34 +5,31 @@ namespace SkiaSharp.Triage.Models;
 // ── Root ─────────────────────────────────────────────────────────
 
 public record SkiaReviewReport(
+    [property: JsonPropertyName("schema_version")] string SchemaVersion,
     SkiaReviewMeta Meta,
     string Summary,
     List<string> Recommendations,
     [property: JsonPropertyName("generated_files")] GeneratedFilesCheck GeneratedFiles,
     [property: JsonPropertyName("upstream_integrity")] SourceIntegrity UpstreamIntegrity,
     [property: JsonPropertyName("interop_integrity")] SourceIntegrity InteropIntegrity,
     [property: JsonPropertyName("deps_audit")] DepsAudit DepsAudit,
-    [property: JsonPropertyName("risk_assessment")] SkiaRiskAssessment RiskAssessment,
-    [property: JsonPropertyName("companion_pr")] CompanionPr? CompanionPr = null
+    [property: JsonPropertyName("risk_assessment")] SkiaRiskAssessment RiskAssessment
 );
 
 // ── Meta ─────────────────────────────────────────────────────────
 
 public record SkiaReviewMeta(
-    [property: JsonPropertyName("schemaVersion")] string SchemaVersion,
-    [property: JsonPropertyName("skiaPrNumber")] int SkiaPrNumber,
-    [property: JsonPropertyName("skiasharpPrNumber")] int? SkiasharpPrNumber,
-    string Repo,
-    [property: JsonPropertyName("upstreamBranch")] string UpstreamBranch,
-    [property: JsonPropertyName("oldUpstreamBranch")] string OldUpstreamBranch,
-    [property: JsonPropertyName("analyzedAt")] DateTime AnalyzedAt,
-    SkiaReviewShas Shas
-);
-
-public record SkiaReviewShas(
-    [property: JsonPropertyName("prHead")] string PrHead,
-    string Base,
-    string Upstream
+    [property: JsonPropertyName("pr_number")] int PrNumber,
+    [property: JsonPropertyName("pr_title")] string? PrTitle,
+    [property: JsonPropertyName("pr_state")] string? PrState,
+    [property: JsonPropertyName("pr_author")] string? PrAuthor,
+    [property: JsonPropertyName("old_upstream_branch")] string OldUpstreamBranch,
+    [property: JsonPropertyName("new_upstream_branch")] string NewUpstreamBranch,
+    [property: JsonPropertyName("base_sha")] string BaseSha,
+    [property: JsonPropertyName("pr_head_sha")] string PrHeadSha,
+    [property: JsonPropertyName("upstream_sha")] string UpstreamSha,
+    DateTime Timestamp,
+    [property: JsonPropertyName("companion_pr")] string? CompanionPr = null
 );
 
 // ── Generated Files ──────────────────────────────────────────────
@@ -117,16 +114,3 @@ public record DepChanged(
     [property: JsonPropertyName("new_revision")] string? NewRevision = null
 );
 
-// ── Companion PR (optional) ──────────────────────────────────────
-
-public record CompanionPr(
-    [property: JsonPropertyName("pr_number")] int PrNumber,
-    [property: JsonPropertyName("files_changed")] int? FilesChanged = null,
-    [property: JsonPropertyName("generated_files_skipped")] List<string>? GeneratedFilesSkipped = null,
-    List<CompanionPrFinding>? Findings = null
-);
-
-public record CompanionPrFinding(
-    string File,
-    string Finding
-);