Reviewing files that changed from the base of the PR and between 941a351 and 02f5927.

• src/engine/src/core/Core.hpp
• src/engine/src/core/Core.inl
• src/engine/src/exception/MissingPluginError.hpp
• src/engine/src/plugin/APlugin.hpp
• src/engine/tests/engine/PluginTest.cpp

src/engine/src/core/Core.hpp (1)

272-279: LGTM! Clean API addition.

The GetPlugin<TPlugin>() method follows the established pattern of the existing HasPlugin() and resource management APIs. The documentation clearly specifies the exception behavior, and the signature is consistent with similar retrieval methods in the codebase.

src/engine/src/exception/MissingPluginError.hpp (1)

1-11: LGTM! Proper exception design.

The exception class follows standard C++ patterns by inheriting from std::runtime_error and using constructor inheritance. This provides a type-safe way to distinguish plugin-related errors from other runtime errors.

src/engine/tests/engine/PluginTest.cpp (3)

80-88: LGTM! Test correctly verifies plugin retrieval.

The test properly validates that:

1. A plugin can be retrieved after being added
2. The systemId is populated during the Bind() call (which happens immediately in AddPlugins)

---

90-109: LGTM! Comprehensive test for the PR's main use case.

This test effectively validates the primary motivation for the PR: retrieving systemIds to enable/disable specific systems. The test flow correctly:

1. Registers the plugin and its system
2. Runs systems once to verify execution
3. Disables the system using the retrieved systemId
4. Confirms the system no longer executes on subsequent runs

---

55-62: Verify the return type structure from RegisterSystems.

The code assumes RegisterSystems returns a tuple-like structure and uses std::get<0> to extract the systemId. While this works if the underlying scheduler's AddSystems returns a tuple, consider verifying this assumption holds across all scheduler types used in the codebase.

#!/bin/bash
# Description: Search for AddSystems method implementations in scheduler classes to verify return types

# Find scheduler implementations and their AddSystems method signatures
rg -n -A5 -B2 "AddSystems\s*\(" --type=cpp -g "*Scheduler*" -g "!test*"

src/engine/src/plugin/APlugin.hpp (1)

12-14: LGTM! Proper forwarding of return value.

The change from void to decltype(auto) correctly forwards the return value from RegisterSystem, enabling plugins to capture and expose system IDs. The use of inline is appropriate for this template method.

This change is essential for the PR's goal of allowing users to retrieve and manage system IDs.

src/engine/src/core/Core.inl (2)

3-3: LGTM! Proper dependency inclusion.

The include for MissingPluginError.hpp is correctly placed alongside the existing exception includes.

---

91-100: LGTM! Implementation follows established patterns.

The GetPlugin implementation correctly mirrors the GetResource pattern:

• Type-safe lookup using std::type_index
• Throws descriptive exception if not found
• Returns reference via static_cast (safe due to type_index guarantees)
• Consistent formatting and error handling

Reviewing files that changed from the base of the PR and between 02f5927 and 2522272.

• src/engine/src/core/Core.inl
• src/engine/tests/engine/PluginTest.cpp

• src/engine/src/core/Core.inl

src/engine/tests/engine/PluginTest.cpp (2)

55-62: LGTM! This correctly demonstrates the new SystemID capture feature.

The Bind() method properly demonstrates the PR's objective: capturing the FunctionID returned by RegisterSystems so it can be stored and later used to enable/disable specific systems.

---

5-5: Remove the unnecessary include "scheduler/Startup.hpp".

The Engine::Scheduler::Update type is already available through the existing include chain: APlugin.hpp → Core.hpp → scheduler/Update.hpp. The newly added #include "scheduler/Startup.hpp" is redundant and does not provide the Update scheduler type. Unless the code explicitly uses Engine::Scheduler::Startup (which is not evident from the review context), this include should be removed.

Likely an incorrect or invalid review comment.