more changes

Author: Your Name

sdk/cpp/CMakeLists.txt

@@ -96,6 +96,8 @@ target_include_directories(CppSdk
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${wil_src_SOURCE_DIR}/include
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
 target_link_libraries(CppSdk
@@ -128,6 +130,7 @@ add_executable(CppSdkTests
 target_include_directories(CppSdkTests
   PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/test
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 
 target_compile_definitions(CppSdkTests PRIVATE FL_TESTS)

sdk/cpp/CMakePresets.json

@@ -42,27 +42,33 @@
       }
     },
     {
-      "name": "x86-debug",
-      "displayName": "MSVC x86 Debug",
-      "inherits": "windows-base",
-      "architecture": {
-        "value": "x86",
-        "strategy": "external"
-      },
+      "name": "linux-debug",
+      "displayName": "Linux Debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
-      "name": "x86-release",
-      "displayName": "MSVC x86 Release",
-      "inherits": "windows-base",
-      "architecture": {
-        "value": "x86",
-        "strategy": "external"
-      },
+      "name": "macos-debug",
+      "displayName": "macOS Debug",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Debug"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     }
   ],

sdk/cpp/include/foundry_local.h

@@ -14,10 +14,13 @@
 #include <gsl/span>
 
 #include "configuration.h"
-#include "foundry_local_internal_core.h"
 
 #include "logger.h"
 
+namespace FoundryLocal::Internal {
+    struct IFoundryLocalCore;
+}
+
 namespace FoundryLocal {
 #ifdef FL_TESTS
     namespace Testing {
@@ -130,7 +133,7 @@ namespace FoundryLocal {
         const char* GetObject() const noexcept { return is_delta ? "chat.completion.chunk" : "chat.completion"; }
 
         /// Returns the created timestamp as an ISO 8601 string.
-        /// Computed lazily; only allocates when called.
+        /// Computed lazilym only allocates when called.
         std::string GetCreatedAtIso() const;
     };
 
@@ -353,7 +356,7 @@ namespace FoundryLocal {
         mutable std::chrono::steady_clock::time_point lastFetch_{};
 
         mutable std::unordered_map<std::string, Model> byAlias_;
-        mutable std::unordered_map<std::string, const ModelVariant*> modelIdToModelVariant_;
+        mutable std::unordered_map<std::string, ModelVariant> modelIdToModelVariant_;
 
         explicit Catalog(gsl::not_null<FoundryLocal::Internal::IFoundryLocalCore*> injected,
                          gsl::not_null<ILogger*> logger);

sdk/cpp/include/core_interop_request.h sdk/cpp/src/core_interop_request.hsdk/cpp/include/core_interop_request.h renamed to sdk/cpp/src/core_interop_request.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <cstdint>
-#include <type_traits>
 
 extern "C" {
     // Layout must match C# structs exactly