macro-agent 0.2.5 → 0.2.6

package/src/cognitive/types.ts

@@ -1,187 +0,0 @@
-/**
- * Cognitive Module - Bridge Types
- *
- * Structurally compatible with cognitive-core's runtime types (AgentSession,
- * AgentMessage, ToolCall) without importing from cognitive-core.
- * TypeScript's structural typing makes these assignable without casting.
- *
- * Stripped to what OpenHive needs: agent execution + session tracking.
- * Atlas, trajectory extraction, and ACP extensions are handled by OpenHive.
- */
-
-import type { AgentId } from "../store/types/index.js";
-import type { TasksAdapter, InboxAdapter } from "../adapters/types.js";
-import type { MCPServerConfig } from "../agent/types.js";
-
-// ─────────────────────────────────────────────────────────────────
-// Agent Session Types (matches cognitive-core/src/runtime/types.ts)
-// ─────────────────────────────────────────────────────────────────
-
-export interface CognitiveAgentMessage {
-  role: "user" | "assistant" | "system" | "tool_use" | "tool_result";
-  content: string;
-  toolName?: string;
-  toolInput?: unknown;
-  toolOutput?: unknown;
-  timestamp: Date;
-}
-
-export interface CognitiveToolCall {
-  id: string;
-  name: string;
-  input: unknown;
-  output?: unknown;
-  error?: string;
-  startTime: Date;
-  endTime?: Date;
-}
-
-export type CognitiveAgentState =
-  | "idle"
-  | "running"
-  | "paused"
-  | "completed"
-  | "failed";
-
-export interface CognitiveTask {
-  description: string;
-  context?: Record<string, unknown>;
-  domain?: string;
-}
-
-/**
- * Agent session — represents a running or completed agent execution.
- * Structurally matches cognitive-core's AgentSession.
- */
-export interface CognitiveAgentSession {
-  id: string;
-  agentType: string;
-  task: CognitiveTask;
-  state: CognitiveAgentState;
-  messages: CognitiveAgentMessage[];
-  toolCalls: CognitiveToolCall[];
-  startTime: Date;
-  endTime?: Date;
-  result?: unknown;
-  error?: string;
-  metadata: Record<string, unknown>;
-}
-
-/**
- * Configuration for spawning an agent.
- * Structurally matches cognitive-core's AgentSpawnConfig (core fields).
- */
-export interface CognitiveAgentSpawnConfig {
-  agentType: string;
-  task: CognitiveTask;
-  systemPromptAdditions?: string;
-  env?: Record<string, string>;
-  cwd?: string;
-  timeout?: number;
-  onMessage?: (message: CognitiveAgentMessage) => void;
-  /**
-   * MCP servers to mount on the spawned agent (e.g. a per-task tau-env
-   * server). Forwarded verbatim into the macro `AgentManager.spawn`'s
-   * `config.mcpServers`. Optional / back-compat: non-MCP spawns are
-   * unaffected. Matches macro `AgentConfig.mcpServers` (the stdio/http union).
-   */
-  mcpServers?: MCPServerConfig[];
-  /**
-   * Optional completion predicate forwarded into `promptUntilDone`. When it
-   * returns true the agent loop completes externally (without the macro done()
-   * tool) — e.g. a benchmark env wrote its reward sink with done:true. Generic:
-   * the backend has no knowledge of what it reads. Back-compat: absent →
-   * unchanged.
-   */
-  completionSignal?: () => boolean | Promise<boolean>;
-  /**
-   * Optional per-attempt hook invoked BEFORE the agent is driven (and again
-   * before each refinement re-spawn, since refine() spreads this config). Used
-   * to reset per-attempt external state — e.g. delete a benchmark reward sink so
-   * each attempt only sees its OWN completion signal. Back-compat: absent →
-   * unchanged.
-   */
-  beforeSpawn?: () => void | Promise<void>;
-}
-
-// ─────────────────────────────────────────────────────────────────
-// Session Completion Types
-// ─────────────────────────────────────────────────────────────────
-
-/**
- * Event emitted when a cognitive session completes (success or failure).
- */
-export interface SessionCompleteEvent {
-  sessionId: string;
-  agentId: string;
-  state: CognitiveAgentState;
-  duration_ms: number;
-  message_count: number;
-  tool_call_count: number;
-}
-
-// ─────────────────────────────────────────────────────────────────
-// Backend Configuration
-// ─────────────────────────────────────────────────────────────────
-
-/**
- * Configuration for MacroAgentBackend.
- *
- * Stripped to essentials: agent lifecycle + optional task tracking.
- * Atlas/trajectory handling is done by OpenHive, not the swarm.
- */
-export interface MacroAgentBackendConfig {
-  /** Max follow-up prompts if agent doesn't call done(). Default: 1 */
-  maxFollowUps?: number;
-  /** Fraction of timeout at which to send "wrap up" nudge. Default: 0.8 */
-  softTimeoutRatio?: number;
-  /** Optional TasksAdapter for tracking analyst tasks. */
-  tasksAdapter?: TasksAdapter;
-  /** Callback invoked when a session completes (success or failure). */
-  onSessionComplete?: (event: SessionCompleteEvent) => void;
-  /** Optional inbox adapter for sending session.complete notifications. */
-  inboxAdapter?: InboxAdapter;
-  /** When true, spawned analysts are children of coordinatorAgentId. */
-  useTeam?: boolean;
-  /** Parent agent ID when useTeam is true. */
-  coordinatorAgentId?: AgentId;
-}
-
-/**
- * Internal session tracking state.
- */
-export interface MacroSessionState {
-  agentId: AgentId;
-  session: CognitiveAgentSession;
-  config: CognitiveAgentSpawnConfig;
-  runPromise: Promise<void>;
-  taskId?: string;
-}
-
-// ─────────────────────────────────────────────────────────────────
-// Batch Types
-// ─────────────────────────────────────────────────────────────────
-
-export interface CognitiveBatchConfig {
-  tasks: CognitiveAgentSpawnConfig[];
-  maxConcurrency?: number;
-}
-
-export interface CognitiveBatchTaskResult {
-  config: CognitiveAgentSpawnConfig;
-  session?: CognitiveAgentSession;
-  error?: string;
-}
-
-export interface CognitiveBatchResult {
-  results: CognitiveBatchTaskResult[];
-  completed: number;
-  failed: number;
-  cancelled: boolean;
-}
-
-export interface CognitiveBatchHandle {
-  totalTasks: number;
-  waitForAll(): Promise<CognitiveBatchResult>;
-  cancel(): Promise<CognitiveBatchResult>;
-}

