@@ -21,27 +21,38 @@
 #include <optional>
 #include <string>
 
+#include <vix/engine/BuildContext.hpp>
+
 #include <vix/cli/process/Process.hpp>
 
 namespace vix::cli::build
 {
   namespace fs = std::filesystem;
   namespace process = vix::cli::process;
 
-  std::optional<process::Preset> resolve_builtin_preset(
-      const std::string &name);
+  using vix::engine::BuildTargetOptions;
+  using vix::engine::resolve_builtin_preset;
 
-  std::string default_build_target_name(
+  inline std::string default_build_target_name(
       const process::Options &opt,
-      const process::Plan &plan);
+      const process::Plan &plan)
+  {
+    return vix::engine::default_build_target_name(opt.buildTarget, plan);
+  }
 
-  std::string default_graph_target_name(
+  inline std::string default_graph_target_name(
       const process::Options &opt,
-      const process::Plan &plan);
+      const process::Plan &plan)
+  {
+    return vix::engine::default_graph_target_name(opt.buildTarget, plan);
+  }
 
-  fs::path default_project_executable_path(
+  inline fs::path default_project_executable_path(
       const process::Options &opt,
-      const process::Plan &plan);
+      const process::Plan &plan)
+  {
+    return vix::engine::default_project_executable_path(opt.buildTarget, plan);
+  }
 
 } // namespace vix::cli::build
 
 
@@ -19,6 +19,9 @@
 #include <utility>
 #include <vector>
 
+#include <vix/engine/ExecutionPlan.hpp>
+#include <vix/engine/Preset.hpp>
+
 namespace vix::cli::process
 {
   namespace fs = std::filesystem;
@@ -206,148 +209,8 @@ namespace vix::cli::process
     std::string capturedFirstLine;
   };
 
