macro-agent 0.2.5 → 0.2.6

package/dist/router/wake.js

@@ -0,0 +1,180 @@
+/**
+ * Priority-Based Wake Decisions
+ *
+ * Determines how to deliver messages based on priority and agent state.
+ *
+ * Wake action semantics:
+ * - 'wake': Start the agent if idle (begin new prompt/turn)
+ * - 'inject': Inject message into current session (if supported)
+ * - 'interrupt': Pause current work, inject message, resume
+ * - 'queue': Just add to message queue, agent will see it on next check
+ *
+ * Priority mappings:
+ * - 'urgent': Always interrupt if busy, wake if idle
+ * - 'high': Inject if busy, wake if idle
+ * - 'normal': Queue if busy, wake if idle
+ * - 'low': Always queue, never wake
+ *
+ * @module router/wake
+ * @see s-9rld In-Flight Steering spec section 3.2
+ */
+// =============================================================================
+// Wake Decision Logic
+// =============================================================================
+/**
+ * Determine the wake action for a message based on priority and agent state.
+ *
+ * Priority semantics:
+ * - 'urgent' → Always wake (interrupt if busy)
+ * - 'high' → Wake if idle, inject if busy
+ * - 'normal' → Wake if idle, queue if busy
+ * - 'low' → Never wake, just queue
+ *
+ * If agent is stopped, always returns 'skip' (no-op).
+ */
+export function determineWakeAction(priority, hasActiveSession, isPrompting = false, isStopped = false) {
+    // If agent is stopped/terminated, skip (no-op)
+    if (isStopped) {
+        return "skip";
+    }
+    // If no active session
+    if (!hasActiveSession) {
+        // Low priority never wakes an idle agent
+        return priority === "low" ? "queue" : "wake";
+    }
+    // If session exists but not currently prompting
+    if (!isPrompting) {
+        return priority === "low" ? "queue" : "wake";
+    }
+    // Agent is actively prompting (busy)
+    switch (priority) {
+        case "urgent":
+            return "interrupt";
+        case "high":
+            return "inject";
+        case "normal":
+            return "queue";
+        case "low":
+            return "queue";
+    }
+}
+/**
+ * Get full wake decision with all state information.
+ */
+export function getWakeDecision(agentId, priority, sessionChecker) {
+    const hasSession = sessionChecker.hasActiveSession(agentId);
+    const isPrompting = sessionChecker.isPrompting?.(agentId) ?? false;
+    const supportsInjection = sessionChecker.supportsInjection?.(agentId) ?? true;
+    const isStopped = sessionChecker.isStopped?.(agentId) ?? false;
+    const action = determineWakeAction(priority, hasSession, isPrompting, isStopped);
+    // If we want to inject but session doesn't support it, fall back to interrupt
+    // (unless action is "skip", which should remain as-is)
+    const effectiveAction = action === "inject" && !supportsInjection ? "interrupt" : action;
+    return {
+        action: effectiveAction,
+        shouldWake: effectiveAction === "wake",
+        shouldInterrupt: effectiveAction === "interrupt",
+        canInject: supportsInjection,
+    };
+}
+/**
+ * Get wake decision considering both priority and delivery hint.
+ *
+ * Delivery hint takes precedence over priority-based decision:
+ * - 'queue' or undefined: Use existing priority-based logic
+ * - 'inject': Force injection attempt (falls back to queue if not supported)
+ * - 'interrupt': Force interrupt (highest priority delivery)
+ *
+ * @param agentId - The target agent
+ * @param options - Priority and optional delivery hint
+ * @param sessionChecker - Session state checker
+ * @returns Wake decision with action and flags
+ */
+export function getWakeDecisionWithHint(agentId, options, sessionChecker) {
+    const { priority, deliveryHint } = options;
+    // Get session state
+    const hasSession = sessionChecker.hasActiveSession(agentId);
+    const supportsInjection = sessionChecker.supportsInjection?.(agentId) ?? true;
+    const isStopped = sessionChecker.isStopped?.(agentId) ?? false;
+    // If agent is stopped, always skip
+    if (isStopped) {
+        return {
+            action: "skip",
+            shouldWake: false,
+            shouldInterrupt: false,
+            canInject: false,
+            reason: "agent_stopped",
+        };
+    }
+    // If no hint or hint is 'queue', use priority-based decision
+    if (!deliveryHint || deliveryHint === "queue") {
+        const decision = getWakeDecision(agentId, priority, sessionChecker);
+        return {
+            ...decision,
+            reason: "priority_based",
+        };
+    }
+    // Delivery hint overrides priority-based decision
+    if (deliveryHint === "interrupt") {
+        return {
+            action: "interrupt",
+            shouldWake: true,
+            shouldInterrupt: true,
+            canInject: supportsInjection,
+            reason: "delivery_hint_interrupt",
+        };
+    }
+    if (deliveryHint === "inject") {
+        // If session doesn't support injection, fall back to wake/queue
+        if (!supportsInjection) {
+            return {
+                action: hasSession ? "queue" : "wake",
+                shouldWake: !hasSession,
+                shouldInterrupt: false,
+                canInject: false,
+                reason: "delivery_hint_inject_fallback",
+            };
+        }
+        return {
+            action: "inject",
+            shouldWake: true,
+            shouldInterrupt: false,
+            canInject: true,
+            reason: "delivery_hint_inject",
+        };
+    }
+    // Fallback to priority-based (shouldn't reach here)
+    const decision = getWakeDecision(agentId, priority, sessionChecker);
+    return {
+        ...decision,
+        reason: "priority_based_fallback",
+    };
+}
+/**
+ * Check if a message should wake an idle agent based on priority.
+ */
+export function shouldWakeAgent(priority) {
+    return priority !== "low";
+}
+/**
+ * Check if a message should interrupt a busy agent based on priority.
+ */
+export function shouldInterruptAgent(priority) {
+    return priority === "urgent";
+}
+/**
+ * Get the numeric value of a priority for comparison.
+ */
+export const PRIORITY_VALUES = {
+    low: 0,
+    normal: 1,
+    high: 2,
+    urgent: 3,
+};
+/**
+ * Compare two priorities. Returns positive if a > b.
+ */
+export function comparePriority(a, b) {
+    return PRIORITY_VALUES[a] - PRIORITY_VALUES[b];
+}
+//# sourceMappingURL=wake.js.map

