macro-agent 0.1.1 → 0.1.3

package/dist/lifecycle/handlers-v2.js

@@ -0,0 +1,319 @@
+/**
+ * Lifecycle Handlers V2
+ *
+ * Simplified done() handlers that use InboxAdapter instead of MessageRouter.
+ *
+ * Key simplifications vs V1:
+ * - Worker handler no longer constructs merge requests (AgentManagerV2.terminate handles that)
+ * - Worker handler no longer reads git branches
+ * - All signal emission goes through InboxAdapter
+ * - Monitor handler no longer needs MessageRouter for subscription management
+ * - Integration strategy dispatch removed (handled at terminate level)
+ *
+ * @module lifecycle/handlers-v2
+ */
+import { commitChanges, attemptMerge, abortMerge } from "./cleanup.js";
+import { getAllDescendants, needsCascadeTermination, } from "./cascade.js";
+// =============================================================================
+// Signal Emission Helper
+// =============================================================================
+async function emitSignal(deps, context, signal, opts = {}) {
+    if (!context.parentId)
+        return;
+    await deps.inboxAdapter.send(context.agentId, context.parentId, {
+        type: "event",
+        event: signal,
+        data: {
+            agentId: context.agentId,
+            taskId: context.taskId,
+            role: context.role,
+            ...opts.details,
+        },
+    }, {
+        importance: opts.importance ?? "normal",
+        threadTag: `lifecycle:${context.agentId}`,
+        subject: opts.summary,
+    });
+}
+// =============================================================================
+// Worker Handler V2
+// =============================================================================
+/**
+ * Handle done() for worker agents.
+ *
+ * Simplified from V1:
+ * - No branch reading or merge request construction
+ * - No integration strategy dispatch
+ * - AgentManagerV2.terminate() handles merge submission
+ * - Just commits changes, emits signals, and returns shouldTerminate
+ */
+async function handleWorkerDone(context, args, cleanupStatus, deps) {
+    const signalsEmitted = [];
+    const cleanupActions = [];
+    const warnings = [];
+    // Step 1: Auto-commit uncommitted changes
+    if (context.workspacePath && !cleanupStatus.ready) {
+        const uncommittedCount = cleanupStatus.uncommittedFiles?.length ?? 0;
+        if (uncommittedCount > 0) {
+            const commitMessage = args.summary
+                ? `WIP: ${args.summary}`
+                : `WIP: Auto-commit from done() with ${uncommittedCount} uncommitted file(s)`;
+            const commitHash = commitChanges(context.workspacePath, commitMessage);
+            if (commitHash) {
+                cleanupActions.push(`Committed ${uncommittedCount} file(s): ${commitHash.slice(0, 8)}`);
+            }
+            else {
+                warnings.push("Failed to auto-commit uncommitted changes");
+            }
+        }
+    }
+    // Step 2: Handle blocked/deferred — don't terminate
+    if (args.status === "blocked") {
+        try {
+            await emitSignal(deps, context, "HELP_NEEDED", {
+                summary: args.summary ?? "Worker blocked - needs help",
+                details: { status: args.status, ...args.details },
+                importance: "high",
+            });
+            signalsEmitted.push("HELP_NEEDED");
+        }
+        catch {
+            warnings.push("Failed to emit HELP_NEEDED");
+        }
+        return {
+            shouldTerminate: false,
+            signalsEmitted,
+            cleanupActions,
+            warnings: warnings.length > 0 ? warnings : undefined,
+        };
+    }
+    if (args.status === "deferred") {
+        try {
+            await emitSignal(deps, context, "WORKER_DEFERRED", {
+                summary: args.summary ?? "Worker deferred work",
+                details: { status: args.status, ...args.details },
+            });
+            signalsEmitted.push("WORKER_DEFERRED");
+        }
+        catch {
+            warnings.push("Failed to emit WORKER_DEFERRED");
+        }
+        return {
+            shouldTerminate: false,
+            signalsEmitted,
+            cleanupActions,
+            warnings: warnings.length > 0 ? warnings : undefined,
+        };
+    }
+    // Step 3: Emit WORKER_DONE signal
+    try {
+        await emitSignal(deps, context, "WORKER_DONE", {
+            summary: args.summary ?? `Worker done with status: ${args.status}`,
+            details: { status: args.status, ...args.details },
+            importance: "high",
+        });
+        signalsEmitted.push("WORKER_DONE");
+    }
+    catch {
+        warnings.push("Failed to emit WORKER_DONE");
+    }
+    // NOTE: Task transition is NOT done here — AgentManagerV2.terminate() handles
+    // it to avoid double-transitioning.
+    // Step 4: Signal descendants (notification only — actual cascade via AgentManager)
+    try {
+        const cascadeAdapter = {
+            getChildren: (agentId) => {
+                const children = deps.agentManager.getChildren(agentId);
+                return children.map((c) => ({ id: c.id, state: c.state, parent: c.parent }));
+            },
+            terminate: async () => {
+                // No-op: actual termination via AgentManager after done() returns
+            },
+        };
+        if (needsCascadeTermination(context.agentId, cascadeAdapter)) {
+            const descendants = getAllDescendants(context.agentId, cascadeAdapter);
+            const active = descendants.filter((d) => d.state === "running" || d.state === "spawning");
+            if (active.length > 0) {
+                cleanupActions.push(`${active.length} descendant(s) will be cascade-terminated`);
+            }
+        }
+    }
+    catch {
+        warnings.push("Failed to check descendants for cascade");
+    }
+    // NOTE: Merge request submission is NOT done here.
+    // AgentManagerV2.terminate() handles it when the worker's workspace
+    // has completed work — keeping merge logistics system-level.
+    // In pull mode, completed workers stay alive to claim more tasks
+    const shouldTerminate = deps.taskMode === "pull" && args.status === "completed" ? false : true;
+    return {
+        shouldTerminate,
+        signalsEmitted,
+        cleanupActions,
+        warnings: warnings.length > 0 ? warnings : undefined,
+    };
+}
+// =============================================================================
+// Integrator Handler V2
+// =============================================================================
+async function handleIntegratorDone(context, args, _cleanupStatus, deps) {
+    const signalsEmitted = [];
+    const cleanupActions = [];
+    const warnings = [];
+    const pendingResolvers = [];
+    // Only process queue on "completed" status (not failed/blocked)
+    if (args.status === "completed" && context.workspacePath && context.streamId) {
+        const mergeQueue = deps.mergeQueue;
+        if (mergeQueue) {
+            let mr = mergeQueue.getNext(context.streamId);
+            while (mr) {
+                mergeQueue.markProcessing(mr.id);
+                const mergeResult = attemptMerge(mr.workerBranch, context.workspacePath, `Merge worker branch '${mr.workerBranch}'`);
+                if (mergeResult.success) {
+                    mergeQueue.markMerged(mr.id, mergeResult.mergeCommit ?? "");
+                    cleanupActions.push(`Merged ${mr.workerBranch} (${mergeResult.mergeCommit?.slice(0, 8) ?? "already-merged"})`);
+                    // Notify via inbox
+                    await emitSignal(deps, context, "MERGE_COMPLETE", {
+                        summary: `Merged ${mr.workerBranch}`,
+                        details: {
+                            mrId: mr.id,
+                            branch: mr.workerBranch,
+                            commit: mergeResult.mergeCommit,
+                        },
+                    });
+                    signalsEmitted.push("MERGE_COMPLETE");
+                }
+                else if (mergeResult.conflicts && mergeResult.conflicts.length > 0) {
+                    // Conflict detected — abort and spawn resolver
+                    abortMerge(context.workspacePath);
+                    const conflictFiles = mergeResult.conflicts;
+                    const taskDesc = [
+                        `Resolve merge conflicts for branch '${mr.workerBranch}'.`,
+                        `Conflicting files: ${conflictFiles.join(", ")}`,
+                        `Work in your worktree to fix the conflicts, then call done(status="completed").`,
+                        `Do NOT submit to the merge queue — the integrator will handle that.`,
+                    ].join("\n");
+                    try {
+                        const spawned = await deps.agentManager.spawn({
+                            task: taskDesc,
+                            parent: context.agentId,
+                            role: "worker.resolver",
+                        });
+                        mergeQueue.markConflict(mr.id, conflictFiles, spawned.id);
+                        pendingResolvers.push(spawned.id);
+                        cleanupActions.push(`Spawned resolver ${spawned.id} for ${mr.workerBranch} (${conflictFiles.length} conflicts)`);
+                    }
+                    catch (err) {
+                        warnings.push(`Failed to spawn resolver for ${mr.workerBranch}: ${err}`);
+                    }
+                }
+                else {
+                    // Non-conflict failure
+                    warnings.push(`Merge failed for ${mr.workerBranch}: ${mergeResult.error}`);
+                }
+                mr = mergeQueue.getNext(context.streamId);
+            }
+        }
+    }
+    // Emit INTEGRATOR_DONE signal
+    try {
+        await emitSignal(deps, context, "INTEGRATOR_DONE", {
+            summary: args.summary ?? `Integrator done: ${args.status}`,
+            details: {
+                status: args.status,
+                resolversSpawned: pendingResolvers.length,
+                ...args.details,
+            },
+        });
+        signalsEmitted.push("INTEGRATOR_DONE");
+    }
+    catch {
+        warnings.push("Failed to emit INTEGRATOR_DONE");
+    }
+    // Stay alive if resolvers are pending
+    const shouldTerminate = pendingResolvers.length === 0;
+    return {
+        shouldTerminate,
+        signalsEmitted,
+        cleanupActions: cleanupActions.length > 0 ? cleanupActions : undefined,
+        warnings: warnings.length > 0 ? warnings : undefined,
+    };
+}
+// =============================================================================
+// Monitor Handler V2
+// =============================================================================
+async function handleMonitorDone(context, args, _cleanupStatus, deps) {
+    const signalsEmitted = [];
+    const warnings = [];
+    try {
+        await emitSignal(deps, context, "MONITOR_DONE", {
+            summary: args.summary ?? `Monitor done: ${args.status}`,
+            details: { status: args.status, ...args.details },
+        });
+        signalsEmitted.push("MONITOR_DONE");
+    }
+    catch {
+        warnings.push("Failed to emit MONITOR_DONE");
+    }
+    return {
+        shouldTerminate: true,
+        signalsEmitted,
+        warnings: warnings.length > 0 ? warnings : undefined,
+    };
+}
+// =============================================================================
+// Generic Handler V2
+// =============================================================================
+async function handleGenericDone(context, args, _cleanupStatus, deps) {
+    const signalsEmitted = [];
+    const warnings = [];
+    const signal = args.status === "completed" ? "AGENT_COMPLETED" : "AGENT_FAILED";
+    try {
+        await emitSignal(deps, context, signal, {
+            summary: args.summary ?? `Agent done: ${args.status}`,
+            details: { status: args.status, ...args.details },
+        });
+        signalsEmitted.push(signal);
+    }
+    catch {
+        warnings.push(`Failed to emit ${signal}`);
+    }
+    return {
+        shouldTerminate: true,
+        signalsEmitted,
+        warnings: warnings.length > 0 ? warnings : undefined,
+    };
+}
+// =============================================================================
+// Dispatch
+// =============================================================================
+/**
+ * Dispatch done() to the appropriate handler based on role.
+ *
+ * Resolution: exact match → dot-prefix → capability-based → generic fallback.
+ */
+export async function dispatchDoneV2(context, args, cleanupStatus, deps) {
+    const role = context.role;
+    const capabilities = context.capabilities ?? [];
+    // Exact or prefix match
+    const baseRole = role.split(".")[0];
+    if (role === "worker" || baseRole === "worker") {
+        return handleWorkerDone(context, args, cleanupStatus, deps);
+    }
+    if (role === "integrator" || baseRole === "integrator") {
+        return handleIntegratorDone(context, args, cleanupStatus, deps);
+    }
+    if (role === "monitor" || baseRole === "monitor") {
+        return handleMonitorDone(context, args, cleanupStatus, deps);
+    }
+    // Capability-based dispatch (team-defined roles)
+    if (capabilities.includes("workspace.worktree")) {
+        return handleWorkerDone(context, args, cleanupStatus, deps);
+    }
+    if (capabilities.includes("workspace.integrate")) {
+        return handleIntegratorDone(context, args, cleanupStatus, deps);
+    }
+    // Generic fallback
+    return handleGenericDone(context, args, cleanupStatus, deps);
+}
+//# sourceMappingURL=handlers-v2.js.map

