diff --git a/SalmonEgg/SalmonEgg/Presentation/Diagnostics/AcpSetupRuntimePathProbeDriver.cs b/SalmonEgg/SalmonEgg/Presentation/Diagnostics/AcpSetupRuntimePathProbeDriver.cs
index c25337c0..93296618 100644
--- a/SalmonEgg/SalmonEgg/Presentation/Diagnostics/AcpSetupRuntimePathProbeDriver.cs
+++ b/SalmonEgg/SalmonEgg/Presentation/Diagnostics/AcpSetupRuntimePathProbeDriver.cs
@@ -75,17 +75,16 @@ private static async Task RunAsync(
             var agentId = Environment.GetEnvironmentVariable("SALMONEGG_ACP_SETUP_PATH_AGENT") ?? "qwen-code";
             var row = wizard.Agents.Single(candidate => candidate.AgentId == agentId);
             wizard.SelectedAgent = row;
+            // Selecting a missing-runtime agent advances to the component step, whose runtime section now
+            // owns the path editor. The selection step no longer carries it.
             await wizard.GoNextCommand.ExecuteAsync(null).WaitAsync(token).ConfigureAwait(true);
-            var list = (ListView)page.FindName("AcpSetupAgentsList");
-            list.ScrollIntoView(row);
-            // This gate's preconditions are read from the rendered wizard: the selection step's
-            // panel is the visible step surface, the row wears its missing verdict, and the busy
-            // affordance is idle. The view-model flags behind those surfaces are not consulted.
-            // Scrolling happens first because a virtualized row renders nothing while off-screen.
-            await WaitForAsync(() => Find<StackPanel>(shellRoot, element => element.Name == "AgentSelectionPanel"
+            // This gate's preconditions are read from the rendered wizard: the component step's panel is
+            // the visible step surface, the runtime wears its missing verdict, and the busy affordance is
+            // idle. The view-model flags behind those surfaces are not consulted.
+            await WaitForAsync(() => Find<StackPanel>(shellRoot, element => element.Name == "ComponentSetupPanel"
                 && IsVisible(element)), token).ConfigureAwait(true);
-            await WaitForAsync(() => Find<FontIcon>(shellRoot, element =>
-                AutomationProperties.GetAutomationId(element) == "AcpSetup.Agents.Missing" && IsVisible(element)),
+            await WaitForAsync(() => Find<InfoBar>(shellRoot, element =>
+                AutomationProperties.GetAutomationId(element) == "AcpSetup.Runtime.MissingBar" && IsVisible(element)),
                 token).ConfigureAwait(true);
             if (Find<Button>(shellRoot, element =>
                     AutomationProperties.GetAutomationId(element) == "AcpSetup.CancelOperation") is { } cancel
@@ -97,10 +96,11 @@ await WaitForAsync(() => Find<FontIcon>(shellRoot, element =>
             logger.LogInformation(
                 "AcpSetupPathProbe missing pid={ProcessId} agent={AgentId} command={Command} availability={Availability}",
                 Environment.ProcessId, row.AgentId, row.ProbeCommand, row.Availability);
-            var container = await WaitForAsync(
-                () => list.ContainerFromItem(row) as ListViewItem, token).ConfigureAwait(true);
+            // The runtime path editor is a page-level element on the component step, not a virtualized list
+            // row, so it is found on the shell root directly rather than through a container.
             var expander = await WaitForAsync(
-                () => Find<Expander>(container, element => element.Name == "AgentProbeDiagnosticsExpander"), token).ConfigureAwait(true);
+                () => Find<Expander>(shellRoot, element => element.Name == "AcpSetupRuntimePathExpander"
+                    && IsVisible(element)), token).ConfigureAwait(true);
             var peer = FrameworkElementAutomationPeer.CreatePeerForElement(expander);
             if (peer?.GetPattern(PatternInterface.ExpandCollapse) is not IExpandCollapseProvider expansion)
             {
@@ -109,11 +109,11 @@ await WaitForAsync(() => Find<FontIcon>(shellRoot, element =>
 
             expansion.Expand();
             input = await WaitForAsync(
-                () => Find<TextBox>(container, element =>
-                    AutomationProperties.GetAutomationId(element) == "AcpSetup.Agents.CustomCommand"), token).ConfigureAwait(true);
+                () => Find<TextBox>(shellRoot, element =>
+                    AutomationProperties.GetAutomationId(element) == "AcpSetup.Runtime.CustomCommand"), token).ConfigureAwait(true);
             var verify = await WaitForAsync(
-                () => Find<Button>(container, element =>
-                    AutomationProperties.GetAutomationId(element) == "AcpSetup.Agents.VerifyCustomCommand"), token).ConfigureAwait(true);
+                () => Find<Button>(shellRoot, element =>
+                    AutomationProperties.GetAutomationId(element) == "AcpSetup.Runtime.VerifyCustomCommand"), token).ConfigureAwait(true);
             input.StartBringIntoView();
             await WaitForAsync(() => IsVisible(input) ? input : null, token).ConfigureAwait(true);
             if (!input.Focus(FocusState.Keyboard))
diff --git a/SalmonEgg/SalmonEgg/Presentation/Views/Settings/AcpSetupWizardPage.xaml b/SalmonEgg/SalmonEgg/Presentation/Views/Settings/AcpSetupWizardPage.xaml
index dff03eed..5c26a948 100644
--- a/SalmonEgg/SalmonEgg/Presentation/Views/Settings/AcpSetupWizardPage.xaml
+++ b/SalmonEgg/SalmonEgg/Presentation/Views/Settings/AcpSetupWizardPage.xaml
@@ -96,7 +96,10 @@
                                                       TextWrapping="Wrap"
                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
                                             <!-- Found: say where, so the user can tell which install
-                                                 of several the wizard picked. -->
+                                                 of several the wizard picked. Selection here is
+                                                 read-only status; installing, choosing among shadowed
+                                                 installs, and supplying a path are the component step's
+                                                 job, so a list of eight agents stays scannable. -->
                                             <StackPanel Orientation="Horizontal" Spacing="6"
                                                         Visibility="{x:Bind HasResolvedPath, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
                                                 <TextBlock x:Uid="AcpSetup_ResolvedPathLabel"
@@ -110,127 +113,20 @@
                                                            Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
                                             </StackPanel>
 
-                                            <!-- Shadowed installs. Absent on an ordinary machine: the
-                                                 whole block is gated on there actually being a choice,
-                                                 so a rare case costs nothing in the common one. -->
-                                            <StackPanel Spacing="6"
-                                                        Visibility="{x:Bind HasMultipleCandidates, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                                <TextBlock x:Uid="AcpSetup_MultipleCandidates"
+                                            <!-- Not found: name the command that was looked for. The fix
+                                                 (install / toolchain / path override) lives on the
+                                                 component step, so selection stays a status-only view. -->
+                                            <StackPanel Orientation="Horizontal" Spacing="6"
+                                                        Visibility="{x:Bind IsMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                                <TextBlock x:Uid="AcpSetup_ProbeTargetLabel"
                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                           TextWrapping="Wrap"
                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                                                <!-- Selection is native ComboBox state bound to the row,
-                                                     so no code-behind writes it back. -->
-                                                <ComboBox x:Uid="AcpSetup_CandidatePicker"
-                                                          IsFocusEngagementEnabled="True"
-                                                          ItemsSource="{x:Bind Candidates, Mode=OneWay}"
-                                                          SelectedItem="{x:Bind SelectedCandidate, Mode=TwoWay}"
-                                                          HorizontalAlignment="Stretch"
-                                                          AutomationProperties.AutomationId="AcpSetup.Agents.CandidatePicker"/>
-                                            </StackPanel>
-
-                                            <!-- Not found: name the command that was looked for, then
-                                                 keep the explanation and the fix one disclosure away so
-                                                 a list of eight agents stays scannable. -->
-                                            <StackPanel Spacing="6"
-                                                        Visibility="{x:Bind IsMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                                    <StackPanel Orientation="Horizontal" Spacing="6">
-                                                        <TextBlock x:Uid="AcpSetup_ProbeTargetLabel"
-                                                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                                                        <TextBlock Text="{x:Bind ProbeCommand}"
-                                                                   Style="{StaticResource CaptionTextBlockStyle}"
-                                                                   FontFamily="Consolas"
-                                                                   IsTextSelectionEnabled="True"
-                                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                                                    </StackPanel>
-                                                    <!-- Offered only when this machine can honour it:
-                                                         CanInstallHere folds the catalog's install path
-                                                         together with a probe of the toolchain that would
-                                                         run it, so the button is absent rather than
-                                                         failing on click. -->
-                                                    <Button x:Name="InstallAgentInlineButton"
-                                                            x:Uid="AcpSetup_InstallAgentRow"
-                                                            Tag="{x:Bind}"
-                                                            Click="OnInstallAgentRowClick"
-                                                            AutomationProperties.AutomationId="AcpSetup.Agents.InstallRow"
-                                                            Visibility="{x:Bind CanInstallHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                    <Button x:Name="InstallAgentToolchainInlineButton"
-                                                            x:Uid="AcpSetup_InstallToolchain"
-                                                            Style="{StaticResource AccentButtonStyle}"
-                                                            Tag="{x:Bind}"
-                                                            Click="OnInstallAgentToolchainRowClick"
-                                                            AutomationProperties.AutomationId="AcpSetup.Agents.InstallToolchain"
-                                                            Visibility="{x:Bind CanInstallToolchainHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                    <!-- Distribution the wizard never automates (a
-                                                         prebuilt binary): the agent's own install page is
-                                                         the right destination. -->
-                                                    <HyperlinkButton NavigateUri="{x:Bind InstallDocumentation}"
-                                                                     x:Uid="AcpSetup_InstallDocs"
-                                                                     Visibility="{x:Bind HasAutomaticInstallPath, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Invert}"/>
-                                                    <!-- Installable in principle, but the toolchain is
-                                                         absent. Points at the toolchain rather than the
-                                                         agent, because the agent's page assumes a
-                                                         toolchain this user does not have yet. -->
-                                                    <HyperlinkButton NavigateUri="{x:Bind ToolchainDocumentation, Mode=OneWay}"
-                                                                     x:Uid="AcpSetup_InstallToolchainDocs"
-                                                                     AutomationProperties.AutomationId="AcpSetup.Agents.ToolchainDocs"
-                                                                     Visibility="{x:Bind IsToolchainMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                </StackPanel>
-
-                                                <!-- Says why there is no install button, naming the
-                                                     toolchain. Withdrawing the button without this would
-                                                     leave the row looking like the agent simply cannot be
-                                                     installed, which is a different and wrong conclusion.
-
-                                                     Text is composed by the row rather than carrying an
-                                                     x:Uid: the sentence interpolates the toolchain name,
-                                                     and an x:Uid would assign .Text from the resw and
-                                                     overwrite this binding. -->
-                                                <TextBlock Text="{x:Bind ToolchainMissingHint, Mode=OneWay}"
-                                                           Visibility="{x:Bind IsToolchainMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                                           AutomationProperties.AutomationId="AcpSetup.Agents.ToolchainMissingHint"
+                                                <TextBlock Text="{x:Bind ProbeCommand}"
                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                           TextWrapping="Wrap"
+                                                           FontFamily="Consolas"
+                                                           IsTextSelectionEnabled="True"
                                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
                                             </StackPanel>
-
-                                            <!-- Editing invalidates the probe, so the path input must not
-                                                 share the missing-only install surface's visibility. -->
-                                            <Expander x:Name="AgentProbeDiagnosticsExpander"
-                                                      IsExpanded="False"
-                                                      Visibility="{x:Bind IsRuntimePathEditorVisible, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                                      AutomationProperties.AutomationId="AcpSetup.Agents.PathDetails"
-                                                      HorizontalAlignment="Stretch"
-                                                      HorizontalContentAlignment="Stretch">
-                                                <Expander.Header>
-                                                    <TextBlock x:Uid="AcpSetup_RuntimePathDetails"/>
-                                                </Expander.Header>
-                                                <StackPanel Spacing="8">
-                                                    <TextBlock x:Uid="AcpSetup_PathHint"
-                                                               Style="{StaticResource CaptionTextBlockStyle}"
-                                                               TextWrapping="Wrap"
-                                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
-                                                    <TextBlock Text="{x:Bind ProbeDetail, Mode=OneWay}"
-                                                               Visibility="{x:Bind HasProbeDetail, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-                                                               Style="{StaticResource CaptionTextBlockStyle}"
-                                                               FontFamily="Consolas"
-                                                               TextWrapping="Wrap"
-                                                               IsTextSelectionEnabled="True"
-                                                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
-                                                    <TextBox x:Uid="AcpSetup_CustomCommand"
-                                                             Text="{x:Bind CustomCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                             AutomationProperties.AutomationId="AcpSetup.Agents.CustomCommand"/>
-                                                    <Button x:Name="VerifyCustomCommandButton"
-                                                            x:Uid="AcpSetup_VerifyCustomCommand"
-                                                            Tag="{x:Bind}"
-                                                            Click="OnVerifyAgentRowClick"
-                                                            IsEnabled="{x:Bind HasCustomCommand, Mode=OneWay}"
-                                                            AutomationProperties.AutomationId="AcpSetup.Agents.VerifyCustomCommand"
-                                                            HorizontalAlignment="Left"/>
-                                                </StackPanel>
-                                            </Expander>
                                         </StackPanel>
                                     </DataTemplate>
                                 </ListView.ItemTemplate>
@@ -244,6 +140,159 @@
                             <TextBlock x:Uid="AcpSetup_ComponentsTitle"
                                        Style="{StaticResource SettingsSectionTitleTextStyle}"/>
 
+                            <!-- ── Runtime section ──────────────────────────────
+                                 The agent runtime is installed here, not on the selection step. The
+                                 selection step only reports what is on the machine; every install,
+                                 toolchain, shadowed-install and path-override action for the runtime
+                                 lives in this section, so setup is one place rather than woven through
+                                 an eight-row list. Bound to the selected agent row, which owns the
+                                 runtime probe and raises the install events the code-behind forwards. -->
+                            <StackPanel x:Name="ComponentRuntimeSection"
+                                        Spacing="8"
+                                        AutomationProperties.AutomationId="AcpSetup.Runtime.Section">
+                                <TextBlock x:Uid="AcpSetup_RuntimeSectionTitle"
+                                           Style="{StaticResource BodyStrongTextBlockStyle}"/>
+
+                                <!-- Runtime present: confirm it, and say where it was found so the
+                                     user can tell which install of several is in use. -->
+                                <InfoBar x:Name="AcpSetupRuntimeReadyBar"
+                                         x:Uid="AcpSetup_RuntimeReadyBar"
+                                         IsOpen="{x:Bind ViewModel.SelectedAgent.IsInstalled, Mode=OneWay}"
+                                         Severity="Success"
+                                         IsClosable="False"/>
+                                <InfoBar x:Name="AcpSetupRuntimeMissingBar"
+                                         x:Uid="AcpSetup_RuntimeMissingBar"
+                                         IsOpen="{x:Bind ViewModel.SelectedAgent.IsMissing, Mode=OneWay}"
+                                         AutomationProperties.AutomationId="AcpSetup.Runtime.MissingBar"
+                                         Severity="Warning"
+                                         IsClosable="False"/>
+                                <InfoBar x:Name="AcpSetupRuntimeUndeterminedBar"
+                                         x:Uid="AcpSetup_RuntimeUndeterminedBar"
+                                         IsOpen="{x:Bind ViewModel.SelectedAgent.IsUndetermined, Mode=OneWay}"
+                                         Severity="Informational"
+                                         IsClosable="False"/>
+
+                                <StackPanel Orientation="Horizontal" Spacing="6"
+                                            Visibility="{x:Bind ViewModel.SelectedAgent.HasResolvedPath, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <TextBlock x:Uid="AcpSetup_ResolvedPathLabel"
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
+                                    <TextBlock Text="{x:Bind ViewModel.SelectedAgent.ResolvedPath, Mode=OneWay}"
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               FontFamily="Consolas"
+                                               TextTrimming="CharacterEllipsis"
+                                               IsTextSelectionEnabled="True"
+                                               Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
+                                </StackPanel>
+
+                                <!-- Not found: name the command that was looked for, then offer the
+                                     way forward beside it. Install and toolchain buttons raise the
+                                     row's own events through the code-behind, matching how the runtime
+                                     probe and revision live on the row. -->
+                                <StackPanel Spacing="8"
+                                            Visibility="{x:Bind ViewModel.SelectedAgent.IsMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <StackPanel Orientation="Horizontal" Spacing="6">
+                                            <TextBlock x:Uid="AcpSetup_ProbeTargetLabel"
+                                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                            <TextBlock Text="{x:Bind ViewModel.SelectedAgent.ProbeCommand, Mode=OneWay}"
+                                                       Style="{StaticResource CaptionTextBlockStyle}"
+                                                       FontFamily="Consolas"
+                                                       IsTextSelectionEnabled="True"
+                                                       Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                        </StackPanel>
+                                        <Button x:Name="AcpSetupInstallRuntimeButton"
+                                                x:Uid="AcpSetup_InstallAgentRow"
+                                                Style="{StaticResource AccentButtonStyle}"
+                                                Tag="{x:Bind ViewModel.SelectedAgent, Mode=OneWay}"
+                                                Click="OnInstallAgentRowClick"
+                                                AutomationProperties.AutomationId="AcpSetup.Runtime.Install"
+                                                Visibility="{x:Bind ViewModel.SelectedAgent.CanInstallHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                        <Button x:Name="AcpSetupInstallRuntimeToolchainButton"
+                                                x:Uid="AcpSetup_InstallToolchain"
+                                                Style="{StaticResource AccentButtonStyle}"
+                                                Tag="{x:Bind ViewModel.SelectedAgent, Mode=OneWay}"
+                                                Click="OnInstallAgentToolchainRowClick"
+                                                AutomationProperties.AutomationId="AcpSetup.Runtime.InstallToolchain"
+                                                Visibility="{x:Bind ViewModel.SelectedAgent.CanInstallToolchainHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                        <HyperlinkButton NavigateUri="{x:Bind ViewModel.SelectedAgent.InstallDocumentation, Mode=OneWay}"
+                                                         x:Uid="AcpSetup_InstallDocs"
+                                                         Visibility="{x:Bind ViewModel.SelectedAgent.HasAutomaticInstallPath, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=Invert}"/>
+                                        <HyperlinkButton NavigateUri="{x:Bind ViewModel.SelectedAgent.ToolchainDocumentation, Mode=OneWay}"
+                                                         x:Uid="AcpSetup_InstallToolchainDocs"
+                                                         AutomationProperties.AutomationId="AcpSetup.Runtime.ToolchainDocs"
+                                                         Visibility="{x:Bind ViewModel.SelectedAgent.IsToolchainMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                                    </StackPanel>
+
+                                    <!-- Says why there is no install button, naming the toolchain.
+                                         Composed by the row because it interpolates the toolchain name. -->
+                                    <TextBlock Text="{x:Bind ViewModel.SelectedAgent.ToolchainMissingHint, Mode=OneWay}"
+                                               Visibility="{x:Bind ViewModel.SelectedAgent.IsToolchainMissing, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                               AutomationProperties.AutomationId="AcpSetup.Runtime.ToolchainMissingHint"
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               TextWrapping="Wrap"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                </StackPanel>
+
+                                <!-- Shadowed installs. Absent on an ordinary machine: the whole block is
+                                     gated on there actually being a choice, so a rare case costs nothing
+                                     in the common one. Selection is native ComboBox state bound to the
+                                     row, so no code-behind writes it back. -->
+                                <StackPanel Spacing="6"
+                                            Visibility="{x:Bind ViewModel.SelectedAgent.HasMultipleCandidates, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                    <TextBlock x:Uid="AcpSetup_MultipleCandidates"
+                                               Style="{StaticResource CaptionTextBlockStyle}"
+                                               TextWrapping="Wrap"
+                                               Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                    <ComboBox x:Uid="AcpSetup_CandidatePicker"
+                                              IsFocusEngagementEnabled="True"
+                                              ItemsSource="{x:Bind ViewModel.SelectedAgent.Candidates, Mode=OneWay}"
+                                              SelectedItem="{x:Bind ViewModel.SelectedAgent.SelectedCandidate, Mode=TwoWay}"
+                                              HorizontalAlignment="Stretch"
+                                              AutomationProperties.AutomationId="AcpSetup.Runtime.CandidatePicker"/>
+                                </StackPanel>
+
+                                <!-- Runtime path override. Editing invalidates the probe, so this must
+                                     not share the missing-only surface's visibility. -->
+                                <Expander x:Name="AcpSetupRuntimePathExpander"
+                                          IsExpanded="False"
+                                          Visibility="{x:Bind ViewModel.SelectedAgent.IsRuntimePathEditorVisible, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                          AutomationProperties.AutomationId="AcpSetup.Runtime.PathDetails"
+                                          HorizontalAlignment="Stretch"
+                                          HorizontalContentAlignment="Stretch">
+                                    <Expander.Header>
+                                        <TextBlock x:Uid="AcpSetup_RuntimePathDetails"/>
+                                    </Expander.Header>
+                                    <StackPanel Spacing="8">
+                                        <TextBlock x:Uid="AcpSetup_PathHint"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   TextWrapping="Wrap"
+                                                   Foreground="{ThemeResource TextFillColorSecondaryBrush}"/>
+                                        <TextBlock Text="{x:Bind ViewModel.SelectedAgent.ProbeDetail, Mode=OneWay}"
+                                                   Visibility="{x:Bind ViewModel.SelectedAgent.HasProbeDetail, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                                   Style="{StaticResource CaptionTextBlockStyle}"
+                                                   FontFamily="Consolas"
+                                                   TextWrapping="Wrap"
+                                                   IsTextSelectionEnabled="True"
+                                                   Foreground="{ThemeResource TextFillColorTertiaryBrush}"/>
+                                        <TextBox x:Uid="AcpSetup_CustomCommand"
+                                                 Text="{x:Bind ViewModel.SelectedAgent.CustomCommand, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                 AutomationProperties.AutomationId="AcpSetup.Runtime.CustomCommand"/>
+                                        <Button x:Name="AcpSetupVerifyRuntimeButton"
+                                                x:Uid="AcpSetup_VerifyCustomCommand"
+                                                Tag="{x:Bind ViewModel.SelectedAgent, Mode=OneWay}"
+                                                Click="OnVerifyAgentRowClick"
+                                                AutomationProperties.AutomationId="AcpSetup.Runtime.VerifyCustomCommand"
+                                                HorizontalAlignment="Left"/>
+                                    </StackPanel>
+                                </Expander>
+                            </StackPanel>
+
+                            <!-- ── Adapter section ────────────────────────────── -->
+                            <TextBlock x:Uid="AcpSetup_AdapterSectionTitle"
+                                       Style="{StaticResource BodyStrongTextBlockStyle}"/>
+
                             <!-- Each probe verdict gets its own surface. "Undetermined" is deliberately
                                  not styled as a failure: the wizard could not look, which is not
                                  evidence the adapter is absent. -->
diff --git a/SalmonEgg/SalmonEgg/Strings/en-US/Resources.resw b/SalmonEgg/SalmonEgg/Strings/en-US/Resources.resw
index 50440b4d..6b8b0975 100644
--- a/SalmonEgg/SalmonEgg/Strings/en-US/Resources.resw
+++ b/SalmonEgg/SalmonEgg/Strings/en-US/Resources.resw
@@ -855,6 +855,30 @@
   <data name="AcpSetup_DetectAgents.Content" xml:space="preserve">
     <value>Detect again</value>
   </data>
+  <data name="AcpSetup_RuntimeSectionTitle.Text" xml:space="preserve">
+    <value>Agent runtime</value>
+  </data>
+  <data name="AcpSetup_AdapterSectionTitle.Text" xml:space="preserve">
+    <value>ACP adapter</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Title" xml:space="preserve">
+    <value>Runtime ready</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Message" xml:space="preserve">
+    <value>The agent runtime was found on this machine. You can continue.</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Title" xml:space="preserve">
+    <value>Agent runtime not found</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Message" xml:space="preserve">
+    <value>Install the agent runtime below, or supply the path to an existing install, then continue.</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Title" xml:space="preserve">
+    <value>Could not confirm the runtime</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Message" xml:space="preserve">
+    <value>Detection reached no conclusion, which is not the same as the runtime being absent. You can continue; the connection test will verify it.</value>
+  </data>
   <data name="AcpSetup_ComponentsTitle.Text" xml:space="preserve">
     <value>Check components</value>
   </data>
diff --git a/SalmonEgg/SalmonEgg/Strings/en/Resources.resw b/SalmonEgg/SalmonEgg/Strings/en/Resources.resw
index b5777c31..8ee17d85 100644
--- a/SalmonEgg/SalmonEgg/Strings/en/Resources.resw
+++ b/SalmonEgg/SalmonEgg/Strings/en/Resources.resw
@@ -1383,6 +1383,30 @@
   <data name="AcpSetup_DetectAgents.Content" xml:space="preserve">
     <value>Detect again</value>
   </data>
+  <data name="AcpSetup_RuntimeSectionTitle.Text" xml:space="preserve">
+    <value>Agent runtime</value>
+  </data>
+  <data name="AcpSetup_AdapterSectionTitle.Text" xml:space="preserve">
+    <value>ACP adapter</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Title" xml:space="preserve">
+    <value>Runtime ready</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Message" xml:space="preserve">
+    <value>The agent runtime was found on this machine. You can continue.</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Title" xml:space="preserve">
+    <value>Agent runtime not found</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Message" xml:space="preserve">
+    <value>Install the agent runtime below, or supply the path to an existing install, then continue.</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Title" xml:space="preserve">
+    <value>Could not confirm the runtime</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Message" xml:space="preserve">
+    <value>Detection reached no conclusion, which is not the same as the runtime being absent. You can continue; the connection test will verify it.</value>
+  </data>
   <data name="AcpSetup_ComponentsTitle.Text" xml:space="preserve">
     <value>Check components</value>
   </data>
diff --git a/SalmonEgg/SalmonEgg/Strings/zh-Hans/Resources.resw b/SalmonEgg/SalmonEgg/Strings/zh-Hans/Resources.resw
index a9b374bb..35516b19 100644
--- a/SalmonEgg/SalmonEgg/Strings/zh-Hans/Resources.resw
+++ b/SalmonEgg/SalmonEgg/Strings/zh-Hans/Resources.resw
@@ -780,6 +780,30 @@
   <data name="AcpSetup_DetectAgents.Content" xml:space="preserve">
     <value>重新检测</value>
   </data>
+  <data name="AcpSetup_RuntimeSectionTitle.Text" xml:space="preserve">
+    <value>Agent 运行时</value>
+  </data>
+  <data name="AcpSetup_AdapterSectionTitle.Text" xml:space="preserve">
+    <value>ACP 适配器</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Title" xml:space="preserve">
+    <value>运行时已就绪</value>
+  </data>
+  <data name="AcpSetup_RuntimeReadyBar.Message" xml:space="preserve">
+    <value>已在本机找到 Agent 运行时，可以进入下一步。</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Title" xml:space="preserve">
+    <value>未找到 Agent 运行时</value>
+  </data>
+  <data name="AcpSetup_RuntimeMissingBar.Message" xml:space="preserve">
+    <value>在下方安装 Agent 运行时，或填入已有安装的路径，然后继续。</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Title" xml:space="preserve">
+    <value>无法确认运行时是否已安装</value>
+  </data>
+  <data name="AcpSetup_RuntimeUndeterminedBar.Message" xml:space="preserve">
+    <value>检测没能得出结论，不代表运行时不存在。可以继续，由连接测试来验证。</value>
+  </data>
   <data name="AcpSetup_ComponentsTitle.Text" xml:space="preserve">
     <value>检查组件</value>
   </data>
diff --git a/src/SalmonEgg.Presentation.Core/ViewModels/Settings/AcpSetup/AcpSetupWizardViewModel.cs b/src/SalmonEgg.Presentation.Core/ViewModels/Settings/AcpSetup/AcpSetupWizardViewModel.cs
index f2a966b4..0357fa24 100644
--- a/src/SalmonEgg.Presentation.Core/ViewModels/Settings/AcpSetup/AcpSetupWizardViewModel.cs
+++ b/src/SalmonEgg.Presentation.Core/ViewModels/Settings/AcpSetup/AcpSetupWizardViewModel.cs
@@ -679,6 +679,7 @@ await _uiDispatcher
                         row.RuntimeToolchain = toolchain;
                         OnPropertyChanged(nameof(StepPositionText));
                         ReportInstallFailure(install);
+                        RequestAdapterReprobeAfterRuntimeChange();
                     })
                     .ConfigureAwait(false);
             },
@@ -715,6 +716,7 @@ await _uiDispatcher.EnqueueAsync(() =>
 
                     row.RuntimeToolchain = toolchain;
                     ReportToolchainInstallFailure(install);
+                    RequestAdapterReprobeAfterRuntimeChange();
                 }).ConfigureAwait(false);
             },
             CancellationToken.None);
