codexport 0.2.0 → 0.3.0

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.2.0";
+const VERSION = "0.3.0";
 const DEFAULT_PORT = 17342;
 const DEFAULT_TIMEOUT_MS = 5_000;
 const CODEXPORT_DIR = ".codexport";
@@ -21,6 +21,8 @@ const MCPS_LOCAL_FILE = "mcps.local.toml";
 const LAST_BUNDLE_FILE = "last-bundle.json";
 const CACHE_BUNDLE_FILE = "bundle.json";
 const APPLIED_FILES_FILE = "applied-files.json";
+const MCP_MANIFEST_FILE = "mcp-manifest.json";
+const MANAGED_MCP_PACKAGE = "codexport@latest";
 const INCLUDE_ROOTS = [
     "AGENTS.md",
     "RTK.md",
@@ -410,10 +412,31 @@ function rewritePortableConfig(canonical, sourceRoot, sourceEnv = {}) {
             continue;
         const server = rawServer;
         mergeSourceEnvForMcp(name, server, sourceEnv);
-        rewritePortableMcpServer(name, server, sourceRoot, sourceHome);
+        rewriteManagedMcpServer(name, server, sourceRoot, sourceHome);
     }
     return stringifyToml(parsed);
 }
+function buildMcpManifest(canonical, sourceRoot, sourceEnv = {}) {
+    let parsed;
+    try {
+        parsed = parseTomlObject(canonical, "canonical config.toml");
+    }
+    catch {
+        return undefined;
+    }
+    const mcpServers = parsed.mcp_servers;
+    if (!mcpServers || typeof mcpServers !== "object" || Array.isArray(mcpServers))
+        return undefined;
+    const servers = {};
+    for (const [name, rawServer] of Object.entries(mcpServers)) {
+        if (!rawServer || typeof rawServer !== "object" || Array.isArray(rawServer))
+            continue;
+        const server = structuredClone(rawServer);
+        mergeSourceEnvForMcp(name, server, sourceEnv);
+        servers[name] = server;
+    }
+    return { version: 1, sourceRoot, sourceEnv, servers };
+}
 function mergeSourceEnvForMcp(name, server, sourceEnv) {
     if (name !== "kagi-mcp")
         return;
@@ -439,25 +462,12 @@ function rewritePortableTableKeys(table, sourceRoot, sourceHome) {
         table[key] = value;
     }
 }
