macro-agent 0.1.2 → 0.1.4

package/dist/acp/index.js

@@ -1,52 +1,11 @@
 /**
- * ACP module - Agent Communication Protocol support for macro-agent
+ * ACP (Agent Communication Protocol) — WebSocket-based multi-client sessions.
  *
- * Enables macro-agent to run as an ACP-compliant agent that external
- * systems can spawn and control.
+ * @module acp
  */
-import { AgentFactory } from "acp-factory";
-/**
- * Register macro-agent with acp-factory for easy spawning.
- *
- * After calling this, you can spawn macro-agent via:
- * ```typescript
- * const handle = await AgentFactory.spawn("macro-agent", { ... });
- * ```
- *
- * @example
- * ```typescript
- * import { registerMacroAgent } from "macro-agent";
- *
- * // Register with defaults
- * registerMacroAgent();
- *
- * // Or with custom options
- * registerMacroAgent({
- *   command: "node",
- *   args: ["./dist/cli/acp.js"],
- * });
- *
- * // Now spawn it
- * const handle = await AgentFactory.spawn("macro-agent", {
- *   permissionMode: "auto-approve",
- * });
- * ```
- */
-export function registerMacroAgent(options = {}) {
-    const { command = "npx", args = ["multiagent", "--acp"], env, } = options;
-    AgentFactory.register("macro-agent", {
-        command,
-        args,
-        env,
-    });
-}
 export { ACPError } from "./types.js";
-// Session mapping
 export { SessionMapper } from "./session-mapper.js";
-// MacroAgent - ACP-compliant agent implementation
-export { MacroAgent } from "./macro-agent.js";
-// WebSocket stream adapter for ACP over WebSocket
-export { webSocketStream, isWebSocketOpen, isWebSocketConnecting, } from "./websocket-stream.js";
-// WebSocket ACP server for multi-client support
-export { createWebSocketACPServer, } from "./websocket-server.js";
+export { createMacroAgent } from "./macro-agent.js";
+export { createWebSocketACPServer } from "./websocket-server.js";
+export { createMAPBridge } from "./map-bridge.js";
 //# sourceMappingURL=index.js.map

package/dist/acp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/acp/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAyB3C;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,kBAAkB,CAAC,UAA2B,EAAE;IAC9D,MAAM,EACJ,OAAO,GAAG,KAAK,EACf,IAAI,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,EAC9B,GAAG,GACJ,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,QAAQ,CAAC,aAAa,EAAE;QACnC,OAAO;QACP,IAAI;QACJ,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAsCD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,kBAAkB;AAClB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,kDAAkD;AAClD,OAAO,EAAE,UAAU,EAAyB,MAAM,kBAAkB,CAAC;AAErE,kDAAkD;AAClD,OAAO,EACL,eAAe,EACf,eAAe,EACf,qBAAqB,GAEtB,MAAM,uBAAuB,CAAC;AAE/B,gDAAgD;AAChD,OAAO,EACL,wBAAwB,GAIzB,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/acp/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAMjE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/acp/macro-agent.d.ts

@@ -1,264 +1,37 @@
 /**
- * MacroAgent - ACP-compliant agent implementation for macro-agent
+ * MacroAgent — ACP Agent implementation for macro-agent.
  *
- * Implements the Agent interface from @agentclientprotocol/sdk to allow
- * macro-agent to be spawned and controlled via the Agent Communication Protocol.
+ * Bridges the ACP protocol to macro-agent's V2 services:
+ * - session/new → agentManager.getOrCreateHeadManager()
+ * - session/prompt → agentManager.prompt() with streaming
+ * - Extension methods → spawn, mount, fork, hierarchy, tasks, etc.
+ *
+ * @module acp/macro-agent
  */
-import type { Agent, AgentSideConnection, InitializeRequest, InitializeResponse, NewSessionRequest, NewSessionResponse, LoadSessionRequest, LoadSessionResponse, AuthenticateRequest, AuthenticateResponse, PromptRequest, PromptResponse, CancelNotification } from "@agentclientprotocol/sdk";
-import type { AgentManager } from "../agent/agent-manager.js";
-import type { EventStore } from "../store/event-store.js";
-import type { TaskManager } from "../task/task-manager.js";
-import type { AgentId } from "../store/types/index.js";
+import type { Agent as ACPAgent } from "@agentclientprotocol/sdk";
+import type { AgentSideConnection } from "@agentclientprotocol/sdk";
+import type { MacroAgentSystemV2 } from "../boot-v2.js";
 import { SessionMapper } from "./session-mapper.js";
