@mkterswingman/5mghost-yonder 0.0.40 → 0.0.41

package/dist/cli/setup.js

@@ -443,8 +443,8 @@ export async function runSetup() {
   {
     "mcpServers": {
       "yt-mcp": {
-        "command": "node",
-        "args": [${JSON.stringify(PATHS.launcherJs)}, "serve"]
+        "command": ${JSON.stringify(launcherCommand.command)},
+        "args": ${JSON.stringify(launcherCommand.args)}
       }
     }
   }
@@ -456,14 +456,14 @@ export async function runSetup() {
     "servers": {
       "yt-mcp": {
         "transport": "stdio",
-        "command": "node",
-        "args": [${JSON.stringify(PATHS.launcherJs)}, "serve"]
+        "command": ${JSON.stringify(launcherCommand.command)},
+        "args": ${JSON.stringify(launcherCommand.args)}
       }
     }
   }
 `);
     console.log("  OpenClaw stdio CLI (recommended):");
-    console.log(`  mcporter config add yt-mcp --command node --arg ${JSON.stringify(PATHS.launcherJs)} --arg serve`);
+    console.log(`  mcporter config add yt-mcp --command ${JSON.stringify(launcherCommand.command)} ${launcherCommand.args.map((arg) => `--arg ${JSON.stringify(arg)}`).join(" ")}`);
     console.log(`  OpenClaw uses ${PATHS.sharedAuthJson} for PAT/JWT, so env.YT_MCP_TOKEN is optional after setup.`);
     console.log(`  WorkBuddy MCP config: ${getWorkBuddyConfigPath()}`);
     console.log(`  CodeBuddy MCP config: ${getCodeBuddyConfigPath()}`);

package/dist/telemetry.js

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 import { PATHS } from "./utils/config.js";
 const PRODUCT = "5mghost-yonder";
-const PRODUCT_VERSION = "0.0.40";
+const PRODUCT_VERSION = "0.0.41";
 const MAX_ERROR_CODE_CHARS = 64;
 export class ToolTelemetryClient {
     config;

package/dist/utils/launcher.d.ts

@@ -1,7 +1,14 @@
-import { isRepairableNpxFailure } from "@mkterswingman/5mghost-shared-client/launcher";
-import type { LauncherCommand, LauncherSourceOptions } from "@mkterswingman/5mghost-shared-client/launcher";
-export type { LauncherCommand, LauncherSourceOptions };
-export { isRepairableNpxFailure };
+export interface LauncherSourceOptions {
+    packageSpec: string;
+    npmCacheDir: string;
+    npxCommand?: string | null;
+}
+export interface LauncherCommand {
+    command: string;
+    args: string[];
+}
 export declare function buildLauncherCommand(launcherPath?: string): LauncherCommand;
+export declare function isRepairableNpxFailure(stderr: string): boolean;
+export declare function resolveNpxCommand(): string | null;
 export declare function buildLauncherSource(options?: Partial<LauncherSourceOptions>): string;
 export declare function writeLauncherFile(options?: Partial<LauncherSourceOptions>): string;

package/dist/utils/launcher.js

@@ -1,19 +1,117 @@
 import { PATHS } from "./config.js";
-import { buildLauncherCommand as _buildLauncherCommand, buildLauncherSource as _buildLauncherSource, writeLauncherFile as _writeLauncherFile, isRepairableNpxFailure, } from "@mkterswingman/5mghost-shared-client/launcher";
-export { isRepairableNpxFailure };
+import { execFileSync } from "node:child_process";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
 const DEFAULT_PACKAGE_SPEC = "@mkterswingman/5mghost-yonder@latest";
 export function buildLauncherCommand(launcherPath = PATHS.launcherJs) {
-    return _buildLauncherCommand(launcherPath);
+    return {
+        command: process.execPath,
+        args: [launcherPath, "serve"],
+    };
+}
+export function isRepairableNpxFailure(stderr) {
+    const lower = stderr.toLowerCase();
+    const referencesNpxDir = lower.includes("_npx/") || lower.includes("_npx\\");
+    return referencesNpxDir && (lower.includes("enotempty") || lower.includes("rename"));
+}
+export function resolveNpxCommand() {
+    try {
+        const lookup = process.platform === "win32" ? "where" : "which";
+        const target = process.platform === "win32" ? "npx.cmd" : "npx";
+        const output = execFileSync(lookup, [target], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+        return output.split(/\r?\n/).map((line) => line.trim()).find(Boolean) ?? null;
+    }
+    catch {
+        return null;
+    }
 }
 export function buildLauncherSource(options = {}) {
-    return _buildLauncherSource({
-        packageSpec: options.packageSpec ?? DEFAULT_PACKAGE_SPEC,
-        npmCacheDir: options.npmCacheDir ?? PATHS.npmCacheDir,
-    });
+    const packageSpec = options.packageSpec ?? DEFAULT_PACKAGE_SPEC;
+    const npmCacheDir = options.npmCacheDir ?? PATHS.npmCacheDir;
+    const npxCommand = "npxCommand" in options ? options.npxCommand : resolveNpxCommand();
+    return `#!/usr/bin/env node
+import { existsSync, mkdirSync, renameSync } from "node:fs";
+import { join } from "node:path";
+import { spawnSync } from "node:child_process";
+
+const packageSpec = ${JSON.stringify(packageSpec)};
+const npmCacheDir = ${JSON.stringify(npmCacheDir)};
+const configuredNpxCommand = ${JSON.stringify(npxCommand)};
+const args = process.argv.slice(2);
+const targetArgs = args.length > 0 ? args : ["serve"];
+
+function isSkillInstallerMode(subArgs) {
+  return subArgs[0] === "install-skills";
+}
+
+function isRepairableNpxFailure(stderr) {
+  const lower = stderr.toLowerCase();
+  return (lower.includes("_npx/") || lower.includes("_npx\\\\"))
+    && (lower.includes("enotempty") || lower.includes("rename"));
+}
+
+function getNpxCommand() {
+  return configuredNpxCommand || (process.platform === "win32" ? "npx.cmd" : "npx");
+}
+
+function writeSpawnError(result, npxBin) {
+  if (!result.error) return;
+  const message = result.error instanceof Error ? result.error.message : String(result.error);
+  process.stderr.write(\`[launcher] failed to start npx command "\${npxBin}": \${message}\\n\`);
+  process.stderr.write("[launcher] rerun setup from a terminal where Node.js/npm are available: yt-mcp setup\\n");
+}
+
+function runNpx(subArgs, captureStdErrOnly = false) {
+  mkdirSync(npmCacheDir, { recursive: true });
+  const npxBin = getNpxCommand();
+  const result = spawnSync(npxBin, ["--yes", packageSpec, ...subArgs], {
+    env: { ...process.env, npm_config_cache: npmCacheDir },
+    // Why: probe runs before MCP starts; stdout must stay silent or it will corrupt stdio transport.
+    // The skill installer is an explicit one-shot CLI path, so it can inherit stdio safely.
+    stdio: captureStdErrOnly ? ["ignore", "ignore", "pipe"] : "inherit",
+  });
+  writeSpawnError(result, npxBin);
+  return result;
+}
+
+function rotateNpxDir() {
+  const npxDir = join(npmCacheDir, "_npx");
+  if (!existsSync(npxDir)) return false;
+  const backup = \`\${npxDir}.bad.\${new Date().toISOString().replace(/[^0-9]/g, "").slice(0, 14)}\`;
+  renameSync(npxDir, backup);
+  process.stderr.write(\`[launcher] repaired corrupted npx cache: \${backup}\\n\`);
+  return true;
+}
+
+function ensurePackageReady() {
+  const first = runNpx(["version"], true);
+  if ((first.status ?? 1) === 0) return;
+
+  const stderr = first.stderr ? String(first.stderr) : "";
+  if (!isRepairableNpxFailure(stderr) || !rotateNpxDir()) {
+    if (stderr) process.stderr.write(stderr);
+    process.exit(first.status ?? 1);
+  }
+
+  const second = runNpx(["version"], true);
+  const secondStderr = second.stderr ? String(second.stderr) : "";
+  if ((second.status ?? 1) !== 0) {
+    if (secondStderr) process.stderr.write(secondStderr);
+    process.exit(second.status ?? 1);
+  }
+}
+
+ensurePackageReady();
+if (isSkillInstallerMode(targetArgs)) {
+  process.env.SHARED_CLIENT_INSTALL_SKILLS = "1";
+}
+const finalRun = runNpx(targetArgs, false);
+process.exit(finalRun.status ?? (finalRun.error ? 1 : 0));
+`;
 }
 export function writeLauncherFile(options = {}) {
-    return _writeLauncherFile({
-        packageSpec: options.packageSpec ?? DEFAULT_PACKAGE_SPEC,
-        npmCacheDir: options.npmCacheDir ?? PATHS.npmCacheDir,
-    }, PATHS.launcherJs);
+    mkdirSync(dirname(PATHS.launcherJs), { recursive: true });
+    const source = buildLauncherSource(options);
+    writeFileSync(PATHS.launcherJs, source, { encoding: "utf8", mode: 0o755 });
+    return PATHS.launcherJs;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mkterswingman/5mghost-yonder",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "description": "Internal MCP client with local data tools and remote API proxy",
   "type": "module",
   "bin": {