macro-agent 0.2.4 → 0.2.6

package/src/map/__tests__/trajectory-reporter.test.ts

@@ -1,173 +0,0 @@
-/**
- * Tests for Trajectory Reporter — checkpoint building & reporting.
- */
-
-import { describe, it, expect, beforeEach, vi } from "vitest";
-import {
-  createTrajectoryReporter,
-  type TrajectoryConnection,
-} from "../trajectory-reporter.js";
-import type { TrajectoryCheckpointPayload } from "../types.js";
-
-function mockConnection(): TrajectoryConnection & {
-  callExtension: ReturnType<typeof vi.fn>;
-  sendNotification: ReturnType<typeof vi.fn>;
-  onNotification: ReturnType<typeof vi.fn>;
-  offNotification: ReturnType<typeof vi.fn>;
-} {
-  return {
-    callExtension: vi.fn().mockResolvedValue({
-      ok: true,
-      resource_id: "res-123",
-      created: true,
-      checkpoint_id: "cp-1",
-    }),
-    sendNotification: vi.fn().mockResolvedValue(undefined),
-    onNotification: vi.fn(),
-    offNotification: vi.fn(),
-    get isConnected() {
-      return true;
-    },
-  };
-}
-
-function sampleCheckpoint(): TrajectoryCheckpointPayload {
-  return {
-    id: "session-1-step1",
-    session_id: "session-1",
-    agent: "macro-agent-sidecar",
-    branch: "main",
-    files_touched: ["src/index.ts"],
-    checkpoints_count: 1,
-    token_usage: { input_tokens: 100, output_tokens: 200 },
-    metadata: { project: "test-project", phase: "active" },
-  };
-}
-
-describe("TrajectoryReporter", () => {
-  let conn: ReturnType<typeof mockConnection>;
-
-  beforeEach(() => {
-    conn = mockConnection();
-  });
-
-  it("sends checkpoint via callExtension", async () => {
-    const reporter = createTrajectoryReporter(conn, {
-      trajectorySyncLevel: "metrics",
-    });
-
-    const result = await reporter.reportCheckpoint(sampleCheckpoint());
-
-    expect(conn.callExtension).toHaveBeenCalledWith(
-      "trajectory/checkpoint",
-      expect.objectContaining({
-        checkpoint: expect.objectContaining({
-          id: "session-1-step1",
-          agent: "macro-agent-sidecar",
-        }),
-      }),
-    );
-    expect(result?.ok).toBe(true);
-    expect(result?.resource_id).toBe("res-123");
-  });
-
-  it("caches resource_id from first response", async () => {
-    const reporter = createTrajectoryReporter(conn, {
-      trajectorySyncLevel: "metrics",
-    });
-
-    // First call
-    await reporter.reportCheckpoint(sampleCheckpoint());
-
-    // Second call should include cached resource_id
-    await reporter.reportCheckpoint({
-      ...sampleCheckpoint(),
-      id: "session-1-step2",
-    });
-
-    const secondCall = conn.callExtension.mock.calls[1];
-    expect(secondCall[1]).toHaveProperty("resource_id", "res-123");
-  });
-
-  it("returns null when sync level is off", async () => {
-    const reporter = createTrajectoryReporter(conn, {
-      trajectorySyncLevel: "off",
-    });
-
-    const result = await reporter.reportCheckpoint(sampleCheckpoint());
-
-    expect(result).toBeNull();
-    expect(conn.callExtension).not.toHaveBeenCalled();
-  });
-
-  it("returns null when disconnected", async () => {
-    const disconnected = {
-      ...conn,
-      get isConnected() {
-        return false;
-      },
-    };
-    const reporter = createTrajectoryReporter(disconnected, {
-      trajectorySyncLevel: "metrics",
-    });
-
-    const result = await reporter.reportCheckpoint(sampleCheckpoint());
-
-    expect(result).toBeNull();
-  });
-
-  it("falls back to sendNotification on extension failure", async () => {
-    conn.callExtension.mockRejectedValue(new Error("unsupported extension"));
-
-    const reporter = createTrajectoryReporter(conn, {
-      trajectorySyncLevel: "metrics",
-    });
-
-    const result = await reporter.reportCheckpoint(sampleCheckpoint());
-
-    expect(result).toBeNull();
-    expect(conn.sendNotification).toHaveBeenCalledWith(
-      "trajectory.checkpoint",
-      expect.objectContaining({
-        checkpoint: expect.objectContaining({ id: "session-1-step1" }),
-      }),
-    );
-  });
-
-  it("registers content request handler on creation", () => {
-    createTrajectoryReporter(conn, { trajectorySyncLevel: "metrics" });
-
-    expect(conn.onNotification).toHaveBeenCalledWith(
-      "trajectory/content.request",
-      expect.any(Function),
-    );
-  });
-
-  it("unregisters content request handler on stop", () => {
-    const reporter = createTrajectoryReporter(conn, {
-      trajectorySyncLevel: "metrics",
-    });
-
-    reporter.stop();
-
-    expect(conn.offNotification).toHaveBeenCalledWith(
-      "trajectory/content.request",
-      expect.any(Function),
-    );
-  });
-
-  it("responds to content request with sendNotification", async () => {
-    createTrajectoryReporter(conn, { trajectorySyncLevel: "metrics" });
-
-    // Get the registered handler
-    const handler = conn.onNotification.mock.calls[0][1];
-
-    // Simulate inbound content request
-    await handler({ request_id: "req-1", checkpoint_id: "cp-1" });
-
-    expect(conn.sendNotification).toHaveBeenCalledWith(
-      "trajectory/content.response",
-      expect.objectContaining({ request_id: "req-1" }),
-    );
-  });
-});

