fix(run): detect Vix runtime scripts correctly in CMake fallback

GaspardKirira · GaspardKirira · commit 23fae623f71a · 2026-04-13T16:00:17.000+03:00
- fix script feature detection for `using namespace vix` and related patterns
- make generated fallback CMakeLists use the Vix runtime branch when needed
- ensure Vix runtime scripts link against the umbrella `vix::vix` target
- keep `--local-cache` behavior working for generated script projects

Result:
- `vix run file.cpp` works for Vix runtime scripts
- `vix run file.cpp --local-cache` works too
- generated fallback projects now enter the correct Vix linking path
diff --git a/src/commands/run/RunScript.cpp b/src/commands/run/RunScript.cpp
@@ -982,13 +982,20 @@ namespace vix::commands::RunCommand::detail
     plan.configureLogPath = plan.projectDir / "configure.log";
     plan.buildLogPath = plan.projectDir / "build.log";
     plan.targetName = plan.exeName;
-    plan.useVixRuntime = probe.usesVixRuntime;
+
+    plan.useVixRuntime = probe.usesVixRuntime || script_uses_vix(plan.scriptPath);
 
     plan.exePath = plan.buildDir / plan.exeName;
 #ifdef _WIN32
     plan.exePath += ".exe";
 #endif
 
+    plan.configSignature = make_script_config_signature(
+        plan.useVixRuntime,
+        opt.enableSanitizers,
+        opt.enableUbsanOnly,
+        opt.scriptFlags);
+
     plan.shouldConfigure = true;
     plan.shouldBuild = true;
     plan.shouldRun = true;
diff --git a/src/commands/run/detail/ScriptCMake.cpp b/src/commands/run/detail/ScriptCMake.cpp
@@ -1027,23 +1027,16 @@ namespace vix::commands::RunCommand::detail
       if (withSqlite || withMySql)
         append_line(s);
 
-      append_line(s, "find_package(vix QUIET CONFIG)");
-      append_line(s, "if (NOT vix_FOUND)");
-      append_line(s, "  find_package(Vix CONFIG REQUIRED)");
-      append_line(s, "endif()");
+      append_line(s, "find_package(Vix CONFIG REQUIRED)");
       append_line(s);
 
       append_line(s, "set(VIX_MAIN_TARGET \"\")");
       append_line(s, "if (TARGET vix::vix)");
       append_line(s, "  set(VIX_MAIN_TARGET vix::vix)");
       append_line(s, "elseif (TARGET Vix::vix)");
       append_line(s, "  set(VIX_MAIN_TARGET Vix::vix)");
-      append_line(s, "elseif (TARGET vix::core)");
-      append_line(s, "  set(VIX_MAIN_TARGET vix::core)");
-      append_line(s, "elseif (TARGET Vix::core)");
-      append_line(s, "  set(VIX_MAIN_TARGET Vix::core)");
       append_line(s, "else()");
-      append_line(s, "  message(FATAL_ERROR \"No Vix target found (vix::vix/Vix::vix/vix::core/Vix::core)\")");
+      append_line(s, "  message(FATAL_ERROR \"No umbrella Vix target found (vix::vix or Vix::vix). Runtime scripts require the full Vix package.\")");
       append_line(s, "endif()");
       append_line(s);
 
@@ -1147,6 +1140,8 @@ namespace vix::commands::RunCommand::detail
     append_global_cmake_defaults(s);
 
     const ScriptFeatures feat = detect_script_features(cppPath);
+    const bool effectiveUseVixRuntime = useVixRuntime || feat.usesVix;
+
     ScriptLinkFlags lf = parse_link_flags(scriptFlags);
     ScriptCompileFlags cf = parse_compile_flags(scriptFlags);
 
@@ -1169,7 +1164,7 @@ namespace vix::commands::RunCommand::detail
     append_target_link_options(s, targetName, lf.linkOpts);
     append_base_warning_and_platform_flags(s, targetName);
 
-    if (!useVixRuntime)
+    if (!effectiveUseVixRuntime)
     {
       append_non_vix_runtime_links(s, targetName);
     }
diff --git a/src/commands/run/detail/ScriptProbe.cpp b/src/commands/run/detail/ScriptProbe.cpp
@@ -345,8 +345,17 @@ namespace vix::commands::RunCommand::detail
       auto has = [&](const char *s)
       { return line.find(s) != std::string::npos; };
 
-      if (has("vix::") || has("Vix::") || has("#include <vix/") || has("#include \"vix/"))
+      if (has("vix::") ||
+          has("Vix::") ||
+          has("using namespace vix") ||
+          has("using namespace Vix") ||
+          has("using vix::") ||
+          has("using Vix::") ||
+          has("#include <vix/") ||
+          has("#include \"vix/"))
+      {
         f.usesVix = true;
+      }
 
       if (has("#include <vix/orm/") || has("#include \"vix/orm/") ||
           has("vix::orm") || has("using namespace vix::orm"))
