Add cache-drift detection to the Develop tab; reskin Expander for glass

dooly123 · claude · dooly123 · commit 1d2f4d28bd1f · 2026-07-05T19:06:41.000+10:00
CacheDriftService finds git packages whose files were edited in place under
Library/PackageCache (invisible to git, and lost on the next re-resolve). For each
it clones the pristine source at the cached revision, overlays the cache's current
files, and diffs — leaving a ready-to-PR work clone so the change can be contributed
upstream. Surfaced on the Develop tab with a scan + open-PR flow, backed by new
GitService helpers (CloneAtAsync / SetConfigAsync / AddAllAsync). Also reskins the
Fluent Expander (transparent header, muted chevron) to match the glass cards.

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/src/BasisPM.App/Localization/Languages/en.json b/src/BasisPM.App/Localization/Languages/en.json
@@ -890,6 +890,10 @@
       "key": "develop.button.installGit",
       "value": "Install Git"
     },
+    {
+      "key": "develop.button.mountAll",
+      "value": "Mount all"
+    },
     {
       "key": "develop.button.mountToEdit",
       "value": "Mount to edit"
@@ -906,6 +910,14 @@
       "key": "develop.button.refresh",
       "value": "Refresh"
     },
+    {
+      "key": "develop.button.reviewOpenPr",
+      "value": "Review & open PR"
+    },
+    {
+      "key": "develop.button.scanCache",
+      "value": "Scan for changes"
+    },
     {
       "key": "develop.button.signIn",
       "value": "Sign in"
@@ -918,6 +930,34 @@
       "key": "develop.button.swapBack",
       "value": "Swap back"
     },
+    {
+      "key": "develop.section.cacheChanges",
+      "value": "Accidental cache changes"
+    },
+    {
+      "key": "develop.section.cacheChangesHint",
+      "value": "Unity keeps git packages in Library/PackageCache. If one was edited there by accident, scan to detect it and open a pull request upstream."
+    },
+    {
+      "key": "develop.section.noCacheChanges",
+      "value": "No local changes found in cached packages."
+    },
+    {
+      "key": "develop.status.scanningDrift",
+      "value": "Scanning cached packages for local changes…"
+    },
+    {
+      "key": "develop.status.noDrift",
+      "value": "No local changes in cached packages."
+    },
+    {
+      "key": "develop.status.driftFound",
+      "value": "Found local changes in {0} cached package(s)."
+    },
+    {
+      "key": "develop.status.driftError",
+      "value": "Couldn't scan cached packages: {0}"
+    },
     {
       "key": "develop.confirm.alreadyMounted",
       "value": "{0} is already mounted at Packages/{0}.\n\nReplace it with a fresh clone? Any local edits in that folder will be lost."
@@ -1002,6 +1042,10 @@
       "key": "develop.status.mounted",
       "value": "Mounted {0} into Packages/ — edit it in Unity, then Submit PR."
     },