-import type { ACPSessionId, MacroAgentInitConfig } from "./types.js";
-import type { PeerManager } from "../peer/peer-manager.js";
-import type { CapabilityManager } from "../peer/capability-manager.js";
-import type { RoleRegistry } from "../roles/types.js";
+import type { MacroAgentInitConfig } from "./types.js";
 export interface MacroAgentConfig {
-    /** AgentManager for spawning and managing agents */
-    agentManager: AgentManager;
-    /** EventStore for persistence */
-    eventStore: EventStore;
-    /** TaskManager for task operations */
-    taskManager: TaskManager;
-    /** PeerManager for inter-macro-agent communication (optional) */
-    peerManager?: PeerManager;
-    /** CapabilityManager for peer capability management (optional) */
-    capabilityManager?: CapabilityManager;
-    /** RoleRegistry for role-based capability checking (optional, uses default if not provided) */
-    roleRegistry?: RoleRegistry;
-    /** Default working directory for new sessions */
-    defaultCwd?: string;
+    system: MacroAgentSystemV2;
+    initConfig?: MacroAgentInitConfig;
 }
 /**
- * MacroAgent implements the ACP Agent interface to expose macro-agent
- * as an ACP-compliant agent that can be spawned by external systems.
+ * Create a macro-agent ACP handler for an AgentSideConnection.
+ *
+ * Usage:
+ * ```ts
+ * new AgentSideConnection(
+ *   (conn) => createMacroAgent(conn, { system }),
+ *   stream,
+ * );
+ * ```
  */