package/dist/lifecycle/handlers-v2.js.map

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

package/dist/lifecycle/index.d.ts

@@ -1,15 +1,13 @@
 /**
- * Lifecycle Module
+ * Lifecycle Module (V2)
  *
  * Agent lifecycle management including done() signaling,
- * cleanup status detection, and role-specific handlers.
+ * cleanup status detection, and cascade termination.
  *
  * @module lifecycle
- * @see s-32xs Self-Cleaning Workers spec
  */
 export type { DoneStatus, CleanupStatus, DoneArgs, DoneResult, LifecycleContext, DoneHandler, DoneHandlerResult, DoneHandlerRegistry, LifecycleConfig, CascadeOptions, CascadeResult, ConsolidationResult, ConsolidationOptions, } from "./types.js";
 export { DEFAULT_LIFECYCLE_CONFIG } from "./types.js";
-export { detectCleanupStatus, hasUncommittedChanges, getUncommittedFiles, getCurrentBranch, getPendingMessageCount, commitChanges, type CleanupDependencies, } from "./cleanup.js";
-export { createHandlerRegistry, getHandler, dispatchDone, handleWorkerDone, handleIntegratorDone, handleMonitorDone, handleGenericDone, type AllHandlerDeps, type WorkerHandlerDeps, type IntegratorHandlerDeps, type MonitorHandlerDeps, type GenericHandlerDeps, } from "./handlers/index.js";
+export { detectCleanupStatus, hasUncommittedChanges, getUncommittedFiles, getCurrentBranch, commitChanges, type CleanupDependencies, } from "./cleanup.js";
 export { cascadeTerminateChildren, terminateWithChangeConsolidation, getAllDescendants, needsCascadeTermination, type CascadeAgent, type CascadeAgentManager, type WorkspaceProvider, } from "./cascade.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAMH,YAAY,EAEV,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,UAAU,EAGV,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EAGnB,eAAe,EAGf,cAAc,EACd,aAAa,EAGb,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAMtD,OAAO,EAEL,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EAGtB,aAAa,EAGb,KAAK,mBAAmB,GACzB,MAAM,cAAc,CAAC;AAMtB,OAAO,EAEL,qBAAqB,EACrB,UAAU,EACV,YAAY,EAGZ,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EAGjB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,GACxB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAEL,wBAAwB,EACxB,gCAAgC,EAChC,iBAAiB,EACjB,uBAAuB,EAGvB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,GACvB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,YAAY,EAEV,UAAU,EACV,aAAa,EAGb,QAAQ,EACR,UAAU,EAGV,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,mBAAmB,EAGnB,eAAe,EAGf,cAAc,EACd,aAAa,EAGb,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAMtD,OAAO,EAEL,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAGhB,aAAa,EAGb,KAAK,mBAAmB,GACzB,MAAM,cAAc,CAAC;AAMtB,OAAO,EAEL,wBAAwB,EACxB,gCAAgC,EAChC,iBAAiB,EACjB,uBAAuB,EAGvB,KAAK,YAAY,EACjB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,GACvB,MAAM,cAAc,CAAC"}