package/src/map/acp-bridge.ts

@@ -1,293 +0,0 @@
-/**
- * ACP-over-MAP Bridge
- *
- * Bridges ACP streams that arrive over MAP messaging to the local
- * createMacroAgent() ACP handler. When a MAP client sends ACP envelopes
- * to a local agent (via mapClient.send(targetAgent, envelope)), this bridge
- * intercepts the delivery, creates a virtual Stream, and wires it to
- * AgentSideConnection + createMacroAgent().
- *
- * Each ACP stream (identified by streamId) gets its own in-memory stream
- * pair. The readable side is fed by inbound MAP messages. The writable side
- * is drained and forwarded back to the client via MAP messaging.
- *
- * @module map/acp-bridge
- */
-
-import {
-  AgentSideConnection,
-  type Stream,
-  type AnyMessage,
-} from "@agentclientprotocol/sdk";
-import { createMacroAgent } from "../acp/macro-agent.js";
-import type { MacroAgentSystemV2 } from "../boot-v2.js";
-
-// =============================================================================
-// Types
-// =============================================================================
-
-/** ACP envelope as sent over MAP (matches MAP SDK's ACPStreamConnection format) */
-interface ACPEnvelope {
-  acp: AnyMessage; // The actual ACP JSON-RPC message
-  acpContext: {
-    streamId: string;
-    sessionId: string | null;
-    direction: "client-to-agent" | "agent-to-client";
-  };
-}
-
-/** Active ACP stream state */
-interface ACPStreamState {
-  streamId: string;
-  /** Macro-agent's internal store id (the agent the stream targets). */
-  peerAgentId: string;
-  /** Push inbound ACP messages into the readable side */
-  push: (message: AnyMessage) => void;
-  /** Close the stream */
-  close: () => void;
-  /** The AgentSideConnection managing this stream */
-  connection: AgentSideConnection;
-}
-
-// =============================================================================
-// Bridge
-// =============================================================================
-
-export interface ACPBridge {
-  /**
-   * Handle a MAP message delivered to a local agent.
-   * Returns true if the message was an ACP envelope and was handled.
-   */
-  handleDelivery(agentId: string, message: any): boolean;
-
-  /**
-   * Inspect which agent each open ACP stream is bound to. Used for
-   * observability and routing tests — the binding is otherwise per-stream
-   * in-memory state and not externally observable.
-   */
-  getStreamBindings(): Array<{ streamId: string; peerAgentId: string }>;
-
-  /** Close all active streams */
-  close(): void;
-}
-
-/**
- * Create an ACP-over-MAP bridge.
- *
- * @param system - The macro-agent system (for createMacroAgent)
- * @param sendToClient - Function to send MAP messages back to the originating client.
- *   Called with (recipientSessionId, payload) where the bridge builds the response envelope.
- */
-export function createACPBridge(
-  system: MacroAgentSystemV2,
-  mapServer: any, // MAPServer instance — typed as any due to dynamic import
-  /** Resolve local agent ID → MAP agent ID for response routing */
-  resolveMapId?: (localAgentId: string) => string | undefined,
-  /** Send a raw JSON-RPC notification to a specific client's WebSocket.
-   *  This bypasses the MAPServer's subscription system for direct delivery. */
-  sendRawToClient?: (clientSessionId: string, notification: any) => void,
-): ACPBridge {
-  const streams = new Map<string, ACPStreamState>();
-
-  /**
-   * Check if a MAP message payload is an ACP envelope.
-   */
-  function isACPEnvelope(payload: unknown): payload is ACPEnvelope {
-    if (!payload || typeof payload !== "object") return false;
-    const p = payload as Record<string, unknown>;
-    return (
-      p.acp !== undefined &&
-      p.acpContext !== undefined &&
-      typeof (p.acpContext as any)?.streamId === "string"
-    );
-  }
-
-  /**
-   * Create an in-memory stream pair for a new ACP stream.
-   * Returns the Stream + a push function to feed inbound messages.
-   */
-  function createInMemoryStream(
-    onOutbound: (msg: AnyMessage) => void,
-  ): {
-    stream: Stream;
-    push: (msg: AnyMessage) => void;
-    close: () => void;
-  } {
-    let readableController: ReadableStreamDefaultController<AnyMessage> | null =
-      null;
-
-    const readable = new ReadableStream<AnyMessage>({
-      start(controller) {
-        readableController = controller;
-      },
-    });
-
-    const writable = new WritableStream<AnyMessage>({
-      // Outbound ACP messages from the AgentSideConnection go here.
-      // This captures JSON-RPC responses (to initialize, newSession, prompt, etc.)
-      // and notifications (sessionUpdate) and routes them back via MAP.
-      write(chunk) {
-        onOutbound(chunk);
-      },
-    });
-
-    return {
-      stream: { readable, writable },
-      push: (msg: AnyMessage) => {
-        try {
-          readableController?.enqueue(msg);
-        } catch {
-          // Stream may be closed
-        }
-      },
-      close: () => {
-        try {
-          readableController?.close();
-        } catch {
-          // Already closed
-        }
-      },
-    };
-  }
-
-  /**
-   * Get or create an ACP stream for the given streamId + agentId.
-   */
-  function getOrCreateStream(
-    streamId: string,
-    agentId: string,
-    sourceSessionId: string,
-  ): ACPStreamState {
-    const existing = streams.get(streamId);
-    if (existing) return existing;
-
-    /**
-     * Route an outbound ACP message back to the client via MAP messaging.
-     * This is called for both JSON-RPC responses AND notifications
-     * written to the stream's writable side by AgentSideConnection.
-     */
-    const sendToClient = (acpMessage: AnyMessage) => {
-      const envelope: ACPEnvelope = {
-        acp: acpMessage,
-        acpContext: {
-          streamId,
-          sessionId: null, // Will be populated if available
-          direction: "agent-to-client",
-        },
-      };
-
-      try {
-        const mapAgentId = resolveMapId?.(agentId) ?? agentId;
-
-        const message = {
-          id: `acp-resp-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
-          from: { agent: mapAgentId },
-          to: { agent: sourceSessionId },
-          payload: envelope,
-          timestamp: Date.now(),
-        };
-
-        const event = {
-          type: "message_delivered",
-          data: { message, agentId: sourceSessionId },
-          source: { agentId: mapAgentId },
-          id: message.id,
-          timestamp: Date.now(),
-        };
-
-        if (sendRawToClient) {
-          // Direct delivery to the requesting client
-          sendRawToClient(sourceSessionId, { params: { event } });
-        }
-
-        // Also emit via eventBus so other MAP clients (observers) can see
-        // agent activity via their subscriptions. This enables the TUI's
-        // "observed" stream mode for multi-agent trajectory visibility.
-        try {
-          mapServer.eventBus.emit(event);
-        } catch {
-          // Best effort — eventBus emit may fail
-        }
-      } catch (err) {
-        console.warn(
-          `[acp-bridge] Failed to send response to client: ${(err as Error).message}`,
-        );
-      }
-    };
-
-    const { stream, push, close } = createInMemoryStream(sendToClient);
-
-    // Create the AgentSideConnection.
-    // All outbound messages (responses + notifications) go through the
-    // writable side of the stream, which calls sendToClient above.
-    //
-    // Bind the MacroAgent to this stream's target agent so `session/new`
-    // creates a session for the agent the MAP stream was opened against,
-    // not whichever head manager happens to share the same cwd.
-    const conn = new AgentSideConnection(
-      (agentConn) =>
-        createMacroAgent(agentConn, {
-          system,
-          initConfig: { targetAgentId: agentId },
-        }),
-      stream,
-    );
-
-    const state: ACPStreamState = {
-      streamId,
-      peerAgentId: agentId,
-      push,
-      close,
-      connection: conn,
-    };
-
-    streams.set(streamId, state);
-    return state;
-  }
-
-  return {
-    handleDelivery(agentId: string, message: any): boolean {
-      const payload = message?.payload;
-      if (!isACPEnvelope(payload)) return false;
-
-      const { acp, acpContext } = payload;
-      if (acpContext.direction !== "client-to-agent") return false;
-
-      const streamId = acpContext.streamId;
-
-      // Get the source client/agent ID to route responses back.
-      // The message 'from' field is an Address object like { agent: "id" } or a string.
-      const fromField = message?.from;
-      const sourceSessionId =
-        (typeof fromField === "string" ? fromField : fromField?.agent ?? fromField?.id) ??
-        message?.sender ?? "";
-
-
-      // Get or create the ACP stream
-      const streamState = getOrCreateStream(
-        streamId,
-        agentId,
-        sourceSessionId,
-      );
-
-      // Push the ACP message into the stream's readable side
-      streamState.push(acp);
-
-      return true;
-    },
-
-    getStreamBindings(): Array<{ streamId: string; peerAgentId: string }> {
-      return Array.from(streams.values()).map((s) => ({
-        streamId: s.streamId,
-        peerAgentId: s.peerAgentId,
-      }));
-    },
-
-    close(): void {
-      for (const state of streams.values()) {
-        state.close();
-      }
-      streams.clear();
-    },
-  };
-}

package/src/map/cascade-action-handler.ts

@@ -1,205 +0,0 @@
-/**
- * Cascade Action Handler — receives hub→runtime commands.
- *
- * Listens for `x-cascade/request.*` notifications from the OpenHive hub
- * and dispatches to the GitCascadeAdapter. This is the inbound counterpart
- * to the CascadeBridge (which handles outbound events).
- *
- * Actions are fire-and-forget from the hub's perspective: the hub sends
- * the notification and the UI updates reactively when the resulting
- * `x-cascade/stream.*` event flows back through the bridge.
- *
- * @module map/cascade-action-handler
- */
-
-import type { GitCascadeAdapter } from '../workspace/git-cascade-adapter.js';
-
-export interface CascadeActionConnection {
-  onNotification(
-    method: string,
-    handler: (params: unknown) => void | Promise<void>,
-  ): void;
-  offNotification(
-    method: string,
-    handler: (params: unknown) => void | Promise<void>,
-  ): void;
-}
-
-const REQUEST_METHODS = {
-  MERGE: 'x-cascade/request.merge',
-  ABANDON: 'x-cascade/request.abandon',
-  PAUSE: 'x-cascade/request.pause',
-  RESUME: 'x-cascade/request.resume',
-  RESOLVE: 'x-cascade/request.resolve',
-  PUSH: 'x-cascade/request.push',
-  COMMIT: 'x-cascade/request.commit',
-} as const;
-
-/**
- * Register cascade action handlers on the MAP connection.
- * Returns a cleanup function that removes all handlers.
- */
-export function setupCascadeActionHandlers(
-  connection: CascadeActionConnection,
-  adapter: GitCascadeAdapter,
-): () => void {
-  const handlers: Array<{
-    method: string;
-    handler: (params: unknown) => void | Promise<void>;
-  }> = [];
-
-  const register = (
-    method: string,
-    handler: (params: unknown) => void | Promise<void>,
-  ): void => {
-    connection.onNotification(method, handler);
-    handlers.push({ method, handler });
-  };
-
-  /** Find the first worktree checked out on a given stream. */
-  function findWorktreeForStream(streamId: string): string | null {
-    const wts = adapter.listWorktrees();
-    const match = wts.find((wt) => wt.currentStream === streamId);
-    return match?.path ?? null;
-  }
-
-  // ── Merge ─────────────────────────────────────────────────────────
-  register(REQUEST_METHODS.MERGE, (params: unknown) => {
-    const p = params as { stream_id?: string; target_stream_id?: string };
-    if (!p?.stream_id) return;
-
-    const stream = adapter.getStream(p.stream_id);
-    const targetStreamId = p.target_stream_id ?? stream?.parentStream;
-    if (!targetStreamId) return;
-
-    const worktreePath = findWorktreeForStream(p.stream_id);
-    if (!worktreePath) return;
-
-    try {
-      adapter.mergeStream({
-        sourceStream: p.stream_id,
-        targetStream: targetStreamId,
-        agentId: 'hub-request',
-        worktree: worktreePath,
-      });
-    } catch {
-      // Non-fatal — the resulting event (or conflict) will surface via the bridge
-    }
-  });
-
-  // ── Abandon ───────────────────────────────────────────────────────
-  register(REQUEST_METHODS.ABANDON, (params: unknown) => {
-    const p = params as { stream_id?: string; reason?: string };
-    if (!p?.stream_id) return;
-    try {
-      adapter.abandonStream(p.stream_id, { reason: p.reason ?? 'hub-request' });
-    } catch { /* non-fatal */ }
-  });
-
-  // ── Pause ─────────────────────────────────────────────────────────
-  register(REQUEST_METHODS.PAUSE, (params: unknown) => {
-    const p = params as { stream_id?: string; reason?: string };
-    if (!p?.stream_id) return;
-    try {
-      adapter.pauseStream(p.stream_id, p.reason);
-    } catch { /* non-fatal */ }
-  });
-
-  // ── Resume ────────────────────────────────────────────────────────
-  register(REQUEST_METHODS.RESUME, (params: unknown) => {
-    const p = params as { stream_id?: string };
-    if (!p?.stream_id) return;
-    try {
-      adapter.resumeStream(p.stream_id);
-    } catch { /* non-fatal */ }
-  });
-
-  // ── Resolve conflict ──────────────────────────────────────────────
-  register(REQUEST_METHODS.RESOLVE, (params: unknown) => {
-    const p = params as {
-      stream_id?: string;
-      conflict_id?: string;
-      strategy?: string;
-    };
-    if (!p?.stream_id || !p?.conflict_id) return;
-    try {
-      adapter.resolveConflict({
-        conflictId: p.conflict_id,
-        resolution: {
-          method: (p.strategy as 'ours' | 'theirs') ?? 'ours',
-          resolvedBy: 'hub-request',
-        },
-      });
-    } catch { /* non-fatal */ }
-  });
-
-  // ── Push ───────────────────────────────────────────────────────────
-  register(REQUEST_METHODS.PUSH, (params: unknown) => {
-    const p = params as {
-      stream_id?: string;
-      remote?: string;
-      target_ref?: string;
-    };
-    if (!p?.stream_id) return;
-
-    const worktreePath = findWorktreeForStream(p.stream_id);
-    if (!worktreePath) return;
-
-    const remote = p.remote ?? 'origin';
-    const streamBranch = `stream/${p.stream_id}`;
-    const targetRef = p.target_ref ?? streamBranch;
-
-    try {
-      const { execSync } = require('child_process');
-      execSync(`git push ${remote} ${streamBranch}:refs/heads/${targetRef}`, {
-        cwd: worktreePath,
-        stdio: 'pipe',
-        encoding: 'utf-8',
-      });
-      // Emit pushed event so the hub records it
-      adapter.notifyStreamPushed?.({
-        streamId: p.stream_id,
-        agentId: 'hub-request',
-        pushedCommit: execSync('git rev-parse HEAD', {
-          cwd: worktreePath,
-          encoding: 'utf-8',
-        }).trim(),
-        remote,
-        remoteRef: targetRef,
-        strategy: 'hub-push',
-      });
-    } catch { /* non-fatal — push failure is reported via absence of pushed event */ }
-  });
-
-  // ── Commit ────────────────────────────────────────────────────────
-  register(REQUEST_METHODS.COMMIT, (params: unknown) => {
-    const p = params as {
-      stream_id?: string;
-      message?: string;
-      metadata?: Record<string, unknown>;
-    };
-    if (!p?.stream_id) return;
-
-    const worktreePath = findWorktreeForStream(p.stream_id);
-    if (!worktreePath) return;
-
-    const message = p.message ?? 'checkpoint (hub-requested)';
-    try {
-      adapter.commitChanges({
-        streamId: p.stream_id,
-        agentId: 'hub-request',
-        worktree: worktreePath,
-        message,
-        metadata: p.metadata,
-      });
-    } catch { /* non-fatal — nothing to commit, or stream conflicted */ }
-  });
-
-  // ── Cleanup ───────────────────────────────────────────────────────
-  return () => {
-    for (const { method, handler } of handlers) {
-      connection.offNotification(method, handler);
-    }
-    handlers.length = 0;
-  };
-}