package/dist/router/wake.js.map

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

package/dist/server/combined-server.d.ts

@@ -0,0 +1,95 @@
+/**
+ * Combined Server
+ *
+ * Single HTTP server that hosts:
+ * - WebSocket ACP protocol on /acp
+ * - WebSocket MAP protocol on /map
+ * - REST API + WebSocket subscriptions on /api/*
+ */
+import http from "http";
+import { Express } from "express";
+import type { EventStore } from "../store/event-store.js";
+import type { AgentManager } from "../agent/agent-manager.js";
+import type { TaskManager } from "../task/task-manager.js";
+import type { MessageRouter } from "../router/message-router.js";
+import type { PeerManager } from "../peer/peer-manager.js";
+import type { CapabilityManager } from "../peer/capability-manager.js";
+import type { ActivityWatcher } from "../activity/watcher.js";
+import { type MAPAdapter, type StreamExtensionServices } from "../map/adapter/index.js";
+import { type MailService } from "../mail/mail-service.js";
+import { type ConversationMap } from "../mail/conversation-map.js";
+import { AgentTokenManager } from "../auth/token.js";
+import { TaskBackend, TaskToolProvider } from "../task/backend/types.js";
+import type { TeamManager } from "../teams/team-manager.js";
+export interface CombinedServerServices {
+    eventStore: EventStore;
+    agentManager: AgentManager;
+    taskManager: TaskManager;
+    messageRouter: MessageRouter;
+    peerManager?: PeerManager;
+    capabilityManager?: CapabilityManager;
+    /** Optional activity watcher for event-driven waking */
+    activityWatcher?: ActivityWatcher;
+    /** Optional task backend for task tool bridge extensions */
+    taskBackend?: TaskBackend;
+    /** Optional task tool provider for dynamic task tools in thin-client mode */
+    taskToolProvider?: TaskToolProvider;
+    /** Mutable context holder for task tool provider agent_id injection */
+    taskToolContext?: {
+        agent_id: string;
+    };
+    /** Per-agent token manager for MCP bridge authentication */
+    agentTokenManager?: AgentTokenManager;
+    /** Get connected opentasks project paths (for health endpoint) */
+    getConnectedProjects?: () => string[];
+    /** Optional stream extension services for git-cascade stream/checkpoint/merge-queue features */
+    streamExtensions?: StreamExtensionServices;
+    /** Optional team manager for dynamic team management */
+    teamManager?: TeamManager;
+    /** Optional workspace manager for workspace isolation and merge queue */
+    workspaceManager?: import("../workspace/types.js").WorkspaceManager;
+}
+export interface CombinedServerConfig {
+    /** Port to listen on (default: 3001) */
+    port?: number;
+    /** Host to bind to (default: "localhost") */
+    host?: string;
+    /** Default working directory for ACP sessions */
+    defaultCwd?: string;
+    /** Enable CORS for REST API (default: true) */
+    cors?: boolean;
+    /** URL path for MAP connections (default: "/map") */
+    mapPath?: string;
+    /** Disable MAP protocol (default: false - MAP is enabled) */
+    disableMap?: boolean;
+    /** Server token for authentication. Auto-generated if not provided (unless noAuth is true). */
+    serverToken?: string;
+    /** Disable authentication entirely (for local development/testing) */
+    noAuth?: boolean;
+}
+export interface CombinedServer {
+    /** Start the server */
+    start(): Promise<void>;
+    /** Stop the server gracefully */
+    stop(): Promise<void>;
+    /** Get the server URL */
+    getUrl(): string;
+    /** Get number of ACP connections */
+    getACPConnectionCount(): number;
+    /** Get number of MAP connections */
+    getMAPConnectionCount(): number;
+    /** HTTP server */
+    readonly httpServer: http.Server;
+    /** Express app */
+    readonly app: Express;
+    /** MAP adapter (for testing) */
+    readonly mapAdapter?: MAPAdapter;
+    /** Mail service (for conversation tracking) */
+    readonly mailService?: MailService;
+    /** Conversation map (for agent-to-conversation tracking) */
+    readonly conversationMap?: ConversationMap;
+    /** Server token used for authentication (exposed for tests). Undefined when auth is disabled. */
+    readonly serverToken?: string;
+}
+export declare function createCombinedServer(services: CombinedServerServices, config?: CombinedServerConfig): CombinedServer;
+//# sourceMappingURL=combined-server.d.ts.map

