wyvrnpm 2.20.1 → 2.20.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyvrnpm",
-  "version": "2.20.1",
+  "version": "2.20.2",
   "description": "A simple, static-hosting-compatible C++ package manager",
   "keywords": [
     "c++",

package/src/commands/build.js

@@ -7,6 +7,7 @@ const { spawn } = require('child_process');
 const { normalizeRecipe, hasBuildRecipe, VALID_CMAKE_CONFIGS, DEFAULT_RECIPE } = require('../build/recipe');
 const { loadMsvcEnv }  = require('../build/msvc-env');
 const { archToVsPlatform, isVisualStudioGenerator } = require('../toolchain');
+const { readConfigurePresetGenerator } = require('../toolchain/presets');
 const { resolveEffectiveGenerator } = require('../build/default-generator');
 const { resolveCmakeExe } = require('../build/cmake-exe');
 const { LOCAL_OVERLAY_FILENAME, readLocalOverlay } = require('../conf');
@@ -226,6 +227,54 @@ function buildInstallArgs({ binaryDir, config, prefix }) {
   return args;
 }
 
+/**
+ * Resolve the generator `cmake --preset <presetName>` will actually use, so
+ * the caller can decide generator-dependent flags (the Visual Studio `-A`
+ * arch pin, and whether to activate vcvarsall) against reality.
+ *
+ * Precedence — each step mirrors what CMake itself does:
+ *   1. CLI `--generator` — `build` passes it as `-G`, which overrides the
+ *      preset, so it wins here too.
+ *   2. The generator baked into the configure preset by `install`. This file,
+ *      not the project's recipe, is the contract `cmake --preset` consumes;
+ *      the recipe and the emitted preset can legitimately diverge (an
+ *      install-time `--generator`, or a recipe edited after the last install).
+ *      Trusting a re-derived recipe value is exactly the bug this guards
+ *      against — it pins `-A` against a non-VS preset (a hard CMake error) and
+ *      wrongly skips vcvarsall.
+ *   3. The detected default (Windows/MSVC → newest VS) for a generator-less
+ *      preset — emitted by a pre-arch-pin client, or any non-Windows
+ *      toolchain. Keeps the recipe-less arch pin firing. See
+ *      claude/PLAN-VS-ARCH-PIN.md.
+ *
+ * `readPresetGenerator` and `detect` are injectable for hermetic tests.
+ *
+ * @param {{
+ *   rootDir:    string,
+ *   presetName: string,
+ *   cliGenerator?: string|null,
+ *   profile?:   { os?: string, compiler?: string, arch?: string }|null,
+ *   readPresetGenerator?: (args: { projectRoot: string, presetName: string }) => string|null,
+ *   detect?:    () => Promise<string|null>,
+ * }} args
+ * @returns {Promise<string|null>}
+ */
+async function resolveConfigureGenerator({
+  rootDir,
+  presetName,
+  cliGenerator = null,
+  profile = null,
+  readPresetGenerator = readConfigurePresetGenerator,
+  detect,
+}) {
+  if (typeof cliGenerator === 'string' && cliGenerator.trim()) return cliGenerator;
+
+  const fromPreset = readPresetGenerator({ projectRoot: rootDir, presetName });
+  if (fromPreset) return fromPreset;
+
+  return resolveEffectiveGenerator({ explicit: null, profile, detect });
+}
+
 // ---------------------------------------------------------------------------
 // Spawn wrapper
 // ---------------------------------------------------------------------------
@@ -370,32 +419,20 @@ async function build(argv) {
   //
   // Same mechanism the source-build path already uses (src/build/msvc-env.js).
   let cmakeEnv = null;
-  let effectiveGenerator = argv.generator ?? null;
-  let effectiveProfile   = null;
+  const effectiveProfile = activeProfile;
+  let effectiveGenerator = null;
   try {
-    effectiveProfile = activeProfile;
-    // Which generator will the preset actually use? Read it from the
-    // project's own recipe if one exists. If not, default to null and let
-    // cmake/CMakePresets decide — in which case MSVC env activation is
-    // skipped (because VS is usually the default on Windows).
-    const manifest = ctx.manifest;
-    let presetGenerator = null;
-    if (hasBuildRecipe(manifest)) {
-      try {
-        const recipe = normalizeRecipe(manifest.build, null);
-        if (recipe.generators.length > 0) [presetGenerator] = recipe.generators;
-      } catch { /* templates need options → skip env activation */ }
-    }
-    // CLI --generator wins, then the recipe's generator, then — on a
-    // Windows/MSVC profile with neither — CMake's detected default VS
-    // generator. Resolving the default here keeps the `-A` pin below and the
-    // vcvarsall-skip decision consistent with the generator `cmake --preset`
-    // will actually use (install pins the same generator into the preset).
-    // Non-Windows / non-MSVC → null, unchanged from before.
-    // See claude/PLAN-VS-ARCH-PIN.md.
-    effectiveGenerator = await resolveEffectiveGenerator({
-      explicit: effectiveGenerator ?? presetGenerator,
-      profile:  activeProfile,
+    // The generator `cmake --preset` will actually use is the one baked into
+    // the configure preset by `install` (a CLI --generator overrides it). That
+    // value — not the project's recipe — drives both the `-A` pin below and the
+    // vcvarsall-skip decision, so they stay consistent with reality even when
+    // the recipe and the emitted preset disagree. See resolveConfigureGenerator
+    // and claude/PLAN-VS-ARCH-PIN.md.
+    effectiveGenerator = await resolveConfigureGenerator({
+      rootDir,
+      presetName,
+      cliGenerator: argv.generator,
+      profile:      activeProfile,
     });
     cmakeEnv = await loadMsvcEnv({
       profile:          activeProfile,
@@ -486,6 +523,7 @@ module.exports._helpers = {
   resolvePresetName,
   resolveBinaryDir,
   resolveConfigList,
+  resolveConfigureGenerator,
   buildConfigureArgs,
   buildBuildArgs,
   buildInstallArgs,

package/src/context.js

@@ -7,7 +7,7 @@
  * re-read config, re-resolve auth, and each toggle JSON mode on the logger.
  * The divergence was cheap at 11 commands; it starts costing real bugs
  * once F3 (`tool_requires`) and F4 (build/host profile split) double the
- * flag surface. See [claude/PLAN-COMMAND-CONTEXT.md](../claude/PLAN-COMMAND-CONTEXT.md).
+ * flag surface. See [.claude-wyvrn-local/plans/2026-04-23-command-context.md](../.claude-wyvrn-local/plans/2026-04-23-command-context.md).
  *
  * `buildContext(argv)` runs once at the top of each command. It:
  *   - resolves filesystem anchors (rootDir, manifestPath)

package/src/toolchain/presets.js

@@ -388,6 +388,36 @@ function generateCMakePresets({
   return { path: null, action: 'skipped', isUser: false };
 }
 
+/**
+ * Read the `generator` of a named configure preset from the project's
+ * CMakePresets.json (falling back to CMakeUserPresets.json). This is the
+ * generator `cmake --preset <name>` will actually use, so callers deciding
+ * generator-dependent flags — the Visual Studio `-A` arch pin, or whether to
+ * activate vcvarsall — must trust it over a value re-derived from the recipe.
+ * The recipe and the emitted preset can legitimately diverge (an install-time
+ * `--generator`, or a recipe edited after the last install); trusting the
+ * recipe pins `-A` against a Ninja preset, which CMake rejects with a hard
+ * "does not support platform specification" error.
+ *
+ * Returns the generator string, or null when the file/preset is absent or the
+ * preset declares no generator — the latter means CMake will fall back to its
+ * platform default, which the caller's detection path handles.
+ *
+ * @param {{ projectRoot: string, presetName: string }} args
+ * @returns {string|null}
+ */
+function readConfigurePresetGenerator({ projectRoot, presetName }) {
+  for (const file of ['CMakePresets.json', 'CMakeUserPresets.json']) {
+    const parsed  = safeReadJson(path.join(projectRoot, file));
+    const presets = parsed && Array.isArray(parsed.configurePresets) ? parsed.configurePresets : [];
+    const match   = presets.find((p) => p && p.name === presetName);
+    if (match && typeof match.generator === 'string' && match.generator.trim()) {
+      return match.generator;
+    }
+  }
+  return null;
+}
+
 /**
  * Strip every wyvrnpm-generated entry from a parsed presets object.
  * Mirror of `mergeIntoExisting` — used by `wyvrnpm clean --all` to
@@ -475,6 +505,7 @@ function stripWyvrnPresets(existing) {
 
 module.exports = {
   generateCMakePresets,
+  readConfigurePresetGenerator,
   stripWyvrnPresets,
   safeReadJson,
   // Exported for tests