package/src/cognitive/workspace-handler.ts

@@ -1,163 +0,0 @@
-/**
- * Workspace Execution Handler
- *
- * Bridge between OpenHive's workspace.execute MAP messages and
- * macro-agent's MacroAgentBackend. Receives workspace tasks from
- * OpenHive, spawns analyst agents, and sends results back.
- *
- * Registered as a MAP notification handler on the swarm's inbound
- * WebSocket connection to the OpenHive hub.
- *
- * Protocol:
- *   Hive → Swarm: x-openhive/learning.workspace.execute
- *     { request_id, prompt, cwd, system_context, timeout }
- *   Swarm → Hive: x-openhive/learning.workspace.result
- *     { request_id, success, output, structured, duration_ms }
- */
-
-import type { MacroAgentBackend } from "./macro-agent-backend.js";
-import type { CognitiveAgentSpawnConfig } from "./types.js";
-
-export interface WorkspaceHandlerDeps {
-  backend: MacroAgentBackend;
-  /** Send a JSON-RPC notification back to the hub */
-  sendToHub: (message: object) => void;
-}
-
-export interface WorkspaceExecuteParams {
-  request_id: string;
-  prompt: string;
-  cwd: string;
-  system_context?: string;
-  timeout?: number;
-}
-
-/**
- * Handle an incoming workspace.execute request from OpenHive.
- *
- * Spawns an analyst agent via MacroAgentBackend, waits for completion,
- * then sends the result back to the hub.
- */
-export async function handleWorkspaceExecute(
-  deps: WorkspaceHandlerDeps,
-  params: WorkspaceExecuteParams,
-): Promise<void> {
-  const { backend, sendToHub } = deps;
-  const { request_id, prompt, cwd, system_context, timeout } = params;
-  const startTime = Date.now();
-
-  try {
-    // Build spawn config from the workspace task
-    const spawnConfig: CognitiveAgentSpawnConfig = {
-      agentType: "claude-code",
-      task: {
-        description: prompt,
-        context: { workspace_cwd: cwd },
-      },
-      systemPromptAdditions: system_context,
-      cwd,
-      timeout: timeout || 300_000,
-    };
-
-    // Spawn analyst agent — this runs to completion
-    const session = await backend.spawn(spawnConfig);
-
-    // Wait for the session to complete (backend runs it in background)
-    // Poll until session state changes from "running"
-    const deadline = Date.now() + (timeout || 300_000);
-    while (Date.now() < deadline) {
-      const current = await backend.getSession(session.id);
-      if (!current || current.state !== "running") break;
-      await new Promise((r) => setTimeout(r, 500));
-    }
-
-    const finalSession = await backend.getSession(session.id);
-    const durationMs = Date.now() - startTime;
-
-    if (!finalSession || finalSession.state === "running") {
-      // Timed out
-      await backend.terminate(session.id).catch(() => {});
-      sendToHub({
-        jsonrpc: "2.0",
-        method: "x-openhive/learning.workspace.result",
-        params: {
-          request_id,
-          success: false,
-          output: "",
-          error: "Workspace execution timed out",
-          duration_ms: durationMs,
-        },
-      });
-      return;
-    }
-
-    // Collect output — read from workspace output directory if available
-    let output = "";
-    let structured: unknown = undefined;
-
-    if (finalSession.state === "completed") {
-      // The agent should have written output files to cwd/output/
-      try {
-        const fs = await import("fs");
-        const path = await import("path");
-        const outputDir = path.join(cwd, "output");
-        if (fs.existsSync(outputDir)) {
-          const files = fs.readdirSync(outputDir).filter((f) => f.endsWith(".json"));
-          if (files.length > 0) {
-            const content = fs.readFileSync(path.join(outputDir, files[0]), "utf-8");
-            output = content;
-            try {
-              structured = JSON.parse(content);
-            } catch {
-              /* not valid JSON, use raw text */
-            }
-          }
-        }
-      } catch {
-        /* output collection is best-effort */
-      }
-
-      // Fallback: use session result
-      if (!output && finalSession.result) {
-        output = typeof finalSession.result === "string"
-          ? finalSession.result
-          : JSON.stringify(finalSession.result);
-        structured = finalSession.result;
-      }
-    }
-
-    sendToHub({
-      jsonrpc: "2.0",
-      method: "x-openhive/learning.workspace.result",
-      params: {
-        request_id,
-        success: finalSession.state === "completed",
-        output,
-        structured,
-        error: finalSession.error,
-        duration_ms: durationMs,
-      },
-    });
-  } catch (err) {
-    sendToHub({
-      jsonrpc: "2.0",
-      method: "x-openhive/learning.workspace.result",
-      params: {
-        request_id,
-        success: false,
-        output: "",
-        error: err instanceof Error ? err.message : String(err),
-        duration_ms: Date.now() - startTime,
-      },
-    });
-  }
-}
-
-/**
- * Check if a MAP notification is a workspace.execute request.
- */
-export function isWorkspaceExecuteMessage(
-  msg: { method?: string },
-): msg is { method: "x-openhive/learning.workspace.execute"; params: WorkspaceExecuteParams } {
-  return msg.method === "x-openhive/learning.workspace.execute";
-}

