fix: avoid substring denies in audit path keywords

2026-10-07 15:51:08 +00:00 · 2026-10-07 15:11:55 +08:00
71 changed files with 335 additions and 474 deletions
@@ -4,17 +4,15 @@ OrcaSlicer — open-source C++17 3D slicer. wxWidgets GUI, CMake build system.

 ## Build Commands

-Build the Release configuration unless asked otherwise.
-
 ```bash
 # macOS
-cmake --build build/arm64 --config Release --target all --
+cmake --build build/arm64 --config RelWithDebInfo --target all --

 # Linux
-cmake --build build --config Release --target all --
+cmake --build build --config RelWithDebInfo --target all --

-# Windows
-cmake --build . --config Release --target ALL_BUILD -- -m
+# Windows (replace %build_type% with Debug/Release/RelWithDebInfo)
+cmake --build . --config %build_type% --target ALL_BUILD -- -m
 ```

 ## Testing
@@ -4,10 +4,5 @@
 <dict>
    <key>com.apple.security.cs.disable-library-validation</key>
    <true/>
-    <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
-         after loading. Under the hardened runtime macOS kills the process when that page is
-         paged back in; this lets it run, as Bambu Studio's signature does. -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
 </dict>
 </plist>
@@ -3618,9 +3618,6 @@ int CLI::run(int argc, char **argv)
                {
                    if (opt_key == "compatible_prints" || opt_key == "compatible_printers" || opt_key == "model_id" || opt_key == "dev_model_name" || opt_key == "filament_settings_id")
                        continue;
-                    // rebuilt from every filament after this loop
-                    if (filament_dev_options.find(opt_key) != filament_dev_options.end())
-                        continue;
                    ConfigOption *opt = m_print_config.option(opt_key, true);
                    if (opt == nullptr) {
                        // opt_key does not exist in this ConfigBase and it cannot be created, because it is not defined by this->def().
@@ -3684,14 +3681,6 @@ int CLI::run(int argc, char **argv)
            }
        }

