macro-agent 0.2.5 → 0.2.6

package/dist/lifecycle/handlers/worker.js

@@ -0,0 +1,381 @@
+/**
+ * Worker Done Handler
+ *
+ * Handles done() for worker agents:
+ * - Commits workspace changes (no push - bare repo shared)
+ * - Creates checkpoints for task commits
+ * - Emits WORKER_DONE signal
+ * - Emits MERGE_REQUEST signal and submits to merge queue
+ * - Signals descendants to prepare for termination
+ *
+ * Note: Actual termination is handled by AgentManager after done() returns.
+ * The AgentManager.terminate() method cascades depth-first to all children.
+ * This handler emits signals for notification only.
+ *
+ * @module lifecycle/handlers/worker
+ * @see s-32xs Self-Cleaning Workers spec
+ * @see s-bcqm Change Management spec
+ */
+import { commitChanges, getCurrentBranch } from "../cleanup.js";
+import { getAllDescendants, needsCascadeTermination, } from "../cascade.js";
+import { handleResolverDone, } from "./integrator.js";
+// =============================================================================
+// Worker Handler
+// =============================================================================
+/**
+ * Handle done() for worker agents
+ *
+ * Processing steps:
+ * 1. Commit any uncommitted changes
+ * 1.5. Create checkpoints for task commits (Phase 6)
+ * 2. Handle blocked/deferred status (emit HELP_NEEDED, return shouldTerminate=false)
+ * 3. Emit WORKER_DONE signal (for completed/failed)
+ * 4. Emit MERGE_REQUEST signal and submit to queue
+ * 5. Signal children to terminate (basic cascade)
+ * 6. Return shouldTerminate=true (for completed/failed only)
+ */
+export async function handleWorkerDone(context, args, cleanupStatus, deps) {
+    const signalsEmitted = [];
+    const cleanupActions = [];
+    const warnings = [];
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Step 1: 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 1.5: Create checkpoints for task commits (Phase 6)
+    // ─────────────────────────────────────────────────────────────────────────────
+    if (deps.dataplane && context.taskId) {
+        try {
+            const checkpoints = deps.dataplane.createCheckpointsForTask(context.taskId, context.agentId);
+            if (checkpoints.length > 0) {
+                cleanupActions.push(`Created ${checkpoints.length} checkpoint(s) for task ${context.taskId}`);
+            }
+        }
+        catch (error) {
+            warnings.push(`Failed to create checkpoints: ${error instanceof Error ? error.message : "unknown"}`);
+        }
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Step 2: Handle blocked/deferred status (don't terminate, emit HELP_NEEDED)
+    // Per s-32xs spec: "Agent explicitly blocked → Self-report + wait → Needs help, don't auto-terminate"
+    // ─────────────────────────────────────────────────────────────────────────────
+    if (args.status === "blocked") {
+        try {
+            deps.messageRouter.emitStatus({
+                from: { agent_id: context.agentId },
+                status_type: "blocked",
+                summary: args.summary ?? `Worker blocked - needs help`,
+                details: {
+                    signal: "HELP_NEEDED",
+                    workerId: context.agentId,
+                    taskId: context.taskId,
+                    parentId: context.parentId,
+                    status: args.status,
+                    ...args.details,
+                },
+            });
+            signalsEmitted.push("HELP_NEEDED");
+        }
+        catch (error) {
+            warnings.push(`Failed to emit HELP_NEEDED: ${error instanceof Error ? error.message : "unknown"}`);
+        }
+        // Blocked agents should NOT terminate - they wait for help
+        return {
+            shouldTerminate: false,
+            signalsEmitted,
+            cleanupActions,
+            warnings: warnings.length > 0 ? warnings : undefined,
+        };
+    }
+    if (args.status === "deferred") {
+        try {
+            deps.messageRouter.emitStatus({
+                from: { agent_id: context.agentId },
+                status_type: "checkpoint",
+                summary: args.summary ?? `Worker deferred work`,
+                details: {
+                    signal: "WORKER_DEFERRED",
+                    workerId: context.agentId,
+                    taskId: context.taskId,
+                    status: args.status,
+                    ...args.details,
+                },
+            });
+            signalsEmitted.push("WORKER_DEFERRED");
+        }
+        catch (error) {
+            warnings.push(`Failed to emit WORKER_DEFERRED: ${error instanceof Error ? error.message : "unknown"}`);
+        }
+        // Deferred agents should NOT terminate
+        return {
+            shouldTerminate: false,
+            signalsEmitted,
+            cleanupActions,
+            warnings: warnings.length > 0 ? warnings : undefined,
+        };
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Step 3: Emit WORKER_DONE signal (for completed/failed)
+    // ─────────────────────────────────────────────────────────────────────────────
+    try {
+        deps.messageRouter.emitStatus({
+            from: { agent_id: context.agentId },
+            status_type: args.status === "completed" ? "completed" : "failed",
+            summary: args.summary ?? `Worker done with status: ${args.status}`,
+            details: {
+                signal: "WORKER_DONE",
+                workerId: context.agentId,
+                taskId: context.taskId,
+                status: args.status,
+                ...args.details,
+            },
+        });
+        signalsEmitted.push("WORKER_DONE");
+    }
+    catch (error) {
+        warnings.push(`Failed to emit WORKER_DONE: ${error instanceof Error ? error.message : "unknown"}`);
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Step 4: Emit MERGE_REQUEST signal and submit to queue
+    // ─────────────────────────────────────────────────────────────────────────────
+    if (args.status === "completed" && context.workspacePath) {
+        const sourceBranch = context.branch ?? getCurrentBranch(context.workspacePath);
+        const targetBranch = context.integrationBranch ?? "integration";
+        // Check if this is a resolver worker
+        const isResolver = context.role === "worker.resolver";
+        if (sourceBranch) {
+            if (isResolver) {
+                // ───────────────────────────────────────────────────────────────────────
+                // Resolver workers emit RESOLVER_DONE instead of MERGE_REQUEST
+                // They do NOT submit to the merge queue - integrator merges inline
+                // ───────────────────────────────────────────────────────────────────────
+                try {
+                    deps.messageRouter.emitStatus({
+                        from: { agent_id: context.agentId },
+                        status_type: "completed",
+                        summary: `Resolver completed${context.mrId ? ` for MR ${context.mrId}` : ""}`,
+                        details: {
+                            signal: "RESOLVER_DONE",
+                            mrId: context.mrId,
+                            resolverBranch: sourceBranch,
+                            resolverId: context.agentId,
+                            taskId: context.taskId,
+                            status: args.status,
+                        },
+                    });
+                    signalsEmitted.push("RESOLVER_DONE");
+                    cleanupActions.push(`Emitted RESOLVER_DONE for resolver branch ${sourceBranch}${context.mrId ? ` (MR: ${context.mrId})` : ""}`);
+                    // ─────────────────────────────────────────────────────────────────────
+                    // Trigger inline merge on behalf of integrator (parent)
+                    // ─────────────────────────────────────────────────────────────────────
+                    if (context.mrId && context.parentId && deps.getWorkspacePath) {
+                        const integratorWorkspace = deps.getWorkspacePath(context.parentId);
+                        if (integratorWorkspace) {
+                            // Build integrator context for the inline merge
+                            const integratorContext = {
+                                agentId: context.parentId,
+                                role: "integrator",
+                                workspacePath: integratorWorkspace,
+                                streamId: context.streamId,
+                                branch: context.integrationBranch ?? "integration",
+                            };
+                            // Build integrator deps
+                            const integratorDeps = {
+                                messageRouter: deps.messageRouter,
+                                mergeQueue: deps.mergeQueue,
+                                workspacePath: integratorWorkspace,
+                                agentManager: deps.agentManager,
+                            };
+                            try {
+                                const resolverResult = await handleResolverDone(context.mrId, sourceBranch, integratorContext, integratorDeps);
+                                if (resolverResult.success) {
+                                    cleanupActions.push(`Inline merge completed for MR ${context.mrId}: ${resolverResult.mergeCommit?.slice(0, 8)}`);
+                                }
+                                else if (resolverResult.nestedConflict) {
+                                    warnings.push(`Nested conflict on MR ${context.mrId} - escalated to coordinator`);
+                                }
+                                else {
+                                    warnings.push(`Inline merge failed for MR ${context.mrId}: ${resolverResult.error}`);
+                                }
+                            }
+                            catch (mergeError) {
+                                warnings.push(`Error during inline merge for MR ${context.mrId}: ${mergeError instanceof Error ? mergeError.message : "unknown"}`);
+                            }
+                        }
+                        else {
+                            warnings.push(`Cannot perform inline merge: integrator workspace not found for parent ${context.parentId}`);
+                        }
+                    }
+                    else if (!context.mrId) {
+                        warnings.push("Cannot perform inline merge: no mrId in context");
+                    }
+                    else if (!context.parentId) {
+                        warnings.push("Cannot perform inline merge: no parent (integrator) in context");
+                    }
+                }
+                catch (error) {
+                    warnings.push(`Failed to emit RESOLVER_DONE: ${error instanceof Error ? error.message : "unknown"}`);
+                }
+            }
+            else if (deps.integrationStrategy) {
+                // ───────────────────────────────────────────────────────────────────────
+                // Strategy-based integration (team config)
+                // ───────────────────────────────────────────────────────────────────────
+                try {
+                    const landResult = await deps.integrationStrategy.land({
+                        sourceBranch,
+                        targetBranch,
+                        workspacePath: context.workspacePath,
+                        agentId: context.agentId,
+                        taskId: context.taskId,
+                        streamId: context.streamId,
+                    });
+                    if (landResult.status === "landed") {
+                        cleanupActions.push(`Strategy '${deps.integrationStrategy.name}' landed ${sourceBranch} → ${targetBranch}${landResult.commitHash ? ` (${landResult.commitHash.slice(0, 8)})` : ""}${landResult.mergeRequestId ? ` (MR: ${landResult.mergeRequestId})` : ""}`);
+                        signalsEmitted.push("WORKER_INTEGRATED");
+                    }
+                    else if (landResult.status === "conflict") {
+                        warnings.push(`Strategy '${deps.integrationStrategy.name}' conflict: ${landResult.error ?? "unknown conflict"}`);
+                    }
+                    else {
+                        warnings.push(`Strategy '${deps.integrationStrategy.name}' failed: ${landResult.error ?? "unknown error"}`);
+                    }
+                }
+                catch (strategyError) {
+                    warnings.push(`Integration strategy error: ${strategyError instanceof Error ? strategyError.message : "unknown"}`);
+                }
+            }
+            else {
+                // ───────────────────────────────────────────────────────────────────────
+                // Regular workers emit MERGE_REQUEST and submit to queue (fallback)
+                // ───────────────────────────────────────────────────────────────────────
+                try {
+                    // Emit the signal for notification
+                    deps.messageRouter.emitStatus({
+                        from: { agent_id: context.agentId },
+                        status_type: "checkpoint",
+                        summary: `Merge request for branch ${sourceBranch}`,
+                        details: {
+                            signal: "MERGE_REQUEST",
+                            sourceBranch,
+                            targetBranch,
+                            taskId: context.taskId,
+                            workerId: context.agentId,
+                        },
+                    });
+                    signalsEmitted.push("MERGE_REQUEST");
+                    // Submit to actual merge queue if available
+                    if (deps.mergeQueue && context.streamId && context.taskId) {
+                        try {
+                            const mrId = deps.mergeQueue.submit({
+                                streamId: context.streamId,
+                                taskId: context.taskId,
+                                workerBranch: sourceBranch,
+                                workerAgentId: context.agentId,
+                            });
+                            cleanupActions.push(`Submitted merge request ${mrId} to queue for ${sourceBranch} -> ${targetBranch}`);
+                        }
+                        catch (queueError) {
+                            warnings.push(`Failed to submit to merge queue: ${queueError instanceof Error ? queueError.message : "unknown"}`);
+                            cleanupActions.push(`MERGE_REQUEST emitted for ${sourceBranch} -> ${targetBranch} (queue submission failed)`);
+                        }
+                    }
+                    else {
+                        // No queue configured or missing required context
+                        const reason = !deps.mergeQueue
+                            ? "no queue configured"
+                            : !context.streamId
+                                ? "no streamId"
+                                : "no taskId";
+                        cleanupActions.push(`MERGE_REQUEST emitted for ${sourceBranch} -> ${targetBranch} (${reason})`);
+                    }
+                }
+                catch (error) {
+                    warnings.push(`Failed to emit MERGE_REQUEST: ${error instanceof Error ? error.message : "unknown"}`);
+                }
+            }
+        }
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Step 5: Signal descendants to prepare for termination
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Note: This is notification only. Actual termination is handled by
+    // AgentManager.terminate() which cascades depth-first after done() returns.
+    try {
+        // Create cascade adapter from AgentManager
+        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 handled by AgentManager after done()
+            },
+        };
+        // Check if cascade signaling is needed
+        if (needsCascadeTermination(context.agentId, cascadeAdapter)) {
+            // Get ALL descendants (children, grandchildren, etc.)
+            const descendants = getAllDescendants(context.agentId, cascadeAdapter);
+            const activeDescendants = descendants.filter((d) => d.state === "running" || d.state === "spawning");
+            if (activeDescendants.length > 0) {
+                cleanupActions.push(`Signaling ${activeDescendants.length} descendant(s) to terminate`);
+                // Signal all active descendants - notification for cleanup preparation
+                // Actual termination will cascade depth-first via AgentManager
+                for (const descendant of activeDescendants) {
+                    try {
+                        deps.messageRouter.emitStatus({
+                            from: { agent_id: context.agentId },
+                            status_type: "completed",
+                            summary: `Parent ${context.agentId} signaling termination`,
+                            details: {
+                                signal: "FORCE_TERMINATE_REQUEST",
+                                agentId: descendant.id,
+                                reason: "parent_stopped",
+                                requestedBy: context.agentId,
+                            },
+                        });
+                    }
+                    catch {
+                        warnings.push(`Failed to signal descendant ${descendant.id}`);
+                    }
+                }
+            }
+        }
+    }
+    catch (error) {
+        warnings.push(`Failed to signal descendants: ${error instanceof Error ? error.message : "unknown"}`);
+    }
+    // ─────────────────────────────────────────────────────────────────────────────
+    // Return result
+    // ─────────────────────────────────────────────────────────────────────────────
+    // 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,
+    };
+}
+//# sourceMappingURL=worker.js.map

package/dist/lifecycle/handlers/worker.js.map

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

package/dist/lifecycle/handlers-v2.d.ts

@@ -17,14 +17,12 @@ import type { TasksAdapter } from "../adapters/types.js";
 import type { AgentManager } from "../agent/agent-manager.js";
 import type { AgentStore } from "../agent/agent-store.js";
 import type { LifecycleContext, DoneArgs, CleanupStatus, DoneHandlerResult } from "./types.js";
-import type { MergeQueueInterface } from "../workspace/merge-queue/types.js";
 import type { WorkspaceManager } from "../workspace/types.js";
 export interface HandlerDepsV2 {
     inboxAdapter: InboxAdapter;
     tasksAdapter: TasksAdapter;
     agentManager: AgentManager;
     taskMode?: "push" | "pull";
-    mergeQueue?: MergeQueueInterface;
     /**
      * Optional workspace manager. When provided AND `context.streamId` is set,
      * commits route through the cascade tracker (Change-Id + x-cascade events).

package/dist/lifecycle/handlers-v2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlers-v2.d.ts","sourceRoot":"","sources":["../../src/lifecycle/handlers-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EACV,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAW9D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC;;;;OAIG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AA8ZD;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,QAAQ,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,iBAAiB,CAAC,CA0B5B"}
+{"version":3,"file":"handlers-v2.d.ts","sourceRoot":"","sources":["../../src/lifecycle/handlers-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EACV,gBAAgB,EAChB,QAAQ,EACR,aAAa,EACb,iBAAiB,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAW9D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC;;;;OAIG;IACH,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB;AA0VD;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,QAAQ,EACd,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,iBAAiB,CAAC,CA0B5B"}

package/dist/lifecycle/handlers-v2.js

@@ -13,7 +13,7 @@
  * @module lifecycle/handlers-v2
  */
 import { getPermissionOverlay } from "../dispatch/permission-overlay.js";
-import { commitChanges, attemptMerge, abortMerge } from "./cleanup.js";
+import { commitChanges } from "./cleanup.js";
 import { getAllDescendants, needsCascadeTermination, } from "./cascade.js";
 // =============================================================================
 // Tracked Commit Helper
@@ -214,60 +214,9 @@ async function handleIntegratorDone(context, args, _cleanupStatus, deps) {
     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);
-            }
-        }
-    }
+    // Integration is driven by per-role LandingStrategy at each worker's done()
+    // time (V3), and git-cascade owns the merge queue. The integrator role now
+    // just signals completion; there is no local merge-queue to drain here.
     // Emit INTEGRATOR_DONE signal
     try {
         await emitSignal(deps, context, "INTEGRATOR_DONE", {

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

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

package/dist/mail/conversation-map.d.ts

@@ -0,0 +1,33 @@
+/**
+ * ConversationMap — Agent-to-conversation tracking.
+ *
+ * Maps agents to their active conversations and manages peer
+ * conversation indexing. In-memory, reconstructible from EventStore.
+ */
+import type { AgentId } from "../store/types/index.js";
+export interface ConversationMap {
+    /** Set the task conversation for an agent. */
+    setAgentConversation(agentId: AgentId, conversationId: string): void;
+    /** Get the task conversation for an agent. */
+    getAgentConversation(agentId: AgentId): string | undefined;
+    /** Remove an agent from the map. */
+    removeAgent(agentId: AgentId): void;
+    /** Set the session conversation for a head manager. */
+    setSessionConversation(headManagerId: AgentId, conversationId: string): void;
+    /** Get the session conversation for a head manager. */
+    getSessionConversation(headManagerId: AgentId): string | undefined;
+    /**
+     * Get or create a peer conversation between two agents.
+     * Uses sorted agent pair as key to ensure consistency.
+     */
+    getOrCreatePeerConversation(agentA: AgentId, agentB: AgentId, createFn: () => string): string;
+    /** Get the peer conversation ID for two agents (if exists). */
+    getPeerConversation(agentA: AgentId, agentB: AgentId): string | undefined;
+    /** Close all peer conversations for an agent. Returns closed conversation IDs. */
+    closePeerConversationsFor(agentId: AgentId): string[];
+}
+/**
+ * Create a ConversationMap instance.
+ */
+export declare function createConversationMap(): ConversationMap;
+//# sourceMappingURL=conversation-map.d.ts.map

package/dist/mail/conversation-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversation-map.d.ts","sourceRoot":"","sources":["../../src/mail/conversation-map.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B,8CAA8C;IAC9C,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAErE,8CAA8C;IAC9C,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IAE3D,oCAAoC;IACpC,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAEpC,uDAAuD;IACvD,sBAAsB,CAAC,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7E,uDAAuD;IACvD,sBAAsB,CAAC,aAAa,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IAEnE;;;OAGG;IACH,2BAA2B,CACzB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,MAAM,MAAM,GACrB,MAAM,CAAC;IAEV,+DAA+D;IAC/D,mBAAmB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAAC;IAE1E,kFAAkF;IAClF,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;CACvD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,eAAe,CA6DvD"}