@fractary/codex-mcp 0.9.0 → 0.10.0

package/README.md

@@ -37,7 +37,7 @@ Add to your `.claude/settings.json`:
   "mcpServers": {
     "fractary-codex": {
       "command": "npx",
-      "args": ["-y", "@fractary/codex-mcp-server", "--config", ".fractary/codex/config.yaml"]
+      "args": ["-y", "@fractary/codex-mcp-server", "--config", ".fractary/config.yaml"]
     }
   }
 }
@@ -46,7 +46,7 @@ Add to your `.claude/settings.json`:
 ### Stdio Mode (Default)
 
 ```bash
-fractary-codex-mcp --config .fractary/codex/config.yaml
+fractary-codex-mcp --config .fractary/config.yaml
 ```
 
 The server communicates via stdin/stdout using the MCP protocol.
@@ -61,7 +61,7 @@ The server exposes an SSE (Server-Sent Events) endpoint for HTTP clients.
 
 ## Configuration
 
-Create a `.fractary/codex/config.yaml` configuration file:
+Create a `.fractary/config.yaml` configuration file:
 
 ```yaml
 # Organization configuration
@@ -139,7 +139,7 @@ const result = await fetch('codex://fractary/auth-service/specs/WORK-123.md')
 
 ### Environment Variables
 
-- `FRACTARY_CONFIG`: Path to configuration file (default: `.fractary/codex/config.yaml`)
+- `FRACTARY_CONFIG`: Path to configuration file (default: `.fractary/config.yaml`)
 - `GITHUB_TOKEN`: GitHub personal access token for GitHub storage provider
 - `FRACTARY_CLI`: Path to fractary CLI executable (default: `fractary`)
 - `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`: AWS credentials for S3
@@ -304,7 +304,7 @@ If you were using the MCP server from `@fractary/codex` (versions ≤0.1.x), upd
   "mcpServers": {
     "fractary-codex": {
       "command": "npx",
-      "args": ["@fractary/codex", "mcp", "--config", ".fractary/codex/config.yaml"]
+      "args": ["@fractary/codex", "mcp", "--config", ".fractary/config.yaml"]
     }
   }
 }
@@ -316,7 +316,7 @@ If you were using the MCP server from `@fractary/codex` (versions ≤0.1.x), upd
   "mcpServers": {
     "fractary-codex": {
       "command": "npx",
-      "args": ["-y", "@fractary/codex-mcp-server", "--config", ".fractary/codex/config.yaml"]
+      "args": ["-y", "@fractary/codex-mcp-server", "--config", ".fractary/config.yaml"]
     }
   }
 }

package/dist/cli.cjs

@@ -12687,8 +12687,40 @@ var ArchiveProjectConfigSchema = external_exports.object({
 var ArchiveConfigSchema = external_exports.object({
   projects: external_exports.record(ArchiveProjectConfigSchema)
 });
+var GitHubAuthConfigSchema = external_exports.object({
+  /** Default token environment variable name (default: GITHUB_TOKEN) */
+  default_token_env: external_exports.string().optional(),
+  /** Fallback to public access if authentication fails */
+  fallback_to_public: external_exports.boolean().optional()
+});
+var AuthConfigSchema = external_exports.object({
+  /** GitHub authentication configuration */
+  github: GitHubAuthConfigSchema.optional()
+});
+var SourceConfigSchema = external_exports.object({
+  /** Source type */
+  type: external_exports.enum(["github", "s3", "http", "local"]),
+  /** Environment variable containing the authentication token */
+  token_env: external_exports.string().optional(),
+  /** Direct token value (not recommended, use token_env instead) */
+  token: external_exports.string().optional(),
+  /** Branch to fetch from (for GitHub sources) */
+  branch: external_exports.string().optional(),
+  /** Base URL (for HTTP sources) */
+  base_url: external_exports.string().optional(),
+  /** Bucket name (for S3 sources) */
+  bucket: external_exports.string().optional(),
+  /** Prefix/path within bucket (for S3 sources) */
+  prefix: external_exports.string().optional()
+});
+var DependencyConfigSchema = external_exports.object({
+  /** Sources within this dependency */
+  sources: external_exports.record(SourceConfigSchema)
+});
 var CodexConfigSchema = external_exports.object({
   organizationSlug: external_exports.string(),
+  /** Project name (optional) */
+  project: external_exports.string().optional(),
   directories: external_exports.object({
     source: external_exports.string().optional(),
     target: external_exports.string().optional(),
@@ -12698,7 +12730,11 @@ var CodexConfigSchema = external_exports.object({
   // Directional sync configuration
   sync: DirectionalSyncSchema.optional(),
   // Archive configuration
-  archive: ArchiveConfigSchema.optional()
+  archive: ArchiveConfigSchema.optional(),
+  // Authentication configuration
+  auth: AuthConfigSchema.optional(),
+  // Dependencies configuration (external projects)
+  dependencies: external_exports.record(DependencyConfigSchema).optional()
 }).strict();
 var FileSourceSchema = external_exports.object({
   type: external_exports.enum(["s3", "r2", "gcs", "local"]),
@@ -13692,7 +13728,9 @@ var S3ArchiveStorage = class {
 var StorageManager = class {
   providers = /* @__PURE__ */ new Map();
   priority;
+  codexConfig;
   constructor(config = {}) {
+    this.codexConfig = config.codexConfig;
     this.providers.set("local", new LocalStorage(config.local));
     this.providers.set("github", new GitHubStorage(config.github));
     this.providers.set("http", new HttpStorage(config.http));
@@ -13704,6 +13742,48 @@ var StorageManager = class {
     }
     this.priority = config.priority || (config.filePlugin && config.s3Archive ? ["file-plugin", "local", "s3-archive", "github", "http"] : config.filePlugin ? ["file-plugin", "local", "github", "http"] : config.s3Archive ? ["local", "s3-archive", "github", "http"] : ["local", "github", "http"]);
   }
+  /**
+   * Resolve authentication token for a reference
+   *
+   * Looks up dependency-specific authentication or falls back to default
+   */
+  resolveToken(reference) {
+    if (!this.codexConfig) {
+      return void 0;
+    }
+    const dependencyKey = `${reference.org}/${reference.project}`;
+    if (this.codexConfig.dependencies?.[dependencyKey]) {
+      const dependency = this.codexConfig.dependencies[dependencyKey];
+      for (const [, sourceConfig] of Object.entries(dependency.sources)) {
+        if (sourceConfig.type === "github") {
+          if (sourceConfig.token_env) {
+            const token = process.env[sourceConfig.token_env];
+            if (token) {
+              return token;
+            }
+          }
+          if (sourceConfig.token) {
+            return sourceConfig.token;
+          }
+        }
+      }
+    }
+    const defaultTokenEnv = this.codexConfig.auth?.github?.default_token_env || "GITHUB_TOKEN";
+    return process.env[defaultTokenEnv];
+  }
+  /**
+   * Resolve fetch options with authentication
+   *
+   * Merges reference-specific authentication with provided options
+   */
+  resolveFetchOptions(reference, options) {
+    const token = this.resolveToken(reference);
+    return {
+      ...options,
+      token: options?.token || token
+      // Explicit option overrides resolved token
+    };
+  }
   /**
    * Register a custom storage provider
    */
@@ -13744,8 +13824,10 @@ var StorageManager = class {
    * Fetch content for a reference
    *
    * Tries providers in priority order until one succeeds.
+   * Automatically resolves authentication based on dependency configuration.
    */
   async fetch(reference, options) {
+    const resolvedOptions = this.resolveFetchOptions(reference, options);
     const errors = [];
     for (const type2 of this.priority) {
       const provider = this.providers.get(type2);
@@ -13753,7 +13835,7 @@ var StorageManager = class {
         continue;
       }
       try {
-        return await provider.fetch(reference, options);
+        return await provider.fetch(reference, resolvedOptions);
       } catch (error) {
         errors.push(error instanceof Error ? error : new Error(String(error)));
       }
@@ -13774,15 +13856,17 @@ var StorageManager = class {
    * Check if content exists for a reference
    *
    * Returns true if any provider reports the content exists.
+   * Automatically resolves authentication based on dependency configuration.
    */
   async exists(reference, options) {
+    const resolvedOptions = this.resolveFetchOptions(reference, options);
     for (const type2 of this.priority) {
       const provider = this.providers.get(type2);
       if (!provider || !provider.canHandle(reference)) {
         continue;
       }
       try {
-        if (await provider.exists(reference, options)) {
+        if (await provider.exists(reference, resolvedOptions)) {
           return true;
         }
       } catch {
@@ -13802,6 +13886,8 @@ var StorageManager = class {
   }
   /**
    * Fetch multiple references in parallel
+   *
+   * Automatically resolves authentication for each reference based on dependency configuration.
    */
   async fetchMany(references, options) {
     const results = /* @__PURE__ */ new Map();
@@ -14984,14 +15070,23 @@ function expandEnvVars(obj) {
   return obj;
 }
 var program2 = new Command();
-program2.name("fractary-codex-mcp").description("MCP server for Fractary Codex knowledge management").version("0.8.0").option("--config <path>", "Path to config file", ".fractary/codex/config.yaml").action(async (options) => {
+program2.name("fractary-codex-mcp").description("MCP server for Fractary Codex knowledge management").version("0.8.0").option("--config <path>", "Path to config file", ".fractary/config.yaml").action(async (options) => {
   let config = {};
   try {
     const configFile = (0, import_fs.readFileSync)(options.config, "utf-8");
-    config = load(configFile);
+    const rawConfig = load(configFile);
+    if (rawConfig && typeof rawConfig === "object" && "codex" in rawConfig) {
+      config = {
+        ...rawConfig.codex,
+        // Preserve file section if present (for file plugin integration)
+        file: rawConfig.file
+      };
+    } else {
+      config = rawConfig || {};
+    }
     config = expandEnvVars(config);
   } catch (error) {
-    if (options.config !== ".fractary/codex/config.yaml") {
+    if (options.config !== ".fractary/config.yaml") {
       console.error(`Warning: Could not load config file: ${options.config}`);
     }
   }