-  /**
-   * @brief Embedded build preset description.
-   */
-  struct Preset
-  {
-    /**
-     * @brief Preset public name.
-     */
-    std::string name;
-
-    /**
-     * @brief CMake generator name, usually "Ninja".
-     */
-    std::string generator;
-
-    /**
-     * @brief CMake build type, such as "Debug" or "Release".
-     */
-    std::string buildType;
-
-    /**
-     * @brief Build directory name associated with the preset.
-     */
-    std::string buildDirName;
-  };
-
-  /**
-   * @brief Fully resolved execution plan for a build.
-   *
-   * This contains all derived paths, resolved tools, generated files,
-   * and CMake variables needed to configure and build the project.
-   */
-  struct Plan
-  {
-    /**
-     * @brief User project root directory.
-     *
-     * This is the real directory where the user runs Vix from.
-     * Build directories, exported binaries, local build state, and project
-     * input snapshots should be based on this path.
-     *
-     * For normal CMake projects, this is the same as cmakeSourceDir.
-     * For vix.app projects, this is the directory containing vix.app.
-     */
-    fs::path userProjectDir;
-
-    /**
-     * @brief CMake source directory passed to `cmake -S`.
-     *
-     * For normal CMake projects, this is the same as userProjectDir.
-     * For vix.app projects, this points to the generated internal CMake
-     * directory under `.vix/generated/app`.
-     */
-    fs::path cmakeSourceDir;
-
-    /**
-     * @brief Root project directory.
-     *
-     * Kept for backward compatibility with existing build code.
-     * New code should prefer userProjectDir or cmakeSourceDir depending on
-     * the operation being performed.
-     */
-    fs::path projectDir;
-
-    /**
-     * @brief Default target name used when --build-target is not provided.
-     *
-     * For normal CMake projects, this is usually the project directory name.
-     * For vix.app projects, this is the manifest `name`.
-     */
-    std::string defaultTargetName;
-
-    /**
-     * @brief True when the active CMake project was generated from vix.app.
-     */
-    bool generatedFromVixApp{false};
-
-    /**
-     * @brief Resolved embedded preset.
-     */
-    Preset preset;
-
-    /**
-     * @brief Build directory used for configure/build artifacts.
-     */
-    fs::path buildDir;
-
-    /**
-     * @brief Path to the configure log file.
-     */
-    fs::path configureLog;
-
-    /**
-     * @brief Path to the build log file.
-     */
-    fs::path buildLog;
-
-    /**
-     * @brief Path to the configuration signature file.
-     */
-    fs::path sigFile;
-
-    /**
-     * @brief Path to the generated toolchain file when cross-compiling.
-     */
-    fs::path toolchainFile;
-
-    /**
-     * @brief Resolved Vix SDK CMake package directory, when SDK selection is required.
-     */
-    fs::path sdkConfigDir;
-
-    /**
-     * @brief Fatal managed SDK resolution error to report before configuring CMake.
-     */
-    std::string sdkResolutionError;
-
-    /**
-     * @brief Resolved CMake cache variables passed during configure.
-     */
-    std::vector<std::pair<std::string, std::string>> cmakeVars;
-
-    /**
-     * @brief Signature used to detect whether reconfigure is needed.
-     */
-    std::string signature;
-
-    /**
-     * @brief Resolved compiler launcher executable, if any.
-     */
-    std::optional<std::string> launcher;
-
-    /**
-     * @brief Resolved fast-linker compiler flag, if any.
-     */
-    std::optional<std::string> fastLinkerFlag;
-
-    /**
-     * @brief Fingerprint of important project files used for caching.
-     */
-    std::string projectFingerprint;
-  };
+  using Preset = vix::engine::Preset;
+  using Plan = vix::engine::ExecutionPlan;
 
   /**
    * @brief Normalizes a raw process exit status into a standard exit code.
 
@@ -0,0 +1,66 @@
+/**
+ *
+ *  @file BuildContextCompatTests.cpp
+ *  @author Gaspard Kirira
+ *
+ *  Copyright 2026, Gaspard Kirira.  All rights reserved.
+ *  https://github.com/vixcpp/vix
+ *  Use of this source code is governed by a MIT license
+ *  that can be found in the License file.
+ *
+ *  Vix.cpp
+ *
+ *  CLI build context compatibility tests
+ *
+ */
+
+#include <vix/cli/build/BuildContext.hpp>
+
+#include <cassert>
+#include <filesystem>
+#include <type_traits>
+
+int main()
+{
+  namespace build = vix::cli::build;
+  namespace process = vix::cli::process;
+  namespace engine = vix::engine;
+
+  static_assert(std::is_same_v<process::Preset, engine::Preset>);
+  static_assert(std::is_same_v<process::Plan, engine::ExecutionPlan>);
+
+  const auto preset = build::resolve_builtin_preset("dev-ninja");
+  assert(preset.has_value());
+  assert(preset->name == "dev-ninja");
+  assert(preset->generator == "Ninja");
+  assert(preset->buildType == "Debug");
+  assert(preset->buildDirName == "build-ninja");
+  assert(!build::resolve_builtin_preset("unknown").has_value());
+
+  process::Options options;
+  process::Plan plan;
+  plan.userProjectDir = "/tmp/app";
+  plan.cmakeSourceDir = "/tmp/app";
+  plan.projectDir = "/tmp/app";
+  plan.preset = *preset;
+  plan.buildDir = "/tmp/app/build-ninja";
+
+  options.buildTarget = "explicit";
+  assert(build::default_build_target_name(options, plan) == "explicit");
+  assert(build::default_graph_target_name(options, plan) == "explicit");
+
+  options.buildTarget.clear();
+  plan.defaultTargetName = "manifest-name";
+  assert(build::default_build_target_name(options, plan) == "manifest-name");
+
+  plan.defaultTargetName.clear();
+  assert(build::default_build_target_name(options, plan) == "app");
+#ifdef _WIN32
+  const std::filesystem::path expectedExe = "/tmp/app/build-ninja/app.exe";
+#else
+  const std::filesystem::path expectedExe = "/tmp/app/build-ninja/app";
+#endif
+  assert(build::default_project_executable_path(options, plan) == expectedExe);
+
+  return 0;
+}