codexport 0.1.6 → 0.1.8

package/dist/index.js

@@ -11,7 +11,7 @@ import { homedir, platform } from "node:os";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
-const VERSION = "0.1.6";
+const VERSION = "0.1.8";
 const DEFAULT_PORT = 17342;
 const DEFAULT_TIMEOUT_MS = 5_000;
 const CODEXPORT_DIR = ".codexport";
@@ -415,19 +415,21 @@ function rewritePortableTableKeys(table, sourceRoot, sourceHome) {
 function rewritePortableMcpServer(_name, server, sourceRoot, sourceHome) {
     if (typeof server.url === "string")
         return;
-    if (typeof server.command === "string" && Array.isArray(server.args)) {
-        const nodePackage = nodePackageFromServer(server.command, server.args);
-        if (nodePackage) {
-            server.command = "npx";
-            server.args = ["-y", nodePackage.packageName, ...nodePackage.remainingArgs.map((arg) => rewritePortablePath(arg, sourceRoot, sourceHome))];
-            return;
-        }
+    const command = typeof server.command === "string" ? server.command : undefined;
+    const args = Array.isArray(server.args) ? server.args : [];
+    const launcher = command && mcpHasRequiredPortableEnv(_name, command, server) ? portableMcpLauncher(_name, command, args, sourceHome) : undefined;
+    if (launcher) {
+        server.command = launcher.command;
+        server.args = launcher.args.map((arg) => rewritePortablePath(arg, sourceRoot, sourceHome));
+    }
+    else if (command && isAbsoluteAnyPlatform(command)) {
+        server.enabled = false;
     }
-    if (typeof server.command === "string") {
-        server.command = rewritePortableCommand(server.command, sourceRoot);
+    else if (command) {
+        server.command = rewritePortableCommand(command, sourceRoot);
     }
-    if (Array.isArray(server.args)) {
-        server.args = server.args.map((arg) => typeof arg === "string" ? rewritePortablePath(arg, sourceRoot, sourceHome) : arg);
+    if (!launcher && args.length) {
+        server.args = args.map((arg) => typeof arg === "string" ? rewritePortablePath(arg, sourceRoot, sourceHome) : arg);
     }
     if (server.env && typeof server.env === "object" && !Array.isArray(server.env)) {
         for (const [key, value] of Object.entries(server.env)) {
@@ -436,6 +438,50 @@ function rewritePortableMcpServer(_name, server, sourceRoot, sourceHome) {
             }
         }
     }
+    if (typeof server.command === "string" && !server.url) {
+        ensurePortablePathEnv(server);
+    }
+}
+function portableMcpLauncher(name, command, args, sourceHome) {
+    const commandName = basenameAnyPlatform(command);
+    if (commandName === "npx" || commandName === "bunx" || commandName === "uvx") {
+        return allStrings(args) ? { command: commandName, args: args } : undefined;
+    }
+    const nodePackage = nodePackageFromServer(command, args) ?? workspacePackageFromServer(command, args, sourceHome);
+    if (nodePackage) {
+        return { command: "npx", args: ["-y", nodePackage.packageName, ...nodePackage.remainingArgs] };
+    }
+    const npmPackage = npmPackageForPortableMcp(name, commandName);
+    if (npmPackage) {
+        const remainingArgs = allStrings(args) ? args : [];
+        return { command: "npx", args: ["-y", npmPackage, ...remainingArgs] };
+    }
+    return undefined;
+}
+function mcpHasRequiredPortableEnv(name, command, server) {
+    if (name !== "kagi-mcp" && basenameAnyPlatform(command) !== "kagi-mcp")
+        return true;
+    const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : undefined;
+    return typeof env?.KAGI_API_KEY === "string" && env.KAGI_API_KEY.length > 0;
+}
+function ensurePortablePathEnv(server) {
+    const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : {};
+    const existingPath = typeof env.PATH === "string" ? env.PATH : undefined;
+    const portableBins = ["${home}/.bun/bin", "${home}/.local/bin", "${home}/.cargo/bin", "${home}/go/bin"];
+    env.PATH = [...portableBins, existingPath ?? process.env.PATH ?? ""].filter(Boolean).join(path.delimiter);
+    server.env = env;
+}
+function npmPackageForPortableMcp(name, commandName) {
+    const knownPackages = {
+        "dora": "@butttons/dora",
+        "kagi-mcp": "kagi-mcp",
+        "opensrc-mcp": "opensrc-mcp",
+        "opensrc-mcp-stdio": "opensrc-mcp",
+        "perplexity-webui": "perplexity-webui-mcp",
+        "perplexity-webui-mcp": "perplexity-webui-mcp",
+        "reddit-mcp-buddy": "reddit-mcp-buddy"
+    };
+    return knownPackages[name] ?? knownPackages[commandName];
 }
 function rewritePortableCommand(command, sourceRoot) {
     const sourceRelative = rewriteSourceRootPath(command, sourceRoot);
@@ -457,13 +503,31 @@ function nodePackageFromServer(command, args) {
     const [entrypoint, ...remainingArgs] = args;
     if (typeof entrypoint !== "string" || !isAbsoluteAnyPlatform(entrypoint))
         return undefined;
-    if (!remainingArgs.every((arg) => typeof arg === "string"))
+    if (!allStrings(remainingArgs))
         return undefined;
     const packageName = packageNameFromNodeModulesPath(entrypoint);
     if (!packageName)
         return undefined;
     return { packageName, remainingArgs: remainingArgs };
 }
+function workspacePackageFromServer(command, args, sourceHome) {
+    if (basenameAnyPlatform(command) !== "node")
+        return undefined;
+    const [entrypoint, ...remainingArgs] = args;
+    if (!sourceHome || typeof entrypoint !== "string" || !isAbsoluteAnyPlatform(entrypoint) || !allStrings(remainingArgs))
+        return undefined;
+    const normalizedEntry = normalizePathForCompare(entrypoint);
+    const workspacePrefix = `${normalizePathForCompare(sourceHome)}/workspace/`;
+    if (!normalizedEntry.startsWith(workspacePrefix))
+        return undefined;
+    const packageName = normalizedEntry.slice(workspacePrefix.length).split("/")[0];
+    if (!packageName)
+        return undefined;
+    return { packageName, remainingArgs: remainingArgs };
+}
+function allStrings(values) {
+    return values.every((value) => typeof value === "string");
+}
 function packageNameFromNodeModulesPath(value) {
     const parts = normalizePathForCompare(value).split("/");
     const nodeModulesIndex = parts.lastIndexOf("node_modules");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexport",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "sync a canonical Codex setup from one master machine to follower machines",
   "author": "Microck <contact@micr.dev>",
   "license": "MIT",