Wire model card Shift to Z-Image, reorder refiner row, fix clip override

- Use ModelCardViewModel.Shift for ModelSamplingAuraFlow (Z-Image) instead of hardcoded 3.0
- Show the Shift control for both HiDream and Z-Image workflows
- Move Refiner row to sit between Model and Workflow selector
- Split RefreshWorkflowProfileState so project load only fires notifications and no longer overwrites a user's encoder type override

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: mohnjiles

StabilityMatrix.Avalonia/Controls/Inference/ModelCard.axaml

@@ -111,6 +111,33 @@
                             </StackPanel>
                         </Grid>
 
+                        <!--  Refiner (below Model, when enabled)  -->
+                        <Grid
+                            Margin="0,8,0,0"
+                            ColumnDefinitions="70,*,Auto"
+                            IsVisible="{Binding IsRefinerSelectionEnabled}">
+                            <TextBlock
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Text="{x:Static lang:Resources.Label_Refiner}"
+                                TextAlignment="Left" />
+                            <controls:BetterComboBox
+                                Grid.Column="1"
+                                Padding="8,6,4,6"
+                                HorizontalAlignment="Stretch"
+                                ItemsSource="{Binding ClientManager.Models}"
+                                SelectedItem="{Binding SelectedRefiner}"
+                                Theme="{StaticResource BetterComboBoxHybridModelTheme}" />
+                            <Button
+                                Grid.Column="2"
+                                Margin="4,0,0,0"
+                                VerticalAlignment="Stretch"
+                                Command="{Binding OpenRefinerPickerCommand}"
+                                ToolTip.Tip="Browse all refiner models">
+                                <fluent:SymbolIcon FontSize="16" Symbol="Search" />
+                            </Button>
+                        </Grid>
+
                         <!--  Workflow Profile  -->
                         <Grid Margin="0,8,0,0" ColumnDefinitions="70,*,Auto">
                             <TextBlock
@@ -155,33 +182,6 @@
                             IsVisible="{Binding ShowWorkflowProfileStatus}"
                             Text="{Binding WorkflowProfileStatusText}" />
 
-                        <!--  Refiner (below Model, when enabled)  -->
-                        <Grid
-                            Margin="0,8,0,0"
-                            ColumnDefinitions="70,*,Auto"
-                            IsVisible="{Binding IsRefinerSelectionEnabled}">
-                            <TextBlock
-                                Grid.Column="0"
-                                VerticalAlignment="Center"
-                                Text="{x:Static lang:Resources.Label_Refiner}"
-                                TextAlignment="Left" />
-                            <controls:BetterComboBox
-                                Grid.Column="1"
-                                Padding="8,6,4,6"
-                                HorizontalAlignment="Stretch"
-                                ItemsSource="{Binding ClientManager.Models}"
-                                SelectedItem="{Binding SelectedRefiner}"
-                                Theme="{StaticResource BetterComboBoxHybridModelTheme}" />
-                            <Button
-                                Grid.Column="2"
-                                Margin="4,0,0,0"
-                                VerticalAlignment="Stretch"
-                                Command="{Binding OpenRefinerPickerCommand}"
-                                ToolTip.Tip="Browse all refiner models">
-                                <fluent:SymbolIcon FontSize="16" Symbol="Search" />
-                            </Button>
-                        </Grid>
-
                         <!--  Advanced Options Expander (Precision, VAE, CLIP Skip)  -->
                         <Expander
                             Margin="0,8,0,0"

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs

@@ -311,7 +311,7 @@ protected void ApplyModelSamplingForCurrentWorkflow(ModuleApplyStepEventArgs app
             {
                 Name = builder.Nodes.GetUniqueName(nameof(ComfyNodeBuilder.ModelSamplingAuraFlow)),
                 Model = builder.Connections.Base.Model.Unwrap(),
-                Shift = 3.0d,
+                Shift = ModelCardViewModel.Shift,
             }
         );
 

