@fractary/codex-cli 0.10.11 → 0.10.13

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, 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.`
@@ -932,7 +838,7 @@ function getDefaultUnifiedConfig(organization, project, codexRepo) {
 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 +850,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,
@@ -1539,7 +1445,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 +1536,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 +1695,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 +2263,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 +2332,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);