From 99ac3f2b8dc777e21fef17eae3f52754f1c867ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chsc=E2=80=9D?= <“huangsucan@kaiyili-lab.com”>
Date: Fri, 7 Aug 2026 14:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A8=8B=E5=BA=8F=E5=AD=90?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ACP/ViewModels/ShellViewModel.cs              |  17 ++-
 ACP/Views/ShellView.xaml                      |  10 +-
 .../ViewModels/CommandTreeViewModel.cs        |  32 +++-
 .../ViewModels/StepsManagerViewModel.cs       | 142 +++++++++---------
 TestingModule/Views/StepsManager.xaml         |  40 +++--
 .../GlobalVariable/ProgramNavigationState.cs  |  89 +++++++++++
 UIShare/GlobalVariable/ScopedContext.cs       |  64 ++------
 UIShare/GlobalVariable/StepRunning.cs         |  13 +-
 UIShare/PubEvent/SubProgramNavigateEvent.cs   |   3 +
 9 files changed, 261 insertions(+), 149 deletions(-)
 create mode 100644 UIShare/GlobalVariable/ProgramNavigationState.cs

diff --git a/ACP/ViewModels/ShellViewModel.cs b/ACP/ViewModels/ShellViewModel.cs
index af76648..a49621e 100644
--- a/ACP/ViewModels/ShellViewModel.cs
+++ b/ACP/ViewModels/ShellViewModel.cs
@@ -46,11 +46,18 @@ namespace ACP.ViewModels
 
         #region 子程序导航
 
-        /// <summary>
-        /// 当前台架是否可以返回上一级
-        /// </summary>
-        public bool CanGoBack => CurrentContext?.CanGoBack ?? false;
+        public bool CanGoBack =>
+            (CurrentContext?.MainNav.CanGoBack ?? false) ||
+            (CurrentContext?.ErrorNav.CanGoBack ?? false);
 
+        private void OnGoBack()
+        {
+            var ctx = CurrentContext;
+            if (ctx == null) return;
+            // 工具栏按钮同时重置两个 Tab 的导航
+            ctx.MainNav.Reset(ctx.Program, "主程序");
+            ctx.ErrorNav.Reset(ctx.Program, "错误程序");
+        }
 
         #endregion
 
@@ -167,6 +174,7 @@ namespace ACP.ViewModels
         public ICommand GetFileStringCommand { get; set; }
         public ICommand SilenceBuzzerCommand { get; set; }
         public ICommand SettingChannelCommand { get; set; }
+        public ICommand GoBackCommand { get; set; }
         #endregion
 
         public ShellViewModel(IContainerProvider containerProvider)
@@ -218,6 +226,7 @@ namespace ACP.ViewModels
             SilenceBuzzerCommand = new AsyncDelegateCommand(SilenceBuzzer);
             SettingChannelCommand = new AsyncDelegateCommand(SilenceBuzzer);
             SettingChannelCommand = new DelegateCommand(SettingChannel);