@@ -972,7 +974,10 @@ private async Task GoNextAsync(CancellationToken cancellationToken)
 
     private bool CanGoNext() => !IsBusy && Step switch
     {
-        AcpSetupWizardStep.AgentSelection => SelectedAgent is { IsChecking: false } && !IsRuntimeInstallRequired,
+        // Selecting an agent is all this step gates. A missing runtime does not block leaving it: the
+        // runtime is installed on the component step alongside the adapter, and CanAdvanceFromComponentSetup
+        // is where a still-missing runtime holds the walk.
+        AcpSetupWizardStep.AgentSelection => SelectedAgent is { IsChecking: false },
         AcpSetupWizardStep.ComponentSetup => CanAdvanceFromComponentSetup(),
         AcpSetupWizardStep.Parameters => true,
         AcpSetupWizardStep.Test => IsTestSuccessful,
@@ -1016,14 +1021,11 @@ await _uiDispatcher.EnqueueAsync(() =>
                 row.Runtime = runtime;
                 OnPropertyChanged(nameof(StepPositionText));
 
-                // PrepareComponentSetup resolves the adapter, and whether an absent runtime blocks the walk
-                // is a fact about that adapter. Preparing first is what lets the gate below see it.
+                // PrepareComponentSetup resolves the adapter. A missing runtime no longer stops the walk
+                // here — the component step owns installing it — so this proceeds to that step, where the
+                // runtime section offers the install and CanAdvanceFromComponentSetup holds the line until
+                // it succeeds.
                 PrepareComponentSetup();
-                if (IsRuntimeInstallRequired)
-                {
-                    return;
-                }
-
                 adapter = SelectedAdapter;
                 if (adapter is not null)
                 {
@@ -1702,6 +1704,25 @@ private void RunDeferredAdapterProbe()
         _ = DetectAdapterCommand.ExecuteAsync(null);
     }
 
+    /// <summary>
+    /// After a runtime or its toolchain is installed on the component step, re-probes the adapter so its
+    /// own verdict reflects the toolchain that install may have just provided.
+    /// </summary>
+    /// <remarks>
+    /// The adapter was probed on entry to the step, when the toolchain could still have been absent — an
+    /// npx adapter probed then reads its package manager missing and stays that way. Installing the runtime
+    /// toolchain is exactly what supplies that manager, so the adapter's stale "missing toolchain" verdict
+    /// would otherwise keep its install refused. Deferred through the same flag a selection change uses,
+    /// because this runs inside the install operation while the wizard is still busy.
+    /// </remarks>
+    private void RequestAdapterReprobeAfterRuntimeChange()
+    {
+        if (IsOnComponentSetup && SelectedAdapter is not null)
+        {
+            _adapterProbeRequested = true;
+        }
+    }
+
     private bool CanRunOperation() => !IsBusy;
 
     /// <summary>
diff --git a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupPrerequisiteFlowTests.cs b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupPrerequisiteFlowTests.cs
index 10c4787b..5cfa4718 100644
--- a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupPrerequisiteFlowTests.cs
+++ b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupPrerequisiteFlowTests.cs
@@ -41,11 +41,13 @@ public async Task GoNext_FreshMachine_RequiresToolchainThenAgentThenAdapter(bool
         var row = Assert.Single(wizard.Agents);
         wizard.SelectedAgent = row;
 
-        // Act / Assert: each next action is offered only after its prerequisite is verified.
+        // Act / Assert: selecting a missing-runtime agent advances to the component step, where the
+        // runtime is installed. Each next action is offered only after its prerequisite is verified.
         await wizard.GoNextCommand.ExecuteAsync(null);
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
         Assert.True(row.CanInstallToolchainHere);
         Assert.False(row.CanInstallHere);
+        Assert.False(wizard.GoNextCommand.CanExecute(null));
         row.RequestInstall();
         Assert.Empty(operations);
 
@@ -55,30 +57,29 @@ public async Task GoNext_FreshMachine_RequiresToolchainThenAgentThenAdapter(bool
         Assert.False(row.CanInstallToolchainHere);
         Assert.True(row.CanInstallHere);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
-        Assert.Null(wizard.AdapterProbe);
 
         row.RequestInstall();
         Assert.False(wizard.IsBusy);
         Assert.True(row.IsInstalled);
-        Assert.True(wizard.GoNextCommand.CanExecute(null));
         Assert.Equal(new[] { "Node.js", agent.Runtime.Id }, operations);
-        Assert.Null(wizard.AdapterProbe);
 
-        await wizard.GoNextCommand.ExecuteAsync(null);
+        // With the runtime present, the adapter section of the same step decides whether it is done.
         if (separateAdapter)
         {
-            Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
             Assert.True(wizard.IsAdapterMissing);
             Assert.False(wizard.GoNextCommand.CanExecute(null));
             await wizard.InstallAdapterCommand.ExecuteAsync(null);
             Assert.True(wizard.IsAdapterInstalled);
             Assert.Equal(new[] { "Node.js", agent.Runtime.Id, adapter.Component.Id }, operations);
+            Assert.True(wizard.GoNextCommand.CanExecute(null));
             await wizard.GoNextCommand.ExecuteAsync(null);
         }
         else
         {
             Assert.True(wizard.IsAdapterBuiltIn);
             Assert.Equal(new[] { "Node.js", agent.Runtime.Id }, operations);
+            Assert.True(wizard.GoNextCommand.CanExecute(null));
+            await wizard.GoNextCommand.ExecuteAsync(null);
         }
 
         Assert.Equal(AcpSetupWizardStep.Test, wizard.Step);
@@ -92,7 +93,7 @@ public async Task GoNext_FreshMachine_RequiresToolchainThenAgentThenAdapter(bool
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public async Task InstallAgent_UnverifiedInstall_KeepsAdapterStepBlocked(bool installerSucceeded)
+    public async Task InstallAgent_UnverifiedInstall_KeepsComponentStepBlocked(bool installerSucceeded)
     {
         // Arrange
         var probe = new StubExecutableProbe();
@@ -102,8 +103,10 @@ public async Task InstallAgent_UnverifiedInstall_KeepsAdapterStepBlocked(bool in
         var wizard = CreateWizard(probe, installer);
         wizard.SelectedAgent = Assert.Single(wizard.Agents);
         await wizard.GoNextCommand.ExecuteAsync(null);
+        // The missing runtime lands on the component step, where its install lives.
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
 
-        // Act
+        // Act: the install leaves the runtime unverified (the probe still reports it absent).
         wizard.SelectedAgent.RequestInstall();
         await wizard.GoNextCommand.ExecuteAsync(null);
 
@@ -111,8 +114,7 @@ public async Task InstallAgent_UnverifiedInstall_KeepsAdapterStepBlocked(bool in
         Assert.Single(installer.InstalledComponentIds);
         Assert.True(wizard.SelectedAgent.IsMissing);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
-        Assert.Null(wizard.AdapterProbe);
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
     }
 
     [Fact]
@@ -245,7 +247,7 @@ public async Task GoNext_UnsupportedProcessProbing_PreservesTheUnverifiedSetupPa
     }
 
     [Fact]
-    public async Task GoNext_AgentDisappearedSinceDetection_StaysAtItsInstallAction()
+    public async Task GoNext_AgentDisappearedSinceDetection_AdvancesToItsComponentInstall()
     {
         // Arrange
         var probe = new StubExecutableProbe();
@@ -259,12 +261,12 @@ public async Task GoNext_AgentDisappearedSinceDetection_StaysAtItsInstallAction(
         // Act
         await wizard.GoNextCommand.ExecuteAsync(null);
 
-        // Assert
+        // Assert: the runtime is installed on the component step, so a runtime that vanished since the
+        // sweep advances there and its install waits, rather than blocking the selection step.
         Assert.True(wizard.SelectedAgent.IsMissing);
         Assert.True(wizard.SelectedAgent.CanInstallHere);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
-        Assert.Null(wizard.AdapterProbe);
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
     }
 
     [Fact]
@@ -429,7 +431,7 @@ public async Task GoNext_BundledRuntimeMissingAfterDetection_UsesTheRecommendedA
     }
 
     [Fact]
-    public async Task GoNext_BundledAdapterWithMissingCustomRuntime_RemainsOnSelection()
+    public async Task GoNext_BundledAdapterWithMissingCustomRuntime_BlocksAtComponentStep()
     {
         // Arrange
         var probe = new StubExecutableProbe();
@@ -443,16 +445,15 @@ public async Task GoNext_BundledAdapterWithMissingCustomRuntime_RemainsOnSelecti
         await wizard.DetectAgentsCommand.ExecuteAsync(null);
         Assert.True(row.IsMissing);
         Assert.Contains(row.CustomCommand, probe.ProbedCommands);
-        probe.ProbedCommands.Clear();
 
         // Act
         await wizard.GoNextCommand.ExecuteAsync(null);
 
-        // Assert: a bundled default must not override the user's explicit runtime choice.
+        // Assert: a bundled default must not override the user's explicit runtime choice. The walk
+        // reaches the component step, but the runtime section holds Next until the chosen path resolves.
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
+        Assert.True(row.IsMissing);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
-        Assert.Null(wizard.AdapterProbe);
-        Assert.Empty(probe.ProbedCommands);
     }
 
     /// <summary>
@@ -460,24 +461,25 @@ public async Task GoNext_BundledAdapterWithMissingCustomRuntime_RemainsOnSelecti
     /// </summary>
     /// <remarks>
     /// CanExecute is only re-read when something raises the change notification, so a gate reading a fact
-    /// nobody announces keeps showing the verdict it was last told. The custom-path box shares the
-    /// selection step with Next and writes on every keystroke, outside any operation whose completion
+    /// nobody announces keeps showing the verdict it was last told. The runtime path box shares the
+    /// component step with Next and writes on every keystroke, outside any operation whose completion
     /// would re-notify — so a Next left grey here has nothing to correct it, and the user faces a path the
     /// wizard would accept beside a button saying it would not. Asserting through CanExecuteChanged rather
     /// than a bare CanExecute call is the difference that matters: reading the property directly recomputes
     /// it and would pass no matter what the view had been told.
     /// </remarks>
     [Fact]
-    public async Task GoNext_CustomPathSuppliedForAMissingRuntime_ReOffersTheWalk()
+    public async Task ComponentStep_CustomPathSuppliedForAMissingRuntime_ReOffersTheWalk()
     {
-        // Arrange: nothing on PATH, so the probe positively reports the runtime absent and Next is withheld.
+        // Arrange: nothing on PATH, so the probe positively reports the runtime absent. Selecting the
+        // agent advances to the component step, where the runtime section holds Next until it resolves.
         var wizard = CreateWizard(
             new StubExecutableProbe(),
             agents: [AcpSetupWizardFixtures.Agent(adapters: AcpSetupWizardFixtures.BuiltInAdapter())]);
         var row = Assert.Single(wizard.Agents);
         wizard.SelectedAgent = row;
         await wizard.GoNextCommand.ExecuteAsync(null);
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
         Assert.True(row.IsMissing);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
 
diff --git a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardViewModelTests.cs b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardViewModelTests.cs
index bb9cd70d..7cacd366 100644
--- a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardViewModelTests.cs
+++ b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardViewModelTests.cs
@@ -544,7 +544,7 @@ public async Task DetectAgents_MissingRuntime_BlocksAdvancementUntilSelected()
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public async Task AgentSelection_MissingRuntime_DoesNotAdvanceToAdapterDetection(bool hasToolchain)
+    public async Task AgentSelection_MissingRuntime_AdvancesToComponentSetupWhereTheRuntimeInstalls(bool hasToolchain)
     {
         // Arrange
         var probe = new StubExecutableProbe();
@@ -561,9 +561,13 @@ public async Task AgentSelection_MissingRuntime_DoesNotAdvanceToAdapterDetection
         // Act
         await wizard.GoNextCommand.ExecuteAsync(null);
 
-        // Assert
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
-        Assert.Null(wizard.AdapterProbe);
+        // Assert: selecting a missing-runtime agent no longer holds the walk on step 1. The component
+        // step is where the runtime is installed, so the wizard advances there and CanAdvanceFromComponentSetup
+        // is what keeps a still-missing runtime from moving on.
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
+        Assert.True(wizard.SelectedAgent.IsMissing);
+        Assert.Equal(!hasToolchain, wizard.SelectedAgent.IsToolchainMissing);
+        Assert.Equal(hasToolchain, wizard.SelectedAgent.CanInstallHere);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
     }
 
@@ -584,7 +588,7 @@ public async Task DetectAgents_UndeterminedProbe_DoesNotBlockAdvancement()
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    public async Task AgentSelection_WithoutInitialDetection_ChecksRuntimeAndToolchainBeforeAdvancing(bool hasToolchain)
+    public async Task AgentSelection_WithoutInitialDetection_ChecksRuntimeThenAdvancesToComponentSetup(bool hasToolchain)
     {
         // Arrange
         var probe = new StubExecutableProbe();
@@ -599,12 +603,13 @@ public async Task AgentSelection_WithoutInitialDetection_ChecksRuntimeAndToolcha
         // Act
         await wizard.GoNextCommand.ExecuteAsync(null);
 
-        // Assert
-        Assert.Equal(AcpSetupWizardStep.AgentSelection, wizard.Step);
+        // Assert: entering the wizard without a sweep still probes the runtime on advance, but a missing
+        // runtime no longer blocks step 1 — it advances to the component step, whose own gate holds until
+        // the runtime is installed there.
+        Assert.Equal(AcpSetupWizardStep.ComponentSetup, wizard.Step);
         Assert.True(wizard.SelectedAgent.IsMissing);
         Assert.Equal(!hasToolchain, wizard.SelectedAgent.IsToolchainMissing);
         Assert.Equal(hasToolchain, wizard.SelectedAgent.CanInstallHere);
-        Assert.Null(wizard.AdapterProbe);
         Assert.False(wizard.GoNextCommand.CanExecute(null));
         Assert.False(wizard.TestCommand.CanExecute(null));
     }
diff --git a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardXamlTests.cs b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardXamlTests.cs
index 6ca298e8..9429da4d 100644
--- a/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardXamlTests.cs
+++ b/tests/SalmonEgg.Presentation.Core.Tests/Settings/AcpSetup/AcpSetupWizardXamlTests.cs
@@ -24,13 +24,13 @@ public void ToolchainMissingStates_OfferARealInstallActionAndManualFallback()
             "{x:Bind ViewModel.IsAdapterToolchainInstallable, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}",
             adapter.Attribute("Visibility")?.Value);
 
-        var row = FindByName(document, "InstallAgentToolchainInlineButton");
-        Assert.Equal("AcpSetup_InstallToolchain", AttributeByLocalName(row, "Uid"));
-        Assert.Equal("AcpSetup.Agents.InstallToolchain", row.Attribute("AutomationProperties.AutomationId")?.Value);
+        var runtime = FindByName(document, "AcpSetupInstallRuntimeToolchainButton");
+        Assert.Equal("AcpSetup_InstallToolchain", AttributeByLocalName(runtime, "Uid"));
+        Assert.Equal("AcpSetup.Runtime.InstallToolchain", runtime.Attribute("AutomationProperties.AutomationId")?.Value);
         Assert.Equal(
-            "{x:Bind CanInstallToolchainHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}",
-            row.Attribute("Visibility")?.Value);
-        Assert.Equal("OnInstallAgentToolchainRowClick", row.Attribute("Click")?.Value);
+            "{x:Bind ViewModel.SelectedAgent.CanInstallToolchainHere, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}",
+            runtime.Attribute("Visibility")?.Value);
+        Assert.Equal("OnInstallAgentToolchainRowClick", runtime.Attribute("Click")?.Value);
 
         foreach (var resourceFile in new[]
                  {