fraim 2.0.281 → 2.0.284

package/bin/fraim.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-
-try {
-  require('../dist/src/cli/fraim.js');
-} catch (error) {
-  if (error && error.code === 'MODULE_NOT_FOUND') {
-    console.error('Could not find FRAIM CLI implementation.');
-    console.error('If you are running from source, run "npm run build" first.');
-    console.error(`Error details: ${error.message}`);
-    process.exit(1);
-  }
-  throw error;
-}
+
+try {
+  require('../dist/src/cli/fraim.js');
+} catch (error) {
+  if (error && error.code === 'MODULE_NOT_FOUND') {
+    console.error('Could not find FRAIM CLI implementation.');
+    console.error('If you are running from source, run "npm run build" first.');
+    console.error(`Error details: ${error.message}`);
+    process.exit(1);
+  }
+  throw error;
+}

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

@@ -6,111 +6,117 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFraimMcpLatestLauncherPath = getFraimMcpLatestLauncherPath;
 exports.getFraimMcpShimPath = getFraimMcpShimPath;
 exports.getFraimNpxShimPath = getFraimNpxShimPath;
+exports.getFraimCliShimPath = getFraimCliShimPath;
+exports.getPackagedFraimRuntimePath = getPackagedFraimRuntimePath;
+exports.getPackagedFraimRuntime = getPackagedFraimRuntime;
+exports.hasPackagedFraimRuntime = hasPackagedFraimRuntime;
 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 launcherSource = `#!/usr/bin/env node
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-const LAUNCHER_VERSION = ${LAUNCHER_VERSION};
-const USER_DIR = process.env.FRAIM_USER_DIR || path.join(os.homedir(), '.fraim');
-const STATE_DIR = path.join(USER_DIR, 'mcp-launcher');
-const STATE_PATH = path.join(STATE_DIR, 'latest.json');
-const CACHE_ROOT = path.join(USER_DIR, 'npm-cache', 'mcp');
-
-const commandName = (name) => process.platform === 'win32' ? name + '.cmd' : name;
-const npmCommand = commandName('npm');
-const npxCommand = commandName('npx');
-const cliArgs = process.argv.slice(2).length > 0 ? process.argv.slice(2) : ['mcp'];
-
-function quoteCmdArg(arg) {
-  const value = String(arg);
-  return /[\\s"&|<>^]/.test(value) ? '"' + value.replace(/"/g, '""') + '"' : value;
-}
-
-function runCommand(command, args, options) {
-  if (process.platform !== 'win32') {
-    return spawnSync(command, args, options);
-  }
-
-  return spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', [command, ...args.map(quoteCmdArg)].join(' ')], options);
-}
-
-function ensureDir(dir) {
-  fs.mkdirSync(dir, { recursive: true });
-}
-
-function readState() {
-  try {
-    return JSON.parse(fs.readFileSync(STATE_PATH, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
-function writeState(state) {
-  ensureDir(STATE_DIR);
-  fs.writeFileSync(STATE_PATH, JSON.stringify({ ...state, launcherVersion: LAUNCHER_VERSION, updatedAt: new Date().toISOString() }, null, 2));
-}
-
-function resolveLatest(packageName) {
-  const result = runCommand(npmCommand, ['view', packageName, 'version', '--silent'], {
-    encoding: 'utf8',
-    env: process.env
-  });
-
-  if (result.status !== 0) {
-    return null;
-  }
-
-  const version = String(result.stdout || '').trim();
-  return /^\\d+\\.\\d+\\.\\d+/.test(version) ? version : null;
-}
-
-function resolvePackage() {
-  const fraimVersion = resolveLatest('fraim');
-  if (fraimVersion) {
-    const state = { packageName: 'fraim', binName: 'fraim', version: fraimVersion, fromCache: false };
-    writeState(state);
-    return state;
-  }
-
-  const cached = readState();
-  if (cached && cached.packageName === 'fraim' && cached.binName === 'fraim' && cached.version) {
-    console.error('[fraim-mcp-launcher] Could not resolve npm latest; using cached fraim@' + cached.version + '.');
-    return { packageName: 'fraim', binName: 'fraim', version: cached.version, fromCache: true };
-  }
-
-  console.error('[fraim-mcp-launcher] Could not resolve fraim latest from npm and no cached fraim version exists.');
-  process.exit(1);
-}
-
-function runPackage(plan, cacheDir) {
-  ensureDir(cacheDir);
-  const env = { ...process.env, npm_config_cache: cacheDir };
-  const result = runCommand(npxCommand, ['--yes', '--package', plan.packageName + '@' + plan.version, plan.binName, ...cliArgs], {
-    stdio: 'inherit',
-    env
-  });
-  return typeof result.status === 'number' ? result.status : 1;
-}
-
-const plan = resolvePackage();
-const versionCacheDir = path.join(CACHE_ROOT, plan.packageName + '-' + plan.version.replace(/[^a-zA-Z0-9._-]/g, '_'));
-let status = runPackage(plan, versionCacheDir);
-
-if (status !== 0 && process.platform === 'win32') {
-  const retryCache = path.join(CACHE_ROOT, 'retry-' + Date.now() + '-' + process.pid);
-  console.error('[fraim-mcp-launcher] Package execution failed; retrying once with a fresh npm cache.');
-  status = runPackage(plan, retryCache);
-}
-
-process.exit(status);
+const PACKAGED_RUNTIME_VERSION = 1;
+const launcherSource = `#!/usr/bin/env node
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const LAUNCHER_VERSION = ${LAUNCHER_VERSION};
+const USER_DIR = process.env.FRAIM_USER_DIR || path.join(os.homedir(), '.fraim');
+const STATE_DIR = path.join(USER_DIR, 'mcp-launcher');
+const STATE_PATH = path.join(STATE_DIR, 'latest.json');
+const CACHE_ROOT = path.join(USER_DIR, 'npm-cache', 'mcp');
+
+const commandName = (name) => process.platform === 'win32' ? name + '.cmd' : name;
+const npmCommand = commandName('npm');
+const npxCommand = commandName('npx');
+const cliArgs = process.argv.slice(2).length > 0 ? process.argv.slice(2) : ['mcp'];
+
+function quoteCmdArg(arg) {
+  const value = String(arg);
+  return /[\\s"&|<>^]/.test(value) ? '"' + value.replace(/"/g, '""') + '"' : value;
+}
+
+function runCommand(command, args, options) {
+  if (process.platform !== 'win32') {
+    return spawnSync(command, args, options);
+  }
+
+  return spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', [command, ...args.map(quoteCmdArg)].join(' ')], options);
+}
+
+function ensureDir(dir) {
+  fs.mkdirSync(dir, { recursive: true });
+}
+
+function readState() {
+  try {
+    return JSON.parse(fs.readFileSync(STATE_PATH, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+function writeState(state) {
+  ensureDir(STATE_DIR);
+  fs.writeFileSync(STATE_PATH, JSON.stringify({ ...state, launcherVersion: LAUNCHER_VERSION, updatedAt: new Date().toISOString() }, null, 2));
+}
+
+function resolveLatest(packageName) {
+  const result = runCommand(npmCommand, ['view', packageName, 'version', '--silent'], {
+    encoding: 'utf8',
+    env: process.env
+  });
+
+  if (result.status !== 0) {
+    return null;
+  }
+
+  const version = String(result.stdout || '').trim();
+  return /^\\d+\\.\\d+\\.\\d+/.test(version) ? version : null;
+}
+
+function resolvePackage() {
+  const fraimVersion = resolveLatest('fraim');
+  if (fraimVersion) {
+    const state = { packageName: 'fraim', binName: 'fraim', version: fraimVersion, fromCache: false };
+    writeState(state);
+    return state;
+  }
+
+  const cached = readState();
+  if (cached && cached.packageName === 'fraim' && cached.binName === 'fraim' && cached.version) {
+    console.error('[fraim-mcp-launcher] Could not resolve npm latest; using cached fraim@' + cached.version + '.');
+    return { packageName: 'fraim', binName: 'fraim', version: cached.version, fromCache: true };
+  }
+
+  console.error('[fraim-mcp-launcher] Could not resolve fraim latest from npm and no cached fraim version exists.');
+  process.exit(1);
+}
+
+function runPackage(plan, cacheDir) {
+  ensureDir(cacheDir);
+  const env = { ...process.env, npm_config_cache: cacheDir };
+  const result = runCommand(npxCommand, ['--yes', '--package', plan.packageName + '@' + plan.version, plan.binName, ...cliArgs], {
+    stdio: 'inherit',
+    env
+  });
+  return typeof result.status === 'number' ? result.status : 1;
+}
+
+const plan = resolvePackage();
+const versionCacheDir = path.join(CACHE_ROOT, plan.packageName + '-' + plan.version.replace(/[^a-zA-Z0-9._-]/g, '_'));
+let status = runPackage(plan, versionCacheDir);
+
+if (status !== 0 && process.platform === 'win32') {
+  const retryCache = path.join(CACHE_ROOT, 'retry-' + Date.now() + '-' + process.pid);
+  console.error('[fraim-mcp-launcher] Package execution failed; retrying once with a fresh npm cache.');
+  status = runPackage(plan, retryCache);
+}
+
+process.exit(status);
 `;
 function getFraimMcpLatestLauncherPath() {
     return path_1.default.join(process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim'), 'bin', 'fraim-mcp-latest.js');
@@ -121,90 +127,155 @@ function getFraimMcpShimPath() {
 function getFraimNpxShimPath() {
     return path_1.default.join(process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim'), 'bin', process.platform === 'win32' ? 'fraim-npx.cmd' : 'fraim-npx.sh');
 }
-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" %*
-  exit /b %ERRORLEVEL%
-)
-if exist "%FRAIM_USER_DIR_VALUE%\\node\\node.exe" (
-  set "PATH=%FRAIM_USER_DIR_VALUE%\\node;%PATH%"
-  "%FRAIM_USER_DIR_VALUE%\\node\\node.exe" "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
-  exit /b %ERRORLEVEL%
-)
-for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*" 2^>nul') do (
-  if exist "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\node.exe" (
-    set "PATH=%FRAIM_USER_DIR_VALUE%\\node\\%%D;%PATH%"
-    "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\node.exe" "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
-    exit /b %ERRORLEVEL%
-  )
-)
-echo [fraim-mcp] Could not find node on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
-exit /b 1
+function getFraimCliShimPath() {
+    return path_1.default.join(process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim'), 'bin', process.platform === 'win32' ? 'fraim.cmd' : 'fraim');
+}
+function getPackagedFraimRuntimePath() {
+    return path_1.default.join(process.env.FRAIM_USER_DIR || path_1.default.join(os_1.default.homedir(), '.fraim'), 'bin', 'packaged-fraim-runtime.json');
+}
+function runtimeFromEnv(env = process.env) {
+    return env.FRAIM_PACKAGED_CLI_EXECUTABLE && env.FRAIM_PACKAGED_CLI_SCRIPT
+        ? { executable: env.FRAIM_PACKAGED_CLI_EXECUTABLE, script: env.FRAIM_PACKAGED_CLI_SCRIPT }
+        : null;
+}
+function getPackagedFraimRuntime(env = process.env) {
+    const envRuntime = runtimeFromEnv(env);
+    if (envRuntime)
+        return envRuntime;
+    try {
+        const raw = JSON.parse(fs_1.default.readFileSync(getPackagedFraimRuntimePath(), 'utf8'));
+        if (!raw.executable || !raw.script)
+            return null;
+        if (!fs_1.default.existsSync(raw.executable) || !fs_1.default.existsSync(raw.script))
+            return null;
+        return { executable: raw.executable, script: raw.script };
+    }
+    catch {
+        return null;
+    }
+}
+function hasPackagedFraimRuntime(env = process.env) {
+    return getPackagedFraimRuntime(env) !== null;
+}
+function posixSingleQuote(value) {
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+function windowsBatchPath(value) {
+    return value.replace(/%/g, '%%').replace(/"/g, '""');
+}
+function writePackagedRuntimeMetadata(runtime) {
+    writeFileIfChanged(getPackagedFraimRuntimePath(), JSON.stringify({
+        version: PACKAGED_RUNTIME_VERSION,
+        executable: runtime.executable,
+        script: runtime.script,
+        updatedAt: new Date().toISOString(),
+    }, null, 2) + '\n');
+}
+function packagedFraimShimSource(command, runtime) {
+    const { executable, script } = runtime;
+    const commandArg = command === 'mcp' ? ' mcp' : '';
+    if (process.platform === 'win32') {
+        return [
+            '@echo off',
+            'setlocal',
+            'set "ELECTRON_RUN_AS_NODE=1"',
+            `"${windowsBatchPath(executable)}" "${windowsBatchPath(script)}"${commandArg} %*`,
+            'exit /b %ERRORLEVEL%',
+            '',
+        ].join('\r\n');
+    }
+    return [
+        '#!/usr/bin/env sh',
+        'set -eu',
+        'export ELECTRON_RUN_AS_NODE=1',
+        `exec ${posixSingleQuote(executable)} ${posixSingleQuote(script)}${commandArg} "$@"`,
+        '',
+    ].join('\n');
+}
+const windowsFraimMcpShimSource = `@echo off
+setlocal
+for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
+${(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" (
+  set "PATH=%FRAIM_USER_DIR_VALUE%\\node;%PATH%"
+  "%FRAIM_USER_DIR_VALUE%\\node\\node.exe" "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
+  exit /b %ERRORLEVEL%
+)
+for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*" 2^>nul') do (
+  if exist "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\node.exe" (
+    set "PATH=%FRAIM_USER_DIR_VALUE%\\node\\%%D;%PATH%"
+    "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\node.exe" "%FRAIM_USER_DIR_VALUE%\\bin\\fraim-mcp-latest.js" %*
+    exit /b %ERRORLEVEL%
+  )
+)
+echo [fraim-mcp] Could not find node on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
+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 %*
-  exit /b %ERRORLEVEL%
-)
-if exist "%FRAIM_USER_DIR_VALUE%\\node\\npx.cmd" (
-  "%FRAIM_USER_DIR_VALUE%\\node\\npx.cmd" %*
-  exit /b %ERRORLEVEL%
-)
-for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*" 2^>nul') do (
-  if exist "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\npx.cmd" (
-    "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\npx.cmd" %*
-    exit /b %ERRORLEVEL%
-  )
-)
-echo [fraim-npx] Could not find npx on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
-exit /b 1
+const windowsFraimNpxShimSource = `@echo off
+setlocal
+for %%I in ("%~dp0..") do set "FRAIM_USER_DIR_VALUE=%%~fI"
+${(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" (
+  "%FRAIM_USER_DIR_VALUE%\\node\\npx.cmd" %*
+  exit /b %ERRORLEVEL%
+)
+for /f "delims=" %%D in ('dir /b /ad /o-n "%FRAIM_USER_DIR_VALUE%\\node\\node-v*" 2^>nul') do (
+  if exist "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\npx.cmd" (
+    "%FRAIM_USER_DIR_VALUE%\\node\\%%D\\npx.cmd" %*
+    exit /b %ERRORLEVEL%
+  )
+)
+echo [fraim-npx] Could not find npx on PATH or in "%FRAIM_USER_DIR_VALUE%\\node" 1>&2
+exit /b 1
 `;
-const posixFraimMcpShimSource = `#!/usr/bin/env sh
-set -eu
-SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
-LAUNCHER="$FRAIM_USER_DIR_VALUE/bin/fraim-mcp-latest.js"
-
-if command -v node >/dev/null 2>&1; then
-  exec node "$LAUNCHER" "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/node" ]; then
-  PATH="$FRAIM_USER_DIR_VALUE/node/bin:$PATH"
-  export PATH
-  exec "$FRAIM_USER_DIR_VALUE/node/bin/node" "$LAUNCHER" "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/node" ]; then
-  PATH="$FRAIM_USER_DIR_VALUE/node:$PATH"
-  export PATH
-  exec "$FRAIM_USER_DIR_VALUE/node/node" "$LAUNCHER" "$@"
-fi
-
-echo "[fraim-mcp] Could not find node on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
-exit 1
+const posixFraimMcpShimSource = `#!/usr/bin/env sh
+set -eu
+SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
+LAUNCHER="$FRAIM_USER_DIR_VALUE/bin/fraim-mcp-latest.js"
+
+if command -v node >/dev/null 2>&1; then
+  exec node "$LAUNCHER" "$@"
+fi
+if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/node" ]; then
+  PATH="$FRAIM_USER_DIR_VALUE/node/bin:$PATH"
+  export PATH
+  exec "$FRAIM_USER_DIR_VALUE/node/bin/node" "$LAUNCHER" "$@"
+fi
+if [ -x "$FRAIM_USER_DIR_VALUE/node/node" ]; then
+  PATH="$FRAIM_USER_DIR_VALUE/node:$PATH"
+  export PATH
+  exec "$FRAIM_USER_DIR_VALUE/node/node" "$LAUNCHER" "$@"
+fi
+
+echo "[fraim-mcp] Could not find node on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
+exit 1
 `;
-const posixFraimNpxShimSource = `#!/usr/bin/env sh
-set -eu
-SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
-
-if command -v npx >/dev/null 2>&1; then
-  exec npx "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/npx" ]; then
-  exec "$FRAIM_USER_DIR_VALUE/node/bin/npx" "$@"
-fi
-if [ -x "$FRAIM_USER_DIR_VALUE/node/npx" ]; then
-  exec "$FRAIM_USER_DIR_VALUE/node/npx" "$@"
-fi
-
-echo "[fraim-npx] Could not find npx on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
-exit 1
+const posixFraimNpxShimSource = `#!/usr/bin/env sh
+set -eu
+SHIM_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+FRAIM_USER_DIR_VALUE=$(dirname "$SHIM_DIR")
+
+if command -v npx >/dev/null 2>&1; then
+  exec npx "$@"
+fi
+if [ -x "$FRAIM_USER_DIR_VALUE/node/bin/npx" ]; then
+  exec "$FRAIM_USER_DIR_VALUE/node/bin/npx" "$@"
+fi
+if [ -x "$FRAIM_USER_DIR_VALUE/node/npx" ]; then
+  exec "$FRAIM_USER_DIR_VALUE/node/npx" "$@"
+fi
+
+echo "[fraim-npx] Could not find npx on PATH or in $FRAIM_USER_DIR_VALUE/node" >&2
+exit 1
 `;
 const writeFileIfChanged = (filePath, content, mode) => {
     if (!fs_1.default.existsSync(filePath) || fs_1.default.readFileSync(filePath, 'utf8') !== content) {
@@ -223,9 +294,23 @@ function ensureFraimMcpLatestLauncher() {
     const launcherPath = getFraimMcpLatestLauncherPath();
     const launcherDir = path_1.default.dirname(launcherPath);
     fs_1.default.mkdirSync(launcherDir, { recursive: true });
-    writeFileIfChanged(launcherPath, launcherSource, process.platform === 'win32' ? undefined : 0o755);
     const fraimMcpShimPath = getFraimMcpShimPath();
     const fraimNpxShimPath = getFraimNpxShimPath();
+    const packagedRuntime = getPackagedFraimRuntime();
+    if (packagedRuntime) {
+        const fraimCliShimPath = getFraimCliShimPath();
+        if (runtimeFromEnv()) {
+            writePackagedRuntimeMetadata(packagedRuntime);
+        }
+        writeFileIfChanged(fraimMcpShimPath, packagedFraimShimSource('mcp', packagedRuntime), process.platform === 'win32' ? undefined : 0o755);
+        writeFileIfChanged(fraimCliShimPath, packagedFraimShimSource('cli', packagedRuntime), process.platform === 'win32' ? undefined : 0o755);
+        return {
+            command: fraimMcpShimPath,
+            args: [],
+            path: packagedRuntime.script,
+        };
+    }
+    writeFileIfChanged(launcherPath, launcherSource, process.platform === 'win32' ? undefined : 0o755);
     writeFileIfChanged(fraimMcpShimPath, process.platform === 'win32' ? windowsFraimMcpShimSource : posixFraimMcpShimSource, process.platform === 'win32' ? undefined : 0o755);
     writeFileIfChanged(fraimNpxShimPath, process.platform === 'win32' ? windowsFraimNpxShimSource : posixFraimNpxShimSource, process.platform === 'win32' ? undefined : 0o755);
     return {

package/dist/src/cli/mcp/mcp-server-registry.js

@@ -55,6 +55,14 @@ exports.BASE_MCP_SERVERS = [
         }
     }
 ];
+function activeBaseMCPServers() {
+    // The packaged desktop owns FRAIM's runtime but intentionally does not bundle
+    // npm. Keep third-party npx MCP servers out of fresh desktop-generated config;
+    // users can add them later through connect-mcp when a system npm is available.
+    return (0, fraim_mcp_latest_launcher_1.hasPackagedFraimRuntime)()
+        ? exports.BASE_MCP_SERVERS.filter((server) => server.id === 'fraim')
+        : exports.BASE_MCP_SERVERS;
+}
 // ============================================================================
 // PROVIDER MCP SERVER BUILDER (uses provider registry)
 // ============================================================================
@@ -147,7 +155,7 @@ function buildStdioServer(mcpConfig, token, config) {
 // REGISTRY LOOKUP FUNCTIONS
 // ============================================================================
 function getBaseMCPServer(id) {
-    return exports.BASE_MCP_SERVERS.find(server => server.id === id);
+    return activeBaseMCPServers().find(server => server.id === id);
 }
 async function getProviderMCPServerIds() {
     // This would need to fetch all providers and filter those with MCP servers
@@ -157,7 +165,7 @@ async function getProviderMCPServerIds() {
 function getAllMCPServerIds() {
     // Return only base server IDs
     // Provider server IDs are dynamic and come from the registry
-    return exports.BASE_MCP_SERVERS.map(s => s.id);
+    return activeBaseMCPServers().map(s => s.id);
 }
 async function isProviderServer(serverId) {
     const provider = await (0, provider_registry_1.getProvider)(serverId);
@@ -172,7 +180,7 @@ async function isHTTPServer(serverId) {
 // ============================================================================
 function buildAllBaseServers(fraimKey) {
     const servers = new Map();
-    for (const def of exports.BASE_MCP_SERVERS) {
+    for (const def of activeBaseMCPServers()) {
         servers.set(def.id, def.buildServer(fraimKey));
     }
     return servers;