macro-agent 0.2.5 → 0.2.6

package/src/cognitive/index.ts

@@ -1,49 +0,0 @@
-/**
- * Cognitive Module — Bridge for cognitive-core integration
- *
- * Provides:
- * - MacroAgentBackend: Implements cognitive-core's AgentBackend interface
- * - AnalystRole: Minimal role for cognitive analysis agents
- * - SessionConverter: Converts ACP updates to cognitive session state
- * - Types: Structural compatibility with cognitive-core (no direct import)
- *
- * Atlas, trajectory extraction, and ACP extensions are handled by OpenHive.
- * This module focuses on: receive task → spawn agent → track session → return result.
- */
-
-// Types
-export type {
-  CognitiveAgentSession,
-  CognitiveAgentMessage,
-  CognitiveToolCall,
-  CognitiveTask,
-  CognitiveAgentState,
-  CognitiveAgentSpawnConfig,
-  MacroAgentBackendConfig,
-  MacroSessionState,
-  CognitiveBatchConfig,
-  CognitiveBatchHandle,
-  CognitiveBatchResult,
-  CognitiveBatchTaskResult,
-  SessionCompleteEvent,
-} from "./types.js";
-
-// Backend
-export {
-  MacroAgentBackend,
-  createMacroAgentBackend,
-} from "./macro-agent-backend.js";
-
-// Role
-export { AnalystRole } from "./analyst-role.js";
-
-// Session conversion (used internally by MacroAgentBackend)
-export { updateSessionFromEvent } from "./session-converter.js";
-
-// Workspace execution handler (bridge for OpenHive workspace.execute messages)
-export {
-  handleWorkspaceExecute,
-  isWorkspaceExecuteMessage,
-  type WorkspaceHandlerDeps,
-  type WorkspaceExecuteParams,
-} from "./workspace-handler.js";

package/src/cognitive/macro-agent-backend.ts

