@fractary/codex-cli 0.10.11 → 0.10.14

package/dist/cli.js

@@ -3,8 +3,8 @@ import * as path5 from 'path';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 import * as fs from 'fs/promises';
-import * as yaml from 'js-yaml';
-import { ValidationError, PermissionDeniedError, ConfigurationError, CodexError } from '@fractary/codex';
+import * as yaml2 from 'js-yaml';
+import { readCodexConfig, CONFIG_SCHEMA_VERSION, expandEnvVarsInConfig, expandEnvVars, parseSize, parseDuration, ValidationError, PermissionDeniedError, ConfigurationError, CodexError } from '@fractary/codex';
 import * as os from 'os';
 import { spawn } from 'child_process';
 import { Command } from 'commander';
@@ -38,7 +38,7 @@ __export(migrate_config_exports, {
   getDefaultYamlConfig: () => getDefaultYamlConfig,
   isLegacyConfig: () => isLegacyConfig,
   migrateConfig: () => migrateConfig,
-  readYamlConfig: () => readYamlConfig,
+  readYamlConfig: () => readCodexConfig,
   writeYamlConfig: () => writeYamlConfig
 });
 async function isLegacyConfig(configPath) {
@@ -163,7 +163,7 @@ async function migrateConfig(legacyConfigPath, options) {
 async function writeYamlConfig(config, outputPath) {
   const dir = path5.dirname(outputPath);
   await fs.mkdir(dir, { recursive: true });
-  const yamlContent = yaml.dump(config, {
+  const yamlContent = yaml2.dump(config, {
     indent: 2,
     lineWidth: 80,
     noRefs: true,
@@ -228,20 +228,6 @@ function getDefaultYamlConfig(organization) {
     }
   };
 }
-async function readYamlConfig(configPath) {
-  const content = await fs.readFile(configPath, "utf-8");
-  const rawConfig = yaml.load(content);
-  let config;
-  if (rawConfig.codex && typeof rawConfig.codex === "object") {
-    config = rawConfig.codex;
-  } else {
-    config = rawConfig;
-  }
-  if (!config.organization) {
-    throw new Error("Invalid config: organization is required");
-  }
-  return config;
-}
 var init_migrate_config = __esm({
   "src/config/migrate-config.ts"() {
     init_esm_shims();
@@ -253,89 +239,9 @@ var config_types_exports = {};
 __export(config_types_exports, {
   parseDuration: () => parseDuration,
   parseSize: () => parseSize,
-  resolveEnvVars: () => resolveEnvVars,
-  resolveEnvVarsInConfig: () => resolveEnvVarsInConfig
+  resolveEnvVars: () => expandEnvVars,
+  resolveEnvVarsInConfig: () => expandEnvVarsInConfig
 });
-function parseDuration(duration) {
-  if (typeof duration === "number") {
-    return duration;
-  }
-  const match = duration.match(/^(\d+)([smhdwMy])$/);
-  if (!match) {
-    throw new Error(`Invalid duration format: ${duration}`);
-  }
-  const [, valueStr, unit] = match;
-  const value = parseInt(valueStr, 10);
-  switch (unit) {
-    case "s":
-      return value;
-    case "m":
-      return value * 60;
-    case "h":
-      return value * 3600;
-    case "d":
-      return value * 86400;
-    case "w":
-      return value * 604800;
-    case "M":
-      return value * 2592e3;
-    // 30 days
-    case "y":
-      return value * 31536e3;
-    // 365 days
-    default:
-      throw new Error(`Unknown duration unit: ${unit}`);
-  }
-}
-function parseSize(size) {
-  if (typeof size === "number") {
-    return size;
-  }
-  const match = size.match(/^(\d+(?:\.\d+)?)\s*(B|KB|MB|GB)$/i);
-  if (!match) {
-    throw new Error(`Invalid size format: ${size}`);
-  }
-  const [, valueStr, unit] = match;
-  const value = parseFloat(valueStr);
-  switch (unit.toUpperCase()) {
-    case "B":
-      return value;
-    case "KB":
-      return value * 1024;
-    case "MB":
-      return value * 1024 * 1024;
-    case "GB":
-      return value * 1024 * 1024 * 1024;
-    default:
-      throw new Error(`Unknown size unit: ${unit}`);
-  }
-}
-function resolveEnvVars(value) {
-  return value.replace(/\$\{([^}]+)\}/g, (_, varName) => {
-    const envValue = process.env[varName];
-    if (envValue === void 0) {
-      console.warn(`Warning: Environment variable ${varName} is not set`);
-      return `\${${varName}}`;
-    }
-    return envValue;
-  });
-}
-function resolveEnvVarsInConfig(config) {
-  if (typeof config === "string") {
-    return resolveEnvVars(config);
-  }
-  if (Array.isArray(config)) {
-    return config.map((item) => resolveEnvVarsInConfig(item));
-  }
-  if (config !== null && typeof config === "object") {
-    const result = {};
-    for (const [key, value] of Object.entries(config)) {
-      result[key] = resolveEnvVarsInConfig(value);
-    }
-    return result;
-  }
-  return config;
-}
 var init_config_types = __esm({
   "src/config/config-types.ts"() {
     init_esm_shims();
@@ -388,14 +294,14 @@ var init_codex_client = __esm({
           CodexError: CodexError2,
           ConfigurationError: ConfigurationError2
         } = await import('@fractary/codex');
-        const { readYamlConfig: readYamlConfig2 } = await Promise.resolve().then(() => (init_migrate_config(), migrate_config_exports));
-        const { resolveEnvVarsInConfig: resolveEnvVarsInConfig2 } = await Promise.resolve().then(() => (init_config_types(), config_types_exports));
+        const { readYamlConfig } = await Promise.resolve().then(() => (init_migrate_config(), migrate_config_exports));
+        const { resolveEnvVarsInConfig } = await Promise.resolve().then(() => (init_config_types(), config_types_exports));
         try {
           const configPath = path5.join(process.cwd(), ".fractary", "config.yaml");
           let config;
           try {
-            config = await readYamlConfig2(configPath);
-            config = resolveEnvVarsInConfig2(config);
+            config = await readYamlConfig(configPath);
+            config = resolveEnvVarsInConfig(config);
           } catch (error) {
             throw new ConfigurationError2(
               `Failed to load configuration from ${configPath}. Run "fractary codex init" to create a configuration.`
@@ -884,7 +790,7 @@ function getDefaultUnifiedConfig(organization, project, codexRepo) {
   const sanitizedProject = sanitizeForS3BucketName(project);
   return {
     file: {
-      schema_version: "2.0",
+      schema_version: CONFIG_SCHEMA_VERSION,
       sources: {
         specs: {
           type: "s3",
@@ -921,18 +827,23 @@ function getDefaultUnifiedConfig(organization, project, codexRepo) {
       }
     },
     codex: {
-      schema_version: "2.0",
+      schema_version: CONFIG_SCHEMA_VERSION,
       organization,
       project,
       codex_repo: codexRepo,
-      dependencies: {}
+      remotes: {
+        // The codex repository - uses same token as git operations
+        [`${organization}/${codexRepo}`]: {
+          token: "${GITHUB_TOKEN}"
+        }
+      }
     }
   };
 }
 async function readUnifiedConfig(configPath) {
   try {
     const content = await fs.readFile(configPath, "utf-8");
-    const config = yaml.load(content);
+    const config = yaml2.load(content);
     return config;
   } catch (error) {
     if (error.code === "ENOENT") {
@@ -944,7 +855,7 @@ async function readUnifiedConfig(configPath) {
 async function writeUnifiedConfig(config, outputPath) {
   const dir = path5.dirname(outputPath);
   await fs.mkdir(dir, { recursive: true });
-  const yamlContent = yaml.dump(config, {
+  const yamlContent = yaml2.dump(config, {
     indent: 2,
     lineWidth: 120,
     noRefs: true,
@@ -956,7 +867,7 @@ function mergeUnifiedConfigs(existing, updates) {
   const merged = {};
   if (updates.file || existing.file) {
     merged.file = {
-      schema_version: updates.file?.schema_version || existing.file?.schema_version || "2.0",
+      schema_version: updates.file?.schema_version || existing.file?.schema_version || CONFIG_SCHEMA_VERSION,
       sources: {
         ...existing.file?.sources || {},
         ...updates.file?.sources || {}
@@ -965,13 +876,13 @@ function mergeUnifiedConfigs(existing, updates) {
   }
   if (updates.codex || existing.codex) {
     merged.codex = {
-      schema_version: updates.codex?.schema_version || existing.codex?.schema_version || "2.0",
+      schema_version: updates.codex?.schema_version || existing.codex?.schema_version || CONFIG_SCHEMA_VERSION,
       organization: updates.codex?.organization || existing.codex?.organization || "default",
       project: updates.codex?.project || existing.codex?.project || "default",
       codex_repo: updates.codex?.codex_repo || existing.codex?.codex_repo || "",
-      dependencies: {
-        ...existing.codex?.dependencies || {},
-        ...updates.codex?.dependencies || {}
+      remotes: {
+        ...existing.codex?.remotes || {},
+        ...updates.codex?.remotes || {}
       }
     };
   }
@@ -1185,9 +1096,64 @@ async function fileExists(filePath) {
     return false;
   }
 }
+async function installMcpServer(projectRoot, configPath = ".fractary/config.yaml", options = {}) {
+  const mcpJsonPath = path5.join(projectRoot, ".mcp.json");
+  const { backup = true } = options;
+  let existingConfig = { mcpServers: {} };
+  let backupPath;
+  let migrated = false;
+  if (await fileExists(mcpJsonPath)) {
+    try {
+      const content = await fs.readFile(mcpJsonPath, "utf-8");
+      existingConfig = JSON.parse(content);
+      if (backup) {
+        const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "").slice(0, 18);
+        const suffix = Math.random().toString(36).substring(2, 6);
+        backupPath = `${mcpJsonPath}.backup.${timestamp}-${suffix}`;
+        await fs.writeFile(backupPath, content);
+      }
+    } catch {
+      console.log(chalk7.yellow("\u26A0 Warning: .mcp.json contains invalid JSON, starting fresh"));
+      existingConfig = { mcpServers: {} };
+    }
+  }
+  if (!existingConfig.mcpServers) {
+    existingConfig.mcpServers = {};
+  }
+  const existing = existingConfig.mcpServers["fractary-codex"];
+  if (existing) {
+    const existingCommand = existing.command;
+    const existingArgs = existing.args || [];
+    if (existingCommand === "npx" && existingArgs.includes("@fractary/codex-mcp")) {
+      return {
+        installed: false,
+        migrated: false,
+        alreadyInstalled: true,
+        backupPath
+      };
+    }
+    if (existingCommand === "node" || existingArgs.includes("@fractary/codex")) {
+      migrated = true;
+    }
+  }
+  existingConfig.mcpServers["fractary-codex"] = {
+    command: "npx",
+    args: ["-y", "@fractary/codex-mcp", "--config", configPath]
+  };
+  await fs.writeFile(
+    mcpJsonPath,
+    JSON.stringify(existingConfig, null, 2) + "\n"
+  );
+  return {
+    installed: true,
+    migrated,
+    alreadyInstalled: false,
+    backupPath
+  };
+}
 function initCommand() {
   const cmd = new Command("init");
-  cmd.description("Initialize unified Fractary configuration (.fractary/config.yaml)").option("--org <slug>", 'Organization slug (e.g., "fractary")').option("--project <name>", "Project name (default: derived from directory)").option("--codex-repo <name>", 'Codex repository name (e.g., "codex.fractary.com")').option("--force", "Overwrite existing configuration").action(async (options) => {
+  cmd.description("Initialize unified Fractary configuration (.fractary/config.yaml)").option("--org <slug>", 'Organization slug (e.g., "fractary")').option("--project <name>", "Project name (default: derived from directory)").option("--codex-repo <name>", 'Codex repository name (e.g., "codex.fractary.com")').option("--force", "Overwrite existing configuration").option("--no-mcp", "Skip MCP server installation").action(async (options) => {
     try {
       console.log(chalk7.blue("Initializing unified Fractary configuration...\n"));
       let org = options.org;
@@ -1299,6 +1265,20 @@ function initCommand() {
       } else if (result.merged) {
         console.log(chalk7.green("\u2713"), chalk7.dim(".fractary/config.yaml (merged with existing)"));
       }
+      if (options.mcp !== false) {
+        console.log("\nConfiguring MCP server...");
+        const mcpResult = await installMcpServer(process.cwd(), ".fractary/config.yaml");
+        if (mcpResult.alreadyInstalled) {
+          console.log(chalk7.green("\u2713"), chalk7.dim(".mcp.json (already configured)"));
+        } else if (mcpResult.migrated) {
+          console.log(chalk7.green("\u2713"), chalk7.dim(".mcp.json (migrated from old format)"));
+          if (mcpResult.backupPath) {
+            console.log(chalk7.dim(`  Backup: ${path5.basename(mcpResult.backupPath)}`));
+          }
+        } else if (mcpResult.installed) {
+          console.log(chalk7.green("\u2713"), chalk7.dim(".mcp.json (created)"));
+        }
+      }
       console.log(chalk7.green("\n\u2713 Unified configuration initialized successfully!\n"));
       console.log(chalk7.bold("Configuration:"));
       console.log(chalk7.dim(`  Organization: ${org}`));
@@ -1310,18 +1290,19 @@ function initCommand() {
       console.log(chalk7.dim("  - logs: .fractary/logs/ \u2192 S3"));
       console.log(chalk7.bold("\nCodex plugin:"));
       console.log(chalk7.dim("  - Cache: .fractary/codex/cache/"));
-      console.log(chalk7.dim("  - Dependencies: (none configured)"));
+      console.log(chalk7.dim("  - MCP Server: @fractary/codex-mcp (via npx)"));
+      console.log(chalk7.dim("  - Remotes: codex repo configured"));
       console.log(chalk7.bold("\nGit Authentication:"));
       console.log(chalk7.dim("  Codex sync uses your existing git credentials."));
       console.log(chalk7.dim("  Ensure you have access to the codex repository:"));
       console.log(chalk7.dim(`    gh repo view ${org}/${codexRepo}`));
       console.log(chalk7.dim("  Or set GITHUB_TOKEN environment variable."));
       console.log(chalk7.bold("\nNext steps:"));
-      console.log(chalk7.dim("  1. Verify codex repository access: gh repo view " + org + "/" + codexRepo));
-      console.log(chalk7.dim("  2. Configure AWS credentials for S3 access (if using file plugin)"));
-      console.log(chalk7.dim("  3. Edit .fractary/config.yaml to add external project dependencies"));
-      console.log(chalk7.dim("  4. Access current project files: codex://specs/SPEC-001.md"));
-      console.log(chalk7.dim("  5. Access external projects: codex://org/project/docs/README.md"));
+      console.log(chalk7.dim("  1. Restart Claude Code to load the MCP server"));
+      console.log(chalk7.dim("  2. Verify codex repository access: gh repo view " + org + "/" + codexRepo));
+      console.log(chalk7.dim("  3. Configure AWS credentials for S3 access (if using file plugin)"));
+      console.log(chalk7.dim("  4. Edit .fractary/config.yaml to add external project remotes"));
+      console.log(chalk7.dim("  5. Reference docs via codex:// URIs (auto-fetched by MCP)"));
     } catch (error) {
       console.error(chalk7.red("Error:"), error.message);
       process.exit(1);
@@ -1539,7 +1520,7 @@ async function checkConfiguration() {
         details: 'Run "fractary codex init" to create configuration'
       };
     }
-    const config = await readYamlConfig(configPath);
+    const config = await readCodexConfig(configPath);
     if (!config.organization) {
       return {
         name: "Configuration",
@@ -1630,7 +1611,7 @@ async function checkCache() {
 async function checkStorage() {
   const configPath = path5.join(process.cwd(), ".fractary", "config.yaml");
   try {
-    const config = await readYamlConfig(configPath);
+    const config = await readCodexConfig(configPath);
     const providers = config.storage || [];
     if (providers.length === 0) {
       return {
@@ -1789,7 +1770,7 @@ function syncCommand() {
       const configPath = path5.join(process.cwd(), ".fractary", "config.yaml");
       let config;
       try {
-        config = await readYamlConfig(configPath);
+        config = await readCodexConfig(configPath);
       } catch (error) {
         console.error(chalk7.red("Error:"), "Codex not initialized.");
         console.log(chalk7.dim('Run "fractary codex init" first.'));
@@ -2357,7 +2338,7 @@ function typesAddCommand() {
         process.exit(1);
       }
       const configPath = path5.join(process.cwd(), ".fractary", "config.yaml");
-      const config = await readYamlConfig(configPath);
+      const config = await readCodexConfig(configPath);
       if (!config.types) {
         config.types = { custom: {} };
       }
@@ -2426,7 +2407,7 @@ function typesRemoveCommand() {
       }
       const typeInfo = registry.get(name);
       const configPath = path5.join(process.cwd(), ".fractary", "config.yaml");
-      const config = await readYamlConfig(configPath);
+      const config = await readCodexConfig(configPath);
       if (!config.types?.custom?.[name]) {
         console.error(chalk7.red("Error:"), `Custom type "${name}" not found in configuration.`);
         process.exit(1);