codexport 0.1.9 → 0.2.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.1.9";
+const VERSION = "0.2.0";
 const DEFAULT_PORT = 17342;
 const DEFAULT_TIMEOUT_MS = 5_000;
 const CODEXPORT_DIR = ".codexport";
@@ -50,6 +50,11 @@ const EXCLUDE_PARTS = new Set([
     ".sqlite",
     ".sqlite3"
 ]);
+const MCP_ENV_EXPORT_NAMES = [
+    "KAGI_API_KEY",
+    "KAGI_SESSION_TOKEN",
+    "KAGI_CLI_PROFILE"
+];
 class CliError extends Error {
     exitCode;
     details;
@@ -232,26 +237,37 @@ async function walkIncluded(root, absolute, files) {
         });
     }
 }
-function computeRevision(files) {
+function computeRevision(files, sourceEnv = {}) {
     const normalized = files.map((file) => ({
         path: file.path,
         mode: file.mode,
         kind: file.kind,
         contentHash: sha256(Buffer.from(file.content, "base64"))
     }));
-    return sha256(JSON.stringify(normalized));
+    return sha256(JSON.stringify({ files: normalized, sourceEnv }));
 }
 async function buildBundle(codexDir) {
     const files = await collectFiles(codexDir);
-    const revision = computeRevision(files);
+    const sourceEnv = collectSourceEnv();
+    const revision = computeRevision(files, sourceEnv);
     return {
         version: 1,
         builtAt: new Date().toISOString(),
         sourceRoot: codexDir,
         revision,
-        files
+        files,
+        sourceEnv
     };
 }
+function collectSourceEnv() {
+    const sourceEnv = {};
+    for (const name of MCP_ENV_EXPORT_NAMES) {
+        const value = process.env[name];
+        if (value)
+            sourceEnv[name] = value;
+    }
+    return sourceEnv;
+}
 async function saveMasterBundle(ctx, bundle) {
     await writeJsonAtomic(path.join(ctx.stateDir, LAST_BUNDLE_FILE), bundle);
 }
@@ -327,7 +343,7 @@ function verifyBundle(bundle) {
     if (bundle.version !== 1 || !Array.isArray(bundle.files)) {
         throw new CliError("Bundle has an unsupported format.", 1);
     }
-    const actualRevision = computeRevision(bundle.files);
+    const actualRevision = computeRevision(bundle.files, bundle.sourceEnv ?? {});
     if (bundle.revision !== actualRevision) {
         throw new CliError(`Bundle revision mismatch. Expected ${bundle.revision}, computed ${actualRevision}.`, 1);
     }
@@ -361,8 +377,8 @@ function extractTomlTableNames(text, prefix) {
     }
     return names;
 }
-function mergeTomlText(canonical, localMcpText, localConfig, sourceRoot) {
-    const expandedCanonical = expandPathVariables(rewritePortableConfig(canonical, sourceRoot), localConfig);
+function mergeTomlText(canonical, localMcpText, localConfig, sourceRoot, sourceEnv = {}) {
+    const expandedCanonical = expandPathVariables(rewritePortableConfig(canonical, sourceRoot, sourceEnv), localConfig);
     if (!localMcpText?.trim())
         return expandedCanonical;
     const canonicalMcps = extractTomlTableNames(canonical, "mcp_servers");
@@ -374,7 +390,7 @@ function mergeTomlText(canonical, localMcpText, localConfig, sourceRoot) {
     }
     return `${expandedCanonical.trimEnd()}\n\n# Follower-local MCP overlay from ~/.codexport/mcps.local.toml\n${localMcpText.trim()}\n`;
 }
-function rewritePortableConfig(canonical, sourceRoot) {
+function rewritePortableConfig(canonical, sourceRoot, sourceEnv = {}) {
     let parsed;
     try {
         parsed = parseTomlObject(canonical, "canonical config.toml");
@@ -393,10 +409,21 @@ function rewritePortableConfig(canonical, sourceRoot) {
         if (!rawServer || typeof rawServer !== "object" || Array.isArray(rawServer))
             continue;
         const server = rawServer;
+        mergeSourceEnvForMcp(name, server, sourceEnv);
         rewritePortableMcpServer(name, server, sourceRoot, sourceHome);
     }
     return stringifyToml(parsed);
 }
+function mergeSourceEnvForMcp(name, server, sourceEnv) {
+    if (name !== "kagi-mcp")
+        return;
+    const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : {};
+    for (const key of ["KAGI_API_KEY", "KAGI_SESSION_TOKEN", "KAGI_CLI_PROFILE"]) {
+        if (typeof env[key] !== "string" && sourceEnv[key])
+            env[key] = sourceEnv[key];
+    }
+    server.env = env;
+}
 function rewritePortableTableKeys(table, sourceRoot, sourceHome) {
     const rewritten = {};
     for (const [key, value] of Object.entries(table)) {
@@ -417,7 +444,7 @@ function rewritePortableMcpServer(_name, server, 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;
+    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));
@@ -442,11 +469,20 @@ function rewritePortableMcpServer(_name, server, sourceRoot, sourceHome) {
         ensurePortablePathEnv(server);
     }
 }
-function portableMcpLauncher(name, command, args, sourceHome) {
+function portableMcpLauncher(name, command, args, sourceHome, server) {
     const commandName = basenameAnyPlatform(command);
     if (commandName === "npx" || commandName === "bunx" || commandName === "uvx") {
         return allStrings(args) ? { command: commandName, args: args } : undefined;
     }
+    if (name === "kagi-mcp" || commandName === "kagi-mcp") {
+        const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : {};
+        if (typeof env.KAGI_API_KEY === "string" && env.KAGI_API_KEY.length > 0) {
+            return { command: "npx", args: ["-y", "kagi-mcp"] };
+        }
+        if (typeof env.KAGI_SESSION_TOKEN === "string" && env.KAGI_SESSION_TOKEN.length > 0) {
+            return { command: "npx", args: ["-y", "kagi-cli", "mcp"] };
+        }
+    }
     const nodePackage = nodePackageFromServer(command, args) ?? workspacePackageFromServer(command, args, sourceHome);
     if (nodePackage) {
         return { command: "npx", args: ["-y", nodePackage.packageName, ...nodePackage.remainingArgs] };
@@ -462,7 +498,8 @@ 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;
+    return (typeof env?.KAGI_API_KEY === "string" && env.KAGI_API_KEY.length > 0)
+        || (typeof env?.KAGI_SESSION_TOKEN === "string" && env.KAGI_SESSION_TOKEN.length > 0);
 }
 function ensurePortablePathEnv(server) {
     const env = server.env && typeof server.env === "object" && !Array.isArray(server.env) ? server.env : {};
@@ -654,7 +691,7 @@ 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 generated = mergeTomlText(canonicalConfig, localMcpText, { ...localConfig, codexDir: ctx.codexDir }, bundle.sourceRoot);
+        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)) {
             const backupPath = `${configPath}.codexport-backup-${new Date().toISOString().replace(/[:.]/g, "-")}`;

package/package.json

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