@@ -1,402 +0,0 @@
-/**
- * MacroAgentBackend
- *
- * Implements cognitive-core's AgentBackend interface, delegating to
- * macro-agent's AgentManager for agent spawning and lifecycle.
- *
- * Stripped to essentials for OpenHive integration:
- * - Spawns analyst agents in a workspace directory (cwd)
- * - Tracks sessions and manages timeouts
- * - Reports completion via callbacks and InboxAdapter
- *
- * Atlas, trajectory extraction, and team coordination are handled
- * by OpenHive, not the swarm. The swarm is pure compute — receive
- * task, execute agent, return result.
- */
-
-import { nanoid } from "nanoid";
-import type { AgentManager } from "../agent/agent-manager.js";
-import type { AgentId } from "../store/types/index.js";
-import { AnalystRole } from "./analyst-role.js";
-import { updateSessionFromEvent } from "./session-converter.js";
-import type {
-  CognitiveAgentSession,
-  CognitiveAgentSpawnConfig,
-  CognitiveBatchConfig,
-  CognitiveBatchHandle,
-  CognitiveBatchResult,
-  CognitiveBatchTaskResult,
-  MacroAgentBackendConfig,
-  MacroSessionState,
-  SessionCompleteEvent,
-} from "./types.js";
-
-const DEFAULT_MAX_FOLLOW_UPS = 1;
-const DEFAULT_SOFT_TIMEOUT_RATIO = 0.8;
-const DEFAULT_MAX_CONCURRENCY = 4;
-
-export class MacroAgentBackend {
-  readonly name = "macro-agent";
-  readonly supportedTypes = ["claude-code"];
-
-  private readonly agentManager: AgentManager;
-  private readonly config: MacroAgentBackendConfig | undefined;
-  private readonly maxFollowUps: number;
-  private readonly softTimeoutRatio: number;
-  private readonly tasksAdapter: import("../adapters/types.js").TasksAdapter | undefined;
-  private readonly onSessionComplete: ((event: SessionCompleteEvent) => void) | undefined;
-  private readonly inboxAdapter: import("../adapters/types.js").InboxAdapter | undefined;
-  private readonly sessions: Map<string, MacroSessionState> = new Map();
-
-  constructor(agentManager: AgentManager, config?: MacroAgentBackendConfig) {
-    this.agentManager = agentManager;
-    this.config = config;
-    this.maxFollowUps = config?.maxFollowUps ?? DEFAULT_MAX_FOLLOW_UPS;
-    this.softTimeoutRatio = config?.softTimeoutRatio ?? DEFAULT_SOFT_TIMEOUT_RATIO;
-    this.tasksAdapter = config?.tasksAdapter;
-    this.onSessionComplete = config?.onSessionComplete;
-    this.inboxAdapter = config?.inboxAdapter;
-
-    // Register analyst role if not already present. Use getRole() (exact match,
-    // returns undefined on a miss) rather than resolveRole(): the real
-    // DefaultRoleRegistry.resolveRole() never throws on an unknown role — it
-    // logs "Role 'analyst' not found, falling back to 'generic'" and returns
-    // GenericRole — so a resolveRole()/try-catch guard would silently skip
-    // registration and every spawn would fall back to GenericRole.
-    const registry = this.agentManager.getRoleRegistry();
-    if (!registry.getRole("analyst")) {
-      registry.registerRole(AnalystRole);
-    }
-  }
-
-  // ── AgentBackend interface ──────────────────────────────────────
-
-  async isAvailable(): Promise<boolean> {
-    return true;
-  }
-
-  async spawn(config: CognitiveAgentSpawnConfig): Promise<CognitiveAgentSession> {
-    let taskId: string | undefined;
-    if (this.tasksAdapter) {
-      taskId = await this.tasksAdapter.createTask({
-        title: config.task.description,
-        tags: config.task.domain ? [config.task.domain] : undefined,
-      });
-    }
-    return this._spawnCore(config, taskId);
-  }
-
-  async getSession(sessionId: string): Promise<CognitiveAgentSession | undefined> {
-    return this.sessions.get(sessionId)?.session;
-  }
-
-  async terminate(sessionId: string): Promise<void> {
-    const state = this.sessions.get(sessionId);
-    if (!state) return;
-
-    // Don't corrupt completed sessions
-    if (state.session.state !== "running") return;
-
-    state.session.state = "failed";
-    state.session.error = "Terminated by caller";
-    state.session.endTime = new Date();
-
-    if (this.tasksAdapter && state.taskId) {
-      await this.tasksAdapter.transitionTask(state.taskId, "fail").catch(() => {});
-    }
-
-    await this.agentManager.terminate(state.agentId, "cancelled").catch(() => {});
-  }
-
-  async listSessions(): Promise<CognitiveAgentSession[]> {
-    return Array.from(this.sessions.values()).map((s) => s.session);
-  }
-
-  // ── Batch submission ────────────────────────────────────────────
-
-  async submitBatch(config: CognitiveBatchConfig): Promise<CognitiveBatchHandle> {
-    const maxConcurrency = config.maxConcurrency ?? DEFAULT_MAX_CONCURRENCY;
-    const tasks = [...config.tasks];
-    const results: CognitiveBatchTaskResult[] = tasks.map((t) => ({ config: t }));
-    let cancelled = false;
-    const runningSessions = new Set<string>();
-    const completionPromises: Promise<void>[] = [];
-
-    const preCreatedTaskIds: (string | undefined)[] = [];
-    if (this.tasksAdapter) {
-      for (const task of tasks) {
-        const taskId = await this.tasksAdapter.createTask({
-          title: task.task.description,
-          tags: task.task.domain ? [task.task.domain] : undefined,
-        });
-        preCreatedTaskIds.push(taskId);
-      }
-    } else {
-      tasks.forEach(() => preCreatedTaskIds.push(undefined));
-    }
-
-    let nextIndex = 0;
-
-    const spawnNext = async (): Promise<void> => {
-      while (nextIndex < tasks.length && !cancelled && runningSessions.size < maxConcurrency) {
-        const idx = nextIndex++;
-        const spawnConfig = tasks[idx];
-        const taskId = preCreatedTaskIds[idx];
-
-        try {
-          const session = await this._spawnCore(spawnConfig, taskId);
-          runningSessions.add(session.id);
-          results[idx].session = session;
-
-          const state = this.sessions.get(session.id)!;
-          const completionPromise = state.runPromise
-            .then(() => { runningSessions.delete(session.id); return spawnNext(); })
-            .catch(() => { runningSessions.delete(session.id); return spawnNext(); });
-
-          completionPromises.push(completionPromise);
-        } catch (err) {
-          results[idx].error = err instanceof Error ? err.message : String(err);
-        }
-      }
-    };
-
-    await spawnNext();
-
-    const buildResult = (): CognitiveBatchResult => {
-      let completed = 0;
-      let failed = 0;
-      for (const r of results) {
-        if (r.session?.state === "completed") completed++;
-        else if (r.session?.state === "failed" || r.error) failed++;
-      }
-      return { results, completed, failed, cancelled };
-    };
-
-    return {
-      totalTasks: tasks.length,
-      waitForAll: async () => { await Promise.all(completionPromises); return buildResult(); },
-      cancel: async () => {
-        cancelled = true;
-        for (const sessionId of runningSessions) {
-          await this.terminate(sessionId).catch(() => {});
-        }
-        await Promise.all(completionPromises).catch(() => {});
-        return buildResult();
-      },
-    };
-  }
-
-  // ── Internal ────────────────────────────────────────────────────
-
-  private async _spawnCore(
-    config: CognitiveAgentSpawnConfig,
-    taskId?: string,
-  ): Promise<CognitiveAgentSession> {
-    // Per-attempt reset hook — runs BEFORE the agent is driven so each attempt
-    // (initial spawn AND each refinement re-spawn) starts from a clean external
-    // state (e.g. a deleted benchmark reward sink). Best-effort: a failing hook
-    // must not abort the spawn.
-    if (config.beforeSpawn) {
-      try {
-        await config.beforeSpawn();
-      } catch {
-        // Best effort — reset failure should not block the spawn.
-      }
-    }
-
-    // Forward env and MCP servers into the raw macro spawn's `config`. Build
-    // the AgentConfig only when at least one field is present so non-MCP,
-    // non-env spawns keep passing `config: undefined` (byte-identical to M0).
-    const rawConfig =
-      config.env || config.mcpServers
-        ? {
-            ...(config.env ? { env: config.env } : {}),
-            ...(config.mcpServers ? { mcpServers: config.mcpServers } : {}),
-          }
-        : undefined;
-
-    const spawned = await this.agentManager.spawn({
-      task: config.task.description,
-      task_id: taskId,
-      role: "analyst",
-      parent: this.config?.useTeam && this.config.coordinatorAgentId
-        ? this.config.coordinatorAgentId
-        : null,
-      cwd: config.cwd,
-      config: rawConfig,
-      customPrompt: config.systemPromptAdditions,
-    });
-
-    if (this.tasksAdapter && taskId) {
-      await this.tasksAdapter.assignTask(taskId, spawned.id as string);
-      await this.tasksAdapter.transitionTask(taskId, "start");
-    }
-
-    const sessionId = `cognitive_${nanoid(12)}`;
-    const session: CognitiveAgentSession = {
-      id: sessionId,
-      agentType: config.agentType,
-      task: config.task,
-      state: "running",
-      messages: [],
-      toolCalls: [],
-      startTime: new Date(),
-      metadata: { macroAgentId: spawned.id },
-    };
-
-    const runPromise = this.runSession(spawned.id, session, config, taskId);
-
-    this.sessions.set(sessionId, {
-      agentId: spawned.id,
-      session,
-      config,
-      runPromise,
-      taskId,
-    });
-
-    return session;
-  }
-
-  private async runSession(
-    agentId: AgentId,
-    session: CognitiveAgentSession,
-    config: CognitiveAgentSpawnConfig,
-    taskId?: string,
-  ): Promise<void> {
-    const timeout = config.timeout;
-    let softTimer: ReturnType<typeof setTimeout> | undefined;
-    let hardTimer: ReturnType<typeof setTimeout> | undefined;
-    let completionNotified = false;
-
-    // Helper: fire the completion callback + inbox notification exactly once.
-    // Called from both the hard-timer path and the finally block to avoid a
-    // race where waitForSession returns (state != "running") before finally
-    // runs and fires the callback.
-    const notifyCompletion = async (): Promise<void> => {
-      if (completionNotified) return;
-      if (session.state !== "completed" && session.state !== "failed") return;
-      completionNotified = true;
-
-      const completeEvent: SessionCompleteEvent = {
-        sessionId: session.id,
-        agentId: agentId as string,
-        state: session.state,
-        duration_ms: session.endTime
-          ? session.endTime.getTime() - session.startTime.getTime()
-          : 0,
-        message_count: session.messages.length,
-        tool_call_count: session.toolCalls.length,
-      };
-
-      this.onSessionComplete?.(completeEvent);
-
-      if (this.inboxAdapter) {
-        try {
-          await this.inboxAdapter.send(
-            agentId as string,
-            agentId as string,
-            {
-              type: "session.complete",
-              sessionId: session.id,
-              state: session.state,
-              duration_ms: completeEvent.duration_ms,
-              outcome: session.state === "completed" ? "success" : "failure",
-            },
-          );
-        } catch { /* best-effort */ }
-      }
-    };
-
-    try {
-      if (timeout && timeout > 0) {
-        const softMs = timeout * this.softTimeoutRatio;
-
-        softTimer = setTimeout(async () => {
-          if (session.state !== "running") return;
-          try {
-            const canInject = await this.agentManager.supportsInjection(agentId);
-            if (canInject) {
-              for await (const _ of this.agentManager.prompt(
-                agentId,
-                "TIME WARNING: Please finalize your analysis, write output, and call done() immediately.",
-              )) { /* drain */ }
-            }
-          } catch { /* best-effort */ }
-        }, softMs);
-
-        hardTimer = setTimeout(() => {
-          if (session.state !== "running") return;
-          session.state = "failed";
-          session.error = "Timeout exceeded";
-          session.endTime = new Date();
-          // Fire completion callback immediately — the finally block's
-          // deferred callback could race with waitForSession returning.
-          void notifyCompletion();
-          this.agentManager.terminate(agentId, "timeout").catch(() => {});
-        }, timeout);
-      }
-
-      const result = await this.agentManager.promptUntilDone(
-        agentId,
-        config.task.description,
-        {
-          maxFollowUps: this.maxFollowUps,
-          onUpdate: (update) => {
-            updateSessionFromEvent(session, update);
-            config.onMessage?.(session.messages[session.messages.length - 1]!);
-          },
-          // Forward the caller's completion predicate (e.g. a benchmark reward
-          // sink wrote done:true). When it fires, promptUntilDone returns
-          // completedExternally:true instead of exhausting maxFollowUps.
-          isComplete: config.completionSignal,
-        },
-      );
-
-      if (session.state === "running") {
-        // External completion (predicate) is a success path, same as done().
-        const completed = result.doneCalled || result.completedExternally;
-        session.state = completed ? "completed" : "failed";
-        if (!completed) session.error = "Agent did not call done()";
-        session.endTime = new Date();
-        session.result = result.doneStatus;
-      }
-    } catch (error) {
-      if (session.state === "running") {
-        session.state = "failed";
-        session.error = error instanceof Error ? error.message : String(error);
-        session.endTime = new Date();
-      }
-    } finally {
-      if (softTimer) clearTimeout(softTimer);
-      if (hardTimer) clearTimeout(hardTimer);
-
-      // Update task status
-      if (this.tasksAdapter && taskId) {
-        try {
-          if (session.state === "completed") {
-            await this.tasksAdapter.transitionTask(taskId, "complete");
-          } else if (session.state === "failed") {
-            await this.tasksAdapter.transitionTask(taskId, "fail");
-          }
-        } catch { /* may already be terminal */ }
-      }
-
-      // Notify completion (no trajectory extraction — OpenHive handles that via sessionlog)
-      // This is a no-op if the hard-timer path already fired it.
-      await notifyCompletion();
-
-      // Clean up agent process
-      if (session.state !== "running") {
-        const stopReason = session.state === "completed" ? "completed" : "failed";
-        await this.agentManager.terminate(agentId, stopReason).catch(() => {});
-      }
-    }
-  }
-}
-
-export function createMacroAgentBackend(
-  agentManager: AgentManager,
-  config?: MacroAgentBackendConfig,
-): MacroAgentBackend {
-  return new MacroAgentBackend(agentManager, config);
-}