+            GoBackCommand = new DelegateCommand(OnGoBack);
             _globalInfo.ContextDic.Add("default", new ScopedContext());
 
             _eventAggregator.GetEvent<LoginSuccessEvent>().Subscribe(() =>
diff --git a/ACP/Views/ShellView.xaml b/ACP/Views/ShellView.xaml
index 39a0696..3b66b38 100644
--- a/ACP/Views/ShellView.xaml
+++ b/ACP/Views/ShellView.xaml
@@ -245,7 +245,15 @@ Command="{Binding GetFileStringCommand}">
                                 </MenuItem.Icon>
                             </MenuItem>
                             <Separator/>
-                 
+                            <!-- 返回上一级程序 -->
+                            <MenuItem Header="返回上一级程序"
+              Foreground="Black"
+              Command="{Binding GoBackCommand}">
+                                <MenuItem.Icon>
+                                    <materialDesign:PackIcon Kind="ArrowLeftBold"
+                                     Foreground="Black" />
+                                </MenuItem.Icon>
+                            </MenuItem>
                         </MenuItem>
                         <MenuItem Header="切换初始主界面"
                                  FontSize="13"
diff --git a/TestingModule/ViewModels/CommandTreeViewModel.cs b/TestingModule/ViewModels/CommandTreeViewModel.cs
index 0a6c2fe..2fe5c42 100644
--- a/TestingModule/ViewModels/CommandTreeViewModel.cs
+++ b/TestingModule/ViewModels/CommandTreeViewModel.cs
@@ -568,20 +568,38 @@ namespace TestingModule.ViewModels
         {
             // 查找最近的未匹配循环开始
             StepVM? lastUnmatchedLoopStart = null;
-            for (int i = Program.StepCollection.Count - 1; i >= 0; i--)
+            if (_ScopedContext.SelectedStepList == "主程序")
             {
-                if (Program.StepCollection[i].StepType == "循环开始")
+                for (int i = Program.StepCollection.Count - 1; i >= 0; i--)
                 {
-                    bool isMatched = Program.StepCollection.Any(s => s.StepType == "循环结束" && s.LoopStartStepId == Program.StepCollection[i].ID);
-
-                    if (!isMatched)
+                    if (Program.StepCollection[i].StepType == "循环开始")
                     {
-                        lastUnmatchedLoopStart = Program.StepCollection[i];
-                        break;
+                        bool isMatched = Program.StepCollection.Any(s => s.StepType == "循环结束" && s.LoopStartStepId == Program.StepCollection[i].ID);
+
+                        if (!isMatched)
+                        {
+                            lastUnmatchedLoopStart = Program.StepCollection[i];
+                            break;
+                        }
                     }
                 }
             }
+            else
+            {
+                for (int i = Program.ErrorStepCollection.Count - 1; i >= 0; i--)
+                {
+                    if (Program.ErrorStepCollection[i].StepType == "循环开始")
+                    {
+                        bool isMatched = Program.ErrorStepCollection.Any(s => s.StepType == "循环结束" && s.LoopStartStepId == Program.StepCollection[i].ID);
 
+                        if (!isMatched)
+                        {
+                            lastUnmatchedLoopStart = Program.ErrorStepCollection[i];
+                            break;
+                        }
+                    }
+                }
+            }
             var newStep = new StepVM
             {
                 Name = "循环结束",
diff --git a/TestingModule/ViewModels/StepsManagerViewModel.cs b/TestingModule/ViewModels/StepsManagerViewModel.cs
index 4b048ff..d2853c4 100644
--- a/TestingModule/ViewModels/StepsManagerViewModel.cs
+++ b/TestingModule/ViewModels/StepsManagerViewModel.cs
@@ -99,39 +99,24 @@ namespace TestingModule.ViewModels
         public ICommand GoBackCommand { get; set; }
         #endregion
 
-        #region 子程序导航
+        #region 子程序导航（主程序 / 错误程序各自独立）
+
+        // --- 主程序 Tab 导航属性 ---
+        public ProgramVM MainCurrentProgram => _ScopedContext.MainNav.CurrentProgram;
+        public string MainBreadcrumbPath => _ScopedContext.MainNav.BreadcrumbPath;
+        public bool MainCanGoBack => _ScopedContext.MainNav.CanGoBack;
+        public ObservableCollection<StepVM> MainDisplaySteps => _ScopedContext.MainNav.DisplaySteps;
+
+        // --- 错误程序 Tab 导航属性 ---
+        public ProgramVM ErrorCurrentProgram => _ScopedContext.ErrorNav.CurrentProgram;
+        public string ErrorBreadcrumbPath => _ScopedContext.ErrorNav.BreadcrumbPath;
+        public bool ErrorCanGoBack => _ScopedContext.ErrorNav.CanGoBack;
+        public ObservableCollection<StepVM> ErrorDisplaySteps => _ScopedContext.ErrorNav.DisplaySteps;
 
         /// <summary>
-        /// 当前显示的程序（绑定到 DataGrid 的 ItemsSource 根）。
-        /// 委托到 ScopedContext.CurrentProgram，保证 ShellViewModel 也能通过 ScopedContext 访问。
+        /// 当前激活的导航状态（根据选中的 Tab 决定）
         /// </summary>
-        public ProgramVM CurrentProgram
-        {
-            get => _ScopedContext.CurrentProgram;
-            set
-            {
-                if (_ScopedContext.CurrentProgram != value)
-                {
-                    _ScopedContext.CurrentProgram = value;
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public string BreadcrumbPath
-        {
-            get => _ScopedContext.BreadcrumbPath;
-            set
-            {
-                if (_ScopedContext.BreadcrumbPath != value)
-                {
-                    _ScopedContext.BreadcrumbPath = value;
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public bool CanGoBack => _ScopedContext.CanGoBack;
+        private ProgramNavigationState ActiveNav => _ScopedContext.ActiveNav;
 
         #endregion
 
@@ -153,19 +138,36 @@ namespace TestingModule.ViewModels
             Program.PropertyChanged += Program_PropertyChanged;
             Admin = _globalInfo.IsAdmin;
 
-            // 初始化 CurrentProgram 为根程序
-            _ScopedContext.CurrentProgram = Program;
-            _ScopedContext.BreadcrumbPath = "主程序";
+            // 初始化两套导航状态
+            _ScopedContext.MainNav.Initialize(Program, "主程序");
+            _ScopedContext.ErrorNav.Initialize(Program, "错误程序");
 
-            // 订阅 ScopedContext 属性变化，外部（ShellViewModel）修改时转发通知给 UI
-            _ScopedContext.PropertyChanged += (s, e) =>
+            // 订阅主程序导航状态变化 → 转发给 UI
+            _ScopedContext.MainNav.PropertyChanged += (s, e) =>
             {
-                if (e.PropertyName == nameof(ScopedContext.CurrentProgram))
-                    RaisePropertyChanged(nameof(CurrentProgram));
-                else if (e.PropertyName == nameof(ScopedContext.BreadcrumbPath))
-                    RaisePropertyChanged(nameof(BreadcrumbPath));
-                else if (e.PropertyName == nameof(ScopedContext.CanGoBack))
-                    RaisePropertyChanged(nameof(CanGoBack));
+                if (e.PropertyName == nameof(ProgramNavigationState.CurrentProgram))
+                {
+                    RaisePropertyChanged(nameof(MainCurrentProgram));
+                    RaisePropertyChanged(nameof(MainDisplaySteps));
+                }
+                else if (e.PropertyName == nameof(ProgramNavigationState.BreadcrumbPath))
+                    RaisePropertyChanged(nameof(MainBreadcrumbPath));
+                else if (e.PropertyName == nameof(ProgramNavigationState.CanGoBack))
+                    RaisePropertyChanged(nameof(MainCanGoBack));
+            };
+
+            // 订阅错误程序导航状态变化 → 转发给 UI
+            _ScopedContext.ErrorNav.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == nameof(ProgramNavigationState.CurrentProgram))
+                {
+                    RaisePropertyChanged(nameof(ErrorCurrentProgram));
+                    RaisePropertyChanged(nameof(ErrorDisplaySteps));
+                }
+                else if (e.PropertyName == nameof(ProgramNavigationState.BreadcrumbPath))
+                    RaisePropertyChanged(nameof(ErrorBreadcrumbPath));
+                else if (e.PropertyName == nameof(ProgramNavigationState.CanGoBack))
+                    RaisePropertyChanged(nameof(ErrorCanGoBack));
             };
 
             // 订阅子程序导航事件（运行时由 StepRunning 发布）
@@ -272,45 +274,38 @@ namespace TestingModule.ViewModels
         #region 子程序导航方法
 
         /// <summary>
-        /// 编辑模式：右键打开子程序
+        /// 编辑模式：右键打开子程序（操作当前激活的 Tab 的导航状态）
         /// </summary>
         private void OpenSubProgram()
         {
             if (SelectedStep == null || SelectedStep.StepType != "子程序" || SelectedStep.SubProgram == null)
                 return;
 
-            // 压栈：保存当前程序
-            _ScopedContext.SubProgramNavigationStack.Push(CurrentProgram);
-            _ScopedContext.UpdateCanGoBack();
-            // 更新面包屑
+            var nav = ActiveNav;
+            nav.NavigationStack.Push(nav.CurrentProgram);
+            nav.UpdateCanGoBack();
             var stepName = SelectedStep.Name ?? "子程序";
-            BreadcrumbPath = $"{BreadcrumbPath} > {stepName}";
-            // 切换到子程序
-            CurrentProgram = SelectedStep.SubProgram;
-            RaisePropertyChanged(nameof(CanGoBack));
+            nav.BreadcrumbPath = $"{nav.BreadcrumbPath} > {stepName}";
+            nav.CurrentProgram = SelectedStep.SubProgram;
         }
 
         /// <summary>
-        /// 返回上一级程序
+        /// 返回上一级程序（操作当前激活的 Tab 的导航状态）
         /// </summary>
         private void GoBack()
         {
-            if (_ScopedContext.SubProgramNavigationStack.Count == 0)
+            var nav = ActiveNav;
+            if (nav.NavigationStack.Count == 0)
                 return;
 
-            // 出栈：恢复上一级程序
-            var parentProgram = _ScopedContext.SubProgramNavigationStack.Pop();
-            _ScopedContext.UpdateCanGoBack();
-            CurrentProgram = parentProgram;
+            var parentProgram = nav.NavigationStack.Pop();
+            nav.UpdateCanGoBack();
+            nav.CurrentProgram = parentProgram;
 
-            // 更新面包屑：去掉最后一段
-            var parts = BreadcrumbPath.Split(" > ");
-            if (parts.Length > 1)
-                BreadcrumbPath = string.Join(" > ", parts.Take(parts.Length - 1));
-            else
-                BreadcrumbPath = "主程序";
-
-            RaisePropertyChanged(nameof(CanGoBack));
+            var parts = nav.BreadcrumbPath.Split(" > ");
+            nav.BreadcrumbPath = parts.Length > 1
+                ? string.Join(" > ", parts.Take(parts.Length - 1))
+                : nav == _ScopedContext.MainNav ? "主程序" : "错误程序";
         }
 
         /// <summary>
@@ -318,18 +313,25 @@ namespace TestingModule.ViewModels
         /// </summary>
         private void OnSubProgramNavigate(SubProgramNavigatePayload payload)
         {
+            var nav = payload.IsErrorProgram ? _ScopedContext.ErrorNav : _ScopedContext.MainNav;
             if (payload.Action == NavigateAction.Enter && payload.SubProgram != null)
             {
-                _ScopedContext.SubProgramNavigationStack.Push(CurrentProgram);
-                _ScopedContext.UpdateCanGoBack();
-                CurrentProgram = payload.SubProgram;
+                nav.NavigationStack.Push(nav.CurrentProgram);
+                nav.UpdateCanGoBack();
+                nav.CurrentProgram = payload.SubProgram;
                 var stepName = payload.StepName ?? "子程序";
-                BreadcrumbPath = $"{BreadcrumbPath} > {stepName}";
-                RaisePropertyChanged(nameof(CanGoBack));
+                nav.BreadcrumbPath = $"{nav.BreadcrumbPath} > {stepName}";
             }
             else if (payload.Action == NavigateAction.Exit)
             {
-                GoBack();
+                if (nav.NavigationStack.Count == 0) return;
+                var parentProgram = nav.NavigationStack.Pop();
+                nav.UpdateCanGoBack();
+                nav.CurrentProgram = parentProgram;
+                var parts = nav.BreadcrumbPath.Split(" > ");
+                nav.BreadcrumbPath = parts.Length > 1
+                    ? string.Join(" > ", parts.Take(parts.Length - 1))
+                    : nav == _ScopedContext.MainNav ? "主程序" : "错误程序";
             }
         }
 
diff --git a/TestingModule/Views/StepsManager.xaml b/TestingModule/Views/StepsManager.xaml
index dcb8b75..5672702 100644
--- a/TestingModule/Views/StepsManager.xaml
+++ b/TestingModule/Views/StepsManager.xaml
@@ -17,23 +17,23 @@
     </UserControl.Resources>
     <Grid>
         <GroupBox Header="{Binding Title}">
-            <DockPanel>
-                <!-- 面包屑导航栏 -->
-                <Border DockPanel.Dock="Top" Background="#F0F0F0" Padding="6,3" Visibility="{Binding CanGoBack, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <DockPanel>
-                        <Button DockPanel.Dock="Right" Content="↩ 返回上一级" 
-                                Command="{Binding GoBackCommand}"
-                                Style="{StaticResource MaterialDesignFlatButton}"
-                                FontSize="12" Padding="8,2" Margin="8,0,0,0"/>
-                        <TextBlock Text="{Binding BreadcrumbPath}" VerticalAlignment="Center" FontSize="12" Foreground="#555"/>
-                    </DockPanel>
-                </Border>
             <TabControl   SelectedIndex="{Binding SelectedTabIndex, Mode=TwoWay}">
                 <i:Interaction.Behaviors>
                     <behaviors:TabControlSelectionChangedBehavior Command="{Binding TabSelectionChangedCommand}"
                                                                   CommandParameter="{Binding SelectedTabHeader}" />
                 </i:Interaction.Behaviors>
                 <TabItem Header="主程序">
+                    <DockPanel>
+                        <!-- 主程序面包屑导航栏 -->
+                        <Border DockPanel.Dock="Top" Background="#F0F0F0" Padding="6,3" Visibility="{Binding MainCanGoBack, Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" Content="↩ 返回上一级" 
+                                        Command="{Binding GoBackCommand}"
+                                        Style="{StaticResource MaterialDesignFlatButton}"
+                                        FontSize="12" Padding="8,2" Margin="8,0,0,0"/>
+                                <TextBlock Text="{Binding MainBreadcrumbPath}" VerticalAlignment="Center" FontSize="12" Foreground="#555"/>
+                            </DockPanel>
+                        </Border>
                     <DataGrid dd:DragDrop.IsDragSource="{Binding Admin}"
                               dd:DragDrop.IsDropTarget="{Binding Admin}"
                               dd:DragDrop.UseDefaultDragAdorner="{Binding Admin}"
@@ -44,7 +44,7 @@
                               Background="Transparent"
                               CanUserAddRows="False"
                               CanUserSortColumns="False"
-                              ItemsSource="{Binding CurrentProgram.StepCollection}"
+                              ItemsSource="{Binding MainDisplaySteps}"
                               SelectedItem="{Binding SelectedStep, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                               SelectionMode="Extended"
                               SelectionUnit="FullRow">
@@ -144,8 +144,20 @@
 
 
                     </DataGrid>
+                    </DockPanel>
                 </TabItem>
                 <TabItem Header="错误程序">
+                    <DockPanel>
+                        <!-- 错误程序面包屑导航栏 -->
+                        <Border DockPanel.Dock="Top" Background="#F0F0F0" Padding="6,3" Visibility="{Binding ErrorCanGoBack, Converter={StaticResource BooleanToVisibilityConverter}}">
+                            <DockPanel>
+                                <Button DockPanel.Dock="Right" Content="↩ 返回上一级" 
+                                        Command="{Binding GoBackCommand}"
+                                        Style="{StaticResource MaterialDesignFlatButton}"
+                                        FontSize="12" Padding="8,2" Margin="8,0,0,0"/>
+                                <TextBlock Text="{Binding ErrorBreadcrumbPath}" VerticalAlignment="Center" FontSize="12" Foreground="#555"/>
+                            </DockPanel>
+                        </Border>
                     <DataGrid dd:DragDrop.IsDragSource="True"
                               dd:DragDrop.IsDropTarget="True"
                               dd:DragDrop.UseDefaultDragAdorner="True"
@@ -153,7 +165,7 @@
                               Background="Transparent"
                               CanUserAddRows="False"
                               CanUserSortColumns="False"
-                              ItemsSource="{Binding CurrentProgram.ErrorStepCollection}"
+                              ItemsSource="{Binding ErrorDisplaySteps}"
                               SelectedItem="{Binding SelectedStep, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
                               SelectionMode="Extended"
                               SelectionUnit="FullRow">
@@ -251,9 +263,9 @@
                         </DataGrid.ContextMenu>
 
                     </DataGrid>
+                    </DockPanel>
                 </TabItem>
             </TabControl>
-            </DockPanel>
         </GroupBox>
         
     </Grid>
diff --git a/UIShare/GlobalVariable/ProgramNavigationState.cs b/UIShare/GlobalVariable/ProgramNavigationState.cs
new file mode 100644
index 0000000..ae9df3f
--- /dev/null
+++ b/UIShare/GlobalVariable/ProgramNavigationState.cs
@@ -0,0 +1,89 @@
+using Prism.Mvvm;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using UIShare.UIViewModel;
+
+namespace UIShare.GlobalVariable
+{
+    /// <summary>
+    /// 单个 Tab（主程序 / 错误程序）的子程序导航状态。
+    /// 主程序和错误程序各自持有一个独立实例，互不干扰。
+    /// </summary>
+    public class ProgramNavigationState : BindableBase
+    {
+        /// <summary>是否为错误程序 Tab</summary>
+        public bool IsErrorTab { get; set; }
+
+        public Stack<ProgramVM> NavigationStack { get; } = new();
+
+        private ProgramVM _currentProgram;
+        public ProgramVM CurrentProgram
+        {
+            get => _currentProgram;
+            set
+            {
+                if (SetProperty(ref _currentProgram, value))
+                    RaisePropertyChanged(nameof(DisplaySteps));
+            }
+        }
+
+        /// <summary>
+        /// DataGrid 实际绑定的步骤集合。
+        /// 根程序 + 错误 Tab → ErrorStepCollection；其他情况 → StepCollection。
+        /// </summary>
+        public ObservableCollection<StepVM> DisplaySteps
+        {
+            get
+            {
+                if (CurrentProgram == null)
+                    return new ObservableCollection<StepVM>();
+                // 在根程序且是错误 Tab → 显示错误步骤集合
+                if (NavigationStack.Count == 0 && IsErrorTab)
+                    return CurrentProgram.ErrorStepCollection;
+                // 其他情况（主 Tab 或已进入子程序）→ 显示正常步骤集合
+                return CurrentProgram.StepCollection;
+            }
+        }
+
+        private string _breadcrumbPath = "主程序";
+        public string BreadcrumbPath
+        {
+            get => _breadcrumbPath;
+            set => SetProperty(ref _breadcrumbPath, value);
+        }
+
+        private bool _canGoBack;
+        public bool CanGoBack
+        {
+            get => _canGoBack;
+            set => SetProperty(ref _canGoBack, value);
+        }
+
+        /// <summary>
+        /// 用根程序初始化导航状态
+        /// </summary>
+        public void Initialize(ProgramVM rootProgram, string label)
+        {
+            NavigationStack.Clear();
+            CurrentProgram = rootProgram;
+            BreadcrumbPath = label;
+            CanGoBack = false;
+        }
+
+        /// <summary>
+        /// 清空导航栈，回到根程序
+        /// </summary>
+        public void Reset(ProgramVM rootProgram, string label)
+        {
+            NavigationStack.Clear();
+            CurrentProgram = rootProgram;
+            BreadcrumbPath = label;
+            CanGoBack = false;
+        }
+
+        /// <summary>
+        /// 根据栈状态刷新 CanGoBack
+        /// </summary>
+        public void UpdateCanGoBack() => CanGoBack = NavigationStack.Count > 0;
+    }
+}
diff --git a/UIShare/GlobalVariable/ScopedContext.cs b/UIShare/GlobalVariable/ScopedContext.cs
index 11756d0..4a371a3 100644
--- a/UIShare/GlobalVariable/ScopedContext.cs
+++ b/UIShare/GlobalVariable/ScopedContext.cs
@@ -19,66 +19,29 @@ namespace UIShare.GlobalVariable
     {
         private static readonly Random _randomSeed = new Random();
 
-        #region 子程序导航栈（台架隔离）
+        #region 子程序导航（主程序 / 错误程序各自独立）
+
+        /// <summary>主程序 Tab 的导航状态</summary>
+        public ProgramNavigationState MainNav { get; } = new();
+
+        /// <summary>错误程序 Tab 的导航状态</summary>
+        public ProgramNavigationState ErrorNav { get; } = new();
 
         /// <summary>
-        /// 子程序导航栈：记录从根程序进入子程序的路径。
-        /// 每个台架（ScopedContext 实例）各自维护一个独立的栈，互不干扰。
+        /// 根据当前选中的 Tab 返回对应的导航状态
         /// </summary>
-        public Stack<ProgramVM> SubProgramNavigationStack { get; } = new();
-
-        private ProgramVM _currentProgram;
-        /// <summary>
-        /// 当前在 StepManager 中显示的程序（可能是根程序，也可能是某层子程序）。
-        /// UI 的 DataGrid 绑定此属性，而非直接绑定 Program。
-        /// </summary>
-        public ProgramVM CurrentProgram
-        {
-            get => _currentProgram;
-            set => SetProperty(ref _currentProgram, value);
-        }
-
-        private string _breadcrumbPath = "主程序";
-        /// <summary>
-        /// 面包屑导航路径，如 "主程序 > 连接流程 > 初始化"
-        /// </summary>
-        public string BreadcrumbPath
-        {
-            get => _breadcrumbPath;
-            set => SetProperty(ref _breadcrumbPath, value);
-        }
-
-        private bool _canGoBack;
-        /// <summary>
-        /// 是否可以返回上一级（导航栈不为空时为 true）
-        /// </summary>
-        public bool CanGoBack
-        {
-            get => _canGoBack;
-            set => SetProperty(ref _canGoBack, value);
-        }
+        public ProgramNavigationState ActiveNav =>
+            SelectedStepList == "错误程序" ? ErrorNav : MainNav;
 
         /// <summary>
-        /// 清空导航栈，回到根程序界面
+        /// 重置两个 Tab 的导航栈，回到根程序
         /// </summary>
         public void ResetNavigation()
         {
-            SubProgramNavigationStack.Clear();
-            CurrentProgram = Program;
-            BreadcrumbPath = "主程序";
-            CanGoBack = false;
+            MainNav.Reset(Program, "主程序");
+            ErrorNav.Reset(Program, "错误程序");
         }
 
-        /// <summary>
-        /// 根据栈状态刷新 CanGoBack
-        /// </summary>
-        public void UpdateCanGoBack() => CanGoBack = SubProgramNavigationStack.Count > 0;
-
-        /// <summary>
-        /// 当前导航深度（0 = 根程序，1 = 第一层子程序，以此类推）
-        /// </summary>
-        public int NavigationDepth => SubProgramNavigationStack.Count;
-
         #endregion
 
         public ProgramVM Program { get; set; } = new();
@@ -109,6 +72,7 @@ namespace UIShare.GlobalVariable
         public int DebugRandomId { get; private set; }
         public ScopedContext()
         {
+            ErrorNav.IsErrorTab = true;
             lock (_randomSeed)
             {
                 // 每次诞生一个新上下文，就在 10000 到 99999 之间随机摇一个数
diff --git a/UIShare/GlobalVariable/StepRunning.cs b/UIShare/GlobalVariable/StepRunning.cs
index 56cfcf4..afaaa65 100644
--- a/UIShare/GlobalVariable/StepRunning.cs
+++ b/UIShare/GlobalVariable/StepRunning.cs
@@ -69,11 +69,11 @@ namespace UIShare
                 tmpParameters.Clear();
                 TestRoundID = Guid.NewGuid();
             }
+            int initialLoopStackCount = loopStack.Count;
             foreach (var item in program.Parameters)
             {
                 tmpParameters.TryAdd(item.ID, item);
             }
-
             while (index < program.ErrorStepCollection.Count)
             {
                 if (_disposed || cancellationToken.IsCancellationRequested)
@@ -188,14 +188,16 @@ namespace UIShare
                             Scope = _systemConfig.Title,
                             Action = NavigateAction.Enter,
                             SubProgram = step.SubProgram,
-                            StepName = step.Name
+                            StepName = step.Name,
+                            IsErrorProgram = true
                         });
                         stepSuccess = await ExecuteSteps(step.SubProgram, depth + 1, cancellationToken);
                         // 发布退出子程序导航事件
                         _eventAggregator.GetEvent<SubProgramNavigateEvent>().Publish(new SubProgramNavigatePayload
                         {
                             Scope = _systemConfig.Title,
-                            Action = NavigateAction.Exit
+                            Action = NavigateAction.Exit,
+                            IsErrorProgram = true
                         });
                         UpdateCurrentStepResult(step, true, stepSuccess, depth);
                         if (SubSingleStep)
@@ -238,7 +240,12 @@ namespace UIShare
                     await SaveStepRecordAsync(step, depth, true);
                 }
             }
+            bool finalResult = loopStack.Count == initialLoopStackCount && stepSuccess;
 
+            if (depth > 0) // 子程序
+            {
+                return finalResult;
+            }
             return loopStack.Count == 0 && stepSuccess;
         }
         public  async Task<bool> ExecuteSteps(ProgramVM program, int depth = 0, CancellationToken cancellationToken = default)
diff --git a/UIShare/PubEvent/SubProgramNavigateEvent.cs b/UIShare/PubEvent/SubProgramNavigateEvent.cs
index 1330f2f..c3407b4 100644
--- a/UIShare/PubEvent/SubProgramNavigateEvent.cs
+++ b/UIShare/PubEvent/SubProgramNavigateEvent.cs
@@ -24,6 +24,9 @@ namespace UIShare.PubEvent
 
         /// <summary>子程序步骤的名称（用于面包屑显示）</summary>
         public string? StepName { get; set; }
+
+        /// <summary>是否为错误程序 Tab 的导航（默认 false = 主程序 Tab）</summary>
+        public bool IsErrorProgram { get; set; }
     }
 
     public enum NavigateAction