-        // The stored values cannot be told apart per filament, so they are kept as they are unless every slot has a config.
-        std::vector<const DynamicPrintConfig *> filament_configs(filament_count, nullptr);
-        for (size_t index = 0; index < load_filaments_config.size(); index++)
-            if (load_filaments_index[index] >= 1 && load_filaments_index[index] <= filament_count)
-                filament_configs[load_filaments_index[index] - 1] = &load_filaments_config[index];
-        if (std::find(filament_configs.begin(), filament_configs.end(), nullptr) == filament_configs.end())
-            set_filament_dev_options(m_print_config, filament_configs);
-
        if (m_print_config.option<ConfigOptionStrings>("filament_extruder_variant")) {
            std::vector<int>& filament_self_indice = m_print_config.option<ConfigOptionInts>("filament_self_index", true)->values;
            int index_size = m_print_config.option<ConfigOptionStrings>("filament_extruder_variant")->size();
@@ -5,10 +5,5 @@
  <!-- for dynamic loading of libraries without signature validation. Used for 3dconnection drivers.-->
  <key>com.apple.security.cs.disable-library-validation</key>  
  <true/>
-  <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
-       after loading. Under the hardened runtime macOS kills the process when that page is
-       paged back in; this lets it run, as Bambu Studio's signature does. -->
-  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-  <true/>
 </dict>
 </plist>
@@ -148,6 +148,8 @@ struct ConflictComputeResult

 using ConflictComputeOpt = std::optional<ConflictComputeResult>;

+using ConflictObjName = std::optional<std::pair<std::string, std::string>>;
+
 struct ConflictChecker
 {
    static ConflictResultOpt  find_inter_of_lines_in_diff_objs(PrintObjectPtrs objs, std::optional<const FakeWipeTower *> wtdptr);
@@ -22,6 +22,9 @@
 namespace Slic3r {
 namespace PreciseSeam {

+// Import EnforcedBlockedSeamPoint from SeamPlacerImpl namespace for convenience
+using SeamPlacerImpl::EnforcedBlockedSeamPoint;
+
 // Geometry and its exterior bounds are prepared together, then treated as read-only.
 struct ModifierRegion {
    ExPolygon polygon;
@@ -134,7 +137,7 @@ SegmentExtraction extract_perimeter_segments(const PreparedPerimeter &prepared,

 // Result of weak modifier segment processing
 struct WeakModifierSegment {
-    SeamPlacerImpl::EnforcedBlockedSeamPoint type;  // Enforced/Blocked/Neutral
+    EnforcedBlockedSeamPoint type;  // Enforced/Blocked/Neutral
    Point left_point;               // Coordinates of left (first) point of segment
    PerimeterPosition left_position; // Position on the source perimeter before insertion/refinement.
    Point right_point;              // Coordinates of right (last) point of segment
@@ -40,7 +40,8 @@ std::string get_error_string(const ThumbnailErrors& errors);


 typedef std::vector<std::pair<GCodeThumbnailsFormat, Vec2d>> GCodeThumbnailDefinitionsList;
-std::pair<GCodeThumbnailDefinitionsList, ThumbnailErrors> make_and_check_thumbnail_list(const std::string& thumbnails_string, const std::string_view def_ext = "PNG");
+using namespace std::literals;
+std::pair<GCodeThumbnailDefinitionsList, ThumbnailErrors> make_and_check_thumbnail_list(const std::string& thumbnails_string, const std::string_view def_ext = "PNG"sv);
 std::pair<GCodeThumbnailDefinitionsList, ThumbnailErrors> make_and_check_thumbnail_list(const ConfigBase &config);


@@ -94,6 +94,8 @@ struct Circle {

 using Circlef = Circle<Vec2f>;
 using Circled = Circle<Vec2d>;
+using CircleSqf = CircleSq<Vec2f>;
+using CircleSqd = CircleSq<Vec2d>;

 /// Find the center of the circle corresponding to the vector of Points as an arc.
 Point circle_center_taubin_newton(const Points::const_iterator& input_start, const Points::const_iterator& input_end, size_t cycles = 20);
@@ -154,12 +154,13 @@ template<class ExecutionPolicy, class Enable = void> struct _Loop
 };

 // Add Specialization for using ExecutionTBB for parallel loops.
-template<> struct _Loop<Slic3r::ExecutionTBB>
+using namespace Slic3r;
+template<> struct _Loop<ExecutionTBB>
 {
    template<class It, class Fn> static void for_each_idx(It from, It to, Fn&& fn)
    {
-        Slic3r::execution::for_each(
-            Slic3r::ex_tbb, size_t(0), size_t(to - from), [&from, &fn](size_t i) { fn(from[i], i); }, Slic3r::execution::max_concurrency(Slic3r::ex_tbb));
+        execution::for_each(
+            ex_tbb, size_t(0), size_t(to - from), [&from, &fn](size_t i) { fn(from[i], i); }, execution::max_concurrency(ex_tbb));
    }
 };

@@ -10822,22 +10822,6 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config)
    }
 }

-void set_filament_dev_options(DynamicPrintConfig &config, const std::vector<const DynamicPrintConfig *> &filament_configs)
-{
-    for (const std::string &key : filament_dev_options) {
-        if (std::none_of(filament_configs.begin(), filament_configs.end(), [&key](const DynamicPrintConfig *filament) { return filament->has(key); }))
-            continue;
-        const ConfigOption *default_value = print_config_def.get(key)->default_value.get();
-        auto *dst = static_cast<ConfigOptionVectorBase *>(config.option(key, true));
-        dst->clear();
-        for (const DynamicPrintConfig *filament : filament_configs) {
-            const auto *src = static_cast<const ConfigOptionVectorBase *>(filament->has(key) ? filament->option(key) : default_value);
-            if (!src->empty())
-                dst->append(src);
-        }
-    }
-}
-

 //used for object/region config
 //use the smallest of multiple to single
@@ -11536,18 +11520,12 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
    int cur_variant_count = cur_extruder_variants.size();
    int target_variant_count = target_extruder_variants.size();

-    // A base variant this config does not list (the base gained it after the config was saved, or the
-    // config lists none) takes this config's first variant of the same extruder, as a user preset's
-    // values do in update_diff_values_to_child_config. Left unmatched, the base's value would silently
-    // replace the user's.
    variant_index.resize(target_variant_count, -1);
    if (cur_variant_count == 0) {
        // Defensive: target_variant_count may be 0 if the preset doesn't carry extruder_variant_name.
        // In that case keep variant_index empty and let the downstream size checks produce a useful error.
        if (!variant_index.empty())
-            // This config's one value belongs to the extruder of the base's first variant.
-            variant_index = map_variant_indices(target_extruder_variants, target_extruder_ids, {},
-                                                target_extruder_ids.empty() ? std::vector<int>() : std::vector<int>{target_extruder_ids[0]});
+            variant_index[0] = 0;
    }
    else if ((cur_extruder_ids.size() > 0) && cur_variant_count != cur_extruder_ids.size()){
        //should not happen
@@ -11560,7 +11538,18 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
             %extruder_variant_name %target_variant_count %extruder_id_name %target_extruder_ids.size();
    }
    else {
-        variant_index = map_variant_indices(target_extruder_variants, target_extruder_ids, cur_extruder_variants, cur_extruder_ids);
+        for (int i = 0; i < target_variant_count; i++)
+        {
+            for (int j = 0; j < cur_variant_count; j++)
+            {
+                if ((target_extruder_variants[i] == cur_extruder_variants[j])
+                    &&(target_extruder_ids.empty() || (target_extruder_ids[i] == cur_extruder_ids[j])))
+                {
+                    variant_index[i] = j;
+                    break;
+                }
+            }
+        }
    }

    for (auto& opt : keys) {
@@ -11585,13 +11574,6 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
                    if (cur_variant_count > target_variant_count)
                        continue;

-                    // The variant lists are the base's layout itself, which every other value is
-                    // carried onto: a variant this config lacks keeps its own name and id.
-                    if (opt == extruder_id_name || opt == extruder_variant_name) {
-                        opt_src->set(opt_target);
-                        continue;
-                    }
-
                    int stride = 1;
                    if (key_set2.find(opt) != key_set2.end())
                        stride = 2;
@@ -928,11 +928,6 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config);

 extern std::set<std::string> filament_dev_options;

-// Orca: a filament_dev_options option holds several values per filament, and how many is up to the
-// filament preset, so one filament's values cannot be replaced in place. This rebuilds each option from
-// filament_configs, one config per filament in slot order, as the filaments' values one after another.
-void set_filament_dev_options(DynamicPrintConfig &config, const std::vector<const DynamicPrintConfig *> &filament_configs);
-
 extern void update_static_print_config_from_dynamic(ConfigBase& config, const DynamicPrintConfig& dest_config, std::vector<int> variant_index, std::set<std::string>& key_set1, int stride = 1);
 extern void compute_filament_override_value(const std::string& opt_key, const ConfigOption *opt_old_machine, const ConfigOption *opt_new_machine, const ConfigOption *opt_new_filament, const DynamicPrintConfig& new_full_config,
    t_config_option_keys& diff_keys, DynamicPrintConfig& filament_overrides, std::vector<int>& f_map_indices);
@@ -49,6 +49,7 @@ public:
    using TColor = typename PixelRenderer::color_type;
    using TValue = typename TColor::value_type;
    using TPixel = typename PixelRenderer::pixel_type;
+    using TRawBuffer = agg::rendering_buffer;

 protected:
    
@@ -17,6 +17,9 @@ typedef std::vector<Color> ColorList;
 typedef std::array<double, 3> ColorDouble;
 typedef std::array<std::size_t, 3> RGB;

+// Function pointer type that points to a specific color-difference function based on the chosen method.
+using DistanceFunction = double (*)(const Color&, const Color&);
+
 // Color space used for computing color differences.
 enum struct ColorDifferenceMethod : std::size_t {
    RGB = 0,  // Simplest and fastest
@@ -23,6 +23,8 @@

 namespace Slic3r { namespace tex2color {

+namespace PMP = CGAL::Polygon_mesh_processing;
+
 // Default upper bound on the number of half-edges in any single boundary cycle
 // that CloseBoundariesAndRepairManifoldness will attempt to triangulate. The
 // cost of triangulate_hole grows non-linearly with cycle length, so this caps
@@ -58,7 +60,6 @@ struct BoundaryEdgeStats
 // any pre-processing (e.g. stitch_borders) needed for the count to be meaningful.
 inline BoundaryEdgeStats ComputeBoundaryEdgeStats(const cgalutils::CGALMesh& cgal_mesh)
 {
-    namespace PMP = CGAL::Polygon_mesh_processing;
    using CGALMesh = cgalutils::CGALMesh;
    using HalfedgeDescriptor = boost::graph_traits<CGALMesh>::halfedge_descriptor;

@@ -85,7 +86,6 @@ inline BoundaryEdgeStats ComputeBoundaryEdgeStats(const cgalutils::CGALMesh& cga
 // boundary statistics; entering this function always triggers triangulation.
 inline void CloseBoundariesAndRepairManifoldness(cgalutils::CGALMesh& cgal_mesh)
 {
-    namespace PMP = CGAL::Polygon_mesh_processing;
    using CGALMesh = cgalutils::CGALMesh;
    using HalfedgeDescriptor = boost::graph_traits<CGALMesh>::halfedge_descriptor;
    using FaceDescriptor = boost::graph_traits<CGALMesh>::face_descriptor;
@@ -111,7 +111,6 @@ inline bool RepairMesh(const TriMesh& mesh,
                       AlgoCancelCallback cancel_callback = nullptr,
                       const RepairSetting& setting = RepairSetting{})
 {
-    namespace PMP = CGAL::Polygon_mesh_processing;
    using Clock = std::chrono::steady_clock;
    auto elapsed_ms = [](Clock::time_point t0) {
        return std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - t0).count();
@@ -432,6 +432,8 @@ inline IntegerOnly<I, I> fast_round_up(double a)
    return a == 0.49999999999999994 ? I(0) : I(floor(a + 0.5));
 }

+template<class T> using SamePair = std::pair<T, T>;
+
 } // namespace Slic3r

 #endif
@@ -974,8 +974,8 @@ bool AMSMaterialsSetting::Show(bool show)

 static void _collect_filament_info(const wxString& shown_name,
                                   const Preset& filament,
-                                   std::unordered_map<wxString, wxString>& query_filament_vendors,
-                                   std::unordered_map<wxString, wxString>& query_filament_types)
+                                   unordered_map<wxString, wxString>& query_filament_vendors,
+                                   unordered_map<wxString, wxString>& query_filament_types)
 {
    query_filament_vendors[shown_name] = filament.config.get_filament_vendor();
    query_filament_types[shown_name] = filament.config.get_filament_type();
@@ -856,14 +856,14 @@ void AuxiliaryPanel::Split(const std::string &src, const std::string &separator,
    dest.clear();
    index = str.find_first_of(separator, start);
    do {
-        if (index != std::string::npos) {
+        if (index != string::npos) {
            substring = str.substr(start, index - start);
            dest.push_back(substring);
            start = index + separator.size();
            index = str.find(separator, start);
-            if (start == std::string::npos) break;
+            if (start == string::npos) break;
        }
-    } while (index != std::string::npos);
+    } while (index != string::npos);

    // the last part
    substring = str.substr(start);
@@ -1307,7 +1307,7 @@ void CalibrationPresetPage::stripWhiteSpace(std::string& str)
 {
    if (str == "") { return; }

-    std::string::iterator cur_it;
+    string::iterator cur_it;
    cur_it = str.begin();

    while (cur_it != str.end()) {
@@ -2597,7 +2597,7 @@ void CalibrationPresetPage::update_multi_extruder_filament_combobox(const std::s
    int ams_id_int = 0;
    try {
        if (!ams_id.empty())
-            ams_id_int = std::stoi(ams_id.c_str());
+            ams_id_int = stoi(ams_id.c_str());

    } catch (...) {}

@@ -2685,7 +2685,7 @@ void CalibrationPresetPage::update_filament_combobox(std::string ams_id)
    int ams_id_int = 0;
    try {
        if (!ams_id.empty())
-            ams_id_int = std::stoi(ams_id.c_str());
+            ams_id_int = stoi(ams_id.c_str());

    } catch (...) {}

@@ -347,7 +347,7 @@ static std::string get_curr_timestmp()
    // return timestampString;
 }

-static void get_filament_compatible_printer(Preset* preset, std::vector<std::string>& printers)
+static void get_filament_compatible_printer(Preset* preset, vector<std::string>& printers)
 {
    auto compatible_printers = dynamic_cast<ConfigOptionStrings *>(preset->config.option("compatible_printers"));
    if (compatible_printers == nullptr) return;
@@ -1581,7 +1581,7 @@ void CreateFilamentPresetDialog::sort_printer_by_nozzle(std::vector<std::pair<st
 {
    std::unordered_map<std::string, float> nozzle_diameter = nozzle_diameter_map;
    std::sort(printer_name_to_filament_preset.begin(), printer_name_to_filament_preset.end(),
-              [&nozzle_diameter](const std::pair<std::string, T> &a, const std::pair<std::string, T> &b) {
+              [&nozzle_diameter](const std::pair<string, T> &a, const std::pair<string, T> &b) {
                  size_t nozzle_index_a = a.first.find(" nozzle");
                  size_t nozzle_index_b = b.first.find(" nozzle");
                  if (nozzle_index_a == std::string::npos || nozzle_index_b == std::string::npos) return a.first < b.first;
@@ -3143,7 +3143,7 @@ void CreatePrinterPresetDialog::set_current_visible_printer()

 wxArrayString CreatePrinterPresetDialog::printer_preset_sort_with_nozzle_diameter(const VendorProfile &vendor_profile, float nozzle_diameter)
 {
-    std::vector<std::pair<float, std::string>> preset_sort;
+    std::vector<pair<float, std::string>> preset_sort;

    auto get_nozzle_size_for_printer_model = [this](const std::string & model_name) -> size_t {
        auto iter = m_printer_name_to_preset.find(model_name);
@@ -4964,7 +4964,7 @@ wxBoxSizer *CreatePresetForPrinterDialog::create_selected_filament_preset_sizer(

    m_selected_printer->Bind(wxEVT_COMBOBOX, [this](wxCommandEvent &e) {
        wxString printer_name = m_selected_printer->GetStringSelection();
-        std::unordered_map<std::string, std::vector<std::shared_ptr<Preset>>>::iterator filament_iter = m_printer_compatible_filament_presets.find(into_u8(printer_name));
+        std::unordered_map<string, std::vector<std::shared_ptr<Preset>>>::iterator filament_iter = m_printer_compatible_filament_presets.find(into_u8(printer_name));
        if (m_printer_compatible_filament_presets.end() != filament_iter) {
            filament_choice_to_filament_preset.clear();
            wxArrayString filament_choices;
@@ -198,3 +198,6 @@ template<> struct std::hash<NozzleDef>
        return h1 ^ (h2 + 0x9e3779b9 + (h1 << 6) + (h1 >> 2));
    };
 };
+
+// key(extruder_id) -> { key1(nozzle type info), val1( number of the nozzle type)}
+using ExtruderNozzleInfos = std::unordered_map<int, std::unordered_map<NozzleDef, int>>;
@@ -160,7 +160,7 @@ DevAms::~DevAms()
    m_trays.clear();
 }

-static std::unordered_map<int, wxString> s_ams_display_formats = {
+static unordered_map<int, wxString> s_ams_display_formats = {
    {DevAms::AMS,      "AMS-%d"},
    {DevAms::AMS_LITE, "AMS Lite-%d"},
    {DevAms::N3F,      "AMS 2 PRO-%d"},
@@ -250,7 +250,7 @@ int DevNozzleMappingCtrl::CtrlGetAutoNozzleMappingV1(Slic3r::GUI::Plater* plater

 void DevNozzleMappingCtrl::ParseAutoNozzleMapping(const json& print_jj)
 {
-    if (print_jj.contains("command") && print_jj["command"].get<std::string>() == "get_auto_nozzle_mapping") {
+    if (print_jj.contains("command") && print_jj["command"].get<string>() == "get_auto_nozzle_mapping") {
        if (print_jj.contains("sequence_id") && print_jj["sequence_id"] == m_sequence_id) {
            Clear();
            DevJsonValParser::ParseVal(print_jj, "result", m_result);
@@ -426,7 +426,7 @@ void DevNozzleSystem::ClearNozzles()

 // ---- parsing ----------------------------------------------------------------------------------------

-static std::unordered_map<std::string, NozzleFlowType> _str2_nozzle_flow_type = {
+static unordered_map<string, NozzleFlowType> _str2_nozzle_flow_type = {
    {"S", NozzleFlowType::S_FLOW},
    {"H", NozzleFlowType::H_FLOW},
    {"A", NozzleFlowType::S_FLOW},
@@ -436,7 +436,7 @@ static std::unordered_map<std::string, NozzleFlowType> _str2_nozzle_flow_type =
    {"B", NozzleFlowType::E_FLOW}, // E3D High Flow -> nvtE3DHighFlow
 };

-static std::unordered_map<std::string, NozzleType> _str2_nozzle_type = {
+static unordered_map<string, NozzleType> _str2_nozzle_type = {
    {"00", NozzleType::ntStainlessSteel},
    {"01", NozzleType::ntHardenedSteel},
    {"05", NozzleType::ntTungstenCarbide}
@@ -368,7 +368,7 @@ wxString DeviceErrorDialog::parse_error_level(int error_code)
    }
 }

-static const std::unordered_set<std::string> s_jump_liveview_error_codes = { "0300-8003", "0300-8002", "0300-800A"};
+static const std::unordered_set<string> s_jump_liveview_error_codes = { "0300-8003", "0300-8002", "0300-800A"};
 wxString DeviceErrorDialog::show_error_code(int error_code)
 {
    if (m_error_code == error_code) { return wxEmptyString;}
@@ -110,7 +110,6 @@ using json = nlohmann::json;
 class wxWindow;

 namespace fs = boost::filesystem;
-using namespace std::chrono_literals;

 #define CALI_DEBUG
 #define MINUTE_30 1800000    //ms
@@ -3104,7 +3103,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                        DevFirmwareVersionInfo ver_info;
                        ver_info.name = (*it)["name"].get<std::string>();
                        if ((*it).contains("product_name"))
-                            ver_info.product_name = wxString::FromUTF8((*it)["product_name"].get<std::string>());
+                            ver_info.product_name = wxString::FromUTF8((*it)["product_name"].get<string>());
                        if ((*it).contains("sw_ver"))
                            ver_info.sw_ver = (*it)["sw_ver"].get<std::string>();
                        if ((*it).contains("sw_new_ver"))
@@ -294,8 +294,8 @@ wxDataViewItem EditGCodeDialog::add_presets_placeholders()


    // Orca: create subgroups from the pages of the tabs
-    auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const std::set<std::string>& preset_keys){
-        std::set extra_keys(preset_keys);
+    auto init_from_tab = [this, full_config](wxDataViewItem parent, Tab* tab, const set<string>& preset_keys){
+        set extra_keys(preset_keys);
        for (const auto& page : tab->m_pages) {
            // ORCA: Pull icons from tabs for subgroups, icons are hidden on tabs
            std::string icon_name = "empty"; // use empty icon if not defined
@@ -549,7 +549,7 @@ void ParamsNode::RefreshSearch(const wxString& search_text)

    if (GetEnabledChildren().empty())
        if (auto pos = text.find(search_text); IsParamNode() && pos != wxString::npos) {
-            m_highlight_index = make_unique<std::pair<int, int>>(pos, search_text.Len());
+            m_highlight_index = make_unique<pair<int, int>>(pos, search_text.Len());
            Enable();
        } else {
            Disable();
@@ -702,11 +702,11 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
                set_value(str, true);
            }
        } else if (m_opt.opt_key == "sparse_infill_rotate_template" || m_opt.opt_key == "solid_infill_rotate_template") {
-            std::string ustr(str.utf8_string());
+            string ustr(str.utf8_string());
            if (!ConfigOptionFloats::validate_string(ustr)) {
-                std::string v;
+                string      v;
                std::smatch match;
-                std::string ps = (m_opt.opt_key == "sparse_infill_rotate_template") ?
+                string      ps = (m_opt.opt_key == "sparse_infill_rotate_template") ?
                                     u8"[BT][!]?|[#][\\d]+[!]?|[+\\-]?[\\d.]+[%]?[*]?[\\d]*[/NnZz$LlUuQq~^|#]?[+\\-]?[\\d.]*[%#\'\"cm]?[m]?[BT]?[!*]?" :
                                     u8"[#][\\d]+[!]?|[+\\-]?[\\d.]+[%]?[*]?[\\d]*[/NnZz$LlUuQq~^|#]?[+\\-]?[\\d.]*[%#\'\"cm]?[m]?[!*]?";

@@ -729,7 +729,7 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
            }
            break;
        } else if (m_opt.opt_key == "extra_solid_infills") {
-            std::string ustr(str.utf8_string());
+            string ustr(str.utf8_string());
            // New rule: accept either interval form (N or N#K) or explicit list (e.g. 1,7,9), with optional quotes.
            const std::regex rx_interval(u8R"(^\s*['"]?\s*\d+\s*(?:#\s*\d*)?\s*['"]?\s*$)");
            // List entries may be plain numbers or number with optional #K count, e.g., 5, 9#2, 18
@@ -94,8 +94,6 @@
 #include "slic3r/GUI/Gizmos/GizmoObjectManipulation.hpp"
 #include "slic3r/GUI/PartPlate.hpp"

-using namespace std::string_view_literals;
-
 namespace Slic3r { class PrintBase; }


@@ -3186,7 +3184,7 @@ void GCodeViewer::render_legend_color_arr_recommen(float window_padding)
    float ams_item_height = 0;
    float filament_group_item_align_width = 0;
    {
-        float three_words_width    = imgui.calc_text_size("ABC"sv).x;
+        float three_words_width    = imgui.calc_text_size(std::string_view("ABC")).x;
        const int line_capacity = 4;

        for (const auto& extruder_filaments : {m_left_extruder_filament,m_right_extruder_filament })
@@ -177,8 +177,6 @@ extern wxPopupWindow* wxCurrentPopupWindow;
 #endif
 #endif

-using namespace std::string_view_literals;
-
 static constexpr const float TRACKBALLSIZE = 0.8f;

 static Slic3r::ColorRGBA DEFAULT_BG_LIGHT_COLOR      = { 0.906f, 0.906f, 0.906f, 1.0f };
@@ -183,10 +183,13 @@ wxDECLARE_EVENT(EVT_GLCANVAS_PLATE_NAME_CHANGE, SimpleEvent);
 //BBS: declare EVT_GLCANVAS_PLATE_SELECT
 wxDECLARE_EVENT(EVT_GLCANVAS_PLATE_SELECT, SimpleEvent);

+using Vec2dEvent = Event<Vec2d>;
 // _bool_ value is used as a indicator of selection in the 3DScene
 using RBtnEvent = Event<std::pair<Vec2d, bool>>;
 using RBtnPlateEvent = Event<std::pair<Vec2d, int>>;
+template <size_t N> using Vec2dsEvent = ArrayEvent<Vec2d, N>;

+using Vec3dEvent = Event<Vec3d>;
 template <size_t N> using Vec3dsEvent = ArrayEvent<Vec3d, N>;

 using HeightProfileSmoothEvent = Event<HeightProfileSmoothingParams>;
@@ -9040,7 +9040,7 @@ std::map<std::string, std::string> GUI_App::get_delete_cache_presets_lock()

 void GUI_App::process_delete_presets()
 {
-    std::map<std::string, std::string> delete_cache_presets = get_delete_cache_presets_lock();
+    std::map<string, string> delete_cache_presets = get_delete_cache_presets_lock();
    for (auto it = delete_cache_presets.begin(); it != delete_cache_presets.end();) {
        if (it->first.empty()) continue;
        std::string del_setting_id = it->first;
@@ -10068,7 +10068,7 @@ bool is_soluble_filament(int extruder_id)
    return support_option->get_at(0);
 };

-bool has_filaments(const std::vector<std::string>& model_filaments) {
+bool has_filaments(const std::vector<string>& model_filaments) {
    auto &filament_presets = Slic3r::GUI::wxGetApp().preset_bundle->filament_presets;
    if (!Slic3r::GUI::wxGetApp().plater()) return false;
    auto model_objects = Slic3r::GUI::wxGetApp().plater()->model().objects;
@@ -10103,7 +10103,7 @@ bool is_support_filament(int extruder_id, bool strict_check)
    Slic3r::ConfigOptionBools *support_option = dynamic_cast<Slic3r::ConfigOptionBools *>(filament->config.option("filament_is_support"));

    if(!strict_check &&(filament_type == "PETG" || filament_type == "PLA")) {
-        std::vector<std::string> model_filaments;
+        std::vector<string> model_filaments;
        if (filament_type == "PETG")
            model_filaments.emplace_back("PLA");
        else {
@@ -1108,7 +1108,7 @@ void ObjectList::update_name_column_width() const
        }
    }

-    GetColumn(colName)->SetWidth(std::max(0, client_size.x - (others_width)*em));
+    GetColumn(colName)->SetWidth(max(0, client_size.x - (others_width)*em));
 }

 void ObjectList::set_filament_column_hidden(const bool hide) const
@@ -3970,7 +3970,7 @@ wxDataViewItem ObjectList::add_settings_item(wxDataViewItem parent_item, const D
        if (config->opt_float("layer_height") == object_cfg->opt_float("layer_height")) {
            SettingsFactory::Bundle new_cat_options;
            for (auto cat_opt : cat_options) {
-                std::vector<std::string> temp;
+                std::vector<string> temp;
                for (auto value : cat_opt.second) {
                    if (value != "layer_height")
                        temp.push_back(value);
@@ -44,8 +44,6 @@
 #define MAX_NUM 9999.99
 #define MAX_SIZE std::string_view{"9999.99"}

-using namespace std::string_view_literals;
-
 namespace Slic3r
 {
 namespace GUI
@@ -33,7 +33,7 @@ static const char* HMS_LOCAL_IMG_PATH = "hms/local_image";

 // the local HMS info
 // Orca: dev-id-type set trimmed to the devices Orca ships local HMS images for
-static std::unordered_set<std::string> package_dev_id_types {"094", "239", "093", "22E"};
+static unordered_set<string> package_dev_id_types {"094", "239", "093", "22E"};

 // Orca: HMS should be disabled when stealth mode is on or networking is not installed
 static bool should_disable_hms()
@@ -345,17 +345,17 @@ wxString HMSQuery::query_hms_msg(const std::string& dev_id, const std::string& l
    return _query_hms_msg(dev_id.substr(0, 3), long_error_code, lang_code);
 }

-std::string HMSQuery::get_dev_id_type(const MachineObject* obj) const
+string HMSQuery::get_dev_id_type(const MachineObject* obj) const
 {
    if (obj)
    {
        return obj->get_dev_id().substr(0, 3);
    }

-    return std::string();
+    return string();
 }

-wxString HMSQuery::_query_hms_msg(const std::string& dev_id_type, const std::string& long_error_code, const std::string& lang_code)
+wxString HMSQuery::_query_hms_msg(const string& dev_id_type, const string& long_error_code, const string& lang_code)
 {
    if (long_error_code.empty())
    {
@@ -426,9 +426,9 @@ wxString HMSQuery::_query_hms_msg(const std::string& dev_id_type, const std::str
    return wxEmptyString;
 }

-bool HMSQuery::_is_internal_error(const std::string &dev_id_type,
-                                  const std::string &error_code,
-                                  const std::string &lang_code)
+bool HMSQuery::_is_internal_error(const string &dev_id_type,
+                                  const string &error_code,
+                                  const string &lang_code)
 {
    init_hms_info(dev_id_type);
    auto iter = m_hms_info_jsons.find(dev_id_type);
@@ -335,7 +335,7 @@ void PrintJob::process(Ctl &ctl)
        auto origin_profile_id = model_info->metadata_items.find(BBL_DESIGNER_PROFILE_ID_TAG);
        if (origin_profile_id != model_info->metadata_items.end()) {
            try {
-                params.origin_profile_id    = std::stoi(origin_profile_id->second.c_str());
+                params.origin_profile_id    = stoi(origin_profile_id->second.c_str());
            }
            catch(...) {}
        }
@@ -536,12 +536,12 @@ void NotificationManager::PopNotification::count_lines()
 		return;

 	// handle with marks
-    if (pos_start == std::string::npos && pos_end == std::string::npos) {
+    if (pos_start == string::npos && pos_end == string::npos) {
        pos_start = text.find(error_start);
-        if (pos_start != std::string::npos) {
+        if (pos_start != string::npos) {
            text.erase(pos_start, error_start.length());
            pos_end = text.find(error_end);
-            if (pos_end != std::string::npos) {
+            if (pos_end != string::npos) {
                text.erase(pos_end, error_end.length());
            }
        }
@@ -675,7 +675,7 @@ void NotificationManager::PopNotification::bbl_render_block_notif_text(ImGuiWrap
 			if (m_text1.size() > m_endlines[i])
 				last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0);

-			if (pos_start != std::string::npos && pos_end != std::string::npos && m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) {
+			if (pos_start != string::npos && pos_end != string::npos && m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) {
 				push_style_color(ImGuiCol_Text, m_ErrorColor, m_state == EState::FadingOut, m_current_fade_opacity);
 				imgui.text(line.c_str());
 				ImGui::PopStyleColor();
@@ -737,7 +737,7 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons
 			if (m_text1.size() > m_endlines[i])
 				last_end += (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0);

-            if (pos_start != std::string::npos && pos_end != std::string::npos&& m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) {
+            if (pos_start != string::npos && pos_end != string::npos&& m_endlines[i] - line.length() >= pos_start && m_endlines[i] <= pos_end) {
                push_style_color(ImGuiCol_Text, m_ErrorColor, m_state == EState::FadingOut, m_current_fade_opacity);
                imgui.text(line.c_str());
                ImGui::PopStyleColor();
@@ -54,6 +54,7 @@ struct Option {
 	Option(const ConfigOptionDef& _opt, t_config_option_key id) :
 		opt(_opt), opt_id(id) {}
 };
+using t_option = std::unique_ptr<Option>;	//!

 /// Represents option lines
 class Line : public UndoValueUIManager
@@ -86,7 +86,7 @@ PartSkipDialog::PartSkipDialog(wxWindow *parent) : DPIDialog(parent, wxID_ANY, _
 {
    std::time_t       t = std::time(0);
    std::stringstream buf;
-    buf << std::put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/");
+    buf << put_time(std::localtime(&t), "%a_%b_%d_%H_%M_%S/");
    m_timestamp = buf.str();

    SetBackgroundColour(*wxWHITE);
@@ -402,7 +402,7 @@ std::string PartSkipDialog::create_tmp_path()
    return tmp_path;
 }

-bool PartSkipDialog::is_local_file_existed(const std::vector<std::string> &local_paths)
+bool PartSkipDialog::is_local_file_existed(const std::vector<string> &local_paths)
 {
    for (auto path : local_paths) {
        if (!std::filesystem::exists(path)) { return false; }
@@ -703,8 +703,8 @@ void PartSkipDialog::InitDialogUI()
    m_parts_state.clear();
    m_parts_name.clear();

-    std::string pick_img   = m_local_paths[0];
-    std::string slice_info = m_local_paths[2];
+    string pick_img   = m_local_paths[0];
+    string slice_info = m_local_paths[2];

    m_switch_drag_btn->SetIcon("canvas_drag");
    m_switch_drag_btn->SetBackgroundColor(*wxWHITE);
@@ -139,11 +139,11 @@ private:
    boost::shared_ptr<PrinterFileSystem> m_file_sys;
    std::string                          m_timestamp;
    std::string                          m_tmp_path;
-    std::vector<std::string>             m_local_paths;
-    std::vector<std::string>             m_target_paths;
+    std::vector<string>                  m_local_paths;
+    std::vector<string>                  m_target_paths;
    std::string                          create_tmp_path();

-    bool is_local_file_existed(const std::vector<std::string> &local_paths);
+    bool is_local_file_existed(const std::vector<string> &local_paths);

    void DownloadPartsFile();
    void OnFileSystemEvent(wxCommandEvent &event);
@@ -357,7 +357,7 @@ wxDEFINE_EVENT(EVT_NOTICE_FULL_SCREEN_CHANGED, IntEvent);
 #define PRINTER_PANEL_RADIUS (6) // ORCA
 #define BTN_SYNC_SIZE (wxSize(FromDIP(96), FromDIP(98)))

-static std::string get_diameter_string(float diameter)
+static string get_diameter_string(float diameter)
 {
    std::ostringstream stream; // ORCA ensure 0.25 returned as 0.25. previous code returned as 0.2 because of std::setprecision(1)
    stream << std::fixed << std::setprecision(2) << diameter;  // Use 2 decimals to capture 0.25 / 0.15 reliably
@@ -6323,7 +6323,7 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
    }

    // BBS:Record consumables information before synchronization
-    std::vector<std::string> color_before_sync;
+    std::vector<string> color_before_sync;
    std::vector<bool>   is_support_before;
    DynamicPrintConfig& project_config = wxGetApp().preset_bundle->project_config;
    ConfigOptionStrings* color_opt = project_config.option<ConfigOptionStrings>("filament_colour");
@@ -12762,7 +12762,7 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
    Vec3d old_plate_pos = old_plate->get_center_origin();

    // BBS: Save the model in the current platelist
-    std::vector<std::vector<int> > plate_object;
+    std::vector<vector<int> > plate_object;
    for (size_t i = 0; i < old_plate_list.get_plate_count(); ++i) {
        PartPlate* plate = old_plate_list.get_plate(i);
        std::vector<int> obj_idxs;
@@ -17975,7 +17975,7 @@ bool Plater::load_files(const wxArrayString& filenames)

    // Orca: Iters through given paths and imports files from zip then remove zip from paths
    // returns true if zip files were found
-    auto handle_zips = [this](std::vector<fs::path>& paths) { // NOLINT(*-no-recursion) - Recursion is intended and should be managed properly
+    auto handle_zips = [this](vector<fs::path>& paths) { // NOLINT(*-no-recursion) - Recursion is intended and should be managed properly
        bool res = false;
        for (auto it = paths.begin(); it != paths.end();) {
            if (boost::algorithm::iends_with(it->string(), ".zip")) {
@@ -108,6 +108,7 @@ class PlaterPresetComboBox;
 class PartPlateList;
 class SyncNozzleAndAmsDialog;
 class FinishSyncAmsDialog;
+using t_optgroups = std::vector <std::shared_ptr<ConfigOptionsGroup>>;

 class Plater;
 enum class ActionButtonType : int;
@@ -324,6 +325,7 @@ private:
 class Plater: public wxPanel
 {
 public:
+    using fs_path = boost::filesystem::path;

    Plater(wxWindow *parent, MainFrame *main_frame);
    Plater(Plater &&) = delete;
@@ -378,7 +378,7 @@ wxBoxSizer *PreferencesDialog::create_item_combobox(wxString title, wxString too

    auto current_setting = app_config->get(param);
    if (!current_setting.empty()) {
-        auto compare  = [current_setting](std::string possible_setting) { return current_setting == possible_setting; };
+        auto compare  = [current_setting](string possible_setting) { return current_setting == possible_setting; };
        auto iterator = find_if(config_name_index.begin(), config_name_index.end(), compare);
        if (iterator != config_name_index.end())
            current_index = static_cast<unsigned int>(iterator - config_name_index.begin());
@@ -1714,7 +1714,7 @@ void PreferencesDialog::create_items()
    g_sizer->Add(create_item_title(_L("Project")), 1, wxEXPAND);

    std::vector<wxString> projectLoadSettingsBehaviourOptions = {_L("Load All"), _L("Ask When Relevant"), _L("Always Ask"), _L("Load Geometry Only")};
-    std::vector<std::string> projectLoadSettingsConfigOptions    = { OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_ALL, OPTION_PROJECT_LOAD_BEHAVIOUR_ASK_WHEN_RELEVANT, OPTION_PROJECT_LOAD_BEHAVIOUR_ALWAYS_ASK, OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_GEOMETRY };
+    std::vector<string>   projectLoadSettingsConfigOptions    = { OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_ALL, OPTION_PROJECT_LOAD_BEHAVIOUR_ASK_WHEN_RELEVANT, OPTION_PROJECT_LOAD_BEHAVIOUR_ALWAYS_ASK, OPTION_PROJECT_LOAD_BEHAVIOUR_LOAD_GEOMETRY };
    auto item_project_load     = create_item_combobox(_L("Load behavior"), _L("Should printer/filament/process settings be loaded when opening a 3MF file?"), SETTING_PROJECT_LOAD_BEHAVIOUR, projectLoadSettingsBehaviourOptions, projectLoadSettingsConfigOptions);
    g_sizer->Add(item_project_load);

@@ -239,7 +239,7 @@ void ProjectPanel::on_reload(wxCommandEvent& evt)
        }

        bool has_content = false;
-        for (const std::string& v : {
+        for (const string& v : {
                 update_type,
                 license,
                 model_name,
@@ -182,7 +182,7 @@ std::string get_nozzle_volume_type_cloud_string(NozzleVolumeType nozzle_volume_t
 static int s_nozzle_mapping_last_request_time = 0;

 std::vector<wxString> SelectMachineDialog::MACHINE_BED_TYPE_STRING;
-std::vector<std::string> SelectMachineDialog::MachineBedTypeString;
+std::vector<string> SelectMachineDialog::MachineBedTypeString;
 void                SelectMachineDialog::init_machine_bed_types()
 {
    if (MACHINE_BED_TYPE_STRING.size() == 0) {
@@ -2748,8 +2748,8 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
    std::vector<ConfirmBeforeSendInfo> confirm_text;

    // check more than one using in same external spool
-    std::unordered_set<std::string> main_external_spool_filas;
-    std::unordered_set<std::string> deputy_external_spool_filas;
+    std::unordered_set<string> main_external_spool_filas;
+    std::unordered_set<string> deputy_external_spool_filas;
    for (const auto& mapping_info : m_ams_mapping_result) {
        if (mapping_info.ams_id == VIRTUAL_AMS_MAIN_ID_STR){
            main_external_spool_filas.insert(mapping_info.filament_id);
@@ -5239,7 +5239,7 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)

    /*Check high temperture slicing*/
    if (m_print_type == PrintFromType::FROM_NORMAL) {
-        std::set<std::string> high_temp_filaments;
+        std::set<string>  high_temp_filaments;
        std::unordered_set<int> known_fila_soften_extruders;
        std::unordered_set<int> unknown_fila_soften_extruders;
        auto preset_full_config = wxGetApp().preset_bundle->full_config();
@@ -337,7 +337,7 @@ private:
    wxColour                            m_colour_bold_color{wxColour(38, 46, 48)};
    StateColor                          m_btn_bg_enable;

-    std::unordered_map<std::string, PrintOption*> m_checkbox_list;
+    std::unordered_map<string, PrintOption*> m_checkbox_list;
    std::list<PrintOption*>                  m_checkbox_list_order;

    std::shared_ptr<int>                m_token = std::make_shared<int>(0);
@@ -126,7 +126,7 @@ void SendToPrinterDialog::stripWhiteSpace(std::string& str)
 {
    if (str == "") { return; }

-    std::string::iterator cur_it;
+    string::iterator cur_it;
    cur_it = str.begin();

    while (cur_it != str.end()) {
@@ -171,7 +171,7 @@ public:
    std::string current_nozzle_loc = "";
    wxColour m_colour;

-    std::string m_file_name;
+    string m_file_name;
    bool   m_ams_loading{false};
    void   doRender(wxDC &dc);
    ExtruderImage(wxWindow *parent, wxWindowID id, int nozzle_num, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize);
@@ -244,7 +244,7 @@ protected:
    {
        wxString          local_image_url; //local image path
        std::string       img_url_paths; // oss url path
-        std::vector<wxPanel *> image_broad;
+        vector<wxPanel *> image_broad;
        bool              is_selected;
        bool              is_uploaded; // load
        wxBoxSizer *      image_tb_broad = nullptr;
@@ -1576,7 +1576,7 @@ bool SyncAmsInfoDialog::is_nozzle_type_match(DevExtderSystem data, wxString &err
        }
    }

-    std::vector<int> map_extruders = {1, 0};
+    vector<int> map_extruders = {1, 0};

    // The default two extruders are left, right, but the order of the extruders on the machine is right, left.
    std::vector<std::string> flow_type_of_machine;
@@ -1676,7 +1676,7 @@ void SyncAmsInfoDialog::stripWhiteSpace(std::string &str)
 {
    if (str == "") { return; }

-    std::string::iterator cur_it;
+    string::iterator cur_it;
    cur_it = str.begin();

    while (cur_it != str.end()) {
@@ -2257,7 +2257,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
            wxGetApp().plater()->update();
    }

-    std::string opt_key_without_idx = opt_key.substr(0, opt_key.find('#'));
+    string opt_key_without_idx = opt_key.substr(0, opt_key.find('#'));

    if (opt_key_without_idx == "long_retractions_when_cut") {
        unsigned char activate = boost::any_cast<unsigned char>(value);
@@ -1682,13 +1682,13 @@ int GuideFrame::SaveProfileData()
    return 0;
 }

-void StringReplace(std::string &strBase, std::string strSrc, std::string strDes)
+void StringReplace(string &strBase, string strSrc, string strDes)
 {
-    std::string::size_type pos    = 0;
-    std::string::size_type srcLen = strSrc.size();
-    std::string::size_type desLen = strDes.size();
+    string::size_type pos    = 0;
+    string::size_type srcLen = strSrc.size();
+    string::size_type desLen = strDes.size();
    pos                      = strBase.find(strSrc, pos);
-    while ((pos != std::string::npos)) {
+    while ((pos != string::npos)) {
        strBase.replace(pos, srcLen, strDes);
        pos = strBase.find(strSrc, (pos + desLen));
    }
@@ -1052,7 +1052,7 @@ void AMSControl::UpdateAms(const std::string   &series_name,
    /*update humidity popup*/
    if (m_percent_humidity_dry_popup->IsShown())
    {
-        std::string target_id = m_percent_humidity_dry_popup->get_owner_ams_id();
+        string target_id = m_percent_humidity_dry_popup->get_owner_ams_id();
        for (const auto& the_info : ams_info)
        {
            if (target_id == the_info.ams_id)
@@ -63,7 +63,7 @@ protected:

    std::string                      m_dev_id;
    std::vector<std::vector<std::string>> m_item_ids{ {}, {} };
-    std::vector<std::pair<std::string, std::string>> pair_id;
+    std::vector<std::pair<string, string>> pair_id;

    int         m_total_ext_count = 1;
    AMSextruder *m_extruder{nullptr};
@@ -181,7 +181,7 @@ public:
    std::tuple<bool, bool> isFilaSwitchReady();
    void show_switcher_status(bool show);

-    void UpdatePassRoad(std::string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step);
+    void UpdatePassRoad(string ams_id, AMSPassRoadType type, AMSPassRoadSTEP step);
    void CreateAms();
    void CreateAmsDoubleNozzle(const std::string &series_name, const std::string& printer_type);
    void CreateAmsSingleNozzle(const std::string &series_name, const std::string &printer_type);
@@ -634,7 +634,7 @@ void AMSextruderImage::doRender(wxDC &dc)
 }


-AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos)
+AMSextruderImage::AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos)
 {
    wxWindow::Create(parent, id, pos, size);
    SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
@@ -823,7 +823,7 @@ void SwitcherImage::doRender(wxDC &dc)
    Layout();
 }

-SwitcherImage::SwitcherImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos)
+SwitcherImage::SwitcherImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos)
 {
    wxWindow::Create(parent, id, pos, size);
    SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
@@ -899,7 +899,7 @@ void AMSextruder::OnAmsLoading(bool load, int nozzle_id, wxColour col /*= AMS_CO
 }

 /*return true if something is updated*/
-bool AMSextruder::updateNozzleNum(int nozzle_num, const std::string& series_name)
+bool AMSextruder::updateNozzleNum(int nozzle_num, const string& series_name)
 {
    if (m_nozzle_num == nozzle_num && m_series_name == series_name) return false;
    m_series_name = series_name;
@@ -393,10 +393,10 @@ public:
    bool            m_show_state = {false};
    wxColour        m_colour;
    ScalableBitmap  m_ams_extruder;
-    std::string m_file_name;
+    string m_file_name;
    bool            m_ams_loading{ false };
    void            doRender(wxDC &dc);
-    AMSextruderImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition);
+    AMSextruderImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition);
    ~AMSextruderImage();
 };

@@ -444,10 +444,10 @@ public:
    bool            m_show_state = {false};
    wxColour        m_colour;
    ScalableBitmap  m_switcher;
-    std::string m_file_name;
+    string m_file_name;
    // bool            m_ams_loading{ false };
    void            doRender(wxDC &dc);
-    SwitcherImage(wxWindow *parent, wxWindowID id, std::string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition);
+    SwitcherImage(wxWindow *parent, wxWindowID id, string file_name, const wxSize& size, const wxPoint &pos = wxDefaultPosition);
    ~SwitcherImage();
 };

@@ -456,7 +456,7 @@ class AMSextruder : public wxWindow
 {
 private:
    int    m_nozzle_num = -1;
-    std::string m_series_name;
+    string m_series_name;

 public:
    void TurnOn(wxColour col);
@@ -466,7 +466,7 @@ public:
    void msw_rescale();
    void has_ams(bool hams) {m_has_vams = hams; Refresh();};
    void no_ams_mode(bool mode) {m_none_ams_mode = mode; Refresh();};
-    bool updateNozzleNum(int nozzle_num, const std::string& series_name = std::string());
+    bool updateNozzleNum(int nozzle_num, const std::string& series_name = string());

    bool            m_none_ams_mode{true};
    bool            m_has_vams{false};
@@ -596,8 +596,7 @@ PrintParams_Legacy BBLNetworkPlugin::as_legacy(PrintParams& param)
 }

 // Every PrintParams field except the four the 02.08.01 series added
-// (task_timelapse_use_internal, extruder_cali_manual_mode, svc_context, slicer_uid) and the
-// queue_plate_id 02.08.02 appended.
+// (task_timelapse_use_internal, extruder_cali_manual_mode, svc_context, slicer_uid).
 PrintParams_0203 BBLNetworkPlugin::as_0203(PrintParams& param)
 {
    PrintParams_0203 p;
@@ -89,6 +89,7 @@ using fn_ft_job_get_result    = ft_err(FT_CALL *)(FT_JobHandle *, uint32_t timeo
 using fn_ft_tunnel_start_job  = ft_err(FT_CALL *)(FT_TunnelHandle *, FT_JobHandle *);
 using fn_ft_job_cancel        = ft_err(FT_CALL *)(FT_JobHandle *);

+using fn_ft_job_msg_destroy = void(FT_CALL *)(ft_job_msg *);
 using fn_ft_job_set_msg_cb  = ft_err(FT_CALL *)(FT_JobHandle *, void(FT_CALL *)(void *user, ft_job_msg msg), void *user);
 using fn_ft_job_try_get_msg = ft_err(FT_CALL *)(FT_JobHandle *, ft_job_msg *out_msg);
 using fn_ft_job_get_msg     = ft_err(FT_CALL *)(FT_JobHandle *, uint32_t timeout_ms, ft_job_msg *out_msg);
@@ -16,12 +16,12 @@
 namespace Slic3r {
 namespace Utils {

+using boost::asio::ip::tcp;
+
 // Generic command / response TCP telnet like console class.
 // Used by the MKS host to send G-code commands to test connection ("M105") and to start printing ("M23 filename", "M24").
 class TCPConsole
 {
-    using tcp = boost::asio::ip::tcp;
-
 public:
    TCPConsole() : m_resolver(m_io_context), m_socket(m_io_context) { set_defaults(); }
    TCPConsole(const std::string& host_name, const std::string& port_name) : m_resolver(m_io_context), m_socket(m_io_context)
@@ -16,6 +16,11 @@
 #include <iostream>
 #include <string>
 #include <chrono>
+namespace beast = boost::beast;         // from <boost/beast.hpp>
+namespace http = beast::http;           // from <boost/beast/http.hpp>
+namespace websocket = beast::websocket; // from <boost/beast/websocket.hpp>
+namespace net = boost::asio;            // from <boost/asio.hpp>
+using tcp = net::ip::tcp;               // from <boost/asio/ip/tcp.hpp>

 class WebSocketClient {
 public:
@@ -31,7 +36,7 @@ public:
        }
        try {
            // Close the WebSocket connection
-            ws_.close(boost::beast::websocket::close_code::normal);
+            ws_.close(websocket::close_code::normal);
        } catch (const std::exception& e) {
            std::cerr << "Error: " << e.what() << std::endl;
        }
@@ -44,7 +49,7 @@ public:
        auto const results = resolver_.resolve(host, port);

        // Make the connection on the IP address we get from a lookup
-        auto ep = boost::asio::connect(ws_.next_layer(), results);
+        auto ep = net::connect(ws_.next_layer(), results);
        std::string _host = host;
        //if _host last char is  '/', remove it
        if(_host.size()>0&&_host[host.size()-1] == '/'){
@@ -53,10 +58,10 @@ public:

        // _host += ':' + std::to_string(ep.port());
        // Set a decorator to change the User-Agent of the handshake
-        ws_.set_option(boost::beast::websocket::stream_base::decorator(
-            [](boost::beast::websocket::request_type& req)
+        ws_.set_option(websocket::stream_base::decorator(
+            [](websocket::request_type& req)
            {
-                req.set(boost::beast::http::field::user_agent,"ElegooSlicer");
+                req.set(http::field::user_agent,"ElegooSlicer");
            }));
        // Perform the WebSocket handshake
        ws_.handshake(_host, path);
@@ -65,25 +70,25 @@ public:

    void send(const std::string& message){
        // Send a message
-        ws_.write(boost::asio::buffer(message));
+        ws_.write(net::buffer(message));
    }

    std::string receive(int timeout = 0){
        // This buffer will hold the incoming message
-        boost::beast::flat_buffer buffer;
+        beast::flat_buffer buffer;

        // Read a message into our buffer
        ws_.read(buffer);

        // Return the message as a string
-        return boost::beast::buffers_to_string(buffer.data());
+        return beast::buffers_to_string(buffer.data());
    }


 private:
-    boost::asio::io_context ioc_;
-    boost::asio::ip::tcp::resolver resolver_;
-    boost::beast::websocket::stream<boost::asio::ip::tcp::socket> ws_;
+    net::io_context ioc_;
+    tcp::resolver resolver_;
+    websocket::stream<tcp::socket> ws_;
    bool is_connect;
 };

@@ -336,7 +336,6 @@ struct PrintParams {
    bool            try_emmc_print;
    std::string     svc_context;
    std::string     slicer_uid;
-    std::string     queue_plate_id;
 };

 struct TaskQueryParams
@@ -413,7 +412,7 @@ enum class NetworkAbi {
    Unsupported, // no generation in this build can call it - never dispatch through it
    Legacy,      // 01.10.01: PrintParams_Legacy; send_message/send_message_to_printer take no flag
    V0203,       // 02.03.00: PrintParams_0203; bind takes no dev_model
-    Current,     // 02.08.04: the layouts and signatures this build declares directly
+    Current,     // 02.08.01: the layouts and signatures this build declares directly
 };

 struct NetworkLibraryVersion {
@@ -426,12 +425,10 @@ struct NetworkLibraryVersion {
 };

 // Every row names the generation that can call it, so a series can never be offered without a
-// host-side ABI for it. Series with no generation - 02.08.01 (whose PrintParams lacks the
-// queue_plate_id that 02.08.02 appended, and whose malformed bind table macOS 27 refuses to
-// load), 02.01.01, 02.00.02 and older - must stay out; is_supported_network_version() is the
-// gate that keeps them from loading.
+// host-side ABI for it. Series with no generation - 02.01.01, 02.00.02 and older - must stay out;
+// is_supported_network_version() is the gate that keeps them from loading.
 static const NetworkLibraryVersion AVAILABLE_NETWORK_VERSIONS[] = {
-    {"02.08.04", "02.08.04", nullptr, true, nullptr, NetworkAbi::Current},
+    {"02.08.01", "02.08.01", nullptr, true, nullptr, NetworkAbi::Current},
    {"02.03.00", "02.03.00", nullptr, false,
     "An older plug-in series. Features that need newer plug-in support, such as print-failure "
     "snapshots in the device error dialog, are unavailable.", NetworkAbi::V0203},
@@ -7,6 +7,9 @@

 #include "nlohmann/json.hpp"

+
+using namespace std;
+
 class json_diff
 {
 private:
@@ -346,8 +346,20 @@ std::vector<std::string> PluginAuditManager::default_denied_path_keywords()
    // must never be able to reach a secret, a certificate, or a configuration file just because
    // it happens to live inside an otherwise-allowed root (e.g. the bundled TLS client cert at
    // resources_dir()/cert/..., which would become reachable the moment resources_dir() is
-    // granted as a read-only allowed root).
-    return {"secret", "cert", "conf"};
+    // granted as a read-only allowed root). Match as whole path components, not substrings, so
+    // imports such as numpy/__config__.py and stdlib configparser.py remain usable.
+    return {"secret", "secrets", "cert", "certs", "certificate", "certificates", "conf", "config"};
+}
+
+static bool has_denied_config_extension(std::string name)
+{
+    const size_t stream_pos = name.find(':');
+    if (stream_pos != std::string::npos)
+        name.erase(stream_pos);
+
+    const boost::filesystem::path path(name);
+    const std::string extension = path.extension().string();
+    return extension == ".conf" || extension == ".ini";
 }

 bool PluginAuditManager::is_denied_path_keyword(const boost::filesystem::path& candidate) const
@@ -372,7 +384,7 @@ bool PluginAuditManager::is_denied_path_keyword(const boost::filesystem::path& c
            continue;
        std::transform(name.begin(), name.end(), name.begin(), [](unsigned char c) { return std::tolower(c); });
        for (const auto& keyword : m_denied_path_keywords) {
-            if (name.find(keyword) != std::string::npos)
+            if (name == keyword || (keyword == "conf" && has_denied_config_extension(name)))
                return true;
        }
    }
@@ -796,7 +808,8 @@ bool persist_permission(const std::string&        plugin_key,

 int report_denied(PluginAuditManager&            mgr,
                  const std::string&             event_name,
-                  const AuditDecision&           decision)
+                  const AuditDecision&           decision,
+                  const std::string&             target = {})
 {
    AuditViolation violation;
    violation.plugin_key = mgr.current_plugin();
@@ -804,7 +817,13 @@ int report_denied(PluginAuditManager&            mgr,
    violation.reason     = decision.reason;
    mgr.report_violation(violation);

-    PyErr_SetString(PyExc_PermissionError, "Plugin attempted an audited operation without permission");
+    std::string message = "Plugin attempted audited operation \"" + event_name + "\" without permission";
+    if (!decision.reason.empty())
+        message += ": " + decision.reason;
+    if (!target.empty())
+        message += ": " + target;
+
+    PyErr_SetString(PyExc_PermissionError, message.c_str());
    return -1;
 }

@@ -916,7 +935,7 @@ int PluginAuditManager::audit_hook(const char* event, PyObject* args, void* user
    if (fs_category) {
        for (const auto& target : targets) {
            if (mgr->is_denied_path(boost::filesystem::path(target)))
-                return PluginAuditDetail::report_denied(*mgr, event_name, {false, "denied path"});
+                return PluginAuditDetail::report_denied(*mgr, event_name, {false, "denied path"}, target);
        }
    }

@@ -4,7 +4,6 @@
 // Via pybind11 so this file requests the same python3xx.lib as everything else.
 #include <boost/filesystem/path.hpp>
 #include <pybind11/conduit/wrap_include_python_h.h>
-#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
@@ -103,22 +102,20 @@ public:
    bool is_denied_filename(const boost::filesystem::path& candidate) const;

    // --- denied-path-keyword registry ---
-    // Keywords that categorically deny a path if ANY of its components (directory or file
-    // name), not just the base name, contains one case-insensitively -- e.g. a "secrets"
-    // subfolder, a "certificates" folder, or a "conf"/"config" file anywhere the plugin can
-    // otherwise reach, including inside an allowed root. This is intentionally broader and
-    // fuzzier than the exact-name is_denied_filename registry: it exists to categorically rule
-    // out whole classes of sensitive paths (secrets, certificates, config) rather than name
-    // specific known files, at the cost of over-blocking an unrelated name that happens to
-    // contain the keyword -- the fail-safe direction, same rationale as is_denied_filename.
+    // Keywords that categorically deny a path if ANY component matches one case-insensitively --
+    // e.g. a "secrets" subfolder, a "certificates" folder, a "conf"/"config" directory, or a
+    // .conf/.ini file anywhere the plugin can otherwise reach, including inside an allowed root.
+    // This is broader than the exact-name is_denied_filename registry, but it is not a substring
+    // match: importable modules such as numpy/__config__.py, configparser.py, sysconfig.py, or
+    // user folders such as "Conference" and "Concert" are unrelated names and must stay promptable.
    void add_denied_path_keyword(const std::string& keyword);

    // The list install_hook() seeds into the keyword registry. Exposed so tests seed the exact
    // same set without a live interpreter.
    static std::vector<std::string> default_denied_path_keywords();

-    // True when any component of candidate's (canonicalized) path contains a registered
-    // keyword, case-insensitively.
+    // True when any component of candidate's (canonicalized) path matches a registered keyword,
+    // case-insensitively. A registered "conf" keyword also blocks .conf/.ini file components.
    bool is_denied_path_keyword(const boost::filesystem::path& candidate) const;

    // is_denied_filename(candidate) || is_denied_path_keyword(candidate). Convenience for
@@ -17,18 +17,20 @@
 #include <map>
 #include <unordered_map>

+using json = nlohmann::json;
+
 // Put serializers in correct ADL namespaces for each type

 namespace Slic3r {
 namespace FilamentGroupUtils {

-inline void to_json(nlohmann::json& j, const Color& c) {
+inline void to_json(json& j, const Color& c) {
    char buf[10];
    snprintf(buf, sizeof(buf), "#%02X%02X%02X%02X", c.r, c.g, c.b, c.a);
    j = std::string(buf);
 }

-inline void from_json(const nlohmann::json& j, Color& c) {
+inline void from_json(const json& j, Color& c) {
    std::string s = j.get<std::string>();
    if (s.size() >= 7 && s[0] == '#') {
        c.r = (unsigned char)std::stoi(s.substr(1, 2), nullptr, 16);
@@ -38,8 +40,8 @@ inline void from_json(const nlohmann::json& j, Color& c) {
    }
 }

-inline void to_json(nlohmann::json& j, const FilamentInfo& fi) {
-    j = nlohmann::json{
+inline void to_json(json& j, const FilamentInfo& fi) {
+    j = json{
        {"color", fi.color},
        {"type", fi.type},
        {"is_support", fi.is_support},
@@ -47,15 +49,15 @@ inline void to_json(nlohmann::json& j, const FilamentInfo& fi) {
    };
 }

-inline void from_json(const nlohmann::json& j, FilamentInfo& fi) {
+inline void from_json(const json& j, FilamentInfo& fi) {
    fi.color = j.at("color").get<Color>();
    j.at("type").get_to(fi.type);
    j.at("is_support").get_to(fi.is_support);
    fi.usage_type = (FilamentUsageType)j.at("usage_type").get<int>();
 }

-inline void to_json(nlohmann::json& j, const MachineFilamentInfo& mfi) {
-    j = nlohmann::json{
+inline void to_json(json& j, const MachineFilamentInfo& mfi) {
+    j = json{
        {"color", mfi.color},
        {"type", mfi.type},
        {"is_support", mfi.is_support},
@@ -65,7 +67,7 @@ inline void to_json(nlohmann::json& j, const MachineFilamentInfo& mfi) {
    };
 }

-inline void from_json(const nlohmann::json& j, MachineFilamentInfo& mfi) {
+inline void from_json(const json& j, MachineFilamentInfo& mfi) {
    mfi.color = j.at("color").get<Color>();
    j.at("type").get_to(mfi.type);
    j.at("is_support").get_to(mfi.is_support);
@@ -78,8 +80,8 @@ inline void from_json(const nlohmann::json& j, MachineFilamentInfo& mfi) {

 namespace MultiNozzleUtils {

-inline void to_json(nlohmann::json& j, const NozzleInfo& ni) {
-    j = nlohmann::json{
+inline void to_json(json& j, const NozzleInfo& ni) {
+    j = json{
        {"diameter", ni.diameter},
        {"volume_type", (int)ni.volume_type},
        {"extruder_id", ni.extruder_id},
@@ -87,15 +89,15 @@ inline void to_json(nlohmann::json& j, const NozzleInfo& ni) {
    };
 }

-inline void from_json(const nlohmann::json& j, NozzleInfo& ni) {
+inline void from_json(const json& j, NozzleInfo& ni) {
    j.at("diameter").get_to(ni.diameter);
    ni.volume_type = (NozzleVolumeType)j.at("volume_type").get<int>();
    j.at("extruder_id").get_to(ni.extruder_id);
    j.at("group_id").get_to(ni.group_id);
 }

-inline void to_json(nlohmann::json& j, const FilamentChangeTimeParams& p) {
-    j = nlohmann::json{
+inline void to_json(json& j, const FilamentChangeTimeParams& p) {
+    j = json{
        {"selector_load_time", p.selector_load_time},
        {"selector_unload_time", p.selector_unload_time},
        {"standard_load_time", p.standard_load_time},
@@ -103,7 +105,7 @@ inline void to_json(nlohmann::json& j, const FilamentChangeTimeParams& p) {
    };
 }

-inline void from_json(const nlohmann::json& j, FilamentChangeTimeParams& p) {
+inline void from_json(const json& j, FilamentChangeTimeParams& p) {
    j.at("selector_load_time").get_to(p.selector_load_time);
    j.at("selector_unload_time").get_to(p.selector_unload_time);
    j.at("standard_load_time").get_to(p.standard_load_time);
@@ -114,22 +116,22 @@ inline void from_json(const nlohmann::json& j, FilamentChangeTimeParams& p) {

 // ============ Helper: set<int> as JSON array ============
 namespace FGTestDetail {
-inline nlohmann::json set_to_json(const std::set<int>& s) {
-    return nlohmann::json(std::vector<int>(s.begin(), s.end()));
+inline json set_to_json(const std::set<int>& s) {
+    return json(std::vector<int>(s.begin(), s.end()));
 }

-inline std::set<int> json_to_set(const nlohmann::json& j) {
+inline std::set<int> json_to_set(const json& j) {
    auto v = j.get<std::vector<int>>();
    return std::set<int>(v.begin(), v.end());
 }

-inline nlohmann::json nvt_set_to_json(const std::set<NozzleVolumeType>& s) {
+inline json nvt_set_to_json(const std::set<NozzleVolumeType>& s) {
    std::vector<int> v;
    for (auto t : s) v.push_back((int)t);
-    return nlohmann::json(v);
+    return json(v);
 }

-inline std::set<NozzleVolumeType> json_to_nvt_set(const nlohmann::json& j) {
+inline std::set<NozzleVolumeType> json_to_nvt_set(const json& j) {
    std::set<NozzleVolumeType> s;
    for (auto& item : j) s.insert((NozzleVolumeType)item.get<int>());
    return s;
@@ -137,28 +139,28 @@ inline std::set<NozzleVolumeType> json_to_nvt_set(const nlohmann::json& j) {
 } // namespace FGTestDetail

 // ============ FilamentGroupContext::ModelInfo ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext::ModelInfo& mi) {
+inline void to_json(json& j, const FilamentGroupContext::ModelInfo& mi) {
    using namespace FGTestDetail;
    j["flush_matrix"] = mi.flush_matrix;
    j["layer_filaments"] = mi.layer_filaments;

-    j["filament_info"] = nlohmann::json::array();
+    j["filament_info"] = json::array();
    for (auto& fi : mi.filament_info)
        j["filament_info"].push_back(fi);

    j["filament_ids"] = mi.filament_ids;

-    j["unprintable_filaments"] = nlohmann::json::array();
+    j["unprintable_filaments"] = json::array();
    for (auto& s : mi.unprintable_filaments)
        j["unprintable_filaments"].push_back(set_to_json(s));

-    nlohmann::json uv = nlohmann::json::object();
+    json uv = json::object();
    for (auto& [fil, types] : mi.unprintable_volumes)
        uv[std::to_string(fil)] = nvt_set_to_json(types);
    j["unprintable_volumes"] = uv;
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext::ModelInfo& mi) {
+inline void from_json(const json& j, FilamentGroupContext::ModelInfo& mi) {
    using namespace FGTestDetail;
    j.at("flush_matrix").get_to(mi.flush_matrix);
    j.at("layer_filaments").get_to(mi.layer_filaments);
@@ -181,8 +183,8 @@ inline void from_json(const nlohmann::json& j, FilamentGroupContext::ModelInfo&
 }

 // ============ FilamentGroupContext::GroupInfo ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext::GroupInfo& gi) {
-    j = nlohmann::json{
+inline void to_json(json& j, const FilamentGroupContext::GroupInfo& gi) {
+    j = json{
        {"total_filament_num", gi.total_filament_num},
        {"max_gap_threshold", gi.max_gap_threshold},
        {"mode", (int)gi.mode},
@@ -193,7 +195,7 @@ inline void to_json(nlohmann::json& j, const FilamentGroupContext::GroupInfo& gi
    };
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext::GroupInfo& gi) {
+inline void from_json(const json& j, FilamentGroupContext::GroupInfo& gi) {
    j.at("total_filament_num").get_to(gi.total_filament_num);
    j.at("max_gap_threshold").get_to(gi.max_gap_threshold);
    gi.mode = (FGMode)j.at("mode").get<int>();
@@ -204,12 +206,12 @@ inline void from_json(const nlohmann::json& j, FilamentGroupContext::GroupInfo&
 }

 // ============ FilamentGroupContext::MachineInfo ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext::MachineInfo& mi) {
+inline void to_json(json& j, const FilamentGroupContext::MachineInfo& mi) {
    j["max_group_size"] = mi.max_group_size;

-    j["machine_filament_info"] = nlohmann::json::array();
+    j["machine_filament_info"] = json::array();
    for (auto& vec : mi.machine_filament_info) {
-        nlohmann::json arr = nlohmann::json::array();
+        json arr = json::array();
        for (auto& mfi : vec) arr.push_back(mfi);
        j["machine_filament_info"].push_back(arr);
    }
@@ -218,7 +220,7 @@ inline void to_json(nlohmann::json& j, const FilamentGroupContext::MachineInfo&
    j["master_extruder_id"] = mi.master_extruder_id;
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext::MachineInfo& mi) {
+inline void from_json(const json& j, FilamentGroupContext::MachineInfo& mi) {
    j.at("max_group_size").get_to(mi.max_group_size);

    mi.machine_filament_info.clear();
@@ -234,10 +236,10 @@ inline void from_json(const nlohmann::json& j, FilamentGroupContext::MachineInfo
 }

 // ============ FilamentGroupContext::SpeedInfo ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext::SpeedInfo& si) {
-    nlohmann::json fpt = nlohmann::json::object();
+inline void to_json(json& j, const FilamentGroupContext::SpeedInfo& si) {
+    json fpt = json::object();
    for (auto& [fil, inner] : si.filament_print_time) {
-        nlohmann::json inner_j = nlohmann::json::object();
+        json inner_j = json::object();
        for (auto& [layer, time] : inner)
            inner_j[std::to_string(layer)] = time;
        fpt[std::to_string(fil)] = inner_j;
@@ -250,7 +252,7 @@ inline void to_json(nlohmann::json& j, const FilamentGroupContext::SpeedInfo& si
    j["ams_preload_enabled"] = si.ams_preload_enabled;
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext::SpeedInfo& si) {
+inline void from_json(const json& j, FilamentGroupContext::SpeedInfo& si) {
    si.filament_print_time.clear();
    if (j.contains("filament_print_time")) {
        for (auto& [k, v] : j.at("filament_print_time").items()) {
@@ -267,23 +269,23 @@ inline void from_json(const nlohmann::json& j, FilamentGroupContext::SpeedInfo&
 }

 // ============ FilamentGroupContext::NozzleInfo ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext::NozzleInfo& ni) {
-    nlohmann::json enl = nlohmann::json::object();
+inline void to_json(json& j, const FilamentGroupContext::NozzleInfo& ni) {
+    json enl = json::object();
    for (auto& [ext, nozzles] : ni.extruder_nozzle_list)
        enl[std::to_string(ext)] = nozzles;
    j["extruder_nozzle_list"] = enl;

-    j["nozzle_list"] = nlohmann::json::array();
+    j["nozzle_list"] = json::array();
    for (auto& n : ni.nozzle_list)
        j["nozzle_list"].push_back(n);

-    nlohmann::json ns = nlohmann::json::object();
+    json ns = json::object();
    for (auto& [noz, fil] : ni.nozzle_status)
        ns[std::to_string(noz)] = fil;
    j["nozzle_status"] = ns;
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext::NozzleInfo& ni) {
+inline void from_json(const json& j, FilamentGroupContext::NozzleInfo& ni) {
    ni.extruder_nozzle_list.clear();
    for (auto& [k, v] : j.at("extruder_nozzle_list").items())
        ni.extruder_nozzle_list[std::stoi(k)] = v.get<std::vector<int>>();
@@ -300,8 +302,8 @@ inline void from_json(const nlohmann::json& j, FilamentGroupContext::NozzleInfo&
 }

 // ============ Full FilamentGroupContext ============
-inline void to_json(nlohmann::json& j, const FilamentGroupContext& ctx) {
-    nlohmann::json mi, gi, mai, si, ni;
+inline void to_json(json& j, const FilamentGroupContext& ctx) {
+    json mi, gi, mai, si, ni;
    to_json(mi, ctx.model_info);
    to_json(gi, ctx.group_info);
    to_json(mai, ctx.machine_info);
@@ -314,7 +316,7 @@ inline void to_json(nlohmann::json& j, const FilamentGroupContext& ctx) {
    j["nozzle_info"] = ni;
 }

-inline void from_json(const nlohmann::json& j, FilamentGroupContext& ctx) {
+inline void from_json(const json& j, FilamentGroupContext& ctx) {
    from_json(j.at("model_info"), ctx.model_info);
    from_json(j.at("group_info"), ctx.group_info);
    from_json(j.at("machine_info"), ctx.machine_info);
@@ -334,11 +336,11 @@ struct TestMetadata {
    int seed = 0;
 };

-inline void to_json(nlohmann::json& j, const TestMetadata& m) {
-    j = nlohmann::json{{"id", m.id}, {"config_type", m.config_type}, {"seed", m.seed}};
+inline void to_json(json& j, const TestMetadata& m) {
+    j = json{{"id", m.id}, {"config_type", m.config_type}, {"seed", m.seed}};
 }

-inline void from_json(const nlohmann::json& j, TestMetadata& m) {
+inline void from_json(const json& j, TestMetadata& m) {
    j.at("id").get_to(m.id);
    j.at("config_type").get_to(m.config_type);
    j.at("seed").get_to(m.seed);
@@ -352,8 +354,8 @@ struct TestResult {
    std::vector<std::string> violations;
 };

-inline void to_json(nlohmann::json& j, const TestResult& r) {
-    j = nlohmann::json{
+inline void to_json(json& j, const TestResult& r) {
+    j = json{
        {"filament_map", r.filament_map},
        {"flush_cost", r.flush_cost},
        {"elapsed_ms", r.elapsed_ms},
@@ -362,7 +364,7 @@ inline void to_json(nlohmann::json& j, const TestResult& r) {
    };
 }

-inline void from_json(const nlohmann::json& j, TestResult& r) {
+inline void from_json(const json& j, TestResult& r) {
    j.at("filament_map").get_to(r.filament_map);
    j.at("flush_cost").get_to(r.flush_cost);
    j.at("elapsed_ms").get_to(r.elapsed_ms);
@@ -378,15 +380,15 @@ struct BaseResult {
    bool constraints_ok = true;
 };

-inline void to_json(nlohmann::json& j, const BaseResult& g) {
-    j = nlohmann::json{
+inline void to_json(json& j, const BaseResult& g) {
+    j = json{
        {"full_score", g.full_score},
        {"flush_cost", g.flush_cost},
        {"constraints_ok", g.constraints_ok}
    };
 }

-inline void from_json(const nlohmann::json& j, BaseResult& g) {
+inline void from_json(const json& j, BaseResult& g) {
    j.at("full_score").get_to(g.full_score);
    j.at("flush_cost").get_to(g.flush_cost);
    j.at("constraints_ok").get_to(g.constraints_ok);
@@ -401,7 +403,7 @@ struct TestCase {

 inline TestCase load_test_case(const std::string& path) {
    std::ifstream f(path);
-    nlohmann::json j = nlohmann::json::parse(f);
+    json j = json::parse(f);
    TestCase tc;
    tc.metadata = j.at("metadata").get<TestMetadata>();
    Slic3r::from_json(j.at("context"), tc.context);
@@ -411,9 +413,9 @@ inline TestCase load_test_case(const std::string& path) {
 }

 inline void save_test_case(const std::string& path, const TestCase& tc) {
-    nlohmann::json j;
+    json j;
    j["metadata"] = tc.metadata;
-    nlohmann::json ctx_j;
+    json ctx_j;
    Slic3r::to_json(ctx_j, tc.context);
    j["context"] = ctx_j;
    if (tc.base_result)
@@ -430,14 +432,14 @@ inline void save_result(const std::string& case_path, const TestResult& result)
    else
        result_path += ".result.json";

-    nlohmann::json j = result;
+    json j = result;
    std::ofstream f(result_path);
    f << j.dump(2);
 }

 inline TestResult load_result(const std::string& result_path) {
    std::ifstream f(result_path);
-    nlohmann::json j = nlohmann::json::parse(f);
+    json j = json::parse(f);
    return j.get<TestResult>();
 }

@@ -538,110 +538,6 @@ SCENARIO("update_diff_values_to_child_config keeps a child's values on variants
    }
 }

-SCENARIO("update_non_diff_values_to_base_config keeps a project's changed values on variants it does not list",
-         "[Config][Variant]") {
-    std::set<std::string> no_keys;
-    auto variants = [](std::initializer_list<std::string> names) { return new Slic3r::ConfigOptionStrings(names); };
-
-    GIVEN("A filament base with three variants") {
-        Slic3r::DynamicPrintConfig base;
-        base.set_key_value("filament_extruder_variant",
-            variants({"Direct Drive Standard", "Bowden Standard", "Direct Drive High Flow"}));
-        base.set_deserialize_strict("nozzle_temperature", "220,220,220");
-
-        WHEN("the project was saved when the base had only its first variant") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("filament_extruder_variant", variants({"Direct Drive Standard"}));
-            project.set_deserialize_strict("nozzle_temperature", "199");
-
-            AND_WHEN("the project lists the value as changed") {
-                project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                              Slic3r::filament_options_with_variant, no_keys);
-                THEN("the project's value applies to every variant") {
-                    REQUIRE(project.opt_serialize("nozzle_temperature") == "199,199,199");
-                }
-            }
-            AND_WHEN("the project does not list the value as changed") {
-                project.update_non_diff_values_to_base_config(base, project.keys(), {}, "", "filament_extruder_variant",
-                                                              Slic3r::filament_options_with_variant, no_keys);
-                THEN("the base's values replace it") {
-                    REQUIRE(project.opt_serialize("nozzle_temperature") == "220,220,220");
-                }
-            }
-        }
-        WHEN("the project lists every variant, in another order") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("filament_extruder_variant",
-                variants({"Bowden Standard", "Direct Drive High Flow", "Direct Drive Standard"}));
-            project.set_deserialize_strict("nozzle_temperature", "190,205,199");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                          Slic3r::filament_options_with_variant, no_keys);
-            THEN("each variant keeps its own value") {
-                REQUIRE(project.opt_serialize("nozzle_temperature") == "199,190,205");
-            }
-        }
-        WHEN("the project lists no variants") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_deserialize_strict("nozzle_temperature", "199");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                          Slic3r::filament_options_with_variant, no_keys);
-            THEN("the project's value applies to every variant") {
-                REQUIRE(project.opt_serialize("nozzle_temperature") == "199,199,199");
-            }
-        }
-    }
-
-    GIVEN("A two-extruder printer base with two variants per extruder") {
-        Slic3r::DynamicPrintConfig base;
-        base.set_key_value("printer_extruder_variant",
-            variants({"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard", "Direct Drive High Flow"}));
-        base.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 1, 2, 2}));
-        base.set_deserialize_strict("retraction_length", "0.8,0.8,0.8,0.8");
-
-        WHEN("the project lists only the Standard variant of each extruder") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"}));
-            project.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2}));
-            project.set_deserialize_strict("retraction_length", "1.1,2.2");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"retraction_length"}, "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("each extruder's High Flow variant takes that extruder's value") {
-                REQUIRE(project.opt_serialize("retraction_length") == "1.1,1.1,2.2,2.2");
-            }
-        }
-        WHEN("the project lists only the Standard variant of each extruder, and the variant lists as changed") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"}));
-            project.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2}));
-            project.set_deserialize_strict("machine_max_speed_x", "300,100,400,150");
-            base.set_deserialize_strict("machine_max_speed_x", "500,200,500,200,500,200,500,200");
-            project.update_non_diff_values_to_base_config(base, project.keys(),
-                                                          {"machine_max_speed_x", "printer_extruder_id", "printer_extruder_variant"},
-                                                          "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("the variant lists are the base's") {
-                REQUIRE(project.opt_serialize("printer_extruder_variant") == base.opt_serialize("printer_extruder_variant"));
-                REQUIRE(project.opt_serialize("printer_extruder_id") == "1,1,2,2");
-            }
-            THEN("each extruder's High Flow variant takes that extruder's pair of limits") {
-                REQUIRE(project.opt_serialize("machine_max_speed_x") == "300,100,300,100,400,150,400,150");
-            }
-        }
-        WHEN("the project lists no variants") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_deserialize_strict("retraction_length", "1.1");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"retraction_length"}, "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("only the first extruder's variants take the project's value") {
-                REQUIRE(project.opt_serialize("retraction_length") == "1.1,1.1,0.8,0.8");
-            }
-        }
-    }
-}
-
 // SCENARIO("DynamicPrintConfig JSON serialization", "[Config]") {
 //     WHEN("DynamicPrintConfig is serialized and deserialized") {
 // 	auto now = std::chrono::high_resolution_clock::now();
@@ -799,30 +799,3 @@ TEST_CASE("A per-variant filament option read with a single value gives it to ev
    config.load_from_ini_string("pressure_advance = 0.021", ForwardCompatibilitySubstitutionRule::Disable);
    REQUIRE(config.option<ConfigOptionFloats>("pressure_advance")->values == std::vector<double>({0.021, 0.021, 0.021}));
 }
-
-// The device drying options hold several values per filament, as many as each filament preset gives.
-TEST_CASE("The device drying options are rebuilt as each filament's values in slot order", "[Config]")
-{
-    DynamicPrintConfig two_values, one_value, no_value;
-    two_values.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"1", "0"};
-    two_values.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature", true)->values     = {45., 45., 55., 55.};
-    one_value.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"1"};
-    one_value.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature", true)->values      = {65., 65., 75., 75.};
-
-    // values a project stored for three other filaments
-    DynamicPrintConfig config;
-    config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"0", "0", "0"};
-    config.option<ConfigOptionFloats>("filament_dev_chamber_drying_time", true)->values         = {12., 8., 12.};
-
-    set_filament_dev_options(config, {&two_values, &one_value, &two_values});
-    REQUIRE(config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations")->values ==
-            std::vector<std::string>({"1", "0", "1", "1", "0"}));
-    REQUIRE(config.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature")->values ==
-            std::vector<double>({45., 45., 55., 55., 65., 65., 75., 75., 45., 45., 55., 55.}));
-    // an option no filament defines keeps the stored values
-    REQUIRE(config.option<ConfigOptionFloats>("filament_dev_chamber_drying_time")->values == std::vector<double>({12., 8., 12.}));
-
-    // a filament without the option takes the option's default
-    set_filament_dev_options(config, {&two_values, &no_value});
-    REQUIRE(config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations")->values == std::vector<std::string>({"1", "0", ""}));
-}
@@ -6228,9 +6228,8 @@ TEST_CASE("A per-variant project value maps onto its base preset's variant layou
                                                                   base_finder(&base, calls));
    CHECK(config.option<ConfigOptionStrings>("print_extruder_variant")->values ==
          std::vector<std::string>{"Direct Drive Standard", "Direct Drive High Flow"});
-    // The listed key keeps the project's Standard value, and High Flow, which the project does not
-    // list, takes it too, as a user preset's value does.
-    check_double_vector(config.option<ConfigOptionFloats>("outer_wall_speed")->values, {100., 100.});
+    // The listed key keeps the project's Standard value and takes High Flow from the base.
+    check_double_vector(config.option<ConfigOptionFloats>("outer_wall_speed")->values, {100., 300.});
    check_double_vector(config.option<ConfigOptionFloats>("inner_wall_speed")->values, {250., 350.});
 }

@@ -31,8 +31,6 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/ExtrusionEntity.hpp"

-using namespace Slic3r;
-
 namespace {

 const char *const BELOW_PAD_TEST_OBJECTS[] = {
@@ -36,8 +36,6 @@
 #include "libslic3r/BoundingBox.hpp"
 #include "libslic3r/Line.hpp"

-using namespace Slic3r;
-
 void test_support_model_collision(const std::string          &obj_filename,
                                  const sla::SupportTreeConfig   &input_supportcfg,
                                  const sla::HollowingConfig &hollowingcfg,
@@ -33,31 +33,33 @@ namespace Slic3r::sla { struct PadConfig; }
 namespace Slic3r::sla { struct SupportTreeConfig; }


+using namespace Slic3r;
+
 enum e_validity {
    ASSUME_NO_EMPTY = 1,
    ASSUME_MANIFOLD = 2,
    ASSUME_NO_REPAIR = 4
 };

-void check_validity(const Slic3r::TriangleMesh &input_mesh,
+void check_validity(const TriangleMesh &input_mesh,
                    int flags = ASSUME_NO_EMPTY | ASSUME_MANIFOLD |
                                ASSUME_NO_REPAIR);

 struct PadByproducts
 {
-    Slic3r::ExPolygons   model_contours;
-    Slic3r::ExPolygons   support_contours;
-    Slic3r::TriangleMesh mesh;
+    ExPolygons   model_contours;
+    ExPolygons   support_contours;
+    TriangleMesh mesh;
 };

-void test_concave_hull(const Slic3r::ExPolygons &polys);
+void test_concave_hull(const ExPolygons &polys);

 void test_pad(const std::string &   obj_filename,
-              const Slic3r::sla::PadConfig &padcfg,
+              const sla::PadConfig &padcfg,
              PadByproducts &       out);

 inline void test_pad(const std::string &   obj_filename,
-              const Slic3r::sla::PadConfig &padcfg = {})
+              const sla::PadConfig &padcfg = {})
 {
    PadByproducts byproducts;
    test_pad(obj_filename, padcfg, byproducts);
@@ -67,53 +69,53 @@ struct SupportByproducts
 {
    std::string             obj_fname;
    std::vector<float>      slicegrid;
-    std::vector<Slic3r::ExPolygons> model_slices;
-    Slic3r::sla::SupportTreeBuilder supporttree;
-    Slic3r::TriangleMesh            input_mesh;
+    std::vector<ExPolygons> model_slices;
+    sla::SupportTreeBuilder supporttree;
+    TriangleMesh            input_mesh;
 };

 const constexpr float CLOSING_RADIUS = 0.005f;

-void check_support_tree_integrity(const Slic3r::sla::SupportTreeBuilder &stree,
-                                  const Slic3r::sla::SupportTreeConfig &cfg);
+void check_support_tree_integrity(const sla::SupportTreeBuilder &stree,
+                                  const sla::SupportTreeConfig &cfg);

 void test_supports(const std::string          &obj_filename,
-                   const Slic3r::sla::SupportTreeConfig   &supportcfg,
-                   const Slic3r::sla::HollowingConfig &hollowingcfg,
-                   const Slic3r::sla::DrainHoles      &drainholes,
+                   const sla::SupportTreeConfig   &supportcfg,
+                   const sla::HollowingConfig &hollowingcfg,
+                   const sla::DrainHoles      &drainholes,
                   SupportByproducts          &out);

 inline void test_supports(const std::string &obj_filename,
-                   const Slic3r::sla::SupportTreeConfig &supportcfg,
+                   const sla::SupportTreeConfig &supportcfg,
                   SupportByproducts        &out) 
 {
-    Slic3r::sla::HollowingConfig hcfg;
+    sla::HollowingConfig hcfg;
    hcfg.enabled = false;
    test_supports(obj_filename, supportcfg, hcfg, {}, out);    
 }

 inline void test_supports(const std::string &obj_filename,
-                   const Slic3r::sla::SupportTreeConfig &supportcfg = {})
+                   const sla::SupportTreeConfig &supportcfg = {})
 {
    SupportByproducts byproducts;
    test_supports(obj_filename, supportcfg, byproducts);
 }

-void export_failed_case(const std::vector<Slic3r::ExPolygons> &support_slices,
+void export_failed_case(const std::vector<ExPolygons> &support_slices,
                        const SupportByproducts &byproducts);


 void test_support_model_collision(
    const std::string          &obj_filename,
-    const Slic3r::sla::SupportTreeConfig   &input_supportcfg,
-    const Slic3r::sla::HollowingConfig &hollowingcfg,
-    const Slic3r::sla::DrainHoles      &drainholes);
+    const sla::SupportTreeConfig   &input_supportcfg,
+    const sla::HollowingConfig &hollowingcfg,
+    const sla::DrainHoles      &drainholes);

 inline void test_support_model_collision(
    const std::string        &obj_filename,
-    const Slic3r::sla::SupportTreeConfig &input_supportcfg = {}) 
+    const sla::SupportTreeConfig &input_supportcfg = {}) 
 {
-    Slic3r::sla::HollowingConfig hcfg;
+    sla::HollowingConfig hcfg;
    hcfg.enabled = false;
    test_support_model_collision(obj_filename, input_supportcfg, hcfg, {});
 }
@@ -154,8 +156,8 @@ template <class I, class II> void test_pairhash()
        
        REQUIRE(a != b);
        
-        II hash_ab = Slic3r::sla::pairhash<I, II>(a, b);
-        II hash_ba = Slic3r::sla::pairhash<I, II>(b, a);
+        II hash_ab = sla::pairhash<I, II>(a, b);
+        II hash_ba = sla::pairhash<I, II>(b, a);
        REQUIRE(hash_ab == hash_ba);
        
        auto it = ints.find(hash_ab);
@@ -178,23 +180,23 @@ static constexpr const TPixel FullBlack = 0;

 template <class A, int N> constexpr int arraysize(const A (&)[N]) { return N; }

-void check_raster_transformations(Slic3r::sla::RasterBase::Orientation o,
-                                  Slic3r::sla::RasterBase::TMirroring  mirroring);
+void check_raster_transformations(sla::RasterBase::Orientation o,
+                                  sla::RasterBase::TMirroring  mirroring);

-Slic3r::ExPolygon square_with_hole(double v);
+ExPolygon square_with_hole(double v);

-inline double pixel_area(TPixel px, const Slic3r::sla::PixelDim &pxdim)
+inline double pixel_area(TPixel px, const sla::PixelDim &pxdim)
 {
    return (pxdim.h_mm * pxdim.w_mm) * px * 1. / (FullWhite - FullBlack);
 }

-double raster_white_area(const Slic3r::sla::RasterGrayscaleAA &raster);
-long raster_pxsum(const Slic3r::sla::RasterGrayscaleAA &raster);
+double raster_white_area(const sla::RasterGrayscaleAA &raster);
+long raster_pxsum(const sla::RasterGrayscaleAA &raster);

-double predict_error(const Slic3r::ExPolygon &p, const Slic3r::sla::PixelDim &pd);
+double predict_error(const ExPolygon &p, const sla::PixelDim &pd);

-Slic3r::sla::SupportPoints calc_support_pts(
-    const Slic3r::TriangleMesh &                      mesh,
-    const Slic3r::sla::SupportPointGenerator::Config &cfg = {});
+sla::SupportPoints calc_support_pts(
+    const TriangleMesh &                      mesh,
+    const sla::SupportPointGenerator::Config &cfg = {});

 #endif // SLA_TEST_UTILS_HPP
@@ -78,34 +78,31 @@ TEST_CASE("Series and managed classification", "[NetworkVersions]")

 TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; customs are surfaced", "[NetworkVersions]")
 {
-    add_plugin("02.08.04.60");          // managed, same series -> folded into the 02.08.04 row
+    add_plugin("02.08.01.55");          // managed, same series -> folded into the 02.08.01 row
    add_plugin("02.09.00.10");          // managed, unknown series -> not listed
-    add_plugin("02.08.01.55");          // managed, series this build no longer has an ABI for -> not listed
    add_plugin("02.03.00.62");          // managed, older whitelisted series -> folded into 02.03.00
    add_plugin("02.01.01.52");          // managed, series with no ABI in this build -> not listed
-    add_plugin("02.08.04_custom");      // custom, whitelisted series -> listed under it
-    add_plugin("02.08.04.52-dev");      // custom (dash-suffixed), whitelisted series -> listed
+    add_plugin("02.08.01_custom");      // custom, whitelisted series -> listed under it
+    add_plugin("02.08.01.52-dev");      // custom (dash-suffixed), whitelisted series -> listed

    auto versions = get_all_available_versions();

    // The specific managed build never gets its own row - the series represents it.
-    REQUIRE(count_version(versions, "02.08.04.60") == 0);
-    REQUIRE(count_version(versions, "02.08.04")    == 1);
-    REQUIRE(count_version(versions, "02.09.00.10") == 0);
    REQUIRE(count_version(versions, "02.08.01.55") == 0);
-    REQUIRE(count_version(versions, "02.08.01")    == 0);
+    REQUIRE(count_version(versions, "02.08.01")    == 1);
+    REQUIRE(count_version(versions, "02.09.00.10") == 0);
    REQUIRE(count_version(versions, "02.03.00.62") == 0);
    REQUIRE(count_version(versions, "02.03.00")    == 1);
    REQUIRE(count_version(versions, "02.01.01.52") == 0);
    // Custom-named builds are distinct files kept under their own name.
-    REQUIRE(count_version(versions, "02.08.04_custom")  == 1);
-    REQUIRE(count_version(versions, "02.08.04.52-dev")  == 1);
+    REQUIRE(count_version(versions, "02.08.01_custom")  == 1);
+    REQUIRE(count_version(versions, "02.08.01.52-dev")  == 1);

    // Newest series first, its customs nested under it (suffix sort: "" < ".52-dev" < "_custom"),
    // then older series, legacy last.
-    REQUIRE(versions[0].version == "02.08.04");
-    REQUIRE(versions[1].version == "02.08.04.52-dev");
-    REQUIRE(versions[2].version == "02.08.04_custom");
+    REQUIRE(versions[0].version == "02.08.01");
+    REQUIRE(versions[1].version == "02.08.01.52-dev");
+    REQUIRE(versions[2].version == "02.08.01_custom");
    REQUIRE(versions[3].version == "02.03.00");
    REQUIRE(versions.back().version == BAMBU_NETWORK_AGENT_VERSION_LEGACY);

@@ -114,9 +111,9 @@ TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; cust
    REQUIRE_FALSE(versions[3].is_latest);

    // Customs sort/render nested under their series (non-empty suffix, base = the series).
-    REQUIRE(versions[1].base_version == "02.08.04");
+    REQUIRE(versions[1].base_version == "02.08.01");
    REQUIRE_FALSE(versions[1].suffix.empty());
-    REQUIRE(versions[2].base_version == "02.08.04");
+    REQUIRE(versions[2].base_version == "02.08.01");
    REQUIRE_FALSE(versions[2].suffix.empty());

    // "(Latest)" is the series row, never a nested custom build.
@@ -126,20 +123,20 @@ TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; cust
    REQUIRE_FALSE(versions[2].is_latest);

    // The stored default that drives download and update-check decisions is now the series.
-    REQUIRE(std::string(get_latest_network_version()) == "02.08.04");
+    REQUIRE(std::string(get_latest_network_version()) == "02.08.01");
 }

 TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installed", "[NetworkVersions]")
 {
-    add_plugin("02.08.04.60");
-    add_plugin("02.08.04_custom");
+    add_plugin("02.08.01.55");
+    add_plugin("02.08.01_custom");

-    // The loaded plug-in reports its full build (02.08.04.60); the series row is what gets marked.
+    // The loaded plug-in reports its full build (02.08.01.55); the series row is what gets marked.
    {
-        auto versions = get_all_available_versions("02.08.04.60");
+        auto versions = get_all_available_versions("02.08.01.55");
        int marked = 0;
        for (const auto& info : versions)
-            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.04"); }
+            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.01"); }
        REQUIRE(marked == 1);
    }

@@ -155,10 +152,10 @@ TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installe

    // A loaded custom build matches its own row, never the bare series.
    {
-        auto versions = get_all_available_versions("02.08.04_custom");
+        auto versions = get_all_available_versions("02.08.01_custom");
        int marked = 0;
        for (const auto& info : versions)
-            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.04_custom"); }
+            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.01_custom"); }
        REQUIRE(marked == 1);
    }

@@ -170,11 +167,11 @@ TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installe
 TEST_CASE("Only whitelisted series pass the load gate", "[NetworkVersions]")
 {
    // Each whitelisted series, its builds, and custom-named builds of that series.
-    REQUIRE(is_supported_network_version("02.08.04"));
-    REQUIRE(is_supported_network_version("02.08.04.52"));
-    REQUIRE(is_supported_network_version("02.08.04.60"));
-    REQUIRE(is_supported_network_version("02.08.04_custom"));
-    REQUIRE(is_supported_network_version("02.08.04.52-dev"));
+    REQUIRE(is_supported_network_version("02.08.01"));
+    REQUIRE(is_supported_network_version("02.08.01.52"));
+    REQUIRE(is_supported_network_version("02.08.01.55"));
+    REQUIRE(is_supported_network_version("02.08.01_custom"));
+    REQUIRE(is_supported_network_version("02.08.01.52-dev"));
    REQUIRE(is_supported_network_version("02.03.00"));
    REQUIRE(is_supported_network_version("02.03.00.62"));
    REQUIRE(is_supported_network_version("02.03.00.70"));
@@ -182,9 +179,6 @@ TEST_CASE("Only whitelisted series pass the load gate", "[NetworkVersions]")
    REQUIRE(is_supported_network_version(BAMBU_NETWORK_AGENT_VERSION_LEGACY));

    // Series whitelisted by previous Orca releases that no generation here can call.
-    REQUIRE_FALSE(is_supported_network_version("02.08.01"));
-    REQUIRE_FALSE(is_supported_network_version("02.08.01.55"));
-    REQUIRE_FALSE(is_supported_network_version("02.08.01_custom"));
    REQUIRE_FALSE(is_supported_network_version("02.01.01.52"));
    REQUIRE_FALSE(is_supported_network_version("02.00.02.50"));

@@ -204,9 +198,9 @@ TEST_CASE("Each version resolves to the ABI generation that can call it", "[Netw
 {
    // The generation is keyed on the series, so every build of a series - including the
    // custom-named ones - resolves to the same one.
-    CHECK(network_plugin_abi("02.08.04")        == NetworkAbi::Current);
-    CHECK(network_plugin_abi("02.08.04.60")     == NetworkAbi::Current);
-    CHECK(network_plugin_abi("02.08.04.52-dev") == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01")        == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01.55")     == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01.52-dev") == NetworkAbi::Current);
    CHECK(network_plugin_abi("02.03.00")        == NetworkAbi::V0203);
    CHECK(network_plugin_abi("02.03.00.62")     == NetworkAbi::V0203);
    CHECK(network_plugin_abi("02.03.00_custom") == NetworkAbi::V0203);
@@ -214,7 +208,6 @@ TEST_CASE("Each version resolves to the ABI generation that can call it", "[Netw

    // Anything the load gate rejects must dispatch through nothing at all, rather than
    // defaulting to a layout it does not share.
-    CHECK(network_plugin_abi("02.08.01.55") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.01.01.52") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.00.02.50") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.09.00.10") == NetworkAbi::Unsupported);
@@ -241,7 +234,7 @@ TEST_CASE_METHOD(PluginFolderFixture, "Legacy series never adopts discovered bui
    // With nothing else on disk, the series holds "(Latest)" even though its library is
    // not installed.
    for (const auto& info : versions) {
-        if (info.version == "02.08.04") {
+        if (info.version == "02.08.01") {
            REQUIRE(info.is_latest);
            REQUIRE_FALSE(info.is_loaded);
        }
@@ -222,18 +222,19 @@ TEST_CASE("Plugin audit denies secret/certificate/config-like paths by keyword",
        CHECK(mgr.is_denied_path_keyword(fs::path("/resources/certificates/ca.pem")));
    }

-    SECTION("a 'conf'/'config' directory or file component is denied")
+    SECTION("a 'conf'/'config' directory or config file component is denied")
    {
        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/conf/settings.json")));
        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/config/settings.json")));
        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/plugin.conf")));
+        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/plugin.ini")));
    }

    SECTION("matching is case-insensitive")
    {
        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/SECRETS/token.txt")));
-        CHECK(mgr.is_denied_path_keyword(fs::path("/resources/CertBundle/ca.pem")));
-        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/CONFIG.JSON")));
+        CHECK(mgr.is_denied_path_keyword(fs::path("/resources/Certificates/ca.pem")));
+        CHECK(mgr.is_denied_path_keyword(fs::path("/plugin/PLUGIN.CONF")));
    }

    SECTION("matching is not limited to the base name -- any ancestor component counts")
@@ -245,6 +246,14 @@ TEST_CASE("Plugin audit denies secret/certificate/config-like paths by keyword",
    {
        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/plugin/output/model.gcode")));
        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/plugin/storage/state.json")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/packages/cp312/numpy/__config__.py")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/packages/cp312/numpy/_core/_ufunc_config.py")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/Lib/configparser.py")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/Lib/sysconfig.py")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/Lib/logging/config.py")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/python/packages/cp312/certifi/cacert.pem")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/users/Conference/output.txt")));
+        CHECK_FALSE(mgr.is_denied_path_keyword(fs::path("/users/Concert/output.txt")));
    }

    SECTION("an empty path is not denied")