fraim 2.0.283 → 2.0.284

package/dist/src/cli/mcp/fraim-mcp-latest-launcher.js

@@ -14,6 +14,7 @@ exports.ensureFraimMcpLatestLauncher = ensureFraimMcpLatestLauncher;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const windows_shim_path_search_1 = require("../../core/utils/windows-shim-path-search");
 const LAUNCHER_VERSION = 1;
 const PACKAGED_RUNTIME_VERSION = 1;
 const launcherSource = `#!/usr/bin/env node
@@ -194,9 +195,9 @@ function packagedFraimShimSource(command, runtime) {
 const windowsFraimMcpShimSource = `@echo off
 setlocal
 for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
-where node >nul 2>nul
-if not errorlevel 1 (
-  node "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
+${(0, windows_shim_path_search_1.windowsPathSearchLines)('NODE_EXE', 'node').join('\n')}
+if defined NODE_EXE (
+  "%NODE_EXE%" "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
   exit /b %ERRORLEVEL%
 )
 if exist "%FRAIM_USER_DIR_VALUE%\\node\\node.exe" (
@@ -217,9 +218,9 @@ exit /b 1
 const windowsFraimNpxShimSource = `@echo off
 setlocal
 for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
-where npx >nul 2>nul
-if not errorlevel 1 (
-  npx %*
+${(0, windows_shim_path_search_1.windowsPathSearchLines)('NPX_CMD', 'npx').join('\n')}
+if defined NPX_CMD (
+  "%NPX_CMD%" %*
   exit /b %ERRORLEVEL%
 )
 if exist "%FRAIM_USER_DIR_VALUE%\\node\\npx.cmd" (

package/dist/src/core/utils/windows-shim-path-search.js

@@ -0,0 +1,56 @@
+"use strict";
+/**
+ * Shared Windows batch-script primitive for resolving an executable on `PATH` without
+ * depending on `where.exe`.
+ *
+ * Issue #1375: every generated `.cmd` launcher in this repo used to probe for `node`/`npx`
+ * with `where <name> >nul 2>nul`. `where.exe` itself lives in `C:\Windows\System32`, so on a
+ * launching process whose `PATH` omits `System32` — the normal case for a shell started from
+ * the VS Code integrated Git Bash terminal — the probe is unresolvable and falsely reports the
+ * target missing even when it is on `PATH`. cmd.exe's own command dispatch resolves external
+ * commands strictly through `PATH` (not the OS's default `CreateProcess` search order, which
+ * would fall back to the system directory automatically), so this is a real, reproducible gap,
+ * not a theoretical one.
+ *
+ * `for %%X in (<name>) do set "VAR=%%~$PATH:X"` is cmd.exe's native argument-expansion PATH
+ * search. It needs no external binary — the direct analogue of a POSIX shell's `command -v`
+ * builtin — and resolves to an absolute path the caller can invoke directly. Unlike `where`, it
+ * needs an exact filename (no `%PATHEXT%` extension search of its own), so this module tries
+ * `.exe` then `.cmd` in turn to match `where`'s original extension-agnostic behavior.
+ *
+ * Every `.cmd` generator in this repo that needs to resolve node/npx/git on Windows should call
+ * this instead of hand-rolling its own `where` probe: three independent reimplementations of this
+ * exact check (`src/cli/mcp/fraim-mcp-latest-launcher.ts`, `src/ai-hub/hub-launcher.ts`, and
+ * `scripts/installer/fraim-install-win.template.cmd`) is exactly how the `where`-based bug shipped
+ * on Windows only while the POSIX shim's single `command -v` call stayed correct.
+ *
+ * `scripts/installer/fraim-install-win.template.cmd` is a static text file, not generated from
+ * this module (it is read verbatim and two tokens substituted, not built from TypeScript), so it
+ * cannot import this function. It re-implements the identical pattern as literal batch text —
+ * keep both in sync when this logic changes.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.windowsPathSearchLines = windowsPathSearchLines;
+/**
+ * Extensions tried, in order, when resolving a bare command name — mirrors the two extensions
+ * every tool this repo probes for actually ships as: `node.exe`/`git.exe`/`winget.exe` are native
+ * PE binaries, `npx.cmd` is npm's batch shim. `%%~$PATH:X` needs an exact filename (unlike `where`,
+ * it does not consult `%PATHEXT%` itself), so trying each extension in turn is what restores
+ * `where`'s original extension-agnostic behavior.
+ */
+const WINDOWS_EXECUTABLE_EXTENSIONS = ['.exe', '.cmd'];
+/**
+ * Returns the batch-script lines that resolve `targetBaseName` (no extension) on `PATH` into
+ * `varName`, trying each of `WINDOWS_EXECUTABLE_EXTENSIONS` in turn, or leave `varName` undefined
+ * if none match. Caller decides line joining (`\n` vs `\r\n`) and what to do with the result —
+ * typically `if defined <varName> ( "%<varName>%" ... )`.
+ *
+ * @param varName Batch variable to receive the resolved absolute path, e.g. `NODE_EXE`.
+ * @param targetBaseName Command name without extension, e.g. `node`, `npx`, `git`, `winget`.
+ */
+function windowsPathSearchLines(varName, targetBaseName) {
+    return [
+        `set "${varName}="`,
+        ...WINDOWS_EXECUTABLE_EXTENSIONS.map((ext) => `if not defined ${varName} for %%X in (${targetBaseName}${ext}) do set "${varName}=%%~$PATH:X"`),
+    ];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraim",
-  "version": "2.0.283",
+  "version": "2.0.284",
   "description": "FRAIM core CLI and MCP package.",
   "main": "index.js",
   "bin": {