package/src/config/index.ts

@@ -1,9 +0,0 @@
-export {
-  loadProjectConfig,
-  getProjectConfigPath,
-  ProjectConfigError,
-  type ProjectConfig,
-  type ProjectConfigErrorCode,
-  CONFIG_DIR,
-  CONFIG_FILE,
-} from "./project-config.js";

package/src/config/project-config.ts

@@ -1,294 +0,0 @@
-/**
- * Configuration Loader
- *
- * 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";
-
-// =============================================================================
-// Types
-// =============================================================================
-
-/**
- * Entry in the `teams` config for declaring additional team templates.
- */
-export interface TeamConfigEntry {
-  /** Template name (defaults to the key) */
-  template?: string;
-  /** Auto-start on server boot (default: false) */
-  autoStart?: boolean;
-}
-
-/**
- * Typed configuration schema for multiagent.
- *
- * Loaded from .multiagent/config.json (project or global).
- * Environment variables override file-based config.
- */
-export interface MultiagentConfig {
-  /** Default team template name to load on startup */
-  team?: string;
-
-  /** Additional teams available for dynamic or auto-start loading */
-  teams?: Record<string, TeamConfigEntry>;
-
-  /** 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 */
-  team?: string;
-
-  /** Additional project-level settings (extensible) */
-  [key: string]: unknown;
-}
-
-// =============================================================================
-// Constants
-// =============================================================================
-
-/** Config directory name */
-export const CONFIG_DIR = ".multiagent";
-
-/** Config file name */
-export const CONFIG_FILE = "config.json";
-
-// =============================================================================
-// JSON Loader (shared)
-// =============================================================================
-
-/**
- * Load and parse a JSON config file.
- * Returns empty object if file doesn't exist.
- * Throws on invalid JSON.
- */
-function loadJsonConfig(configPath: string): Record<string, unknown> {
-  if (!fs.existsSync(configPath)) {
-    return {};
-  }
-
-  const raw = fs.readFileSync(configPath, "utf-8");
-
-  try {
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      throw new ProjectConfigError(
-        `Config must be a JSON object, got ${Array.isArray(parsed) ? "array" : typeof parsed}`,
-        "INVALID_FORMAT",
-        configPath
-      );
-    }
-    return parsed as Record<string, unknown>;
-  } catch (error) {
-    if (error instanceof ProjectConfigError) throw error;
-    throw new ProjectConfigError(
-      `Failed to parse ${configPath}: ${error instanceof Error ? error.message : String(error)}`,
-      "PARSE_ERROR",
-      configPath
-    );
-  }
-}
-
-// =============================================================================
-// 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 (or MACRO_AGENT_HOME/config.json)
- */
-export function getGlobalConfigPath(): string {
-  const globalDir = process.env.MACRO_AGENT_HOME || path.join(os.homedir(), CONFIG_DIR);
-  return path.join(globalDir, 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 };
-  }
-
-  // MACRO_TEAMS: comma-separated template names to auto-start
-  if (process.env.MACRO_TEAMS) {
-    const names = process.env.MACRO_TEAMS.split(",").map(s => s.trim()).filter(Boolean);
-    const teams: Record<string, TeamConfigEntry> = { ...(merged.teams ?? {}) };
-    for (const name of names) {
-      teams[name] = { ...teams[name], autoStart: true };
-    }
-    merged.teams = teams;
-  }
-
-  return merged;
-}
-
-// =============================================================================
-// Errors
-// =============================================================================
-
-export type ProjectConfigErrorCode = "PARSE_ERROR" | "INVALID_FORMAT";
-
-export class ProjectConfigError extends Error {
-  constructor(
-    message: string,
-    public readonly code: ProjectConfigErrorCode,
-    public readonly configPath: string
-  ) {
-    super(message);
-    this.name = "ProjectConfigError";
-  }
-}