-export declare class MacroAgent implements Agent {
-    private connection;
-    private agentManager;
-    private eventStore;
-    private taskManager;
-    private peerManager;
-    private capabilityManager;
-    private roleRegistry;
-    private sessionMapper;
-    private defaultCwd;
-    /** Configuration from ACP initialization */
-    private initConfig;
-    /** Map of ACP session ID to cancellation abort controllers */
-    private cancellationControllers;
-    /** Accumulates assistant response parts during prompt streaming for history persistence */
-    private promptBuffers;
-    /** Caches tool info (title, name, input) from initial tool_call events per session */
-    private toolInfoCaches;
-    constructor(connection: AgentSideConnection, config: MacroAgentConfig);
-    /**
-     * Initialize the connection and advertise capabilities
-     *
-     * Reads configuration from `params._meta?.macroConfig` if provided.
-     * This allows each macro-agent instance to have different settings.
-     */
-    initialize(params: InitializeRequest): Promise<InitializeResponse>;
-    /**
-     * Create a new session by spawning a head manager
-     */
-    newSession(params: NewSessionRequest): Promise<NewSessionResponse>;
-    /**
-     * Load an existing session from EventStore
-     */
-    loadSession(params: LoadSessionRequest): Promise<LoadSessionResponse>;
-    /**
-     * Authenticate - macro-agent doesn't require authentication
-     */
-    authenticate(_params: AuthenticateRequest): Promise<AuthenticateResponse>;
-    /**
-     * Process a prompt by routing to the mapped agent
-     */
-    prompt(params: PromptRequest): Promise<PromptResponse>;
-    /**
-     * Cancel ongoing operations for a session
-     */
-    cancel(params: CancelNotification): Promise<void>;
-    /**
-     * Route extension method calls to handlers
-     */
-    extMethod(method: string, params: Record<string, unknown>): Promise<Record<string, unknown>>;
-    /**
-     * Spawn a new child agent
-     */
-    private handleSpawnAgent;
-    /**
-     * Map a child role name to the required spawn capability.
-     * Handles subroles like "worker.resolver" by checking base role.
-     */
-    private getSpawnCapability;
-    /**
-     * Get the agent hierarchy tree
-     */
-    private handleGetHierarchy;
-    /**
-     * Get task details by ID
-     */
-    private handleGetTask;
-    /**
-     * Mount (attach to) an existing agent
-     *
-     * Remaps an ACP session to point to a different agent.
-     * Subsequent prompts will go to the mounted agent.
-     */
-    private handleMountAgent;
-    /**
-     * Fork an agent (create a branch with same conversation context)
-     *
-     * Creates a new agent that starts from the same point as the original.
-     * Uses native fork if available, otherwise falls back to loadSession.
-     */
-    private handleForkAgent;
-    /**
-     * Send a peer message (outbound, fire-and-forget)
-     *
-     * Called by external clients to have an agent send a message to a peer.
-     */
-    private handleSendPeerMessage;
-    /**
-     * Send a peer request (outbound, request-response)
-     *
-     * Called by external clients to have an agent send a request to a peer
-     * and wait for a response.
-     */
-    private handleSendPeerRequest;
-    /**
-     * Deliver a peer message (inbound, fire-and-forget)
-     *
-     * Called by external clients to route an inbound message from a peer
-     * to this macro-agent. The message is queued for the target agent.
-     */
-    private handleDeliverPeerMessage;
-    /**
-     * Deliver a peer request (inbound, request-response)
-     *
-     * Called by external clients to route an inbound request from a peer
-     * to this macro-agent. The request is queued and this waits for the
-     * internal agent to respond.
-     */
-    private handleDeliverPeerRequest;
-    /**
-     * Grant capabilities to a peer
-     */
-    private handleGrantCapability;
-    /**
-     * Revoke capabilities from a peer
-     */
-    private handleRevokeCapability;
-    /**
-     * Get capabilities for a peer or list all authorized peers
-     */
-    private handleGetCapabilities;
-    /**
-     * Check if a peer has a required capability
-     */
-    private handleCheckCapability;
-    /**
-     * Respond to a permission request for a session
-     *
-     * Routes the response through the session mapper to find the agent,
-     * then calls the agent manager to resolve the pending permission.
-     */
-    private handleRespondToPermission;
-    /**
-     * Cancel a permission request for a session
-     *
-     * Routes the cancellation through the session mapper to find the agent,
-     * then calls the agent manager to cancel the pending permission.
-     */
-    private handleCancelPermission;
-    /**
-     * Change the permission mode for a running agent at runtime
-     */
-    private handleSetPermissionMode;
-    /**
-     * Resume a stopped/failed agent
-     */
-    private handleResumeAgent;
-    /**
-     * Extract text content from prompt content blocks
-     */
-    private extractMessageContent;
-    /**
-     * Forward session updates from child agents to the ACP client
-     *
-     * acp-factory already sends updates in ACP SDK format, so we forward
-     * all updates directly. This handles all update types including:
-     * - agent_message_chunk: Text content from agent
-     * - agent_thought_chunk: Agent thinking/reasoning (if enabled)
-     * - user_message_chunk: Echo of user messages
-     * - tool_call: Tool invocation start
-     * - tool_call_update: Tool execution progress/completion
-     * - plan: Plan updates
-     * - available_commands_update: Available slash commands
-     * - current_mode_update: Mode changes (code/plan/etc)
-     * - config_option_update: Configuration changes
-     * - session_info_update: Session title and timestamps
-     *
-     * Permission requests are handled separately via the requestPermission RPC.
-     */
-    private forwardSessionUpdate;
-    /**
-     * Emit a session_info_update with title and timestamps.
-     * Uses agent task as title and session mapping timestamps.
-     */
-    private emitSessionInfo;
-    /**
-     * Build system prompt with configured prefix/suffix
-     */
-    private buildSystemPrompt;
-    /**
-     * Merge default sub-agent config with per-spawn override
-     *
-     * Override values take precedence over defaults.
-     * Arrays (like mcpServers) are concatenated, not replaced.
-     */
-    private mergeSubAgentConfig;
-    /**
-     * Convert SubAgentConfig to internal AgentConfig format
-     */
-    private toAgentConfig;
-    /**
-     * Ensure a conversation exists in the EventStore for a session.
-     * Uses the ACP session ID as the conversation ID for direct lookup.
-     */
-    private ensureConversation;
-    /**
-     * Record user and assistant turns after a prompt completes.
-     */
-    private recordPromptTurns;
-    /**
-     * Handle _macro/getModels extension — returns the session's available models.
-     * Claude Code populates models asynchronously after session creation
-     * (via _model_state_update notification), so this allows the TUI to poll
-     * for the model list once it's available.
-     *
-     * Returns full model info (modelId + name) since Claude Code uses shorthand
-     * model IDs ("default", "sonnet") that don't match models.dev. The name
-     * field (e.g., "Claude Sonnet 4") enables better model registry matching.
-     */
-    private handleGetModels;
-    /**
-     * Handle _macro/getHistory extension — returns conversation turns for a session
-     */
-    private handleGetHistory;
-    /**
-     * Get the session mapper for testing/debugging
-     */
-    getSessionMapper(): SessionMapper;
-    /**
-     * Get mapped agent ID for a session
-     */
-    getMappedAgentId(acpSessionId: ACPSessionId): AgentId | undefined;
-    /**
-     * Get the applied initialization config
-     */
-    getInitConfig(): MacroAgentInitConfig;
-}
+export declare function createMacroAgent(connection: AgentSideConnection, config: MacroAgentConfig): ACPAgent;
+/**
+ * Get the SessionMapper instance from a macro-agent.
+ * Exposed for testing and for the WebSocket server.
+ */
+export { SessionMapper };
 //# sourceMappingURL=macro-agent.d.ts.map

package/dist/acp/macro-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"macro-agent.d.ts","sourceRoot":"","sources":["../../src/acp/macro-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"macro-agent.d.ts","sourceRoot":"","sources":["../../src/acp/macro-agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,KAAK,IAAI,QAAQ,EAclB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAKpE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAQvD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,CAAC,EAAE,oBAAoB,CAAC;CACnC;AAoFD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,mBAAmB,EAC/B,MAAM,EAAE,gBAAgB,GACvB,QAAQ,CAoqBV;AAED;;;GAGG;AACH,OAAO,EAAE,aAAa,EAAE,CAAC"}