@defai.digital/automatosx 11.2.5 → 11.2.7

package/dist/index.js

@@ -57,12 +57,8 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var getFilename, getDirname, __dirname$1;
 var init_esm_shims = __esm({
   "node_modules/tsup/assets/esm_shims.js"() {
-    getFilename = () => fileURLToPath(import.meta.url);
-    getDirname = () => path4__default.dirname(getFilename());
-    __dirname$1 = /* @__PURE__ */ getDirname();
   }
 });
 function sanitizeObject(obj, maxDepth = 5, currentDepth = 0) {
@@ -99,7 +95,7 @@ function setLogLevel(level) {
 }
 var LOG_LEVELS, COLORS, SENSITIVE_KEYS, SimpleLogger, logger;
 var init_logger = __esm({
-  "src/utils/logger.ts"() {
+  "src/shared/logging/logger.ts"() {
     init_esm_shims();
     LOG_LEVELS = {
       trace: 0,
@@ -271,7 +267,7 @@ ${JSON.stringify(entry.context, null, 2)}`;
   }
 });
 
-// src/utils/process-manager.ts
+// src/shared/process/process-manager.ts
 var process_manager_exports = {};
 __export(process_manager_exports, {
   installExitHandlers: () => installExitHandlers,
@@ -321,7 +317,7 @@ function installExitHandlers() {
 }
 var ProcessManager, processManager, exitHandlersInstalled, exitInProgress;
 var init_process_manager = __esm({
-  "src/utils/process-manager.ts"() {
+  "src/shared/process/process-manager.ts"() {
     init_esm_shims();
     init_logger();
     ProcessManager = class {
@@ -393,7 +389,7 @@ var init_process_manager = __esm({
           if (child.killed || child.exitCode !== null) {
             continue;
           }
-          killPromises.push(new Promise((resolve12) => {
+          killPromises.push(new Promise((resolve13) => {
             let mainTimeoutId = null;
             let fallbackTimeoutId = null;
             let resolved = false;
@@ -408,7 +404,7 @@ var init_process_manager = __esm({
               }
               if (!resolved) {
                 resolved = true;
-                resolve12();
+                resolve13();
               }
             };
             child.once("exit", () => {
@@ -433,8 +429,8 @@ var init_process_manager = __esm({
         try {
           await Promise.race([
             Promise.all(killPromises),
-            new Promise((resolve12) => {
-              finalTimeoutId = setTimeout(resolve12, timeout);
+            new Promise((resolve13) => {
+              finalTimeoutId = setTimeout(resolve13, timeout);
             })
           ]);
         } finally {
@@ -485,8 +481,8 @@ var init_process_manager = __esm({
   }
 });
 var DEFAULT_OPTIONS, DatabaseFactory;
-var init_db_factory = __esm({
-  "src/utils/db-factory.ts"() {
+var init_factory = __esm({
+  "src/core/database/factory.ts"() {
     init_esm_shims();
     init_logger();
     DEFAULT_OPTIONS = {
@@ -682,12 +678,12 @@ function extname(filePath) {
   return path4__default.extname(filePath);
 }
 var init_path_utils = __esm({
-  "src/utils/path-utils.ts"() {
+  "src/shared/validation/path-utils.ts"() {
     init_esm_shims();
   }
 });
 
-// src/utils/errors.ts
+// src/shared/errors/errors.ts
 function toBaseError(error) {
   if (error instanceof BaseError) {
     return error;
@@ -708,7 +704,7 @@ function toBaseError(error) {
 }
 var BaseError, ConfigError, ProviderError;
 var init_errors = __esm({
-  "src/utils/errors.ts"() {
+  "src/shared/errors/errors.ts"() {
     init_esm_shims();
     BaseError = class extends Error {
       code;
@@ -1012,7 +1008,7 @@ var init_path = __esm({
   }
 });
 
-// src/core/path-resolver.ts
+// src/shared/validation/path-resolver.ts
 var path_resolver_exports = {};
 __export(path_resolver_exports, {
   PathResolver: () => PathResolver,
@@ -1062,7 +1058,7 @@ async function detectProjectRoot(startDir = process.cwd()) {
 }
 var PathResolver;
 var init_path_resolver = __esm({
-  "src/core/path-resolver.ts"() {
+  "src/shared/validation/path-resolver.ts"() {
     init_esm_shims();
     init_path_utils();
     init_path();
@@ -1228,7 +1224,7 @@ var init_workspace_indexer = __esm({
   "src/core/workspace-indexer.ts"() {
     init_esm_shims();
     init_logger();
-    init_db_factory();
+    init_factory();
     DEFAULT_IGNORE_PATTERNS = [
       "node_modules/**",
       ".git/**",
@@ -1749,10 +1745,10 @@ var init_workspace_indexer = __esm({
   }
 });
 
-// src/utils/verbosity-manager.ts
+// src/shared/logging/verbosity-manager.ts
 var VerbosityManager;
 var init_verbosity_manager = __esm({
-  "src/utils/verbosity-manager.ts"() {
+  "src/shared/logging/verbosity-manager.ts"() {
     init_esm_shims();
     VerbosityManager = class _VerbosityManager {
       static instance = null;
@@ -2072,7 +2068,7 @@ var init_provider_schemas = __esm({
 });
 var StreamingProgressParser;
 var init_streaming_progress_parser = __esm({
-  "src/utils/streaming-progress-parser.ts"() {
+  "src/shared/process/streaming-progress-parser.ts"() {
     init_esm_shims();
     StreamingProgressParser = class {
       spinner = null;
@@ -2582,7 +2578,8 @@ var init_base_provider = __esm({
         try {
           const cliCommand2 = this.getCLICommand();
           const cliArgs = await this.getCLIArgs();
-          const argsString = cliArgs.length > 0 ? cliArgs.join(" ") + " " : "";
+          const escapedArgs = cliArgs.map((arg) => this.escapeShellArg(arg));
+          const argsString = escapedArgs.length > 0 ? escapedArgs.join(" ") + " " : "";
           const escapedPrompt = this.escapeShellArg(prompt);
           const fullCommand = `${cliCommand2} ${argsString}${escapedPrompt}`;
           const commandLength = fullCommand.length;
@@ -2625,7 +2622,7 @@ var init_base_provider = __esm({
        * @returns Promise resolving to stdout and stderr
        */
       async executeWithSpawn(command, cliCommand2) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           const child = spawn(command, [], {
             shell: true,
             // Auto-detects: cmd.exe on Windows, /bin/sh on Unix
@@ -2724,11 +2721,16 @@ var init_base_provider = __esm({
             if (stderr) {
               logger.debug(`${cliCommand2} CLI stderr output`, { stderr: stderr.trim() });
             }
-            if (code === 0 || code === null) {
+            if ((code === 0 || code === null) && !signal) {
               if (progressParser) {
                 progressParser.succeed(`${cliCommand2} completed successfully`);
               }
-              resolve12({ stdout, stderr });
+              resolve13({ stdout, stderr });
+            } else if (signal) {
+              if (progressParser) {
+                progressParser.fail(`${cliCommand2} killed by signal ${signal}`);
+              }
+              reject(new Error(`${cliCommand2} CLI killed by signal ${signal}. stderr: ${stderr || "none"}`));
             } else {
               if (progressParser) {
                 progressParser.fail(`${cliCommand2} failed with code ${code}`);
@@ -2778,7 +2780,7 @@ var init_base_provider = __esm({
        * @returns Promise resolving to stdout and stderr
        */
       async executeWithStdin(cliCommand2, cliArgs, prompt) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           const commandArgs = cliArgs ? cliArgs.split(" ").filter(Boolean) : [];
           logger.debug(`Executing ${cliCommand2} CLI with stdin`, {
             command: cliCommand2,
@@ -2891,7 +2893,7 @@ var init_base_provider = __esm({
               if (progressParser) {
                 progressParser.succeed(`${cliCommand2} completed successfully`);
               }
-              resolve12({ stdout, stderr });
+              resolve13({ stdout, stderr });
             } else {
               if (progressParser) {
                 progressParser.fail(`${cliCommand2} failed with code ${code}`);
@@ -3014,6 +3016,10 @@ ${fullPrompt}
               errors: responseValidation.error.issues,
               response
             });
+            throw new ProviderError(
+              `Provider returned invalid response structure: ${responseValidation.error.issues.map((i) => i.message).join(", ")}`,
+              "E1305" /* PROVIDER_EXEC_ERROR */
+            );
           }
           return response;
         } catch (error) {
@@ -3643,7 +3649,7 @@ var init_cli_wrapper = __esm({
        * Spawn codex process
        */
       async spawnProcess(args, prompt, timeout) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           let stdout = "";
           let stderr = "";
           let hasTimedOut = false;
@@ -3700,7 +3706,7 @@ var init_cli_wrapper = __esm({
               return;
             }
             if (code === 0) {
-              resolve12({ stdout, stderr, exitCode: code });
+              resolve13({ stdout, stderr, exitCode: code });
             } else {
               reject(
                 new CodexError(
@@ -3733,7 +3739,7 @@ var init_cli_wrapper = __esm({
        * Spawn codex process with streaming support
        */
       async spawnProcessWithStreaming(args, prompt, timeout, renderer) {
-        return new Promise((resolve12, reject) => {
+        return new Promise((resolve13, reject) => {
           let stdout = "";
           let stderr = "";
           let hasTimedOut = false;
@@ -3803,7 +3809,7 @@ var init_cli_wrapper = __esm({
               if (renderer) {
                 renderer.succeed("Execution complete");
               }
-              resolve12({ stdout, stderr, exitCode: code });
+              resolve13({ stdout, stderr, exitCode: code });
             } else {
               if (renderer) {
                 renderer.fail(`Process exited with code ${code}`);
@@ -4291,16 +4297,16 @@ var init_command_builder = __esm({
         const args = [];
         args.push("-p", this.escape(prompt));
         if (options.provider) {
-          args.push("--provider", options.provider);
+          args.push("--provider", this.escape(options.provider));
         }
         if (options.model) {
-          args.push("--model", options.model);
+          args.push("--model", this.escape(options.model));
         }
         if (options.apiKey) {
-          args.push("--api-key", options.apiKey);
+          args.push("--api-key", this.escape(options.apiKey));
         }
         if (options.baseUrl) {
-          args.push("--base-url", options.baseUrl);
+          args.push("--base-url", this.escape(options.baseUrl));
         }
         if (options.directory) {
           args.push("--directory", this.escape(options.directory));
@@ -4318,7 +4324,7 @@ var init_command_builder = __esm({
           args.push("--selection", this.escape(options.selection));
         }
         if (options.lineRange) {
-          args.push("--line-range", options.lineRange);
+          args.push("--line-range", this.escape(options.lineRange));
         }
         if (options.gitDiff) {
           args.push("--git-diff");
@@ -7617,7 +7623,7 @@ var init_ax_cli_provider = __esm({
 init_esm_shims();
 init_logger();
 
-// src/utils/performance.ts
+// src/shared/profiling/performance.ts
 init_esm_shims();
 var PerformanceTracker = class {
   marks = /* @__PURE__ */ new Map();
@@ -7712,14 +7718,14 @@ var globalTracker = new PerformanceTracker(
   process.env.AX_PROFILE === "true"
 );
 
-// src/utils/version.ts
+// src/shared/helpers/version.ts
 init_esm_shims();
 var __dirname2 = dirname(fileURLToPath(import.meta.url));
 function getVersion() {
   try {
     const possiblePaths = [
-      join(__dirname2, "../../package.json"),
-      // From src/utils
+      join(__dirname2, "../../../package.json"),
+      // From src/shared/helpers
       join(__dirname2, "../package.json")
       // From dist
     ];
@@ -7746,10 +7752,10 @@ init_process_manager();
 // src/cli/commands/cache.ts
 init_esm_shims();
 
-// src/core/response-cache.ts
+// src/core/cache/response-cache.ts
 init_esm_shims();
 init_logger();
-init_db_factory();
+init_factory();
 var LRUCache = class {
   cache;
   maxSize;
@@ -8128,7 +8134,7 @@ var ResponseCache = class {
   }
 };
 
-// src/core/config.ts
+// src/core/config/loader.ts
 init_esm_shims();
 init_path_utils();
 
@@ -8504,11 +8510,11 @@ var DEFAULT_CONFIG = {
   }
 };
 
-// src/core/config.ts
+// src/core/config/loader.ts
 init_errors();
 init_logger();
 
-// src/utils/deep-merge.ts
+// src/shared/helpers/deep-merge.ts
 init_esm_shims();
 function deepMerge(defaults, user) {
   if (user === null || user === void 0) {
@@ -8648,7 +8654,7 @@ function isNonNegativeInteger(value) {
   return typeof value === "number" && Number.isInteger(value) && value >= 0;
 }
 
-// src/core/cache.ts
+// src/core/cache/cache.ts
 init_esm_shims();
 init_logger();
 var TTLCache = class {
@@ -8933,7 +8939,7 @@ var TTLCache = class {
   }
 };
 
-// src/utils/resource-calculator.ts
+// src/shared/helpers/resource-calculator.ts
 init_esm_shims();
 function getSystemResources() {
   const totalMemory = os2.totalmem();
@@ -8975,13 +8981,13 @@ function calculateMaxConcurrentAgents(staticLimit) {
   };
 }
 
-// src/config.generated.ts
+// src/core/config/generated.ts
 init_esm_shims();
 var PRECOMPILED_CONFIG = {
   "providers": {
     "claude-code": {
       "enabled": true,
-      "priority": 3,
+      "priority": 1,
       "timeout": 27e5,
       "command": "claude",
       "healthCheck": {
@@ -9041,7 +9047,7 @@ var PRECOMPILED_CONFIG = {
     },
     "openai": {
       "enabled": true,
-      "priority": 1,
+      "priority": 3,
       "timeout": 27e5,
       "command": "codex",
       "healthCheck": {
@@ -9279,10 +9285,10 @@ var PRECOMPILED_CONFIG = {
     "enableFreeTierPrioritization": true,
     "enableWorkloadAwareRouting": true
   },
-  "version": "11.2.5"
+  "version": "11.2.7"
 };
 
-// src/core/config-schemas.ts
+// src/core/config/schemas.ts
 init_esm_shims();
 z.enum([
   "claude",
@@ -9583,7 +9589,7 @@ function safeValidateConfig(config) {
 }
 automatosXConfigSchema.partial().passthrough();
 
-// src/core/config.ts
+// src/core/config/loader.ts
 var configCache = new TTLCache({
   ttl: 6e4,
   // 60 seconds
@@ -9617,7 +9623,7 @@ async function loadConfigUncached(projectDir) {
         logger.warn("\u26A0\uFE0F  DEPRECATED: automatosx.config.{yaml,json} is deprecated.");
         logger.warn("   Please rename to ax.config.{yaml,json} for future compatibility.");
         logger.warn("   Migration: mv automatosx.config.json ax.config.json");
-        logger.warn("   Support will be removed in v10.0.0.");
+        logger.warn("   Support will be removed in a future version.");
       }
       return await loadConfigFile(configPath);
     }
@@ -10159,7 +10165,7 @@ async function saveConfigFile(path7, config) {
   }
 }
 
-// src/utils/message-formatter.ts
+// src/shared/logging/message-formatter.ts
 init_esm_shims();
 function formatSuccess(message, options = {}) {
   const { colors = true, icon = true } = options;
@@ -10431,7 +10437,7 @@ var cacheCommand = {
 init_esm_shims();
 init_logger();
 
-// src/utils/error-formatter.ts
+// src/shared/errors/error-formatter.ts
 init_esm_shims();
 init_errors();
 function formatError(error, options = {}) {
@@ -10485,7 +10491,7 @@ function printError(error, options = {}) {
   console.error(formatted);
 }
 
-// src/utils/config-validator.ts
+// src/core/config/validator.ts
 init_esm_shims();
 function validateConfig2(config) {
   const errors = [];
@@ -10902,7 +10908,7 @@ var configCommand = {
       } else if (process.env.AUTOMATOSX_CONFIG_PATH) {
         configPath = process.env.AUTOMATOSX_CONFIG_PATH;
       } else {
-        const projectConfig = resolve(process.cwd(), "automatosx.config.json");
+        const projectConfig = resolve(process.cwd(), "ax.config.json");
         const hiddenConfig = resolve(process.cwd(), ".automatosx", "config.json");
         const fs7 = await import('fs');
         if (fs7.existsSync(projectConfig)) {
@@ -10990,7 +10996,7 @@ async function validateConfigFile(config, verbose) {
 async function resetConfig(path7, verbose) {
   const { createRequire } = await import('module');
   const require2 = createRequire(import.meta.url);
-  let version = "5.8.6";
+  let version = "11.2.6";
   try {
     const packageJson = require2("../../../package.json");
     version = packageJson.version;
@@ -11137,7 +11143,7 @@ function setNestedValue(obj, path7, value) {
 init_esm_shims();
 init_logger();
 
-// src/utils/prompt-helper.ts
+// src/shared/helpers/prompt-helper.ts
 init_esm_shims();
 var PromptHelper = class {
   rl = null;
@@ -11165,9 +11171,9 @@ var PromptHelper = class {
    */
   async question(query) {
     const rl = this.ensureInterface();
-    return new Promise((resolve12) => {
+    return new Promise((resolve13) => {
       rl.question(query, (answer) => {
-        resolve12(answer.trim());
+        resolve13(answer.trim());
       });
     });
   }
@@ -11257,6 +11263,29 @@ Your choice${defaultSuffix}: `,
   }
 };
 
+// src/shared/helpers/package-root.ts
+init_esm_shims();
+var cachedPackageRoot = null;
+function getPackageRoot(startDir) {
+  if (cachedPackageRoot && true) {
+    return cachedPackageRoot;
+  }
+  const __filename3 = fileURLToPath(import.meta.url);
+  const __dirname4 = dirname(__filename3);
+  let current = __dirname4;
+  const root = "/";
+  while (current !== root) {
+    if (existsSync(join(current, "package.json"))) {
+      {
+        cachedPackageRoot = current;
+      }
+      return current;
+    }
+    current = dirname(current);
+  }
+  return __dirname4;
+}
+
 // src/integrations/claude-code/setup-helper.ts
 init_esm_shims();
 init_logger();
@@ -11822,7 +11851,7 @@ var AgentNotFoundError = class extends Error {
 // src/agents/profile-loader.ts
 init_logger();
 
-// src/utils/performance-markers.ts
+// src/shared/profiling/performance-markers.ts
 init_esm_shims();
 init_logger();
 var PERFORMANCE_THRESHOLDS = {
@@ -12124,16 +12153,6 @@ function safeValidateAgentProfile(profile) {
 agentProfileSchema.partial();
 
 // src/agents/profile-loader.ts
-var __filename2 = fileURLToPath(import.meta.url);
-var __dirname3 = dirname(__filename2);
-function getPackageRoot() {
-  const currentDir = __dirname3;
-  if (currentDir.includes("/dist")) {
-    return join(currentDir, "..");
-  } else {
-    return join(currentDir, "../..");
-  }
-}
 var ProfileLoader = class {
   profilesDir;
   fallbackProfilesDir;
@@ -13181,19 +13200,6 @@ var ProviderDetector = class _ProviderDetector {
 };
 
 // src/cli/commands/setup.ts
-var __filename3 = fileURLToPath(import.meta.url);
-var __dirname4 = dirname(__filename3);
-function getPackageRoot2() {
-  let current = __dirname4;
-  const root = "/";
-  while (current !== root) {
-    if (existsSync(join(current, "package.json"))) {
-      return current;
-    }
-    current = dirname(current);
-  }
-  throw new Error("Could not find package root (no package.json found)");
-}
 var setupCommand = {
   command: "setup [path]",
   describe: "Set up AutomatosX in current or specified directory",
@@ -13223,8 +13229,8 @@ var setupCommand = {
     const projectDir = resolve(argv.path || ".");
     const automatosxDir = join(projectDir, ".automatosx");
     const configPath = join(projectDir, "ax.config.json");
-    const packageRoot = getPackageRoot2();
-    let version = "5.1.2";
+    const packageRoot = getPackageRoot();
+    let version = "11.2.6";
     try {
       const packageJson = JSON.parse(
         await import('fs/promises').then((fs7) => fs7.readFile(join(packageRoot, "package.json"), "utf-8"))
@@ -13589,7 +13595,7 @@ async function validateEnvironment(packageRoot) {
   const requiredDirs = [
     "examples/agents",
     "examples/abilities",
-    "examples/templates",
+    "examples/workflows",
     "examples/teams"
   ];
   const errors = [];
@@ -13667,7 +13673,7 @@ async function copyExampleAbilities(baseDir, packageRoot) {
 }
 async function copyExampleTemplates(baseDir, packageRoot) {
   return copyExampleFiles(baseDir, packageRoot, {
-    exampleDir: "templates",
+    exampleDir: "workflows",
     targetDir: "templates",
     extension: ".yaml",
     resourceName: "template"
@@ -13849,7 +13855,7 @@ async function createDefaultConfig(configPath, force, version) {
   await writeFile(configPath, content, "utf-8");
 }
 async function setupClaudeIntegration(projectDir, packageRoot) {
-  const examplesBaseDir = join(packageRoot, "examples/claude");
+  const examplesBaseDir = join(packageRoot, "examples/providers/claude");
   const claudeDir = join(projectDir, ".claude");
   const mcpDir = join(claudeDir, "mcp");
   await mkdir(mcpDir, { recursive: true });
@@ -13898,7 +13904,7 @@ async function initializeGitRepository(projectDir) {
       return true;
     }
     const { spawn: spawn9 } = await import('child_process');
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve13, reject) => {
       const child = spawn9("git", ["init"], {
         cwd: projectDir,
         stdio: "pipe",
@@ -13914,7 +13920,7 @@ async function initializeGitRepository(projectDir) {
           reject(new Error(`git init failed with code ${code}: ${stderr}`));
         } else {
           logger.info("Git repository set up successfully");
-          resolve12();
+          resolve13();
         }
       });
       child.on("error", (error) => {
@@ -16060,7 +16066,7 @@ var configureCommand = {
       }
       console.log(chalk5.bold.cyan("\n\u2728 AutomatosX Setup Wizard\n"));
       console.log(chalk5.dim("This wizard will help you configure the OpenAI integration mode.\n"));
-      const configPath = resolve(process.cwd(), "automatosx.config.json");
+      const configPath = resolve(process.cwd(), "ax.config.json");
       const config = await loadConfig(configPath);
       if (!config.providers.openai) {
         console.log(chalk5.red("\n\u274C OpenAI provider not found in configuration\n"));
@@ -16350,7 +16356,7 @@ var MCP_PROTOCOL_VERSION = "2024-11-05";
 // src/mcp/server.ts
 init_logger();
 
-// src/core/router.ts
+// src/core/router/router.ts
 init_esm_shims();
 init_logger();
 init_errors();
@@ -16707,7 +16713,7 @@ async function getProviderLimitManager(stateDirectory) {
   return ProviderLimitManager.getInstance(stateDirectory);
 }
 
-// src/core/routing-strategy.ts
+// src/core/router/routing-strategy.ts
 init_esm_shims();
 
 // src/types/routing.ts
@@ -16784,7 +16790,7 @@ var ROUTING_STRATEGIES = {
 init_esm_shims();
 init_logger();
 
-// src/utils/statistics.ts
+// src/shared/helpers/statistics.ts
 init_esm_shims();
 function getPercentileIndex(length, percentile) {
   if (length === 0) {
@@ -17230,7 +17236,7 @@ function getProviderMetricsTracker() {
   return globalMetricsTracker;
 }
 
-// src/core/routing-strategy.ts
+// src/core/router/routing-strategy.ts
 init_logger();
 var RoutingStrategyManager = class extends EventEmitter {
   strategy;
@@ -17513,7 +17519,7 @@ function getRoutingStrategyManager(config) {
   return globalRoutingStrategy;
 }
 
-// src/core/circuit-breaker.ts
+// src/core/router/circuit-breaker.ts
 init_esm_shims();
 init_logger();
 var DEFAULT_CONFIG2 = {
@@ -17676,7 +17682,7 @@ var CircuitBreaker = class {
   }
 };
 
-// src/core/router-trace-logger.ts
+// src/core/router/trace-logger.ts
 init_esm_shims();
 init_logger();
 var RouterTraceLogger = class {
@@ -18049,7 +18055,7 @@ async function getProviderSession(workspacePath) {
   return providerSessionInstances.get(path7);
 }
 
-// src/core/router.ts
+// src/core/router/router.ts
 var Router = class {
   providers;
   fallbackEnabled;
@@ -18229,23 +18235,29 @@ var Router = class {
         const isCircuitOpen = this.circuitBreaker.isOpen(provider.name);
         healthMultipliers.set(provider.name, isCircuitOpen ? 0.5 : 1);
       }
-      const scores = await getProviderMetricsTracker().getAllScores(
-        providerNames,
-        strategyManager.getWeights(),
-        healthMultipliers
-      );
-      if (scores.length > 0) {
-        const scoreMap = new Map(scores.map((s) => [s.provider, s.totalScore]));
-        const originalOrder = providersToTry.map((p) => p.name);
-        providersToTry = [...providersToTry].sort((a, b) => {
-          const scoreA = scoreMap.get(a.name) ?? 0;
-          const scoreB = scoreMap.get(b.name) ?? 0;
-          return scoreB - scoreA;
-        });
-        logger.debug("Provider order after multi-factor routing", {
-          original: originalOrder,
-          reordered: providersToTry.map((p) => p.name),
-          scores: Object.fromEntries(scoreMap)
+      try {
+        const scores = await getProviderMetricsTracker().getAllScores(
+          providerNames,
+          strategyManager.getWeights(),
+          healthMultipliers
+        );
+        if (scores.length > 0) {
+          const scoreMap = new Map(scores.map((s) => [s.provider, s.totalScore]));
+          const originalOrder = providersToTry.map((p) => p.name);
+          providersToTry = [...providersToTry].sort((a, b) => {
+            const scoreA = scoreMap.get(a.name) ?? 0;
+            const scoreB = scoreMap.get(b.name) ?? 0;
+            return scoreB - scoreA;
+          });
+          logger.debug("Provider order after multi-factor routing", {
+            original: originalOrder,
+            reordered: providersToTry.map((p) => p.name),
+            scores: Object.fromEntries(scoreMap)
+          });
+        }
+      } catch (scoringError) {
+        logger.warn("Multi-factor scoring failed, using priority order", {
+          error: scoringError.message
         });
       }
     }
@@ -18853,10 +18865,10 @@ Run 'ax doctor' to diagnose provider setup.` : "";
   }
 };
 
-// src/core/lazy-memory-manager.ts
+// src/core/memory/lazy-manager.ts
 init_esm_shims();
 
-// src/core/memory-manager.ts
+// src/core/memory/manager.ts
 init_esm_shims();
 
 // src/types/memory.ts
@@ -18870,12 +18882,12 @@ var MemoryError = class extends Error {
   }
 };
 
-// src/core/memory-manager.ts
+// src/core/memory/manager.ts
 init_logger();
 init_path_utils();
-init_db_factory();
+init_factory();
 
-// src/core/memory-manager-schemas.ts
+// src/core/memory/schemas.ts
 init_esm_shims();
 var MemoryMetadataSchema = z.object({
   type: z.string().min(1).max(100),
@@ -19151,7 +19163,7 @@ var MemoryCleanupStrategies = class {
   }
 };
 
-// src/core/memory-manager.ts
+// src/core/memory/manager.ts
 var MemoryManager = class _MemoryManager {
   // v5.6.18: Performance optimization - Static regex for FTS5 query sanitization
   // Moving these to class-level constants reduces 90% sanitization time
@@ -20124,8 +20136,11 @@ var MemoryManager = class _MemoryManager {
       }
       const tempPath = `${this.config.dbPath}.restore.tmp`;
       const srcDb = new Database2(srcPath, { readonly: true });
-      await srcDb.backup(tempPath);
-      srcDb.close();
+      try {
+        await srcDb.backup(tempPath);
+      } finally {
+        srcDb.close();
+      }
       try {
         const tempDb = new Database2(tempPath, { readonly: true });
         tempDb.prepare("SELECT COUNT(*) FROM memory_entries").get();
@@ -20408,7 +20423,7 @@ var MemoryManager = class _MemoryManager {
   }
 };
 
-// src/core/lazy-memory-manager.ts
+// src/core/memory/lazy-manager.ts
 init_logger();
 var LazyMemoryManager = class {
   manager;
@@ -20614,7 +20629,7 @@ var LazyMemoryManager = class {
   }
 };
 
-// src/core/session-manager.ts
+// src/core/session/manager.ts
 init_esm_shims();
 
 // src/types/orchestration.ts
@@ -20637,11 +20652,11 @@ var SessionError = class extends Error {
   }
 };
 
-// src/core/session-manager.ts
+// src/core/session/manager.ts
 init_logger();
 init_path_utils();
 
-// src/core/session-manager-schemas.ts
+// src/core/session/schemas.ts
 init_esm_shims();
 var SessionTaskInfoSchema = z.object({
   id: z.string().min(1).max(200),
@@ -20684,7 +20699,7 @@ z.object({
   offset: z.number().int().nonnegative().optional()
 }).strict();
 
-// src/core/session-manager.ts
+// src/core/session/manager.ts
 var SessionManager = class _SessionManager {
   /** Active sessions (in-memory, keyed by session ID) */
   activeSessions = /* @__PURE__ */ new Map();
@@ -22713,23 +22728,13 @@ var ContextManager = class {
 // src/agents/abilities-manager.ts
 init_esm_shims();
 init_logger();
-var __filename4 = fileURLToPath(import.meta.url);
-var __dirname5 = dirname(__filename4);
-function getPackageRoot3() {
-  const currentDir = __dirname5;
-  if (currentDir.includes("/dist")) {
-    return join(currentDir, "..");
-  } else {
-    return join(currentDir, "../..");
-  }
-}
 var AbilitiesManager = class {
   abilitiesDir;
   fallbackAbilitiesDir;
   cache;
   constructor(abilitiesDir, fallbackAbilitiesDir) {
     this.abilitiesDir = abilitiesDir;
-    this.fallbackAbilitiesDir = fallbackAbilitiesDir || join(getPackageRoot3(), "examples/abilities");
+    this.fallbackAbilitiesDir = fallbackAbilitiesDir || join(getPackageRoot(), "examples/abilities");
     this.cache = new TTLCache({
       maxEntries: 50,
       ttl: 6e5,
@@ -22845,9 +22850,10 @@ ${content}`);
 // src/mcp/server.ts
 init_path_resolver();
 
-// src/core/conversation-context-store.ts
+// src/core/session/context-store.ts
 init_esm_shims();
 init_logger();
+var VALID_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
 var ConversationContextStore = class {
   storePath;
   maxEntries;
@@ -22857,6 +22863,33 @@ var ConversationContextStore = class {
     this.maxEntries = options.maxEntries ?? 100;
     this.ttlMs = options.ttlMs ?? 24 * 60 * 60 * 1e3;
   }
+  /**
+   * Validate and sanitize context ID to prevent path traversal attacks
+   *
+   * SECURITY: This is critical to prevent path traversal vulnerabilities.
+   * A malicious ID like "../../.ssh/id_rsa" could read/write/delete files
+   * outside the context store directory.
+   *
+   * @param id - Context ID to validate
+   * @returns Sanitized file path within storePath
+   * @throws Error if ID is invalid or path escapes storePath
+   */
+  validateAndResolvePath(id) {
+    if (!VALID_ID_PATTERN.test(id)) {
+      throw new Error(
+        `Invalid context ID: "${id}". IDs must be 1-64 characters, alphanumeric with underscores/hyphens only.`
+      );
+    }
+    const filePath = join(this.storePath, `${id}.json`);
+    const resolvedPath = resolve(filePath);
+    const resolvedStorePath = resolve(this.storePath);
+    const relativePath = relative(resolvedStorePath, resolvedPath);
+    if (relativePath.startsWith("..") || relativePath.includes("/..") || relativePath.includes("\\..")) {
+      logger.error("[ContextStore] Path traversal attempt blocked", { id, resolvedPath });
+      throw new Error(`Security violation: context ID "${id}" would escape store directory`);
+    }
+    return resolvedPath;
+  }
   /**
    * Initialize store (create directory if needed)
    */
@@ -22874,7 +22907,7 @@ var ConversationContextStore = class {
    */
   async save(context) {
     await this.initialize();
-    const filePath = join(this.storePath, `${context.id}.json`);
+    const filePath = this.validateAndResolvePath(context.id);
     const data = JSON.stringify(context, null, 2);
     try {
       await writeFile(filePath, data, "utf-8");
@@ -22893,7 +22926,7 @@ var ConversationContextStore = class {
    * Get conversation context by ID
    */
   async get(id) {
-    const filePath = join(this.storePath, `${id}.json`);
+    const filePath = this.validateAndResolvePath(id);
     try {
       const data = await readFile(filePath, "utf-8");
       const context = JSON.parse(data);
@@ -22947,7 +22980,7 @@ var ConversationContextStore = class {
    * Delete context entry
    */
   async delete(id) {
-    const filePath = join(this.storePath, `${id}.json`);
+    const filePath = this.validateAndResolvePath(id);
     try {
       await unlink(filePath);
       logger.info("[ContextStore] Context deleted", { id });
@@ -23640,7 +23673,7 @@ var TimeoutManager = class {
   }
 };
 
-// src/utils/timeout-validator.ts
+// src/shared/validation/timeout-validator.ts
 init_esm_shims();
 init_errors();
 var MIN_WARNING_THRESHOLD2 = 0.5;
@@ -25331,7 +25364,7 @@ ${context.task}`;
    * @param signal - Optional AbortSignal to cancel the sleep
    */
   sleep(ms, signal) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       if (signal?.aborted) {
         reject(new Error("Sleep cancelled"));
         return;
@@ -25341,7 +25374,7 @@ ${context.task}`;
         if (abortHandler && signal) {
           signal.removeEventListener("abort", abortHandler);
         }
-        resolve12();
+        resolve13();
       }, ms);
       if (signal) {
         abortHandler = () => {
@@ -26759,10 +26792,10 @@ var McpClient = class extends EventEmitter {
       return;
     }
     if (this.state.status === "connecting") {
-      return new Promise((resolve12, reject) => {
+      return new Promise((resolve13, reject) => {
         const onConnected = () => {
           this.off("error", onError);
-          resolve12();
+          resolve13();
         };
         const onError = (err) => {
           this.off("connected", onConnected);
@@ -26929,14 +26962,14 @@ var McpClient = class extends EventEmitter {
       method,
       params
     };
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const timeoutMs = timeout ?? this.config.timeout;
       const timeoutHandle = setTimeout(() => {
         this.pendingRequests.delete(id);
         reject(new Error(`Request timed out after ${timeoutMs}ms: ${method}`));
       }, timeoutMs);
       this.pendingRequests.set(id, {
-        resolve: resolve12,
+        resolve: resolve13,
         reject,
         timeout: timeoutHandle
       });
@@ -27394,15 +27427,15 @@ var McpClientPool = class extends EventEmitter {
     }
   }
   async waitForConnection(provider, pool) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const timeout = setTimeout(() => {
-        const index = pool.waitQueue.findIndex((w) => w.resolve === resolve12);
+        const index = pool.waitQueue.findIndex((w) => w.resolve === resolve13);
         if (index !== -1) {
           pool.waitQueue.splice(index, 1);
         }
         reject(new ConnectionTimeoutError(provider, this.config.acquireTimeoutMs));
       }, this.config.acquireTimeoutMs);
-      pool.waitQueue.push({ resolve: resolve12, reject, timeout });
+      pool.waitQueue.push({ resolve: resolve13, reject, timeout });
       logger.debug("[MCP Pool] Waiting for connection", {
         provider,
         queuePosition: pool.waitQueue.length
@@ -28879,6 +28912,8 @@ var McpServer = class _McpServer {
   initializationPromise = null;
   initializationMutex = new Mutex();
   // BUG FIX (v9.0.1): Prevent concurrent initialization
+  stdinMutex = new Mutex();
+  // BUG FIX: Prevent race conditions in stdin message processing
   version;
   ajv;
   compiledValidators = /* @__PURE__ */ new Map();
@@ -29254,7 +29289,15 @@ var McpServer = class _McpServer {
    * v10.5.0: Capture clientInfo for Smart Routing
    */
   async handleInitialize(request, id) {
-    const clientInfo = request.params.clientInfo;
+    const clientInfo = request.params?.clientInfo;
+    if (!clientInfo || typeof clientInfo.name !== "string" || typeof clientInfo.version !== "string") {
+      logger.warn("[MCP Server] Invalid initialize request: missing or invalid clientInfo", {
+        hasParams: !!request.params,
+        hasClientInfo: !!clientInfo,
+        clientInfo
+      });
+      return this.createErrorResponse(id, -32600 /* InvalidRequest */, "Invalid initialize request: clientInfo with name and version is required");
+    }
     logger.info("[MCP Server] Initialize request received (fast handshake mode)", { clientInfo });
     this.session = {
       clientInfo: {
@@ -29380,67 +29423,77 @@ ${json}`;
     logger.info("[MCP Server] Starting stdio JSON-RPC server...");
     let buffer = "";
     let contentLength = null;
-    process.stdin.on("data", async (chunk) => {
-      buffer += chunk.toString("utf-8");
-      if (buffer.length > STDIO_MAX_BUFFER_SIZE) {
-        logger.error("[MCP Server] Buffer size exceeded maximum", {
-          bufferSize: buffer.length,
-          maxSize: STDIO_MAX_BUFFER_SIZE
-        });
-        buffer = "";
-        contentLength = null;
-        return;
-      }
-      let iterations = 0;
-      while (iterations < STDIO_MAX_ITERATIONS) {
-        iterations++;
-        if (contentLength === null) {
-          const delimiter2 = buffer.includes("\r\n\r\n") ? "\r\n\r\n" : buffer.includes("\n\n") ? "\n\n" : null;
-          if (!delimiter2) break;
-          const headerEndIndex = buffer.indexOf(delimiter2);
-          const headerBlock = buffer.slice(0, headerEndIndex);
-          for (const line of headerBlock.split(delimiter2 === "\r\n\r\n" ? "\r\n" : "\n")) {
-            const [key, value] = line.split(":", 2).map((s) => s.trim());
-            if (key && key.toLowerCase() === "content-length" && value) {
-              contentLength = parseInt(value, 10);
-              if (isNaN(contentLength) || contentLength <= 0 || contentLength > STDIO_MAX_MESSAGE_SIZE) {
-                logger.error("[MCP Server] Invalid Content-Length", { contentLength });
-                buffer = buffer.slice(headerEndIndex + delimiter2.length);
-                contentLength = null;
-                continue;
+    process.stdin.on("data", (chunk) => {
+      void this.stdinMutex.runExclusive(async () => {
+        buffer += chunk.toString("utf-8");
+        if (buffer.length > STDIO_MAX_BUFFER_SIZE) {
+          logger.error("[MCP Server] Buffer size exceeded maximum", {
+            bufferSize: buffer.length,
+            maxSize: STDIO_MAX_BUFFER_SIZE
+          });
+          buffer = "";
+          contentLength = null;
+          return;
+        }
+        let iterations = 0;
+        while (iterations < STDIO_MAX_ITERATIONS) {
+          iterations++;
+          if (contentLength === null) {
+            const delimiter2 = buffer.includes("\r\n\r\n") ? "\r\n\r\n" : buffer.includes("\n\n") ? "\n\n" : null;
+            if (!delimiter2) break;
+            const headerEndIndex = buffer.indexOf(delimiter2);
+            const headerBlock = buffer.slice(0, headerEndIndex);
+            for (const line of headerBlock.split(delimiter2 === "\r\n\r\n" ? "\r\n" : "\n")) {
+              const [key, value] = line.split(":", 2).map((s) => s.trim());
+              if (key && key.toLowerCase() === "content-length" && value) {
+                contentLength = parseInt(value, 10);
+                if (isNaN(contentLength) || contentLength <= 0 || contentLength > STDIO_MAX_MESSAGE_SIZE) {
+                  logger.error("[MCP Server] Invalid Content-Length", { contentLength });
+                  this.writeResponse({
+                    jsonrpc: "2.0",
+                    id: null,
+                    error: {
+                      code: -32600 /* InvalidRequest */,
+                      message: `Invalid Content-Length: ${contentLength}`
+                    }
+                  });
+                  buffer = buffer.slice(headerEndIndex + delimiter2.length);
+                  contentLength = null;
+                  continue;
+                }
               }
             }
-          }
-          if (contentLength === null) {
-            logger.error("[MCP Server] No Content-Length header found");
+            if (contentLength === null) {
+              logger.error("[MCP Server] No Content-Length header found");
+              buffer = buffer.slice(headerEndIndex + delimiter2.length);
+              continue;
+            }
             buffer = buffer.slice(headerEndIndex + delimiter2.length);
-            continue;
           }
-          buffer = buffer.slice(headerEndIndex + delimiter2.length);
-        }
-        if (Buffer.byteLength(buffer, "utf-8") < contentLength) break;
-        const messageBuffer = Buffer.from(buffer, "utf-8");
-        const jsonMessage = messageBuffer.slice(0, contentLength).toString("utf-8");
-        buffer = messageBuffer.slice(contentLength).toString("utf-8");
-        contentLength = null;
-        try {
-          const request = JSON.parse(jsonMessage);
-          logger.debug("[MCP Server] Request received", { method: request.method, id: request.id });
-          const response = await this.handleRequest(request);
-          if (request.id !== void 0 && request.id !== null) {
-            this.writeResponse(response);
+          if (Buffer.byteLength(buffer, "utf-8") < contentLength) break;
+          const messageBuffer = Buffer.from(buffer, "utf-8");
+          const jsonMessage = messageBuffer.slice(0, contentLength).toString("utf-8");
+          buffer = messageBuffer.slice(contentLength).toString("utf-8");
+          contentLength = null;
+          try {
+            const request = JSON.parse(jsonMessage);
+            logger.debug("[MCP Server] Request received", { method: request.method, id: request.id });
+            const response = await this.handleRequest(request);
+            if (request.id !== void 0 && request.id !== null) {
+              this.writeResponse(response);
+            }
+          } catch (error) {
+            logger.error("[MCP Server] Failed to parse or handle request", { jsonMessage, error });
+            this.writeResponse({ jsonrpc: "2.0", id: null, error: { code: -32700 /* ParseError */, message: "Parse error: Invalid JSON" } });
           }
-        } catch (error) {
-          logger.error("[MCP Server] Failed to parse or handle request", { jsonMessage, error });
-          this.writeResponse({ jsonrpc: "2.0", id: null, error: { code: -32700 /* ParseError */, message: "Parse error: Invalid JSON" } });
         }
-      }
-      if (iterations >= STDIO_MAX_ITERATIONS) {
-        logger.warn("[MCP Server] Maximum iterations reached in message processing", {
-          iterations,
-          bufferSize: buffer.length
-        });
-      }
+        if (iterations >= STDIO_MAX_ITERATIONS) {
+          logger.warn("[MCP Server] Maximum iterations reached in message processing", {
+            iterations,
+            bufferSize: buffer.length
+          });
+        }
+      });
     });
     const shutdown = (reason) => {
       logger.info(`[MCP Server] ${reason}`);
@@ -30331,7 +30384,7 @@ var UnifiedMCPManager = class {
       };
       this.setupProcessHandlers(config.name, childProcess, serverProcess);
       this.servers.set(config.name, serverProcess);
-      await new Promise((resolve12) => setTimeout(resolve12, 100));
+      await new Promise((resolve13) => setTimeout(resolve13, 100));
       if (childProcess.killed || childProcess.exitCode !== null) {
         throw new Error(
           `Server process exited immediately with code ${childProcess.exitCode}`
@@ -30354,6 +30407,14 @@ var UnifiedMCPManager = class {
         name: config.name,
         error: error.message
       });
+      const serverProcess = this.servers.get(config.name);
+      if (serverProcess?.process && !serverProcess.process.killed) {
+        try {
+          serverProcess.process.kill("SIGTERM");
+        } catch {
+        }
+      }
+      this.servers.delete(config.name);
       throw error;
     }
   }
@@ -30434,7 +30495,7 @@ var UnifiedMCPManager = class {
   async restartServer(serverName) {
     logger.info("UnifiedMCPManager: Restarting server", { name: serverName });
     await this.stopServer(serverName);
-    await new Promise((resolve12) => setTimeout(resolve12, 1e3));
+    await new Promise((resolve13) => setTimeout(resolve13, 1e3));
     const serverConfig = this.config.servers.find((s) => s.name === serverName);
     if (!serverConfig) {
       throw new Error(`Server configuration not found: ${serverName}`);
@@ -30681,31 +30742,34 @@ var UnifiedMCPManager = class {
         this.pendingRestarts.set(serverName, restartTimer);
       }
     });
-    if (this.config.logging?.logServerOutput) {
-      if (process2.stdout) {
-        process2.stdout.on("data", (data) => {
+    const shouldLog = this.config.logging?.logServerOutput;
+    if (process2.stdout) {
+      process2.stdout.on("data", (data) => {
+        if (shouldLog) {
           logger.debug(`MCP[${serverName}] stdout:`, {
             data: data.toString().trim()
           });
-        });
-      }
-      if (process2.stderr) {
-        process2.stderr.on("data", (data) => {
+        }
+      });
+    }
+    if (process2.stderr) {
+      process2.stderr.on("data", (data) => {
+        if (shouldLog) {
           logger.debug(`MCP[${serverName}] stderr:`, {
             data: data.toString().trim()
           });
-        });
-      }
+        }
+      });
     }
   }
   /**
    * Wait for process to exit
    */
   async waitForExit(process2, timeoutMs) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const exitListener = () => {
         clearTimeout(timeout);
-        resolve12();
+        resolve13();
       };
       const timeout = setTimeout(() => {
         process2.removeListener("exit", exitListener);
@@ -30977,15 +31041,6 @@ var KNOWN_MCP_SERVERS = {
     description: "Persistent memory storage",
     tags: ["memory", "storage", "persistence"]
   },
-  brave: {
-    command: "npx",
-    args: ["-y", "@modelcontextprotocol/server-brave-search"],
-    description: "Brave Search API integration",
-    tags: ["search", "web", "brave"],
-    env: {
-      // BRAVE_API_KEY should be provided by user
-    }
-  },
   puppeteer: {
     command: "npx",
     args: ["-y", "@modelcontextprotocol/server-puppeteer"],
@@ -31030,14 +31085,14 @@ var statusCommand2 = {
     return yargs2.option("provider", {
       alias: "p",
       type: "string",
-      description: "Filter by provider (claude, gemini, codex, grok)",
-      choices: ["claude", "gemini", "codex", "grok"]
+      description: "Filter by provider (claude, gemini, codex)",
+      choices: ["claude", "gemini", "codex"]
     }).option("json", {
       alias: "j",
       type: "boolean",
       description: "Output as JSON",
       default: false
-    }).example("$0 mcp status", "Show all MCP servers").example("$0 mcp status --provider grok", "Show Grok MCP servers only").example("$0 mcp status --json", "Output as JSON");
+    }).example("$0 mcp status", "Show all MCP servers").example("$0 mcp status --provider gemini", "Show Gemini MCP servers only").example("$0 mcp status --json", "Output as JSON");
   },
   handler: async (argv) => {
     try {
@@ -31059,7 +31114,7 @@ var statusCommand2 = {
         if (allStatuses.length === 0) {
           console.log(chalk5.yellow("No MCP servers running"));
           console.log(chalk5.gray("\nTo enable MCP servers, configure them in your provider YAML files."));
-          console.log(chalk5.gray("See: examples/providers/grok-with-mcp.yaml\n"));
+          console.log(chalk5.gray("See: examples/providers/ for MCP configuration templates\n"));
           return;
         }
         const table = new Table({
@@ -31107,7 +31162,7 @@ var healthCommand = {
       alias: "p",
       type: "string",
       description: "Filter by provider",
-      choices: ["claude", "gemini", "codex", "grok"]
+      choices: ["claude", "gemini", "codex"]
     }).option("json", {
       alias: "j",
       type: "boolean",
@@ -31186,13 +31241,13 @@ var toolsCommand = {
       alias: "p",
       type: "string",
       description: "Filter by provider",
-      choices: ["claude", "gemini", "codex", "grok"]
+      choices: ["claude", "gemini", "codex"]
     }).option("json", {
       alias: "j",
       type: "boolean",
       description: "Output as JSON",
       default: false
-    }).example("$0 mcp tools", "List all available tools").example("$0 mcp tools --provider grok", "List Grok tools only");
+    }).example("$0 mcp tools", "List all available tools").example("$0 mcp tools --provider gemini", "List Gemini tools only");
   },
   handler: async (argv) => {
     try {
@@ -31328,7 +31383,7 @@ function checkIfInstalled(packageName) {
 // src/cli/commands/memory.ts
 init_esm_shims();
 
-// src/utils/progress.ts
+// src/shared/logging/progress.ts
 init_esm_shims();
 var ProgressIndicator = class {
   spinner = null;
@@ -31760,8 +31815,8 @@ var deleteCommand = {
           input: process.stdin,
           output: process.stdout
         });
-        const answer = await new Promise((resolve12) => {
-          rl.question(chalk5.yellow("\nAre you sure you want to delete this entry? (y/N): "), resolve12);
+        const answer = await new Promise((resolve13) => {
+          rl.question(chalk5.yellow("\nAre you sure you want to delete this entry? (y/N): "), resolve13);
         });
         rl.close();
         if (answer.toLowerCase() !== "y" && answer.toLowerCase() !== "yes") {
@@ -32227,7 +32282,7 @@ var AgentSelector = class {
 // src/core/stage-execution-controller.ts
 init_esm_shims();
 
-// src/core/checkpoint-manager.ts
+// src/core/session/checkpoint.ts
 init_esm_shims();
 var CURRENT_SCHEMA_VERSION = "1.0.0";
 var CheckpointValidationError = class extends Error {
@@ -32721,7 +32776,7 @@ ${this.config.locale === "zh" ? "\u8ACB\u9078\u64C7" : "Select"}${defaultDisplay
   async promptWithTimeout(prompt, parser, defaultValue) {
     const rl = this.getReadline();
     const template = this.getTemplate();
-    return new Promise((resolve12) => {
+    return new Promise((resolve13) => {
       let resolved = false;
       let timeoutHandle;
       let warningHandle;
@@ -32735,7 +32790,7 @@ ${this.config.locale === "zh" ? "\u8ACB\u9078\u64C7" : "Select"}${defaultDisplay
 ${template.timedOut}`);
           rl.close();
           this.rl = null;
-          resolve12({
+          resolve13({
             value: defaultValue,
             timedOut: true
           });
@@ -32759,7 +32814,7 @@ ${template.timeoutWarning(30)}`);
             clearTimeout(warningHandle);
           }
           const value = parser(answer);
-          resolve12({
+          resolve13({
             value,
             timedOut: false
           });
@@ -33841,9 +33896,9 @@ ${action.modifications}`;
               )
             );
             console.log(chalk5.gray(`   Waiting ${delay}ms before retry...`));
-            await new Promise((resolve12) => setTimeout(resolve12, delay));
+            await new Promise((resolve13) => setTimeout(resolve13, delay));
           } else {
-            await new Promise((resolve12) => setTimeout(resolve12, delay));
+            await new Promise((resolve13) => setTimeout(resolve13, delay));
           }
         }
         const executionOptions = {
@@ -34277,7 +34332,7 @@ init_gemini_provider();
 init_openai_provider_factory();
 init_logger();
 
-// src/utils/agent-status-writer.ts
+// src/shared/helpers/agent-status-writer.ts
 init_esm_shims();
 init_logger();
 async function writeAgentStatus(status, projectDir = process.cwd()) {
@@ -36064,7 +36119,7 @@ var IterateStatusRenderer = class {
 // src/cli/commands/run.ts
 init_verbosity_manager();
 
-// src/utils/output-formatter.ts
+// src/shared/logging/output-formatter.ts
 init_esm_shims();
 function formatOutput(result, format, verbose = false) {
   switch (format) {
@@ -36810,12 +36865,12 @@ Result: ${result.stages.map((s) => s.output).join("\n\n")}`;
         let iterateHooks;
         if (argv.iterate || argv.autoContinue) {
           if (argv.iterateMaxCost !== void 0) {
-            console.log(chalk5.yellow("\n\u26A0\uFE0F  Warning: --iterate-max-cost is deprecated and will be removed in v9.0.0"));
+            console.log(chalk5.yellow("\n\u26A0\uFE0F  Warning: --iterate-max-cost is deprecated and will be removed in a future version"));
             console.log(chalk5.yellow("    Reason: Provider pricing changes frequently, making cost estimates unreliable\n"));
             console.log(chalk5.cyan("    Please use --iterate-max-tokens instead:"));
             console.log(chalk5.cyan(`      ax run ${resolvedAgentName} "${actualTask}" --iterate --iterate-max-tokens 1000000
 `));
-            console.log(chalk5.gray("    Learn more: https://docs.automatosx.com/migration/cost-to-tokens\n"));
+            console.log(chalk5.gray("    Learn more: https://github.com/defai-digital/automatosx/blob/main/docs/migration/cost-to-tokens.md\n"));
           }
           const maxTokens = argv.iterateMaxTokens || 1e6;
           const maxTokensPerIteration = argv.iterateMaxTokensPerIteration || 1e5;
@@ -36980,7 +37035,7 @@ Result: ${result.stages.map((s) => s.output).join("\n\n")}`;
         if (argv.save) {
           try {
             const savePath = argv.save;
-            const saveDir = join(savePath, "..");
+            const saveDir = dirname(savePath);
             await mkdir(saveDir, { recursive: true });
             const outputData = formatForSave(result, argv.format || "text", {
               agent: resolvedAgentName,
@@ -37028,7 +37083,7 @@ Response: ${result.response.content}`;
       if (router) {
         router.destroy();
       }
-      await new Promise((resolve12) => setImmediate(resolve12));
+      await new Promise((resolve13) => setImmediate(resolve13));
       if (!verbosity.isQuiet()) {
         const executionTime = ((Date.now() - executionStartTime) / 1e3).toFixed(1);
         if (verbosity.isNormal()) {
@@ -37095,7 +37150,7 @@ Response: ${result.response.content}`;
             logger.debug("Context cleanup error", { error: errMsg });
           });
         }
-        await new Promise((resolve12) => setImmediate(resolve12));
+        await new Promise((resolve13) => setImmediate(resolve13));
         try {
           const { processManager: processManager2 } = await Promise.resolve().then(() => (init_process_manager(), process_manager_exports));
           await processManager2.shutdown(3e3);
@@ -37927,7 +37982,7 @@ var updateCommand = {
       describe: "Skip confirmation prompt",
       type: "boolean",
       default: false
-    }).example("automatosx update", "Check and install latest version").example("automatosx update --check", "Only check for updates").example("automatosx update --yes", "Update without confirmation");
+    }).example("$0 update", "Check and install latest version").example("$0 update --check", "Only check for updates").example("$0 update --yes", "Update without confirmation");
   },
   handler: async (argv) => {
     console.log(chalk5.blue.bold("\n\u{1F504} AutomatosX Update Checker\n"));
@@ -37994,11 +38049,11 @@ async function getCurrentVersion() {
     return result.dependencies["@defai.digital/automatosx"]?.version || "unknown";
   } catch (error) {
     const { readFile: readFile24 } = await import('fs/promises');
-    const { dirname: dirname16, join: join48 } = await import('path');
-    const { fileURLToPath: fileURLToPath8 } = await import('url');
-    const __filename7 = fileURLToPath8(import.meta.url);
-    const __dirname8 = dirname16(__filename7);
-    const pkgPath = join48(__dirname8, "../../../package.json");
+    const { dirname: dirname14, join: join49 } = await import('path');
+    const { fileURLToPath: fileURLToPath5 } = await import('url');
+    const __filename3 = fileURLToPath5(import.meta.url);
+    const __dirname4 = dirname14(__filename3);
+    const pkgPath = join49(__dirname4, "../../../package.json");
     const content = await readFile24(pkgPath, "utf-8");
     const pkg = JSON.parse(content);
     return pkg.version;
@@ -38152,16 +38207,22 @@ var cleanupCommand = {
   },
   handler: async (argv) => {
     try {
+      const olderThan = argv.olderThan ?? 7;
+      if (isNaN(olderThan) || olderThan < 0) {
+        console.error(chalk5.red.bold("\n\u2717 Invalid --older-than value\n"));
+        console.error(chalk5.red("Value must be a non-negative number (days)"));
+        process.exit(1);
+      }
       const { detectProjectRoot: detectProjectRoot2 } = await Promise.resolve().then(() => (init_path_resolver(), path_resolver_exports));
       const projectDir = await detectProjectRoot2(process.cwd());
       const workspaceManager = new WorkspaceManager(projectDir);
       if (!argv.confirm) {
         console.log(chalk5.yellow(`
-\u26A0 This will remove temporary files older than ${argv.olderThan} days`));
+\u26A0 This will remove temporary files older than ${olderThan} days`));
         console.log(chalk5.gray("Run with --confirm to proceed\n"));
         process.exit(0);
       }
-      const removed = await workspaceManager.cleanupTmp(argv.olderThan);
+      const removed = await workspaceManager.cleanupTmp(olderThan);
       console.log(chalk5.green.bold(`
 \u2713 Cleanup complete
 `));
@@ -38190,7 +38251,11 @@ init_esm_shims();
 
 // src/cli/commands/agent/templates.ts
 init_esm_shims();
-var TEMPLATE_DESCRIPTIONS = {
+
+// src/cli/commands/agent/helpers.ts
+init_esm_shims();
+init_logger();
+var BUILTIN_TEMPLATE_METADATA = {
   "basic-agent": {
     name: "basic-agent",
     team: "core",
@@ -38217,6 +38282,161 @@ var TEMPLATE_DESCRIPTIONS = {
     description: "QA specialist (test planning, automation, quality)"
   }
 };
+async function listAvailableTemplates(baseDir) {
+  const templates = [];
+  const projectDir = process.cwd();
+  const projectTemplatesDir = join(projectDir, ".automatosx", "templates");
+  if (existsSync(projectTemplatesDir)) {
+    try {
+      const files = await readdir(projectTemplatesDir);
+      for (const file of files) {
+        if (extname$1(file) === ".yaml" || extname$1(file) === ".yml") {
+          const name = file.replace(/\.(yaml|yml)$/, "");
+          templates.push({
+            name,
+            path: join(projectTemplatesDir, file),
+            description: "Custom template"
+          });
+        }
+      }
+    } catch (error) {
+      logger.debug("Failed to read project templates", { error });
+    }
+  }
+  const packageRoot = getPackageRoot();
+  const builtinTemplatesDir = join(packageRoot, "examples/workflows");
+  if (existsSync(builtinTemplatesDir)) {
+    try {
+      const files = await readdir(builtinTemplatesDir);
+      for (const file of files) {
+        if (extname$1(file) === ".yaml" || extname$1(file) === ".yml") {
+          const name = file.replace(/\.(yaml|yml)$/, "");
+          if (templates.find((t) => t.name === name)) {
+            continue;
+          }
+          const metadata = BUILTIN_TEMPLATE_METADATA[name];
+          templates.push({
+            name,
+            path: join(builtinTemplatesDir, file),
+            description: metadata?.description || "Built-in template",
+            team: metadata?.team
+          });
+        }
+      }
+    } catch (error) {
+      logger.debug("Failed to read built-in templates", { error });
+    }
+  }
+  return templates.sort((a, b) => a.name.localeCompare(b.name));
+}
+async function listAvailableTeams(baseDir) {
+  const projectDir = process.cwd();
+  const teamsDir = join(projectDir, ".automatosx", "teams");
+  const teamManager = new TeamManager(teamsDir);
+  try {
+    const teamNames = await teamManager.listTeams();
+    const teams = [];
+    for (const name of teamNames) {
+      try {
+        const teamConfig = await teamManager.loadTeam(name);
+        teams.push({
+          name: teamConfig.name,
+          displayName: teamConfig.displayName || teamConfig.name,
+          description: teamConfig.description
+        });
+      } catch (error) {
+        teams.push({
+          name,
+          displayName: name,
+          description: void 0
+        });
+      }
+    }
+    return teams.sort((a, b) => a.name.localeCompare(b.name));
+  } catch (error) {
+    logger.warn("Failed to list teams, using defaults", { error });
+    return [
+      { name: "core", displayName: "Core Team", description: "Quality assurance, core functions" },
+      { name: "engineering", displayName: "Engineering Team", description: "Software development" },
+      { name: "business", displayName: "Business Team", description: "Business analysis, product" },
+      { name: "design", displayName: "Design Team", description: "UI/UX design" }
+    ];
+  }
+}
+function isValidAgentName(name) {
+  if (!name || typeof name !== "string") {
+    return { valid: false, error: "Agent name is required" };
+  }
+  if (name.length < 2) {
+    return { valid: false, error: "Agent name must be at least 2 characters" };
+  }
+  if (name.length > 50) {
+    return { valid: false, error: "Agent name must be at most 50 characters" };
+  }
+  if (!/^[a-z]/.test(name)) {
+    return { valid: false, error: "Agent name must start with a lowercase letter" };
+  }
+  if (!/^[a-z0-9-]+$/.test(name)) {
+    return {
+      valid: false,
+      error: "Agent name must contain only lowercase letters, numbers, and hyphens"
+    };
+  }
+  if (/--/.test(name)) {
+    return { valid: false, error: "Agent name cannot contain consecutive hyphens" };
+  }
+  if (name.endsWith("-")) {
+    return { valid: false, error: "Agent name cannot end with a hyphen" };
+  }
+  return { valid: true };
+}
+async function checkDisplayNameConflict(displayName, excludeAgentName, baseDir) {
+  if (!displayName) {
+    return void 0;
+  }
+  const projectDir = process.cwd();
+  const agentsDir = join(projectDir, ".automatosx", "agents");
+  const profileLoader = new ProfileLoader(agentsDir);
+  try {
+    const allProfiles = await profileLoader.listProfiles();
+    for (const profileName of allProfiles) {
+      if (excludeAgentName && profileName === excludeAgentName) ;
+      try {
+        const profile = await profileLoader.loadProfile(profileName);
+        if (profile.displayName?.toLowerCase() === displayName.toLowerCase()) {
+          return profileName;
+        }
+      } catch (error) {
+        logger.debug("Failed to load profile for displayName check", {
+          profile: profileName,
+          error
+        });
+      }
+    }
+    return void 0;
+  } catch (error) {
+    logger.warn("Failed to check displayName conflicts", { error });
+    return void 0;
+  }
+}
+function suggestValidAgentName(input) {
+  let suggestion = input.toLowerCase();
+  suggestion = suggestion.replace(/[^a-z0-9-]/g, "-");
+  suggestion = suggestion.replace(/-+/g, "-");
+  suggestion = suggestion.replace(/^-+|-+$/g, "");
+  if (suggestion.length < 2) {
+    return "agent";
+  }
+  if (!/^[a-z]/.test(suggestion)) {
+    suggestion = "agent-" + suggestion;
+  }
+  if (suggestion.length > 50) {
+    suggestion = suggestion.substring(0, 50).replace(/-+$/, "");
+  }
+  return suggestion;
+}
+
+// src/cli/commands/agent/templates.ts
 var templatesCommand = {
   command: "templates",
   describe: "List available agent templates",
@@ -38225,7 +38445,8 @@ var templatesCommand = {
       console.log(chalk5.blue.bold("\n\u{1F4CB} Available Agent Templates\n"));
       const projectTemplatesDir = join(process.cwd(), ".automatosx", "templates");
       const hasProjectTemplates = existsSync(projectTemplatesDir);
-      const defaultTemplatesDir = join(__dirname$1, "../examples/templates");
+      const packageRoot = getPackageRoot();
+      const defaultTemplatesDir = join(packageRoot, "examples/workflows");
       const hasDefaultTemplates = existsSync(defaultTemplatesDir);
       if (!hasProjectTemplates && !hasDefaultTemplates) {
         console.log(chalk5.yellow("\u26A0 No templates found."));
@@ -38249,7 +38470,7 @@ var templatesCommand = {
         design: []
       };
       templates.forEach((template) => {
-        const info = TEMPLATE_DESCRIPTIONS[template] || {
+        const info = BUILTIN_TEMPLATE_METADATA[template] || {
           name: template,
           team: "core",
           description: "Custom template"
@@ -38415,169 +38636,6 @@ var TemplateEngine = class _TemplateEngine {
   }
 };
 
-// src/cli/commands/agent/helpers.ts
-init_esm_shims();
-init_logger();
-var __filename5 = fileURLToPath(import.meta.url);
-var __dirname6 = dirname(__filename5);
-async function listAvailableTemplates(baseDir) {
-  const templates = [];
-  const projectDir = process.cwd();
-  const projectTemplatesDir = join(projectDir, ".automatosx", "templates");
-  if (existsSync(projectTemplatesDir)) {
-    try {
-      const files = await readdir(projectTemplatesDir);
-      for (const file of files) {
-        if (extname$1(file) === ".yaml" || extname$1(file) === ".yml") {
-          const name = file.replace(/\.(yaml|yml)$/, "");
-          templates.push({
-            name,
-            path: join(projectTemplatesDir, file),
-            description: "Custom template"
-          });
-        }
-      }
-    } catch (error) {
-      logger.debug("Failed to read project templates", { error });
-    }
-  }
-  const builtinTemplatesDir = join(__dirname6, "../../../../examples/templates");
-  if (existsSync(builtinTemplatesDir)) {
-    try {
-      const files = await readdir(builtinTemplatesDir);
-      for (const file of files) {
-        if (extname$1(file) === ".yaml" || extname$1(file) === ".yml") {
-          const name = file.replace(/\.(yaml|yml)$/, "");
-          if (templates.find((t) => t.name === name)) {
-            continue;
-          }
-          const descriptions = {
-            "basic-agent": "Basic agent (core team)",
-            "developer": "Software developer (engineering)",
-            "analyst": "Business analyst (business)",
-            "designer": "UI/UX designer (design)",
-            "qa-specialist": "QA specialist (core)"
-          };
-          templates.push({
-            name,
-            path: join(builtinTemplatesDir, file),
-            description: descriptions[name] || "Built-in template"
-          });
-        }
-      }
-    } catch (error) {
-      logger.debug("Failed to read built-in templates", { error });
-    }
-  }
-  return templates.sort((a, b) => a.name.localeCompare(b.name));
-}
-async function listAvailableTeams(baseDir) {
-  const projectDir = process.cwd();
-  const teamsDir = join(projectDir, ".automatosx", "teams");
-  const teamManager = new TeamManager(teamsDir);
-  try {
-    const teamNames = await teamManager.listTeams();
-    const teams = [];
-    for (const name of teamNames) {
-      try {
-        const teamConfig = await teamManager.loadTeam(name);
-        teams.push({
-          name: teamConfig.name,
-          displayName: teamConfig.displayName || teamConfig.name,
-          description: teamConfig.description
-        });
-      } catch (error) {
-        teams.push({
-          name,
-          displayName: name,
-          description: void 0
-        });
-      }
-    }
-    return teams.sort((a, b) => a.name.localeCompare(b.name));
-  } catch (error) {
-    logger.warn("Failed to list teams, using defaults", { error });
-    return [
-      { name: "core", displayName: "Core Team", description: "Quality assurance, core functions" },
-      { name: "engineering", displayName: "Engineering Team", description: "Software development" },
-      { name: "business", displayName: "Business Team", description: "Business analysis, product" },
-      { name: "design", displayName: "Design Team", description: "UI/UX design" }
-    ];
-  }
-}
-function isValidAgentName(name) {
-  if (!name || typeof name !== "string") {
-    return { valid: false, error: "Agent name is required" };
-  }
-  if (name.length < 2) {
-    return { valid: false, error: "Agent name must be at least 2 characters" };
-  }
-  if (name.length > 50) {
-    return { valid: false, error: "Agent name must be at most 50 characters" };
-  }
-  if (!/^[a-z]/.test(name)) {
-    return { valid: false, error: "Agent name must start with a lowercase letter" };
-  }
-  if (!/^[a-z0-9-]+$/.test(name)) {
-    return {
-      valid: false,
-      error: "Agent name must contain only lowercase letters, numbers, and hyphens"
-    };
-  }
-  if (/--/.test(name)) {
-    return { valid: false, error: "Agent name cannot contain consecutive hyphens" };
-  }
-  if (name.endsWith("-")) {
-    return { valid: false, error: "Agent name cannot end with a hyphen" };
-  }
-  return { valid: true };
-}
-async function checkDisplayNameConflict(displayName, excludeAgentName, baseDir) {
-  if (!displayName) {
-    return void 0;
-  }
-  const projectDir = process.cwd();
-  const agentsDir = join(projectDir, ".automatosx", "agents");
-  const profileLoader = new ProfileLoader(agentsDir);
-  try {
-    const allProfiles = await profileLoader.listProfiles();
-    for (const profileName of allProfiles) {
-      if (excludeAgentName && profileName === excludeAgentName) ;
-      try {
-        const profile = await profileLoader.loadProfile(profileName);
-        if (profile.displayName?.toLowerCase() === displayName.toLowerCase()) {
-          return profileName;
-        }
-      } catch (error) {
-        logger.debug("Failed to load profile for displayName check", {
-          profile: profileName,
-          error
-        });
-      }
-    }
-    return void 0;
-  } catch (error) {
-    logger.warn("Failed to check displayName conflicts", { error });
-    return void 0;
-  }
-}
-function suggestValidAgentName(input) {
-  let suggestion = input.toLowerCase();
-  suggestion = suggestion.replace(/[^a-z0-9-]/g, "-");
-  suggestion = suggestion.replace(/-+/g, "-");
-  suggestion = suggestion.replace(/^-+|-+$/g, "");
-  if (suggestion.length < 2) {
-    return "agent";
-  }
-  if (!/^[a-z]/.test(suggestion)) {
-    suggestion = "agent-" + suggestion;
-  }
-  if (suggestion.length > 50) {
-    suggestion = suggestion.substring(0, 50).replace(/-+$/, "");
-  }
-  return suggestion;
-}
-
 // src/cli/commands/agent/create.ts
 var createCommand2 = {
   command: "create <agent>",
@@ -38724,7 +38782,8 @@ async function findTemplate(name) {
   if (existsSync(projectTemplate)) {
     return projectTemplate;
   }
-  const defaultTemplate = join(__dirname$1, "../examples/templates", `${name}.yaml`);
+  const packageRoot = getPackageRoot();
+  const defaultTemplate = join(packageRoot, "examples/workflows", `${name}.yaml`);
   if (existsSync(defaultTemplate)) {
     return defaultTemplate;
   }
@@ -39436,7 +39495,7 @@ var resumeCommand = {
       if (router) {
         router.destroy();
       }
-      await new Promise((resolve12) => setImmediate(resolve12));
+      await new Promise((resolve13) => setImmediate(resolve13));
       console.log(chalk5.green.bold("\u2705 Complete\n"));
       process.exit(0);
     } catch (error) {
@@ -39456,7 +39515,7 @@ var resumeCommand = {
         if (router) {
           router.destroy();
         }
-        await new Promise((resolve12) => setImmediate(resolve12));
+        await new Promise((resolve13) => setImmediate(resolve13));
       } catch (cleanupError) {
         const errMsg = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
         logger.debug("Cleanup error ignored", { error: errMsg });
@@ -41747,7 +41806,7 @@ var doctorCommand = {
       }
     }
     async function checkCLIVersion() {
-      return new Promise((resolve12) => {
+      return new Promise((resolve13) => {
         const child = spawn("gemini", ["--version"], {
           stdio: ["ignore", "pipe", "pipe"]
         });
@@ -41761,14 +41820,14 @@ var doctorCommand = {
         });
         child.on("close", (code) => {
           if (code === 0 && stdout.trim()) {
-            resolve12({
+            resolve13({
               name: "CLI Version",
               status: "pass",
               message: "Gemini CLI version detected",
               details: stdout.trim()
             });
           } else {
-            resolve12({
+            resolve13({
               name: "CLI Version",
               status: "warn",
               message: "Could not detect version",
@@ -41778,7 +41837,7 @@ var doctorCommand = {
         });
         setTimeout(() => {
           child.kill();
-          resolve12({
+          resolve13({
             name: "CLI Version",
             status: "fail",
             message: "Version check timed out"
@@ -41998,14 +42057,14 @@ init_esm_shims();
 // src/core/spec/SpecSchemaValidator.ts
 init_esm_shims();
 init_logger();
-var __filename6 = fileURLToPath(import.meta.url);
-var __dirname7 = dirname(__filename6);
+var __filename2 = fileURLToPath(import.meta.url);
+var __dirname3 = dirname(__filename2);
 var SpecSchemaValidator = class {
   ajv;
   validateFn = null;
   schemaPath;
   constructor(schemaPath) {
-    this.schemaPath = schemaPath || join(__dirname7, "../../../schema/spec-schema.json");
+    this.schemaPath = schemaPath || join(__dirname3, "../../../schema/spec-schema.json");
     this.ajv = new Ajv({
       allErrors: true,
       // Collect all errors, not just first
@@ -43275,22 +43334,30 @@ var DagGenerator = class {
   }
   /**
    * Calculate maximum depth of DAG (longest path)
+   * BUG FIX: Added cycle detection with visiting set to prevent infinite recursion
    */
   calculateMaxDepth(dag) {
     const depths = /* @__PURE__ */ new Map();
+    const visiting = /* @__PURE__ */ new Set();
     const calculateDepth = (nodeId) => {
       if (depths.has(nodeId)) {
         return depths.get(nodeId);
       }
+      if (visiting.has(nodeId)) {
+        return 0;
+      }
+      visiting.add(nodeId);
       const node = dag.nodes.find((n) => n.id === nodeId);
       if (!node || !node.dependencies || node.dependencies.length === 0) {
         depths.set(nodeId, 1);
+        visiting.delete(nodeId);
         return 1;
       }
       const depthValues = node.dependencies.map((dep) => calculateDepth(dep));
       const maxDepDep = depthValues.length > 0 ? Math.max(...depthValues) : 0;
       const depth = maxDepDep + 1;
       depths.set(nodeId, depth);
+      visiting.delete(nodeId);
       return depth;
     };
     let maxDepth = 0;
@@ -44289,11 +44356,23 @@ var genCommand = {
         process.exit(1);
       }
       specFile = resolve(process.cwd(), specFile);
-      const dangerousPaths = ["/etc", "/sys", "/proc", "/dev", "/root", "/boot"];
-      const isDangerousPath = dangerousPaths.some(
+      const dangerousUnixPaths = ["/etc", "/sys", "/proc", "/dev", "/root", "/boot"];
+      const isDangerousUnixPath = dangerousUnixPaths.some(
         (dangerous) => specFile.startsWith(dangerous + "/") || specFile === dangerous
       );
-      if (isDangerousPath) {
+      const specFileLower = specFile.toLowerCase();
+      const dangerousWindowsPaths = [
+        "c:\\windows",
+        "c:\\program files",
+        "c:\\program files (x86)",
+        "c:\\programdata",
+        "c:\\users\\public",
+        "c:\\system32"
+      ];
+      const isDangerousWindowsPath = dangerousWindowsPaths.some(
+        (dangerous) => specFileLower.startsWith(dangerous + "\\") || specFileLower === dangerous
+      );
+      if (isDangerousUnixPath || isDangerousWindowsPath) {
         console.error(chalk5.red(`\u2717 Error: Access to system directory '${specFile}' is not allowed`));
         console.error(chalk5.gray("Spec files should be in your project directory"));
         process.exit(1);
@@ -45006,8 +45085,8 @@ async function handleReset() {
 }
 async function handleTrace(workspacePath, argv) {
   const { existsSync: existsSync25, readFileSync: readFileSync8, watchFile } = await import('fs');
-  const { join: join48 } = await import('path');
-  const traceFile = join48(workspacePath, ".automatosx/logs/router.trace.jsonl");
+  const { join: join49 } = await import('path');
+  const traceFile = join49(workspacePath, ".automatosx/logs/router.trace.jsonl");
   if (!existsSync25(traceFile)) {
     console.log(chalk5.yellow("\n\u26A0\uFE0F  No trace log found\n"));
     console.log(chalk5.gray(`Expected location: ${traceFile}
@@ -46085,15 +46164,17 @@ async function checkDiskSpace(workingDir, verbose) {
           timeout: 1e4
         });
         const sizeKB = parseInt(duOutput.trim(), 10);
-        const sizeMB = (sizeKB / 1024).toFixed(2);
-        results.push({
-          name: ".automatosx Size",
-          category: "Disk",
-          passed: true,
-          message: sizeKB > 1024 ? `${sizeMB} MB` : `${sizeKB} KB`,
-          details: verbose ? `Includes: memory, sessions, logs, agents` : void 0
-        });
-        displayCheck(results[results.length - 1]);
+        if (!isNaN(sizeKB)) {
+          const sizeMB = (sizeKB / 1024).toFixed(2);
+          results.push({
+            name: ".automatosx Size",
+            category: "Disk",
+            passed: true,
+            message: sizeKB > 1024 ? `${sizeMB} MB` : `${sizeKB} KB`,
+            details: verbose ? `Includes: memory, sessions, logs, agents` : void 0
+          });
+          displayCheck(results[results.length - 1]);
+        }
       } catch {
       }
     }
@@ -46450,7 +46531,7 @@ async function findProcesses(processName, verbose) {
 }
 async function killProcess(pid, verbose) {
   try {
-    await new Promise((resolve12, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = spawn("kill", ["-TERM", String(pid)], {
         stdio: "pipe",
         shell: false
@@ -46458,23 +46539,23 @@ async function killProcess(pid, verbose) {
       });
       proc.on("close", (code) => {
         if (code === 0) {
-          resolve12();
+          resolve13();
         } else {
           reject(new Error(`kill -TERM failed with code ${code}`));
         }
       });
       proc.on("error", reject);
     });
-    await new Promise((resolve12) => setTimeout(resolve12, 1e3));
+    await new Promise((resolve13) => setTimeout(resolve13, 1e3));
     try {
-      await new Promise((resolve12, reject) => {
+      await new Promise((resolve13, reject) => {
         const proc = spawn("ps", ["-p", String(pid)], {
           stdio: "pipe",
           shell: false
         });
         proc.on("close", (code) => {
           if (code === 0) {
-            resolve12();
+            resolve13();
           } else {
             reject(new Error("Process not running"));
           }
@@ -46484,14 +46565,14 @@ async function killProcess(pid, verbose) {
       if (verbose) {
         logger.debug(`Process ${pid} didn't respond to SIGTERM, using SIGKILL`);
       }
-      await new Promise((resolve12, reject) => {
+      await new Promise((resolve13, reject) => {
         const proc = spawn("kill", ["-KILL", String(pid)], {
           stdio: "pipe",
           shell: false
         });
         proc.on("close", (code) => {
           if (code === 0) {
-            resolve12();
+            resolve13();
           } else {
             reject(new Error(`kill -KILL failed with code ${code}`));
           }
@@ -46514,7 +46595,7 @@ init_esm_shims();
 // src/core/telemetry/TelemetryCollector.ts
 init_esm_shims();
 init_logger();
-init_db_factory();
+init_factory();
 var DEFAULT_OPTIONS3 = {
   enabled: false,
   // Opt-in by default (privacy-first)
@@ -48069,7 +48150,7 @@ async function handleKill(argv) {
 `);
   console.log(chalk5.yellow("This will immediately disable the feature for ALL users."));
   console.log(chalk5.gray("Press Ctrl+C to cancel, or wait 5 seconds to confirm...\n"));
-  await new Promise((resolve12) => setTimeout(resolve12, 5e3));
+  await new Promise((resolve13) => setTimeout(resolve13, 5e3));
   try {
     await flagManager.killSwitch(flagName, reason);
     console.log(chalk5.red("\u2713 Kill switch activated"));