macro-agent 0.0.17 → 0.1.1

package/src/config/project-config.ts

@@ -1,12 +1,16 @@
 /**
- * Project Configuration Loader
+ * Configuration Loader
  *
- * Reads .macro-agent/config.json for project-level settings.
+ * Layered configuration system with priority (highest to lowest):
+ * 1. Environment variables (MACRO_*, OPENTASKS_*)
+ * 2. Project config: .multiagent/config.json
+ * 3. Global config: ~/.multiagent/config.json
  *
  * @module config/project-config
  */
 
 import * as fs from "fs";
+import * as os from "os";
 import * as path from "path";
 
 // =============================================================================
@@ -14,9 +18,49 @@ import * as path from "path";
 // =============================================================================
 
 /**
- * Project-level configuration schema.
+ * Typed configuration schema for multiagent.
  *
- * Loaded from .macro-agent/config.json in the project root.
+ * Loaded from .multiagent/config.json (project or global).
+ * Environment variables override file-based config.
+ */
+export interface MultiagentConfig {
+  /** Team template name to load on startup */
+  team?: string;
+
+  /** Server port (default: 3001) */
+  port?: number;
+
+  /** Server host (default: "localhost") */
+  host?: string;
+
+  /** Authentication config */
+  auth?: {
+    /** Disable auth entirely */
+    disabled?: boolean;
+    /** Server secret token */
+    secret?: string;
+  };
+
+  /** Task backend config */
+  task?: {
+    /** Backend type: "memory" | "opentasks" */
+    backend?: string;
+    /** OpenTasks-specific config */
+    opentasks?: {
+      /** Path to OpenTasks daemon socket */
+      socket_path?: string;
+      /** Auto-start central daemon (default: true) */
+      auto_start?: boolean;
+      /** Central daemon location (default: ~/.multiagent/opentasks) */
+      central_path?: string;
+      /** Auto-connect project .opentasks/ on agent spawn (default: true) */
+      connect_on_spawn?: boolean;
+    };
+  };
+}
+
+/**
+ * Legacy project config interface (backwards compatibility).
  */
 export interface ProjectConfig {
   /** Team template name to load on startup */
@@ -31,38 +75,21 @@ export interface ProjectConfig {
 // =============================================================================
 
 /** Config directory name */
-export const CONFIG_DIR = ".macro-agent";
+export const CONFIG_DIR = ".multiagent";
 
 /** Config file name */
 export const CONFIG_FILE = "config.json";
 
 // =============================================================================
-// Loader
+// JSON Loader (shared)
 // =============================================================================
 
 /**
- * Get the project config file path.
- *
- * @param projectPath - Project root directory (default: process.cwd())
- * @returns Absolute path to .macro-agent/config.json
- */
-export function getProjectConfigPath(projectPath?: string): string {
-  const root = projectPath ?? process.cwd();
-  return path.join(root, CONFIG_DIR, CONFIG_FILE);
-}
-
-/**
- * Load project configuration from .macro-agent/config.json.
- *
- * Returns empty config if the file doesn't exist.
+ * Load and parse a JSON config file.
+ * Returns empty object if file doesn't exist.
  * Throws on invalid JSON.
- *
- * @param projectPath - Project root directory (default: process.cwd())
- * @returns Parsed ProjectConfig
  */
-export function loadProjectConfig(projectPath?: string): ProjectConfig {
-  const configPath = getProjectConfigPath(projectPath);
-
+function loadJsonConfig(configPath: string): Record<string, unknown> {
   if (!fs.existsSync(configPath)) {
     return {};
   }
@@ -78,7 +105,7 @@ export function loadProjectConfig(projectPath?: string): ProjectConfig {
         configPath
       );
     }
-    return parsed as ProjectConfig;
+    return parsed as Record<string, unknown>;
   } catch (error) {
     if (error instanceof ProjectConfigError) throw error;
     throw new ProjectConfigError(
@@ -89,6 +116,142 @@ export function loadProjectConfig(projectPath?: string): ProjectConfig {
   }
 }
 
+// =============================================================================
+// Path Resolution
+// =============================================================================
+
+/**
+ * Get the project config file path.
+ *
+ * @param projectPath - Project root directory (default: process.cwd())
+ * @returns Absolute path to .multiagent/config.json
+ */
+export function getProjectConfigPath(projectPath?: string): string {
+  const root = projectPath ?? process.cwd();
+  return path.join(root, CONFIG_DIR, CONFIG_FILE);
+}
+
+/**
+ * Get the global config file path.
+ *
+ * @returns Absolute path to ~/.multiagent/config.json
+ */
+export function getGlobalConfigPath(): string {
+  return path.join(os.homedir(), CONFIG_DIR, CONFIG_FILE);
+}
+
+// =============================================================================
+// Individual Loaders
+// =============================================================================
+
+/**
+ * Load project configuration from .multiagent/config.json.
+ *
+ * Returns empty config if the file doesn't exist.
+ * Throws on invalid JSON.
+ *
+ * @param projectPath - Project root directory (default: process.cwd())
+ * @returns Parsed ProjectConfig
+ */
+export function loadProjectConfig(projectPath?: string): ProjectConfig {
+  return loadJsonConfig(getProjectConfigPath(projectPath)) as ProjectConfig;
+}
+
+/**
+ * Load global configuration from ~/.multiagent/config.json.
+ *
+ * Returns empty config if the file doesn't exist.
+ * Throws on invalid JSON.
+ *
+ * @returns Parsed config
+ */
+export function loadGlobalConfig(): MultiagentConfig {
+  return loadJsonConfig(getGlobalConfigPath()) as MultiagentConfig;
+}
+
+// =============================================================================
+// Merged Config (layered)
+// =============================================================================
+
+/**
+ * Deep merge two objects. Source values override target values.
+ * Only merges plain objects recursively; arrays and primitives are replaced.
+ */
+function deepMerge<T extends Record<string, unknown>>(target: T, source: Record<string, unknown>): T {
+  const result = { ...target };
+
+  for (const key of Object.keys(source)) {
+    const sourceVal = source[key];
+    const targetVal = (result as Record<string, unknown>)[key];
+
+    if (
+      sourceVal !== undefined &&
+      sourceVal !== null &&
+      typeof sourceVal === "object" &&
+      !Array.isArray(sourceVal) &&
+      typeof targetVal === "object" &&
+      targetVal !== null &&
+      !Array.isArray(targetVal)
+    ) {
+      (result as Record<string, unknown>)[key] = deepMerge(
+        targetVal as Record<string, unknown>,
+        sourceVal as Record<string, unknown>
+      );
+    } else if (sourceVal !== undefined) {
+      (result as Record<string, unknown>)[key] = sourceVal;
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Load merged configuration with layered priority:
+ * 1. Environment variables (highest)
+ * 2. Project .multiagent/config.json
+ * 3. Global ~/.multiagent/config.json (lowest)
+ *
+ * Only server-level settings are merged. Agent-level env vars
+ * (MACRO_AGENT_ID, MACRO_SERVER_URL, etc.) are internal wiring
+ * and not part of this config.
+ *
+ * @param projectPath - Project root directory (default: process.cwd())
+ * @returns Fully merged MultiagentConfig
+ */
+export function loadMergedConfig(projectPath?: string): MultiagentConfig {
+  const globalConfig = loadGlobalConfig();
+  const projectConfig = loadProjectConfig(projectPath);
+
+  // Layer 1: global (lowest priority)
+  // Layer 2: project overrides global
+  const merged: MultiagentConfig = deepMerge(
+    globalConfig as Record<string, unknown>,
+    projectConfig as Record<string, unknown>,
+  ) as MultiagentConfig;
+
+  // Layer 3: env vars override everything (server-level only)
+  if (process.env.MACRO_TASK_BACKEND) {
+    merged.task = { ...(merged.task ?? {}), backend: process.env.MACRO_TASK_BACKEND };
+  }
+  if (process.env.OPENTASKS_SOCKET_PATH) {
+    merged.task = {
+      ...(merged.task ?? {}),
+      opentasks: {
+        ...(merged.task?.opentasks ?? {}),
+        socket_path: process.env.OPENTASKS_SOCKET_PATH,
+      },
+    };
+  }
+  if (process.env.MACRO_SERVER_SECRET) {
+    merged.auth = { ...(merged.auth ?? {}), secret: process.env.MACRO_SERVER_SECRET };
+  }
+  if (process.env.MACRO_NO_AUTH === "true") {
+    merged.auth = { ...(merged.auth ?? {}), disabled: true };
+  }
+
+  return merged;
+}
+
 // =============================================================================
 // Errors
 // =============================================================================

package/src/lifecycle/__tests__/cascade-termination.test.ts

@@ -74,7 +74,7 @@ function createCascadeAdapter(harness: TestHarness): CascadeAgentManager {
       }
       // Update agent state in EventStore
       harness.eventStore.emit({
-        type: "terminate",
+        type: "stop",
         source: { agent_id: agentId },
         payload: { agent_id: agentId, reason },
       });