package/dist/server/combined-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"combined-server.d.ts","sourceRoot":"","sources":["../../src/server/combined-server.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAI3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAEvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAUL,KAAK,UAAU,EAGf,KAAK,uBAAuB,EAC7B,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,iBAAiB,EAGlB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAM5D,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,wDAAwD;IACxD,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,4DAA4D;IAC5D,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,6EAA6E;IAC7E,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,uEAAuE;IACvE,eAAe,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACvC,4DAA4D;IAC5D,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,kEAAkE;IAClE,oBAAoB,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACtC,gGAAgG;IAChG,gBAAgB,CAAC,EAAE,uBAAuB,CAAC;IAC3C,wDAAwD;IACxD,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,yEAAyE;IACzE,gBAAgB,CAAC,EAAE,OAAO,uBAAuB,EAAE,gBAAgB,CAAC;CACrE;AAED,MAAM,WAAW,oBAAoB;IACnC,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,6CAA6C;IAC7C,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,iDAAiD;IACjD,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,+CAA+C;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,qDAAqD;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,6DAA6D;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,+FAA+F;IAC/F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,sEAAsE;IACtE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,uBAAuB;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,iCAAiC;IACjC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtB,yBAAyB;IACzB,MAAM,IAAI,MAAM,CAAC;IAEjB,oCAAoC;IACpC,qBAAqB,IAAI,MAAM,CAAC;IAEhC,oCAAoC;IACpC,qBAAqB,IAAI,MAAM,CAAC;IAEhC,kBAAkB;IAClB,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IAEjC,kBAAkB;IAClB,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IAEtB,gCAAgC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;IAEjC,+CAA+C;IAC/C,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IAEnC,4DAA4D;IAC5D,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAE3C,iGAAiG;IACjG,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAkFD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,sBAAsB,EAChC,MAAM,GAAE,oBAAyB,GAChC,cAAc,CAyThB"}