package/src/cognitive/session-converter.ts

@@ -1,151 +0,0 @@
-/**
- * Session Converter
- *
- * Converts macro-agent's ExtendedSessionUpdate stream into CognitiveAgentSession.
- * This is the proto-agent-session-parser — will be extracted to a shared package
- * in Phase 2/3.
- *
- * Reference: cognitive-core's ACPProtocolHandler.processUpdate()
- * at references/cognitive-core/src/runtime/backends/acp-protocol.ts
- */
-
-import type { ExtendedSessionUpdate } from "acp-factory";
-import type {
-  CognitiveAgentSession,
-  CognitiveAgentMessage,
-  CognitiveToolCall,
-  CognitiveTask,
-} from "./types.js";
-
-/**
- * Convert a batch of ExtendedSessionUpdate events into a CognitiveAgentSession.
- *
- * @param updates - Array of session update events from macro-agent prompt()
- * @param sessionId - Session ID to assign
- * @param agentType - Agent type (e.g., 'claude-code')
- * @param task - Task description
- * @returns Populated session with messages and tool calls
- */
-export function convertUpdatesToSession(
-  updates: ExtendedSessionUpdate[],
-  sessionId: string,
-  agentType: string,
-  task: CognitiveTask,
-): CognitiveAgentSession {
-  const session: CognitiveAgentSession = {
-    id: sessionId,
-    agentType,
-    task,
-    state: "running",
-    messages: [],
-    toolCalls: [],
-    startTime: new Date(),
-    metadata: {},
-  };
-
-  for (const update of updates) {
-    updateSessionFromEvent(session, update);
-  }
-
-  return session;
-}
-
-/**
- * Incrementally update a CognitiveAgentSession from a single ExtendedSessionUpdate.
- * Used for streaming: call this as each update arrives.
- *
- * Uses defensive typing since ACP's ExtendedSessionUpdate is a complex union type.
- */
-export function updateSessionFromEvent(
-  session: CognitiveAgentSession,
-  update: ExtendedSessionUpdate,
-): void {
-  const u = update as Record<string, unknown>;
-  const updateType = u.sessionUpdate as string;
-
-  switch (updateType) {
-    case "agent_message_chunk":
-    case "user_message_chunk":
-    case "agent_thought_chunk": {
-      const content = u.content as Record<string, unknown> | undefined;
-      if (
-        content &&
-        content.type === "text" &&
-        typeof content.text === "string"
-      ) {
-        const message: CognitiveAgentMessage = {
-          role: updateType === "user_message_chunk" ? "user" : "assistant",
-          content: content.text,
-          timestamp: new Date(),
-        };
-        session.messages.push(message);
-      }
-      break;
-    }
-
-    case "tool_call": {
-      const toolCallId =
-        (u.toolCallId as string) ?? `tc_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-      const title = (u.title as string) ?? "unknown";
-      const rawInput = u.rawInput;
-
-      const toolCall: CognitiveToolCall = {
-        id: toolCallId,
-        name: title,
-        input: rawInput,
-        startTime: new Date(),
-      };
-      session.toolCalls.push(toolCall);
-      break;
-    }
-
-    case "tool_call_update": {
-      const toolCallId = u.toolCallId as string;
-      const status = u.status as string | undefined;
-      const content = u.content as
-        | Array<Record<string, unknown>>
-        | undefined;
-
-      const existingTc = session.toolCalls.find((t) => t.id === toolCallId);
-      if (existingTc) {
-        if (status === "completed" || status === "failed") {
-          existingTc.endTime = new Date();
-        }
-        if (content && Array.isArray(content)) {
-          const outputs: string[] = [];
-          for (const block of content) {
-            if (block.type === "text" && typeof block.text === "string") {
-              outputs.push(block.text);
-            } else if (
-              block.type === "diff" &&
-              typeof block.diff === "string"
-            ) {
-              outputs.push(block.diff);
-            }
-          }
-          if (outputs.length > 0) {
-            existingTc.output = outputs.join("\n");
-          }
-        }
-        if (status === "failed") {
-          existingTc.error = "Tool call failed";
-        }
-      }
-      break;
-    }
-
-    case "plan": {
-      const plan = u.plan;
-      session.messages.push({
-        role: "assistant",
-        content: `[Plan] ${JSON.stringify(plan)}`,
-        timestamp: new Date(),
-      });
-      break;
-    }
-
-    default:
-      // Store last unrecognized update for debugging
-      session.metadata.lastUpdate = updateType;
-  }
-}