codexport 0.3.5 → 0.3.6

package/README.md

@@ -12,7 +12,7 @@
 
 the master serves a content-hashed bundle from its `~/.codex` directory. followers pin the master's fingerprint on join, fetch updates over a Tailscale-reachable HTTP address, and apply updates at Codex `SessionStart` through a short best-effort hook.
 
-MCPs are exported as full definitions, including env needed by supported tools. command-based MCPs are written through a managed launcher, so followers run `npx -y codexport@latest mcp run <name>` and let `codexport` translate master-local paths into repairable package, Python tool, or source-built launchers.
+MCPs are exported as full definitions, including env needed by supported tools. command-based MCPs are written through a quiet local managed launcher, so followers run `node ~/.codexport/bin/codexport-mcp-run.mjs mcp run <name>` and let `codexport` translate master-local paths into repairable package, Python tool, or source-built launchers.
 
 [npm](https://www.npmjs.com/package/codexport) | [github](https://github.com/Microck/codexport)
 
@@ -123,8 +123,8 @@ all master MCP definitions are exported into `~/.codexport/mcp-manifest.json` on
 
 ```toml
 [mcp_servers.example]
-command = "npx"
-args = [ "-y", "codexport@latest", "mcp", "run", "example" ]
+command = "node"
+args = [ "~/.codexport/bin/codexport-mcp-run.mjs", "mcp", "run", "example" ]
 ```
 
 when Codex starts an MCP, `codexport mcp run` reads the original manifest entry, restores transferred environment values, rewrites master paths to follower paths, and chooses a runnable target:

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.3.5";
+const VERSION = "0.3.6";
 const DEFAULT_PORT = 17342;
 const DEFAULT_TIMEOUT_MS = 5_000;
 const CODEXPORT_DIR = ".codexport";
@@ -22,7 +22,7 @@ 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 MANAGED_MCP_RUNNER_FILE = "codexport-mcp-run.mjs";
 const INCLUDE_ROOTS = [
     "AGENTS.md",
     "RTK.md",
@@ -465,9 +465,8 @@ function rewritePortableTableKeys(table, sourceRoot, sourceHome) {
 function rewriteManagedMcpServer(name, server, sourceRoot, sourceHome) {
     if (typeof server.url === "string")
         return;
-    const args = Array.isArray(server.args) ? server.args : [];
-    server.command = "npx";
-    server.args = ["-y", MANAGED_MCP_PACKAGE, "mcp", "run", name];
+    server.command = "${node}";
+    server.args = ["${codexportMcpRunner}", "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") {
@@ -760,6 +759,7 @@ async function applyBundle(ctx, bundle) {
     const localConfig = await readLocalConfig(ctx);
     await assertSkillConflicts(ctx, bundle, localConfig);
     await ensureDir(ctx.codexDir);
+    const managedMcpRunner = await writeManagedMcpRunner(ctx);
     const nextFiles = new Set(bundle.files.map((file) => file.path));
     const previousFiles = await readJsonIfExists(path.join(ctx.stateDir, APPLIED_FILES_FILE)) ?? [];
     for (const previousFile of previousFiles) {
@@ -785,7 +785,15 @@ async function applyBundle(ctx, bundle) {
         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 generated = mergeTomlText(canonicalConfig, localMcpText, {
+            ...localConfig,
+            codexDir: ctx.codexDir,
+            pathVariables: {
+                ...(localConfig.pathVariables ?? {}),
+                node: process.execPath,
+                codexportMcpRunner: managedMcpRunner
+            }
+        }, bundle.sourceRoot, bundle.sourceEnv);
         const configPath = path.join(ctx.codexDir, "config.toml");
         if (await pathExists(configPath)) {
             const backupPath = `${configPath}.codexport-backup-${new Date().toISOString().replace(/[:.]/g, "-")}`;
@@ -802,6 +810,15 @@ 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 writeManagedMcpRunner(ctx) {
+    const binDir = path.join(ctx.stateDir, "bin");
+    const runnerPath = path.join(binDir, MANAGED_MCP_RUNNER_FILE);
+    await ensureDir(binDir);
+    await writeFileReplacingExisting(runnerPath, await readFile(fileURLToPath(import.meta.url)), { mode: 0o755 });
+    if (platform() !== "win32")
+        await chmod(runnerPath, 0o755);
+    return runnerPath;
+}
 async function commandMcpRun(ctx, name) {
     const manifest = await readJsonIfExists(path.join(ctx.stateDir, MCP_MANIFEST_FILE));
     if (!manifest?.servers?.[name]) {
@@ -1005,7 +1022,7 @@ async function installHook(ctx, timeoutMs) {
     const existingText = await readTextIfExists(hooksPath);
     const existing = existingText ? JSON.parse(existingText) : {};
     const hooks = existing.SessionStart && Array.isArray(existing.SessionStart) ? existing.SessionStart : [];
-    const command = `codexport sync --apply --timeout-ms ${timeoutMs} --no-input`;
+    const command = `codexport hook sync --timeout-ms ${timeoutMs} --no-input`;
     const filtered = hooks.filter((hook) => !(hook && typeof hook === "object" && hook.name === "codexport-sync"));
     filtered.push({ name: "codexport-sync", command, timeoutMs });
     await writeJsonAtomic(hooksPath, { ...existing, SessionStart: filtered });
@@ -1236,6 +1253,16 @@ async function commandSync(ctx, options) {
         print(ctx, { status: "staged", revision: bundle.revision, files: bundle.files.length });
     }
 }
+async function commandHookSync(ctx, options) {
+    try {
+        await commandSync(ctx, { apply: true, timeoutMs: options.timeoutMs });
+    }
+    catch (error) {
+        if (!ctx.quiet) {
+            process.stderr.write(`codexport hook sync skipped: ${asError(error).message}\n`);
+        }
+    }
+}
 async function commandApply(ctx) {
     const bundle = await readCachedBundle(ctx);
     await applyBundle(ctx, bundle);
@@ -1336,8 +1363,12 @@ async function main(argv) {
         .action(async (options, command) => {
         const ctx = contextFromCommand(command);
         await installHook(ctx, options.timeoutMs);
-        print(ctx, { installed: true, hook: "SessionStart", command: `codexport sync --apply --timeout-ms ${options.timeoutMs} --no-input` });
+        print(ctx, { installed: true, hook: "SessionStart", command: `codexport hook sync --timeout-ms ${options.timeoutMs} --no-input` });
     });
+    hook.command("sync")
+        .description("Best-effort follower sync for Codex SessionStart hooks.")
+        .option("--timeout-ms <ms>", "hook sync timeout", parsePositiveInt, 3_000)
+        .action(async (options, command) => commandHookSync(contextFromCommand(command), options));
     program.command("status")
         .description("Show local enrollment state and remote revision reachability.")
         .option("--timeout-ms <ms>", "network timeout", parsePositiveInt, 1_500)

package/package.json

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