+    {
+      "key": "develop.status.mountedAll",
+      "value": "Mounted {0} package(s); skipped {1}; {2} failed."
+    },
     {
       "key": "develop.status.mounting",
       "value": "Mounting {0}…"
diff --git a/src/BasisPM.App/Styles/BasisTheme.axaml b/src/BasisPM.App/Styles/BasisTheme.axaml
@@ -80,6 +80,33 @@
                 <GradientStop Offset="0" Color="#FF2C50"/>
                 <GradientStop Offset="1" Color="#A855F7"/>
             </LinearGradientBrush>
+
+            <!-- Expander reskin: the Fluent defaults (opaque header surface, blue-grey chevron)
+                 clash with the glass theme. Override its theme resources to match the cards. -->
+            <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="{StaticResource BasisSurfaceHover}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="{StaticResource BasisSurfaceHover}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderHeaderForeground" Color="{StaticResource BasisTextPrimary}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderForegroundPointerOver" Color="{StaticResource BasisTextPrimary}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderForegroundPressed" Color="{StaticResource BasisTextPrimary}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderForegroundDisabled" Color="{StaticResource BasisTextDim}"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderContentBorderBrush" Color="{StaticResource BasisBorder}"/>
+            <SolidColorBrush x:Key="ExpanderChevronForeground" Color="{StaticResource BasisTextMuted}"/>
+            <SolidColorBrush x:Key="ExpanderChevronForegroundPointerOver" Color="{StaticResource BasisBrand}"/>
+            <SolidColorBrush x:Key="ExpanderChevronForegroundPressed" Color="{StaticResource BasisBrand}"/>
+            <SolidColorBrush x:Key="ExpanderChevronForegroundDisabled" Color="{StaticResource BasisTextDim}"/>
+            <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent"/>
         </ResourceDictionary>
     </Styles.Resources>
 
@@ -341,4 +368,20 @@
         <Setter Property="Background" Value="#33FFFFFF"/>
         <Setter Property="TextElement.Foreground" Value="#FFFFFF"/>
     </Style>
+
+    <!-- Expander: a frosted-glass collapsible section that matches Border.card -->
+    <Style Selector="Expander">
+        <Setter Property="Background" Value="{StaticResource BasisGlassBrush}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource BasisBorderBrush}"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="CornerRadius" Value="14"/>
+        <Setter Property="Foreground" Value="{StaticResource BasisTextPrimaryBrush}"/>
+    </Style>
+    <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+        <Setter Property="Padding" Value="20,14"/>
+        <Setter Property="MinHeight" Value="0"/>
+    </Style>
+    <Style Selector="Expander /template/ Border#ExpanderContent">
+        <Setter Property="Padding" Value="20,6,20,18"/>
+    </Style>
 </Styles>
diff --git a/src/BasisPM.App/ViewModels/DevelopViewModel.cs b/src/BasisPM.App/ViewModels/DevelopViewModel.cs
@@ -12,6 +12,7 @@ public sealed class DevelopViewModel : ObservableObject
 {
     private readonly MountService _mount;
     private readonly ContributeService _contribute;
+    private readonly CacheDriftService _drift;
     private readonly GitHubAuthService _auth;
     private readonly GitHubApiService _api;
     private readonly GitService _git;
@@ -26,6 +27,7 @@ public sealed class DevelopViewModel : ObservableObject
 
     public ObservableCollection<GitPackageRow> GitPackages { get; } = new();
     public ObservableCollection<MountedRow> Mounted { get; } = new();
+    public ObservableCollection<CacheDriftRow> DriftPackages { get; } = new();
 
     public string InstallName => _install?.DisplayName ?? L.Tr("develop.install.none");
     public bool HasInstall => _install is not null && _install.HasUnityProject;
@@ -35,6 +37,11 @@ public sealed class DevelopViewModel : ObservableObject
     public bool NoGitPackages => HasInstall && GitPackages.Count == 0;
     public bool HasMounted => Mounted.Count > 0;
 
+    private bool _driftScanned;
+    public bool DriftScanned { get => _driftScanned; private set { if (SetField(ref _driftScanned, value)) OnPropertyChanged(nameof(NoDrift)); } }
+    public bool HasDrift => DriftPackages.Count > 0;
+    public bool NoDrift => DriftScanned && DriftPackages.Count == 0;
+
     public bool GitAvailable => _git.IsAvailable;
     public bool GitMissing => !_git.IsAvailable;
     public bool GhAvailable => _auth.GhAvailable;
@@ -58,23 +65,29 @@ public bool AuthOk
     public RelayCommand RecheckCommand { get; }
     public RelayCommand ApplyPatCommand { get; }
     public RelayCommand<GitPackageRow> MountCommand { get; }
+    public RelayCommand MountAllCommand { get; }
     public RelayCommand<MountedRow> SubmitPrCommand { get; }
     public RelayCommand<MountedRow> SwapBackCommand { get; }
     public RelayCommand<MountedRow> OpenInUnityCommand { get; }
+    public RelayCommand ScanDriftCommand { get; }
+    public RelayCommand<CacheDriftRow> OpenDriftPrCommand { get; }
 
-    public DevelopViewModel(MountService mount, ContributeService contribute, GitHubAuthService auth,
+    public DevelopViewModel(MountService mount, ContributeService contribute, CacheDriftService drift, GitHubAuthService auth,
         GitHubApiService api, GitService git, MountRegistry registry, MainWindowViewModel shell)
     {
-        _mount = mount; _contribute = contribute; _auth = auth; _api = api; _git = git; _registry = registry; _shell = shell;
+        _mount = mount; _contribute = contribute; _drift = drift; _auth = auth; _api = api; _git = git; _registry = registry; _shell = shell;
 
         RefreshCommand = new RelayCommand(RefreshAsync);
         InstallGitCommand = new RelayCommand(() => OpenUrl("https://git-scm.com/downloads"));
         RecheckCommand = new RelayCommand(RefreshAsync);
         ApplyPatCommand = new RelayCommand(ApplyPatAsync);
         MountCommand = new RelayCommand<GitPackageRow>(MountAsync);
+        MountAllCommand = new RelayCommand(MountAllAsync);
         SubmitPrCommand = new RelayCommand<MountedRow>(SubmitPrAsync);
         SwapBackCommand = new RelayCommand<MountedRow>(SwapBackAsync);
         OpenInUnityCommand = new RelayCommand<MountedRow>(row => { if (_install is not null) _ = _shell.OpenProjectInUnityAsync(_install); });
+        ScanDriftCommand = new RelayCommand(ScanDriftAsync);
+        OpenDriftPrCommand = new RelayCommand<CacheDriftRow>(OpenDriftPrAsync);
     }
 
     public void SetActiveInstall(BasisInstall install)
@@ -99,6 +112,8 @@ private void Refresh()
 
         GitPackages.Clear();
         Mounted.Clear();
+        DriftPackages.Clear();
+        DriftScanned = false;
 
         if (_install is not null && _install.HasUnityProject)
         {
@@ -119,6 +134,8 @@ private void Refresh()
         OnPropertyChanged(nameof(HasGitPackages));
         OnPropertyChanged(nameof(NoGitPackages));
         OnPropertyChanged(nameof(HasMounted));
+        OnPropertyChanged(nameof(HasDrift));
+        OnPropertyChanged(nameof(NoDrift));
     }
 
     private async Task CheckAuthAsync()
@@ -176,6 +193,97 @@ private async Task MountAsync(GitPackageRow? row)
         finally { IsBusy = false; }
     }
 
+    // Mount every git package that isn't mounted yet, skipping any whose folder is already present.
+    private async Task MountAllAsync()
+    {
+        if (_install is null) return;
+        if (!_git.IsAvailable) { _shell.SetStatus(L.Tr("develop.status.gitRequiredMount"), StatusKind.Error); return; }
+
+        var rows = GitPackages.ToList();
+        if (rows.Count == 0) return;
+
+        IsBusy = true;
+        int ok = 0, skipped = 0, failed = 0;
+        try
+        {
+            foreach (var row in rows)
+            {
+                _shell.SetStatus(L.Tr("develop.status.mounting", row.Id));
+                var result = await _mount.MountAsync(_install, row.Id, row.GitUrl, line => Dispatcher.UIThread.Post(() => _shell.SetStatus(line)));
+                if (result.Ok) ok++;
+                else if (result.Error is not null && result.Error.Contains("already exists", StringComparison.OrdinalIgnoreCase)) skipped++;
+                else failed++;
+            }
+            Refresh();
+            _shell.SetStatus(L.Tr("develop.status.mountedAll", ok, skipped, failed), failed > 0 ? StatusKind.Error : StatusKind.Success);
+        }
+        catch (Exception ex) { _shell.SetStatus(L.Tr("develop.status.mountError", ex.Message), StatusKind.Error); }
+        finally { IsBusy = false; }
+    }
+
+    // Scan the project's git packages for accidental edits made directly in Library/PackageCache.
+    private async Task ScanDriftAsync()
+    {
+        if (_install is null) return;
+        if (!_git.IsAvailable) { _shell.SetStatus(L.Tr("develop.status.gitRequiredMount"), StatusKind.Error); return; }
+
+        IsBusy = true;
+        DriftPackages.Clear();
+        OnPropertyChanged(nameof(HasDrift));
+        _shell.SetStatus(L.Tr("develop.status.scanningDrift"));
+        try
+        {
+            var drifts = await _drift.ScanAsync(_install, line => Dispatcher.UIThread.Post(() => _shell.SetStatus(line)));
+            foreach (var d in drifts)
+            {
+                var summary = string.Join(", ", d.ChangedFiles.Take(6));
+                if (d.ChangedFiles.Count > 6) summary += ", …";
+                DriftPackages.Add(new CacheDriftRow(d.PackageId, d.WorkClonePath, d.GitUrl, d.ChangedFiles.Count, summary));
+            }
+            DriftScanned = true;
+            OnPropertyChanged(nameof(HasDrift));
+            OnPropertyChanged(nameof(NoDrift));
+            _shell.SetStatus(
+                drifts.Count == 0 ? L.Tr("develop.status.noDrift") : L.Tr("develop.status.driftFound", drifts.Count),
+                drifts.Count == 0 ? StatusKind.Success : StatusKind.Info);
+        }
+        catch (Exception ex) { _shell.SetStatus(L.Tr("develop.status.driftError", ex.Message), StatusKind.Error); }
+        finally { IsBusy = false; }
+    }
+
+    // Turn an accidental cache edit into a pull request, reusing the mounted-package PR flow on the work clone.
+    private async Task OpenDriftPrAsync(CacheDriftRow? row)
+    {
+        if (row is null) return;
+        if (!_git.IsAvailable) { _shell.SetStatus(L.Tr("develop.status.gitRequired"), StatusKind.Error); return; }
+
+        var token = await _auth.GetTokenAsync();
+        if (string.IsNullOrEmpty(token)) { _shell.SetStatus(L.Tr("develop.status.signInFirst"), StatusKind.Error); return; }
+        var user = await _api.GetUserAsync(token);
+        if (user is null) { _shell.SetStatus(L.Tr("develop.status.loginUnverified"), StatusKind.Error); return; }
+
+        var draft = await Dialogs.SubmitPrAsync(row.PackageId);
+        if (draft is null) return;
+
+        IsBusy = true;
+        _shell.SetStatus(L.Tr("develop.status.submittingPr", row.PackageId));
+        try
+        {
+            var result = await _contribute.SubmitPrAsync(row.WorkClonePath, token, user, draft, line => Dispatcher.UIThread.Post(() => _shell.SetStatus(line)));
+            if (result.Ok)
+            {
+                _shell.SetStatus(L.Tr("develop.status.prOpened", result.Forked ? L.Tr("develop.status.viaFork") : "", result.PrUrl), StatusKind.Success);
+                if (!string.IsNullOrEmpty(result.PrUrl)) OpenUrl(result.PrUrl!);
+                DriftPackages.Remove(row);
+                OnPropertyChanged(nameof(HasDrift));
+                OnPropertyChanged(nameof(NoDrift));
+            }
+            else _shell.SetStatus(result.Error ?? L.Tr("develop.status.prFailed"), StatusKind.Error);
+        }
+        catch (Exception ex) { _shell.SetStatus(L.Tr("develop.status.prError", ex.Message), StatusKind.Error); }
+        finally { IsBusy = false; }
+    }
+
     private async Task SwapBackAsync(MountedRow? row)
     {
         if (row is null || _install is null) return;
@@ -237,3 +345,5 @@ private static void TryForceDelete(string path)
 public sealed record GitPackageRow(string Id, string GitUrl, string Host, string Slug, bool InSubfolder);
 
 public sealed record MountedRow(string Id, string FolderPath, string OriginalManifestValue);
+
+public sealed record CacheDriftRow(string PackageId, string WorkClonePath, string GitUrl, int ChangedCount, string ChangedSummary);
diff --git a/src/BasisPM.App/ViewModels/MainWindowViewModel.cs b/src/BasisPM.App/ViewModels/MainWindowViewModel.cs
@@ -73,7 +73,8 @@ public MainWindowViewModel()
         FundingVM = new FundingViewModel();
         var mountService = new MountService(_gitService, _projectService, _mountRegistry);
         var contributeService = new ContributeService(_gitService, _ghApi);
-        DevelopVM = new DevelopViewModel(mountService, contributeService, _ghAuth, _ghApi, _gitService, _mountRegistry, this);
+        var cacheDriftService = new CacheDriftService(_gitService);
+        DevelopVM = new DevelopViewModel(mountService, contributeService, cacheDriftService, _ghAuth, _ghApi, _gitService, _mountRegistry, this);
         AnnouncementsVM = new AnnouncementsViewModel(_announcementService);
         DocumentationVM = new DocumentationViewModel();
         CommunityVM = new CommunityViewModel(AnnouncementsVM, DocumentationVM, FundingVM);
diff --git a/src/BasisPM.App/Views/DevelopView.axaml b/src/BasisPM.App/Views/DevelopView.axaml
@@ -68,7 +68,11 @@
                 <Border Classes="card" Padding="0">
                     <StackPanel>
                         <Border Padding="20,16" BorderBrush="{StaticResource BasisBorderBrush}" BorderThickness="0,0,0,1">
-                            <TextBlock Text="{loc:Tr develop.section.gitPackages}" Classes="h3"/>
+                            <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
+                                <TextBlock Grid.Column="0" Text="{loc:Tr develop.section.gitPackages}" Classes="h3" VerticalAlignment="Center"/>
+                                <Button Grid.Column="1" Classes="primary" Content="{loc:Tr develop.button.mountAll}"
+                                        Command="{Binding MountAllCommand}" IsVisible="{Binding HasGitPackages}"/>
+                            </Grid>
                         </Border>
                         <ItemsControl ItemsSource="{Binding GitPackages}">
                             <ItemsControl.ItemTemplate>
@@ -92,6 +96,40 @@
                     </StackPanel>
                 </Border>
 
+                <!-- Accidental edits in Library/PackageCache -->
+                <Border Classes="card" Padding="0">
+                    <StackPanel>
+                        <Border Padding="20,16" BorderBrush="{StaticResource BasisBorderBrush}" BorderThickness="0,0,0,1">
+                            <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
+                                <StackPanel Grid.Column="0" Spacing="3">
+                                    <TextBlock Text="{loc:Tr develop.section.cacheChanges}" Classes="h3"/>
+                                    <TextBlock Text="{loc:Tr develop.section.cacheChangesHint}" Classes="muted" FontSize="11" TextWrapping="Wrap"/>
+                                </StackPanel>
+                                <Button Grid.Column="1" Content="{loc:Tr develop.button.scanCache}" Command="{Binding ScanDriftCommand}" VerticalAlignment="Top"/>
+                            </Grid>
+                        </Border>
+                        <ItemsControl ItemsSource="{Binding DriftPackages}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate DataType="vm:CacheDriftRow">
+                                    <Border Padding="20,14" BorderBrush="{StaticResource BasisBorderBrush}" BorderThickness="0,0,0,1">
+                                        <Grid ColumnDefinitions="*,Auto" VerticalAlignment="Center">
+                                            <StackPanel Grid.Column="0" Spacing="3" ClipToBounds="True">
+                                                <TextBlock Text="{Binding PackageId}" FontWeight="SemiBold"/>
+                                                <TextBlock Text="{Binding ChangedSummary}" Classes="dim" FontSize="11" TextTrimming="CharacterEllipsis"/>
+                                            </StackPanel>
+                                            <Button Grid.Column="1" Classes="primary" Content="{loc:Tr develop.button.reviewOpenPr}"
+                                                    Command="{Binding #Root.((vm:DevelopViewModel)DataContext).OpenDriftPrCommand}"
+                                                    CommandParameter="{Binding}"/>
+                                        </Grid>
+                                    </Border>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                        <TextBlock Text="{loc:Tr develop.section.noCacheChanges}" Classes="muted" FontSize="12"
+                                   Margin="20,16" IsVisible="{Binding NoDrift}"/>
+                    </StackPanel>
+                </Border>
+
                 <!-- Mounted for editing -->
                 <Border Classes="card" Padding="0" IsVisible="{Binding HasMounted}">
                     <StackPanel>
diff --git a/src/BasisPM.Core/Services/CacheDriftService.cs b/src/BasisPM.Core/Services/CacheDriftService.cs
diff --git a/src/BasisPM.Core/Services/GitService.cs b/src/BasisPM.Core/Services/GitService.cs
