macro-agent 0.0.6 → 0.0.8

package/.claude/settings.local.json

@@ -52,7 +52,8 @@
       "Bash(npm link:*)",
       "Bash(npm unlink:*)",
       "mcp__macro-agent__spawn_agent",
-      "Bash(git stash:*)"
+      "Bash(git stash:*)",
+      "Bash(do echo \"Testing $f\")"
     ]
   }
 }

package/README.md

@@ -25,8 +25,8 @@ macro-agent can integrate with [sudocode](https://github.com/sudocode-ai/sudocod
 export MACRO_TASK_BACKEND=sudocode
 export SUDOCODE_PROJECT_PATH=/path/to/project
 
-# Start macro-agent
-npx multiagent start
+# Start macro-agent server (full mode with ACP + MAP + REST)
+npx multiagent
 ```
 
 With sudocode enabled:
@@ -45,26 +45,33 @@ npm install macro-agent
 
 ## Quick Start
 
-### CLI Usage
+### Server Mode (Default)
 
 ```bash
-# Start the server
-npx multiagent start
+# Start full server with ACP + MAP + REST API
+npx multiagent
 
+# Custom port and host
+npx multiagent --port 8080 --host 0.0.0.0
+```
+
+### CLI Tools
+
+```bash
 # Start interactive chat
-npx multiagent chat
+npx multiagent-cli chat
 
 # Check system status
-npx multiagent status
+npx multiagent-cli status
 
 # View agent hierarchy
-npx multiagent hierarchy
+npx multiagent-cli hierarchy
 
 # List all agents
-npx multiagent agents
+npx multiagent-cli agents
 
 # List all tasks
-npx multiagent tasks
+npx multiagent-cli tasks
 ```
 
 ### Programmatic Usage
@@ -243,43 +250,36 @@ Fallback chain: `inject()` → `interruptWith()` → high-priority message
 | `inject_context` | Inject context into another agent |
 | `wait_for_activity` | Wait for system events (Monitor) |
 
-## ACP Mode (Agent Communication Protocol)
+## Server Mode (ACP + MAP)
 
-macro-agent can run as an ACP-compliant agent, enabling external systems to spawn and control it programmatically.
+macro-agent runs as an ACP-compliant agent server with MAP (Multi-Agent Protocol) support, enabling external systems to spawn and control agents programmatically.
 
-### Stdio ACP (Single Client)
+### Full Server Mode (Default)
 
 ```bash
-# Run as stdio ACP server (for spawning via acp-factory)
-npx multiagent-acp --cwd /path/to/project
-```
+# Start combined server with all protocols
+npx multiagent
 
-### WebSocket ACP (Multi-Client)
+# Custom configuration
+npx multiagent --port 8080 --host 0.0.0.0 --cwd /path/to/project
+```
 
-For scenarios where multiple clients need to connect to the same agent hierarchy simultaneously:
+### Stdio ACP (Embedded Use)
 
 ```bash
-# WebSocket ACP server
-npx multiagent-acp --ws --ws-port 3001
-
-# WebSocket + HTTP API together
-npx multiagent-acp --ws --ws-port 3001 --api --port 3000
-
-# All transports: stdio + WebSocket + HTTP API
-npx multiagent-acp --ws --ws-port 3001 --api --port 3000
+# Run as stdio ACP server (for spawning via acp-factory)
+npx multiagent --acp
+npx multiagent --acp --cwd /path/to/project
 ```
 
-### ACP Options
+### Server Options
 
 | Option | Description |
 |--------|-------------|
+| `--port <port>` | Server port (default: 3001) |
+| `--host <host>` | Server host (default: localhost) |
 | `--cwd <path>` | Working directory for agents |
-| `--ws` | Enable WebSocket ACP server |
-| `--ws-port <port>` | WebSocket port (default: 3001) |
-| `--ws-host <host>` | WebSocket host (default: localhost) |
-| `--api` | Enable HTTP API server |
-| `--port <port>` | HTTP API port (auto-discovers if not specified) |
-| `--host <host>` | HTTP API host (default: localhost) |
+| `--acp` | Stdio ACP-only mode (for embedded use with acp-factory) |
 
 ### Multi-Client Architecture
 
@@ -316,55 +316,65 @@ Each client can:
 - Send prompts to their mounted agents
 - See agents spawned by other clients
 
-### Programmatic ACP Registration
+### Programmatic Usage
 
 ```typescript
 import { registerMacroAgent } from 'macro-agent';
 import { AgentFactory } from 'acp-factory';
 
-// Register macro-agent with acp-factory
+// Register macro-agent with acp-factory (uses --acp flag for stdio mode)
 registerMacroAgent();
 
-// Spawn via ACP
+// Spawn via ACP (stdio mode)
 const handle = await AgentFactory.spawn('macro-agent', {
   permissionMode: 'auto-approve',
 });
 
-// Or connect to WebSocket ACP
-const ws = new WebSocket('ws://localhost:3001/acp');
-// Send JSON-RPC 2.0 messages for ACP methods
+// Or connect to server mode (default when running `multiagent`)
+const acpWs = new WebSocket('ws://localhost:3001/acp');   // ACP protocol
+const mapWs = new WebSocket('ws://localhost:3001/map');   // MAP protocol
 ```
 
 ## CLI Commands
 
+### multiagent (Server)
+
 ```
-multiagent start [options]    Start the server
-  -p, --port <port>           Port (default: 3000)
-  -h, --host <host>           Host (default: localhost)
+multiagent [options]          Start the agent server (full mode by default)
+  --port <port>               Port (default: 3001)
+  --host <host>               Host (default: localhost)
   --cwd <path>                Working directory
+  --acp                       Stdio ACP-only mode (for acp-factory)
+```
 
-multiagent chat               Interactive chat mode
+Server endpoints (default mode):
+- `ws://host:port/acp` - ACP protocol (WebSocket)
+- `ws://host:port/map` - MAP protocol (WebSocket)
+- `ws://host:port/api/ws` - Real-time subscriptions
+- `http://host:port/api/*` - REST API
+- `http://host:port/health` - Health check
 
-multiagent status             Show system status
+### multiagent-cli (Management Tools)
 
-multiagent agents [id]        List agents or show details
+```
+multiagent-cli start [options]  Start REST-only server (legacy)
+  -p, --port <port>             Port (default: 3000)
+  -h, --host <host>             Host (default: localhost)
+  --cwd <path>                  Working directory
 
-multiagent tasks [id]         List tasks or show details
+multiagent-cli chat             Interactive chat mode
 
-multiagent hierarchy [root]   Show agent hierarchy tree
+multiagent-cli status           Show system status
 
-multiagent stop [agentId]     Stop agent(s)
+multiagent-cli agents [id]      List agents or show details
 
-multiagent clear              Reset the system
+multiagent-cli tasks [id]       List tasks or show details
 
-multiagent-acp [options]      Run as ACP server
-  --cwd <path>                Working directory
-  --ws                        Enable WebSocket ACP
-  --ws-port <port>            WebSocket port (default: 3001)
-  --ws-host <host>            WebSocket host (default: localhost)
-  --api                       Enable HTTP API server
-  --port <port>               HTTP API port (auto-discovers)
-  --host <host>               HTTP API host (default: localhost)
+multiagent-cli hierarchy [root] Show agent hierarchy tree
+
+multiagent-cli stop [agentId]   Stop agent(s)
+
+multiagent-cli clear            Reset the system
 ```
 
 ## Development

package/dist/acp/index.d.ts

@@ -6,13 +6,13 @@
  */
 export interface RegisterOptions {
     /**
-     * Custom command to run macro-agent ACP server.
-     * Defaults to "npx" with args ["multiagent-acp"]
+     * Custom command to run macro-agent in ACP mode.
+     * Defaults to "npx" with args ["multiagent", "--acp"]
      */
     command?: string;
     /**
      * Custom arguments for the command.
-     * Defaults to ["multiagent-acp"]
+     * Defaults to ["multiagent", "--acp"]
      */
     args?: string[];
     /**

package/dist/acp/index.js

@@ -33,7 +33,7 @@ import { AgentFactory } from "acp-factory";
  * ```
  */
 export function registerMacroAgent(options = {}) {
-    const { command = "npx", args = ["multiagent-acp"], env, } = options;
+    const { command = "npx", args = ["multiagent", "--acp"], env, } = options;
     AgentFactory.register("macro-agent", {
         command,
         args,

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,gBAAgB,CAAC,EACzB,GAAG,GACJ,GAAG,OAAO,CAAC;IAEZ,YAAY,CAAC,QAAQ,CAAC,aAAa,EAAE;QACnC,OAAO;QACP,IAAI;QACJ,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAkCD,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;;;;;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;AAkCD,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"}

package/dist/cli/acp.d.ts

@@ -1,48 +1,50 @@
 #!/usr/bin/env node
 /**
- * ACP Server CLI Entry Point
+ * Multi-Agent Server Entry Point
  *
- * Runs macro-agent as an ACP-compliant agent that can be spawned
- * and controlled via the Agent Communication Protocol.
+ * Runs macro-agent as a full server with ACP + MAP + REST support.
+ * This is the primary entry point for running macro-agent.
  *
  * Usage:
- *   multiagent-acp [options]
+ *   multiagent [options]
  *
  * Options:
  *   --cwd <path>       Working directory for agents
- *   --api              Enable API server (WebSocket ACP + REST API on same port)
- *   --port <port>      Port for API server (default: 3001)
- *   --host <host>      Host for API server (default: localhost)
+ *   --port <port>      Port for server (default: 3001)
+ *   --host <host>      Host for server (default: localhost)
+ *   --acp              Stdio ACP-only mode (for embedded use with acp-factory)
  *
  * Examples:
- *   # Stdio ACP only (default, for embedded use)
- *   multiagent-acp
+ *   # Full server mode (default): WebSocket ACP + MAP + REST API
+ *   multiagent
+ *   multiagent --port 8080
+ *   multiagent --host 0.0.0.0 --port 3001
  *
- *   # API server: WebSocket ACP + REST API
- *   multiagent-acp --api
- *   multiagent-acp --api --port 8080
- *   multiagent-acp --api --host 0.0.0.0 --port 3001
+ *   # Stdio ACP-only mode (for spawning via acp-factory)
+ *   multiagent --acp
+ *   multiagent --acp --cwd /path/to/project
  *
- * API server endpoints:
+ * Server endpoints (default mode):
  *   ws://host:port/acp      - ACP protocol (WebSocket)
+ *   ws://host:port/map      - MAP protocol (WebSocket)
  *   ws://host:port/api/ws   - Real-time subscriptions (WebSocket)
  *   http://host:port/api/*  - REST API endpoints
  *   http://host:port/health - Health check
  *
- * Or register with acp-factory:
+ * For embedded use with acp-factory:
  *   AgentFactory.register('macro-agent', {
  *     command: 'npx',
- *     args: ['multiagent-acp'],
+ *     args: ['multiagent', '--acp'],
  *   });
  */
 export interface ACPServerOptions {
     /** Working directory for agents */
     cwd?: string;
-    /** Enable API server (WebSocket ACP + REST API) */
-    api?: boolean;
-    /** Port for API server (default: 3001) */
+    /** Stdio ACP-only mode (for embedded use with acp-factory) */
+    acp?: boolean;
+    /** Port for server (default: 3001) */
     port?: number;
-    /** Host for API server (default: localhost) */
+    /** Host for server (default: localhost) */
     host?: string;
 }
 /**

package/dist/cli/acp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AA+BH,MAAM,WAAW,gBAAgB;IAC/B,mCAAmC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,0CAA0C;IAC1C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAoB3D"}
+{"version":3,"file":"acp.d.ts","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AAoCH,MAAM,WAAW,gBAAgB;IAC/B,mCAAmC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAyB3D"}

package/dist/cli/acp.js

@@ -1,41 +1,46 @@
 #!/usr/bin/env node
 /**
- * ACP Server CLI Entry Point
+ * Multi-Agent Server Entry Point
  *
- * Runs macro-agent as an ACP-compliant agent that can be spawned
- * and controlled via the Agent Communication Protocol.
+ * Runs macro-agent as a full server with ACP + MAP + REST support.
+ * This is the primary entry point for running macro-agent.
  *
  * Usage:
- *   multiagent-acp [options]
+ *   multiagent [options]
  *
  * Options:
  *   --cwd <path>       Working directory for agents
- *   --api              Enable API server (WebSocket ACP + REST API on same port)
- *   --port <port>      Port for API server (default: 3001)
- *   --host <host>      Host for API server (default: localhost)
+ *   --port <port>      Port for server (default: 3001)
+ *   --host <host>      Host for server (default: localhost)
+ *   --acp              Stdio ACP-only mode (for embedded use with acp-factory)
  *
  * Examples:
- *   # Stdio ACP only (default, for embedded use)
- *   multiagent-acp
+ *   # Full server mode (default): WebSocket ACP + MAP + REST API
+ *   multiagent
+ *   multiagent --port 8080
+ *   multiagent --host 0.0.0.0 --port 3001
  *
- *   # API server: WebSocket ACP + REST API
- *   multiagent-acp --api
- *   multiagent-acp --api --port 8080
- *   multiagent-acp --api --host 0.0.0.0 --port 3001
+ *   # Stdio ACP-only mode (for spawning via acp-factory)
+ *   multiagent --acp
+ *   multiagent --acp --cwd /path/to/project
  *
- * API server endpoints:
+ * Server endpoints (default mode):
  *   ws://host:port/acp      - ACP protocol (WebSocket)
+ *   ws://host:port/map      - MAP protocol (WebSocket)
  *   ws://host:port/api/ws   - Real-time subscriptions (WebSocket)
  *   http://host:port/api/*  - REST API endpoints
  *   http://host:port/health - Health check
  *
- * Or register with acp-factory:
+ * For embedded use with acp-factory:
  *   AgentFactory.register('macro-agent', {
  *     command: 'npx',
- *     args: ['multiagent-acp'],
+ *     args: ['multiagent', '--acp'],
  *   });
  */
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
 import { Readable } from "node:stream";
+import { fileURLToPath } from "node:url";
 import { AgentSideConnection, ndJsonStream, } from "@agentclientprotocol/sdk";
 import { createEventStore } from "../store/event-store.js";
 import { createAgentManager } from "../agent/agent-manager.js";
@@ -53,12 +58,18 @@ export function parseArgs(argv) {
     const args = argv ?? process.argv.slice(2);
     const options = {};
     for (let i = 0; i < args.length; i++) {
-        if (args[i] === "--cwd" && args[i + 1]) {
+        if (args[i] === "--version" || args[i] === "-v") {
+            const __dirname = dirname(fileURLToPath(import.meta.url));
+            const pkg = JSON.parse(readFileSync(join(__dirname, "../../package.json"), "utf-8"));
+            console.log(pkg.version);
+            process.exit(0);
+        }
+        else if (args[i] === "--cwd" && args[i + 1]) {
             options.cwd = args[i + 1];
             i++;
         }
-        else if (args[i] === "--api") {
-            options.api = true;
+        else if (args[i] === "--acp") {
+            options.acp = true;
         }
         else if (args[i] === "--port" && args[i + 1]) {
             options.port = parseInt(args[i + 1], 10);
@@ -105,8 +116,97 @@ async function main() {
     const defaultCwd = options.cwd ?? process.cwd();
     // Initialize services
     const eventStore = await createEventStore({ inMemory: false });
-    const messageRouter = createMessageRouter(eventStore);
-    const agentManager = createAgentManager(eventStore, messageRouter);
+    // We need to create agentManager first (with a placeholder router),
+    // then wire the sessionChecker/wakeHandler into the router,
+    // then update agentManager with the real router.
+    // However, to avoid circular dependency, we'll create the session checker
+    // lazily since it only needs agentManager methods.
+    // Create a deferred agentManager reference for the session checker
+    let agentManager;
+    // Create session checker that the MessageRouter uses to decide wake actions
+    const sessionChecker = {
+        hasActiveSession(agentId) {
+            return agentManager?.hasActiveSession(agentId) ?? false;
+        },
+        isPrompting(agentId) {
+            return agentManager?.isPrompting(agentId) ?? false;
+        },
+        supportsInjection(_agentId) {
+            // Default to true; actual injection support is checked during inject()
+            return true;
+        },
+        isStopped(agentId) {
+            const agent = agentManager?.get(agentId);
+            return agent?.state === "stopped";
+        },
+    };
+    // Create wake handler that the MessageRouter calls when messages should wake agents
+    const routerWakeHandler = async (agentId, decision, messageId) => {
+        if (!agentManager)
+            return;
+        const session = agentManager.getSession(agentId);
+        if (!session) {
+            // No session, message is queued - agent will see it on next check_messages
+            console.error(`[acp] Message ${messageId} queued for agent ${agentId} (no session)`);
+            return;
+        }
+        // Format the message notification
+        const message = `[New Message Received]\nMessage ID: ${messageId}\nUse check_messages to read your pending messages.`;
+        if (decision.shouldInterrupt) {
+            // Interrupt the current work
+            try {
+                const iterable = session.interruptWith(message);
+                const iterator = iterable[Symbol.asyncIterator]();
+                await iterator.next(); // Start the interrupt
+                console.error(`[acp] Interrupted agent ${agentId} for message ${messageId}`);
+            }
+            catch (error) {
+                console.error(`[acp] Failed to interrupt agent ${agentId}:`, error);
+            }
+        }
+        else if (decision.action === "inject") {
+            // Try to inject into current session
+            try {
+                const result = await session.inject(message);
+                if (result.success) {
+                    console.error(`[acp] Injected message notification to agent ${agentId}`);
+                }
+                else {
+                    console.error(`[acp] Injection not supported for agent ${agentId}, message queued`);
+                }
+            }
+            catch (error) {
+                console.error(`[acp] Failed to inject to agent ${agentId}:`, error);
+            }
+        }
+        else if (decision.shouldWake) {
+            // Wake the agent by starting a new prompt
+            try {
+                const promptIterable = agentManager.prompt(agentId, message);
+                // Fire and forget - just start the iteration
+                (async () => {
+                    try {
+                        for await (const _ of promptIterable) {
+                            break; // Exit after first update
+                        }
+                    }
+                    catch {
+                        // Ignore background errors
+                    }
+                })();
+                console.error(`[acp] Woke agent ${agentId} for message ${messageId}`);
+            }
+            catch (error) {
+                console.error(`[acp] Failed to wake agent ${agentId}:`, error);
+            }
+        }
+    };
+    const messageRouter = createMessageRouter(eventStore, {
+        sessionChecker,
+        wakeHandler: routerWakeHandler,
+    });
+    // Now create the agentManager with the real router
+    agentManager = createAgentManager(eventStore, messageRouter);
     const taskManager = createTaskManager(eventStore);
     // Create ActivityWatcher for event-driven agent waking
     const sessionProvider = createSessionProviderFromAgentManager(agentManager);
@@ -183,13 +283,6 @@ async function main() {
         await eventStore.close();
     };
     try {
-        // Start combined server if --api is enabled
-        if (options.api) {
-            const host = options.host ?? "localhost";
-            const port = options.port ?? 3001;
-            combinedServer = createCombinedServer({ eventStore, agentManager, taskManager, messageRouter, activityWatcher }, { port, host, defaultCwd });
-            await combinedServer.start();
-        }
         // Handle graceful shutdown
         process.on("SIGINT", async () => {
             await cleanup();
@@ -199,22 +292,8 @@ async function main() {
             await cleanup();
             process.exit(0);
         });
-        // Determine if we should run stdio ACP
-        // Skip stdio ACP if:
-        // 1. MACRO_AGENT_SERVER_ONLY env var is set (spawned by MacroAgentServerManager)
-        // 2. Or stdin detection fails (fallback)
-        const serverOnlyEnv = process.env.MACRO_AGENT_SERVER_ONLY === "1";
-        const skipStdioAcp = options.api && serverOnlyEnv;
-        if (skipStdioAcp) {
-            // WebSocket-only mode: just keep the process alive until shutdown signal
-            console.error("[acp] Running in server-only mode (stdin not connected)");
-            // Keep process alive - will exit via SIGINT/SIGTERM handlers
-            await new Promise(() => {
-                // Never resolves - process stays alive until signal
-            });
-        }
-        else {
-            // Standard mode: set up stdio ACP connection
+        if (options.acp) {
+            // Stdio ACP-only mode (for embedded use with acp-factory)
             const { input, output } = createStdioStreams();
             const stream = ndJsonStream(output, input);
             // Create ACP connection with MacroAgent
@@ -229,6 +308,17 @@ async function main() {
             // Clean up on normal close
             await cleanup();
         }
+        else {
+            // Full server mode (default): WebSocket ACP + MAP + REST API
+            const host = options.host ?? "localhost";
+            const port = options.port ?? 3001;
+            combinedServer = createCombinedServer({ eventStore, agentManager, taskManager, messageRouter, activityWatcher }, { port, host, defaultCwd });
+            await combinedServer.start();
+            // Keep process alive - will exit via SIGINT/SIGTERM handlers
+            await new Promise(() => {
+                // Never resolves - process stays alive until signal
+            });
+        }
     }
     catch (error) {
         // Log errors to stderr (not stdout, which is used for ACP)

package/dist/cli/acp.js.map

@@ -1 +1 @@
-{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":"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"}

package/dist/cli/index.d.ts

@@ -2,7 +2,11 @@
 /**
  * Multi-Agent CLI
  *
- * Command-line interface for the multi-agent orchestration system.
+ * Command-line interface for inspecting and managing the multi-agent system.
+ * For running the server, use `multiagent` instead.
+ *
+ * Usage:
+ *   multiagent-cli <command> [options]
  */
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/cli/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;;GAIG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA;;;;;;;;GAQG"}

package/dist/cli/index.js

@@ -2,7 +2,11 @@
 /**
  * Multi-Agent CLI
  *
- * Command-line interface for the multi-agent orchestration system.
+ * Command-line interface for inspecting and managing the multi-agent system.
+ * For running the server, use `multiagent` instead.
+ *
+ * Usage:
+ *   multiagent-cli <command> [options]
  */
 import { Command } from "commander";
 import chalk from "chalk";
@@ -83,7 +87,7 @@ function printHierarchy(agent, getChildren, indent = 0) {
 // ─────────────────────────────────────────────────────────────────
 const program = new Command();
 program
-    .name("multiagent")
+    .name("multiagent-cli")
     .description("Multi-agent orchestration system CLI")
     .version("0.0.1");
 // ─────────────────────────────────────────────────────────────────