package/dist/lifecycle/index.js

@@ -1,11 +1,10 @@
 /**
- * Lifecycle Module
+ * Lifecycle Module (V2)
  *
  * Agent lifecycle management including done() signaling,
- * cleanup status detection, and role-specific handlers.
+ * cleanup status detection, and cascade termination.
  *
  * @module lifecycle
- * @see s-32xs Self-Cleaning Workers spec
  */
 export { DEFAULT_LIFECYCLE_CONFIG } from "./types.js";
 // =============================================================================
@@ -13,18 +12,10 @@ export { DEFAULT_LIFECYCLE_CONFIG } from "./types.js";
 // =============================================================================
 export { 
 // Detection functions
-detectCleanupStatus, hasUncommittedChanges, getUncommittedFiles, getCurrentBranch, getPendingMessageCount, 
+detectCleanupStatus, hasUncommittedChanges, getUncommittedFiles, getCurrentBranch, 
 // Helper functions
 commitChanges, } from "./cleanup.js";
 // =============================================================================
-// Handlers
-// =============================================================================
-export { 
-// Registry and dispatch
-createHandlerRegistry, getHandler, dispatchDone, 
-// Individual handlers
-handleWorkerDone, handleIntegratorDone, handleMonitorDone, handleGenericDone, } from "./handlers/index.js";
-// =============================================================================
 // Cascade Termination
 // =============================================================================
 export { 

package/dist/lifecycle/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiCH,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEtD,gFAAgF;AAChF,oBAAoB;AACpB,gFAAgF;AAEhF,OAAO;AACL,sBAAsB;AACtB,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB;AAEtB,mBAAmB;AACnB,aAAa,GAId,MAAM,cAAc,CAAC;AAEtB,gFAAgF;AAChF,WAAW;AACX,gFAAgF;AAEhF,OAAO;AACL,wBAAwB;AACxB,qBAAqB,EACrB,UAAU,EACV,YAAY;AAEZ,sBAAsB;AACtB,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,GAQlB,MAAM,qBAAqB,CAAC;AAE7B,gFAAgF;AAChF,sBAAsB;AACtB,gFAAgF;AAEhF,OAAO;AACL,YAAY;AACZ,wBAAwB,EACxB,gCAAgC,EAChC,iBAAiB,EACjB,uBAAuB,GAMxB,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lifecycle/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAiCH,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAEtD,gFAAgF;AAChF,oBAAoB;AACpB,gFAAgF;AAEhF,OAAO;AACL,sBAAsB;AACtB,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,gBAAgB;AAEhB,mBAAmB;AACnB,aAAa,GAId,MAAM,cAAc,CAAC;AAEtB,gFAAgF;AAChF,sBAAsB;AACtB,gFAAgF;AAEhF,OAAO;AACL,YAAY;AACZ,wBAAwB,EACxB,gCAAgC,EAChC,iBAAiB,EACjB,uBAAuB,GAMxB,MAAM,cAAc,CAAC"}

package/dist/lifecycle/types.d.ts

@@ -79,6 +79,8 @@ export interface LifecycleContext {
     streamId?: string;
     /** Merge request ID (for resolver workers to track which MR they're resolving) */
     mrId?: string;
+    /** Resolved capabilities for the agent's role (for capability-based handler dispatch) */
+    capabilities?: string[];
 }
 /**
  * Handler function signature for role-specific done() processing

package/dist/lifecycle/types.d.ts.map

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

package/dist/lifecycle/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lifecycle/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAkKH;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAoB;IACvD,gBAAgB,EAAE,KAAK;IACvB,uBAAuB,EAAE,IAAI;IAC7B,gBAAgB,EAAE,KAAK;CACxB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/lifecycle/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAqKH;;GAEG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAoB;IACvD,gBAAgB,EAAE,KAAK;IACvB,uBAAuB,EAAE,IAAI;IAC7B,gBAAgB,EAAE,KAAK;CACxB,CAAC"}

package/dist/map/acp-bridge.d.ts

@@ -0,0 +1,39 @@
+/**
+ * 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 type { MacroAgentSystemV2 } from "../boot-v2.js";
+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;
+    /** 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 declare 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;
+//# sourceMappingURL=acp-bridge.d.ts.map

package/dist/map/acp-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp-bridge.d.ts","sourceRoot":"","sources":["../../src/map/acp-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAQH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAgCxD,MAAM,WAAW,SAAS;IACxB;;;OAGG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC;IAEvD,+BAA+B;IAC/B,KAAK,IAAI,IAAI,CAAC;CACf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,kBAAkB,EAC1B,SAAS,EAAE,GAAG,EAAE,0DAA0D;AAC1E,iEAAiE;AACjE,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS;AAC3D;6EAC6E;AAC7E,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,IAAI,GACrE,SAAS,CA6LX"}

package/dist/map/acp-bridge.js

@@ -0,0 +1,180 @@
+/**
+ * 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, } from "@agentclientprotocol/sdk";
+import { createMacroAgent } from "../acp/macro-agent.js";
+/**
+ * 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, mapServer, // MAPServer instance — typed as any due to dynamic import
+/** Resolve local agent ID → MAP agent ID for response routing */
+resolveMapId, 
+/** Send a raw JSON-RPC notification to a specific client's WebSocket.
+ *  This bypasses the MAPServer's subscription system for direct delivery. */
+sendRawToClient) {
+    const streams = new Map();
+    /**
+     * Check if a MAP message payload is an ACP envelope.
+     */
+    function isACPEnvelope(payload) {
+        if (!payload || typeof payload !== "object")
+            return false;
+        const p = payload;
+        return (p.acp !== undefined &&
+            p.acpContext !== undefined &&
+            typeof p.acpContext?.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) {
+        let readableController = null;
+        const readable = new ReadableStream({
+            start(controller) {
+                readableController = controller;
+            },
+        });
+        const writable = new WritableStream({
+            // 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) => {
+                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, agentId, sourceSessionId) {
+        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) => {
+            const envelope = {
+                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.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.
+        const conn = new AgentSideConnection((agentConn) => createMacroAgent(agentConn, { system }), stream);
+        const state = {
+            streamId,
+            agentId,
+            push,
+            close,
+            connection: conn,
+        };
+        streams.set(streamId, state);
+        return state;
+    }
+    return {
+        handleDelivery(agentId, message) {
+            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;
+        },
+        close() {
+            for (const state of streams.values()) {
+                state.close();
+            }
+            streams.clear();
+        },
+    };
+}
+//# sourceMappingURL=acp-bridge.js.map