StabilityMatrix.Avalonia/ViewModels/Inference/ModelCardViewModel.cs

@@ -168,6 +168,7 @@ public HybridModelFile? SelectedUnifiedModel
         nameof(IsHiDreamClip),
         nameof(ResolvedWorkflowProfile),
         nameof(IsHiDreamWorkflow),
+        nameof(IsZImageWorkflow),
         nameof(ShowShift),
         nameof(ShowEncoderTypeSelection),
         nameof(HasRecommendedDefaults),
@@ -181,6 +182,7 @@ public HybridModelFile? SelectedUnifiedModel
     [NotifyPropertyChangedFor(
         nameof(ResolvedWorkflowProfile),
         nameof(IsHiDreamWorkflow),
+        nameof(IsZImageWorkflow),
         nameof(ShowShift),
         nameof(ShowEncoderTypeSelection),
         nameof(HasRecommendedDefaults),
@@ -242,6 +244,9 @@ public HybridModelFile? SelectedUnifiedModel
     public bool IsHiDreamWorkflow =>
         ResolvedWorkflowProfile is InferenceWorkflowProfile.HiDream
         || (ResolvedWorkflowProfile is InferenceWorkflowProfile.Custom && SelectedClipType == "HiDream");
+    public bool IsZImageWorkflow =>
+        ResolvedWorkflowProfile is InferenceWorkflowProfile.ZImageBase or InferenceWorkflowProfile.ZImageTurbo
+        || (ResolvedWorkflowProfile is InferenceWorkflowProfile.Custom && SelectedClipType == "lumina2");
     public bool IsGguf => SelectedUnetModel?.RelativePath.EndsWith("gguf") ?? false;
 
     /// <summary>
@@ -272,9 +277,9 @@ public string AdvancedOptionsHeader
     public string TextEncodersHeader => $"Text Encoders ({TextEncoders.Count})";
 
     /// <summary>
-    /// Whether to show the Shift control (for HiDream clip type, only when in UNet mode).
+    /// Whether to show the Shift control (for HiDream and Z-Image workflows, only when in UNet mode).
     /// </summary>
-    public bool ShowShift => ShowEncoderSection && IsHiDreamWorkflow;
+    public bool ShowShift => ShowEncoderSection && (IsHiDreamWorkflow || IsZImageWorkflow);
     public bool ShowEncoderTypeSelection =>
         ShowEncoderSection && SelectedWorkflowProfile is not InferenceWorkflowProfile.Auto;
     public InferenceWorkflowProfile ResolvedWorkflowProfile =>
@@ -629,7 +634,7 @@ public override void LoadStateFromJsonObject(JsonObject state)
         finally
         {
             isLoadingState = false;
-            RefreshWorkflowProfileState();
+            NotifyWorkflowProfileStateChanged();
         }
     }
 
@@ -914,16 +919,22 @@ partial void OnSelectedWorkflowProfileChanged(InferenceWorkflowProfile value)
         RefreshWorkflowProfileState();
     }
 
-    private void RefreshWorkflowProfileState()
+    private void NotifyWorkflowProfileStateChanged()
     {
         OnPropertyChanged(nameof(ResolvedWorkflowProfile));
         OnPropertyChanged(nameof(IsHiDreamWorkflow));
+        OnPropertyChanged(nameof(IsZImageWorkflow));
         OnPropertyChanged(nameof(ShowShift));
         OnPropertyChanged(nameof(ShowEncoderTypeSelection));
         OnPropertyChanged(nameof(HasRecommendedDefaults));
         OnPropertyChanged(nameof(WorkflowProfileStatusText));
         OnPropertyChanged(nameof(ShowWorkflowProfileStatus));
         OnPropertyChanged(nameof(RecommendedDefaultsToolTip));
+    }
+
+    private void RefreshWorkflowProfileState()
+    {
+        NotifyWorkflowProfileStateChanged();
 
         if (!isLoadingState)
         {