-function rewritePortableMcpServer(_name, server, sourceRoot, sourceHome) {
+function rewriteManagedMcpServer(name, server, sourceRoot, sourceHome) {
     if (typeof server.url === "string")
         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, server) : 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;
-    }
-    else if (command) {
-        server.command = rewritePortableCommand(command, sourceRoot);
-    }
-    if (!launcher && args.length) {
-        server.args = args.map((arg) => typeof arg === "string" ? rewritePortablePath(arg, sourceRoot, sourceHome) : arg);
-    }
+    server.command = "npx";
+    server.args = ["-y", MANAGED_MCP_PACKAGE, "mcp", "run", name];
     if (server.env && typeof server.env === "object" && !Array.isArray(server.env)) {
         for (const [key, value] of Object.entries(server.env)) {
             if (typeof value === "string") {
@@ -691,6 +701,10 @@ async function applyBundle(ctx, bundle) {
     if (configEntry) {
         const canonicalConfig = decodeFile(configEntry).toString("utf8");
         const localMcpText = await readTextIfExists(path.join(ctx.stateDir, MCPS_LOCAL_FILE));
+        const manifest = buildMcpManifest(canonicalConfig, bundle.sourceRoot, bundle.sourceEnv);
+        if (manifest) {
+            await writeJsonAtomic(path.join(ctx.stateDir, MCP_MANIFEST_FILE), manifest);
+        }
         const generated = mergeTomlText(canonicalConfig, localMcpText, { ...localConfig, codexDir: ctx.codexDir }, bundle.sourceRoot, bundle.sourceEnv);
         const configPath = path.join(ctx.codexDir, "config.toml");
         if (await pathExists(configPath)) {
@@ -708,6 +722,43 @@ async function applyBundle(ctx, bundle) {
     await writeLocalConfig(ctx, { ...localConfig, lastRevision: bundle.revision, codexDir: ctx.codexDir });
     await writeJsonAtomic(path.join(ctx.stateDir, APPLIED_FILES_FILE), bundle.files.map((file) => file.path));
 }
+async function commandMcpRun(ctx, name) {
+    const manifest = await readJsonIfExists(path.join(ctx.stateDir, MCP_MANIFEST_FILE));
+    if (!manifest?.servers?.[name]) {
+        throw new CliError(`No managed MCP named ${name}. Run codexport sync --apply first.`, 1);
+    }
+    const localConfig = await readLocalConfig(ctx);
+    const sourceHome = inferHomeFromCodexDir(manifest.sourceRoot);
+    const server = structuredClone(manifest.servers[name]);
+    mergeSourceEnvForMcp(name, server, manifest.sourceEnv ?? {});
+    rewritePortableTableKeys(server, manifest.sourceRoot, sourceHome);
+    if (typeof server.url === "string") {
+        throw new CliError(`MCP ${name} is URL-based and should not be launched through codexport mcp run.`, 2);
+    }
+    const command = typeof server.command === "string" ? expandPathVariables(server.command, { ...localConfig, codexDir: ctx.codexDir }) : undefined;
+    const args = Array.isArray(server.args)
+        ? server.args.map((arg) => typeof arg === "string" ? expandPathVariables(rewritePortablePath(arg, manifest.sourceRoot, sourceHome), { ...localConfig, codexDir: ctx.codexDir }) : String(arg))
+        : [];
+    if (!command)
+        throw new CliError(`MCP ${name} has no command.`, 1);
+    const launcher = mcpHasRequiredPortableEnv(name, command, server)
+        ? portableMcpLauncher(name, command, args, sourceHome, server)
+        : undefined;
+    const runCommandName = launcher?.command ?? rewritePortableCommand(command, manifest.sourceRoot);
+    const runArgs = launcher?.args ?? args;
+    const childEnv = { ...process.env, ...portableServerEnv(server, manifest.sourceRoot, sourceHome, { ...localConfig, codexDir: ctx.codexDir }) };
+    await runCommandWithEnv(runCommandName, runArgs, childEnv);
+}
+function portableServerEnv(server, sourceRoot, sourceHome, localConfig) {
+    const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : {};
+    const out = {};
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === "string") {
+            out[key] = expandPathVariables(rewritePortablePath(value, sourceRoot, sourceHome), localConfig);
+        }
+    }
+    return out;
+}
 async function copyDirectory(source, target) {
     await ensureDir(target);
     for (const entry of await readdir(source, { withFileTypes: true })) {
@@ -749,6 +800,23 @@ function runCommand(command, args) {
         });
     });
 }
+function runCommandWithEnv(command, args, env) {
+    return new Promise((resolve, reject) => {
+        const child = spawn(command, args, { stdio: "inherit", env });
+        child.on("error", (error) => {
+            const message = error.code === "ENOENT"
+                ? `MCP launcher program not found: ${command}. Install it on this follower or add it to PATH.`
+                : asError(error).message;
+            reject(new CliError(message, 1));
+        });
+        child.on("exit", (code) => {
+            if (code === 0)
+                resolve();
+            else
+                reject(new CliError(`${command} ${args.join(" ")} exited with ${code}`, code ?? 1));
+        });
+    });
+}
 async function installMasterService(ctx, port, dryRun) {
     const command = `${process.execPath} ${realpathSync(fileURLToPath(import.meta.url))} master serve --port ${port}`;
     if (platform() === "linux") {
@@ -1016,6 +1084,10 @@ async function main(argv) {
     program.command("apply")
         .description("Apply the last staged bundle.")
         .action(async (_options, command) => commandApply(contextFromCommand(command)));
+    const mcp = program.command("mcp").description("Run managed follower MCP launchers.");
+    mcp.command("run <name>")
+        .description("Run a synced MCP through codexport's managed launcher.")
+        .action(async (name, _options, command) => commandMcpRun(contextFromCommand(command), name));
     const hook = program.command("hook").description("Manage follower Codex hooks.");
     hook.command("install")
         .description("Install a follower-only Codex SessionStart sync hook.")

package/package.json

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