package/dist/server/combined-server.js

@@ -0,0 +1,335 @@
+/**
+ * Combined Server
+ *
+ * Single HTTP server that hosts:
+ * - WebSocket ACP protocol on /acp
+ * - WebSocket MAP protocol on /map
+ * - REST API + WebSocket subscriptions on /api/*
+ */
+import http from "http";
+import { WebSocketServer } from "ws";
+import { getAncestors } from "../activity/index.js";
+import { setupACPWebSocket } from "../acp/websocket-server.js";
+import { createAPIApp, setupAPIWebSocket } from "../api/server.js";
+import { createMAPAdapter, createMAPWebSocketHandler, registerWorkspaceFileExtensions, registerUpdateMetadataExtension, registerMCPBridgeExtensions, registerTaskExtensions, registerResumeExtension, registerAgentLifecycleExtensions, registerStreamExtensions, } from "../map/adapter/index.js";
+import { createMailService } from "../mail/mail-service.js";
+import { createConversationMap, } from "../mail/conversation-map.js";
+import { createTurnRecorder } from "../mail/turn-recorder.js";
+import { secureCompare, } from "../auth/token.js";
+// ─────────────────────────────────────────────────────────────────
+// MAP Services Wiring
+// ─────────────────────────────────────────────────────────────────
+/**
+ * Get all descendants of an agent recursively.
+ */
+function getDescendantsRecursive(agentId, agentManager) {
+    const descendants = [];
+    const children = agentManager.getChildren(agentId);
+    for (const child of children) {
+        descendants.push(child.id);
+        descendants.push(...getDescendantsRecursive(child.id, agentManager));
+    }
+    return descendants;
+}
+/**
+ * Create MAPAdapterServices from CombinedServerServices.
+ * Wires the internal services to the MAP adapter interface.
+ */
+function createMAPServices(services) {
+    // Create agent source for getAncestors (needs lineage lookup)
+    // RelevanceAgentSource expects getAgent to return null (not undefined) when not found
+    const agentSource = {
+        getAgent: (id) => services.agentManager.get(id),
+        listAgents: () => services.agentManager.list(),
+    };
+    // Map Agent → MAPAdapterServices AgentState (handle null→undefined, created_at→createdAt)
+    const mapAgent = (agent) => agent
+        ? {
+            id: agent.id,
+            name: agent.name,
+            role: agent.role,
+            state: agent.state,
+            parent: agent.parent ?? undefined,
+            createdAt: agent.created_at,
+            metadata: agent.metadata,
+        }
+        : undefined;
+    return {
+        getAgent: (id) => mapAgent(services.agentManager.get(id)),
+        listAgents: (filter) => services.agentManager.list(filter).map((a) => mapAgent(a)),
+        sendMessage: async (from, to, content, options) => {
+            const result = await services.messageRouter.sendToAddress({
+                from,
+                to,
+                content,
+                options: options ? { priority: options.priority } : undefined,
+            });
+            return { delivered: result.delivered };
+        },
+        getAncestors: (agentId) => getAncestors(agentId, agentSource),
+        getDescendants: (agentId) => getDescendantsRecursive(agentId, services.agentManager),
+        // Full services for ACP-over-MAP support
+        agentManager: services.agentManager,
+        eventStore: services.eventStore,
+        taskManager: services.taskManager,
+    };
+}
+// ─────────────────────────────────────────────────────────────────
+// Server Implementation
+// ─────────────────────────────────────────────────────────────────
+export function createCombinedServer(services, config = {}) {
+    const { port = 3001, host = "localhost", defaultCwd = process.cwd(), cors = true, mapPath = "/map", disableMap = false, serverToken: configToken, noAuth = false, } = config;
+    // Resolve server token: disabled > config > env > none (no auth by default)
+    const resolvedServerToken = noAuth
+        ? undefined
+        : (configToken ?? process.env.MACRO_SERVER_SECRET ?? undefined);
+    // Set up mail service and conversation map (always created, independent of MAP)
+    const mailService = createMailService({ eventStore: services.eventStore });
+    const conversationMap = createConversationMap();
+    // Wire mail services into AgentManager for conversation lifecycle
+    if (services.agentManager.setMailServices) {
+        services.agentManager.setMailServices(mailService, conversationMap);
+    }
+    // Wire turn recorder into MessageRouter for automatic turn tracking
+    if (services.messageRouter.setTurnRecorder) {
+        const turnRecorder = createTurnRecorder({
+            mailService,
+            conversationMap,
+            eventStore: services.eventStore,
+        });
+        services.messageRouter.setTurnRecorder(turnRecorder);
+    }
+    // Create Express app with API routes (include mail services)
+    const app = createAPIApp({ ...services, mailService, conversationMap }, { cors, serverToken: resolvedServerToken, defaultCwd });
+    // Create HTTP server with Express
+    const httpServer = http.createServer(app);
+    // Create WebSocket servers in noServer mode
+    const acpWss = new WebSocketServer({ noServer: true });
+    const apiWss = new WebSocketServer({ noServer: true });
+    // Set up ACP WebSocket handling
+    const acpHandler = setupACPWebSocket(acpWss, services, { defaultCwd });
+    // Set up API WebSocket handling (pass app to share state)
+    const apiHandler = setupAPIWebSocket(apiWss, services, app);
+    // Set up MAP protocol handling (unless disabled)
+    let mapAdapter;
+    let mapHandler;
+    if (!disableMap) {
+        const mapServices = {
+            ...createMAPServices(services),
+            defaultCwd,
+            mailService,
+        };
+        mapAdapter = createMAPAdapter({ name: "macro-agent", version: "1.0.0" }, mapServices);
+        // Register workspace file extensions for TUI file attachment.
+        // Uses defaultCwd (project root) as the workspace path for all agents,
+        // since the head manager doesn't have an isolated worktree.
+        registerWorkspaceFileExtensions(mapAdapter, {
+            getWorkspace: () => ({ path: defaultCwd }),
+            agentExists: () => true,
+        });
+        // Register generic metadata update extension
+        registerUpdateMetadataExtension(mapAdapter, {
+            getAgent: (id) => services.agentManager.get(id),
+            updateAgentMetadata: (id, updates) => services.eventStore.updateAgentMetadata(id, updates),
+        });
+        // Register task extensions for direct MAP task management
+        if (services.taskBackend) {
+            registerTaskExtensions(mapAdapter, {
+                taskBackend: services.taskBackend,
+                sendMessage: async (from, to, content, options) => {
+                    const result = await services.messageRouter.sendToAddress({
+                        from: from,
+                        to,
+                        content: typeof content === "string" ? content : JSON.stringify(content),
+                        options: options ? { priority: options.priority } : undefined,
+                    });
+                    return { delivered: result.delivered };
+                },
+            });
+        }
+        // Register resume extension for restarting stopped agents
+        registerResumeExtension(mapAdapter, {
+            getAgent: (id) => {
+                const agent = services.agentManager.get(id);
+                if (!agent)
+                    return undefined;
+                return { id: agent.id, state: agent.state, session_id: agent.session_id };
+            },
+            resume: (id) => services.agentManager.resume(id),
+        });
+        // Register agent lifecycle extensions (spawn, fork, permission management)
+        registerAgentLifecycleExtensions(mapAdapter, {
+            getAgent: (id) => services.agentManager.get(id),
+            spawn: (opts) => services.agentManager.spawn(opts),
+            forkAgent: (id, opts) => services.agentManager.forkAgent(id, opts),
+            prompt: (id, msg) => services.agentManager.prompt(id, msg),
+            setPermissionMode: (id, mode) => services.agentManager.setPermissionMode(id, mode),
+            getPermissionMode: (id) => services.agentManager.getPermissionMode(id),
+            respondToPermission: (id, reqId, optId) => services.agentManager.respondToPermission(id, reqId, optId),
+            onAgentRegistered: (agent) => {
+                // Emit agent_registered event to all MAP subscribers
+                // mapAdapter is guaranteed non-null here (inside if (!disableMap) block)
+                mapAdapter.emitEvent({
+                    eventId: `agent-reg-${agent.id}-${Date.now()}`,
+                    type: "agent_registered",
+                    timestamp: Date.now(),
+                    data: agent,
+                });
+            },
+            listHeadManagers: () => services.agentManager.listHeadManagers(),
+            defaultCwd,
+        });
+        // Register MCP bridge extensions for thin-client MCP subprocesses
+        registerMCPBridgeExtensions(mapAdapter, {
+            eventStore: services.eventStore,
+            agentManager: services.agentManager,
+            taskManager: services.taskManager,
+            messageRouter: services.messageRouter,
+            peerManager: services.peerManager,
+            activityWatcher: services.activityWatcher,
+            taskBackend: services.taskBackend,
+            taskToolProvider: services.taskToolProvider,
+            taskToolContext: services.taskToolContext,
+            agentTokenManager: services.agentTokenManager,
+        });
+        // Register stream/checkpoint/diffStack/mergeQueue extensions
+        if (services.streamExtensions) {
+            registerStreamExtensions(mapAdapter, services.streamExtensions);
+        }
+        mapHandler = createMAPWebSocketHandler(mapAdapter);
+    }
+    // Handle upgrade requests - route by path
+    httpServer.on("upgrade", (request, socket, head) => {
+        const parsedUrl = new URL(request.url ?? "/", `http://${request.headers.host}`);
+        const pathname = parsedUrl.pathname;
+        // Validate server token on WebSocket upgrade (skip when auth disabled)
+        if (resolvedServerToken) {
+            const urlToken = parsedUrl.searchParams.get("token");
+            if (!urlToken || !secureCompare(urlToken, resolvedServerToken)) {
+                socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
+                socket.destroy();
+                return;
+            }
+        }
+        if (pathname === "/acp") {
+            acpWss.handleUpgrade(request, socket, head, (ws) => {
+                acpWss.emit("connection", ws, request);
+            });
+        }
+        else if (pathname === "/api/ws") {
+            apiWss.handleUpgrade(request, socket, head, (ws) => {
+                apiWss.emit("connection", ws, request);
+            });
+        }
+        else if (pathname === mapPath && mapHandler) {
+            // MAP protocol connection
+            acpWss.handleUpgrade(request, socket, head, (ws) => {
+                mapHandler.handleConnection(ws, request);
+            });
+        }
+        else {
+            // Unknown WebSocket path
+            socket.write("HTTP/1.1 404 Not Found\r\n\r\n");
+            socket.destroy();
+        }
+    });
+    // Add health endpoint
+    app.get("/health", (_req, res) => {
+        const connectedProjects = services.getConnectedProjects?.() ?? [];
+        res.json({
+            status: "ok",
+            acp_connections: acpHandler.getConnectionCount(),
+            map_connections: mapHandler?.getConnectionCount() ?? 0,
+            opentasks: {
+                connected_projects: connectedProjects,
+                project_count: connectedProjects.length,
+            },
+            timestamp: Date.now(),
+        });
+    });
+    // ─────────────────────────────────────────────────────────────────
+    // Server Lifecycle
+    // ─────────────────────────────────────────────────────────────────
+    async function start() {
+        // Start MAP adapter if enabled
+        if (mapAdapter && !mapAdapter.isRunning()) {
+            await mapAdapter.start();
+        }
+        return new Promise((resolve, reject) => {
+            httpServer.on("error", reject);
+            httpServer.listen(port, host, () => {
+                httpServer.removeListener("error", reject);
+                const tokenParam = resolvedServerToken ? `?token=${resolvedServerToken}` : "";
+                console.error(`[combined] Server listening on http://${host}:${port}`);
+                console.error(`[combined]   ACP WebSocket: ws://${host}:${port}/acp${tokenParam}`);
+                if (mapHandler) {
+                    console.error(`[combined]   MAP WebSocket: ws://${host}:${port}${mapPath}${tokenParam}`);
+                }
+                console.error(`[combined]   API WebSocket: ws://${host}:${port}/api/ws${tokenParam}`);
+                console.error(`[combined]   REST API: http://${host}:${port}/api/*`);
+                if (resolvedServerToken) {
+                    console.error(`[combined]   Server token: ${resolvedServerToken.substring(0, 8)}...`);
+                }
+                else {
+                    console.error(`[combined]   Auth: disabled`);
+                }
+                resolve();
+            });
+        });
+    }
+    async function stop() {
+        console.error(`[combined] Shutting down...`);
+        // Close ACP connections
+        acpHandler.closeAll();
+        // Close MAP connections
+        mapHandler?.closeAll();
+        // Stop MAP adapter
+        if (mapAdapter?.isRunning()) {
+            await mapAdapter.stop();
+        }
+        // Close API WebSocket connections
+        apiHandler.closeAll();
+        // Close WebSocket servers
+        await Promise.all([
+            new Promise((resolve) => acpWss.close(() => resolve())),
+            new Promise((resolve) => apiWss.close(() => resolve())),
+        ]);
+        // Close HTTP server
+        await new Promise((resolve, reject) => {
+            httpServer.close((err) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        });
+        console.error(`[combined] Server stopped`);
+    }
+    function getUrl() {
+        const addr = httpServer.address();
+        if (addr && typeof addr === "object") {
+            return `http://${host}:${addr.port}`;
+        }
+        return `http://${host}:${port}`;
+    }
+    function getACPConnectionCount() {
+        return acpHandler.getConnectionCount();
+    }
+    function getMAPConnectionCount() {
+        return mapHandler?.getConnectionCount() ?? 0;
+    }
+    return {
+        start,
+        stop,
+        getUrl,
+        getACPConnectionCount,
+        getMAPConnectionCount,
+        httpServer,
+        app,
+        mapAdapter,
+        mailService,
+        conversationMap,
+        serverToken: resolvedServerToken,
+    };
+}
+//# sourceMappingURL=combined-server.js.map

package/dist/server/combined-server.js.map

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

package/dist/steering/index.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Steering Module
+ *
+ * Context injection and in-flight steering for agents.
+ *
+ * @module steering
+ * @see s-9rld In-Flight Steering spec
+ */
+export type { InjectionSource, InjectionOptions, InjectionMethod, InjectionResult, InjectableSession, InjectionDeps, } from "./types.js";
+export { injectContext, createInjector, formatInjectedContent, } from "./inject.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/steering/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,YAAY,EACV,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,aAAa,GACd,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,aAAa,EACb,cAAc,EACd,qBAAqB,GACtB,MAAM,aAAa,CAAC"}