macro-agent 0.1.10 → 0.1.12

package/dist/boot-v2.js

@@ -21,6 +21,7 @@
 import * as path from "path";
 import * as os from "os";
 import * as fs from "fs";
+import * as crypto from "crypto";
 import { AgentStore } from "./agent/agent-store.js";
 import { DefaultInboxAdapter, } from "./adapters/inbox-adapter.js";
 import { DefaultTasksAdapter, } from "./adapters/tasks-adapter.js";
@@ -33,15 +34,61 @@ import { DefaultRoleRegistry } from "./roles/registry.js";
 // =============================================================================
 export async function bootV2(config = {}) {
     const cwd = config.cwd ?? process.cwd();
-    const baseDir = config.baseDir ?? path.join(os.homedir(), ".macro-agent");
+    // Resolve the instance id with three-tier precedence so the on-disk layout
+    // stays meaningful across standalone, MAP-connected, and hosted runs:
+    //
+    //   1. Explicit `instanceId` — caller-chosen, human-readable.
+    //   2. `map.swarmId` — the MAP identity when the caller has pre-registered
+    //      one. This ties macro-agent's local store to its hub identity, so a
+    //      swarm with swarm_id=X always resumes its own state.
+    //   3. A stable hash of the resolved cwd — the last-resort fallback so two
+    //      processes in different projects never collide on agents.db, inbox.db,
+    //      or the control socket. Reruns in the same project reuse their store.
+    //
+    // Hosts that manage their own storage layout (e.g. openswarm spawning
+    // per-swarm instances under a unique data dir) still win by passing
+    // `baseDir` directly. Legacy `~/.macro-agent/*.db` from pre-instancing
+    // versions is left alone — new boots start fresh under their own subdir.
+    const instanceId = config.instanceId
+        ?? config.map?.swarmId
+        ?? ("inst_" + crypto.createHash("sha256").update(path.resolve(cwd)).digest("hex").slice(0, 12));
+    const baseDir = config.baseDir ?? path.join(os.homedir(), ".macro-agent", instanceId);
+    // Env-var bridge for hosts that pass through bootConfig with a fixed
+    // whitelist (e.g. openswarm). Translates MACRO_BOOTSTRAP_COORDINATOR /
+    // MACRO_BOOTSTRAP_CWD / MACRO_BOOTSTRAP_REHYDRATE into the structured
+    // bootstrap field if not already set programmatically. Programmatic
+    // config wins per field.
+    if (process.env.MACRO_BOOTSTRAP_COORDINATOR === "true" &&
+        !config.bootstrap?.coordinator) {
+        const envCwd = process.env.MACRO_BOOTSTRAP_CWD;
+        config = {
+            ...config,
+            bootstrap: {
+                ...(config.bootstrap ?? {}),
+                coordinator: envCwd ? { cwd: envCwd } : true,
+            },
+        };
+    }
+    const envRehydrate = process.env.MACRO_BOOTSTRAP_REHYDRATE;
+    if ((envRehydrate === "none" ||
+        envRehydrate === "coordinators" ||
+        envRehydrate === "all") &&
+        config.bootstrap?.rehydrate === undefined) {
+        config = {
+            ...config,
+            bootstrap: {
+                ...(config.bootstrap ?? {}),
+                rehydrate: envRehydrate,
+            },
+        };
+    }
     // Ensure base directory exists
     fs.mkdirSync(baseDir, { recursive: true });
     // 1. Agent Store (minimal SQLite)
     const agentStorePath = path.join(baseDir, "agents.db");
     const agentStore = new AgentStore(agentStorePath);
     // 2. Inbox Adapter (embedded agent-inbox, hybrid mode)
-    const inboxSocketPath = config.inbox?.socketPath ??
-        path.join(baseDir, "inbox.sock");
+    const inboxSocketPath = config.inbox?.socketPath ?? path.join(baseDir, "inbox.sock");
     const inboxSqlitePath = path.join(baseDir, "inbox.db");
     const inboxAdapter = new DefaultInboxAdapter({
         socketPath: inboxSocketPath,
@@ -105,7 +152,152 @@ export async function bootV2(config = {}) {
         },
     });
     await triggerSystem.start();
-    // 7. Control Server (lifecycle RPC for MCP subprocesses)
+    // 7a. Task Dispatch (opt-in autonomous task dispatch mode)
+    let taskDispatcher = null;
+    if (config.dispatch?.enabled && tasksAdapter) {
+        const { createOrchestrator, createOpenTasksSource, createAgentInboxPort } = await import("swarm-dispatch");
+        const { getStableInstanceId } = await import("./cli/stable-instance-id.js");
+        const claimantId = `${os.hostname()}:${process.pid}:${getStableInstanceId(cwd)}`;
+        const dispatchAgentId = `dispatcher:${claimantId}`;
+        // Adapt opentasks client → DispatchTaskSource
+        const opentasksClient = tasksAdapter.client;
+        const source = opentasksClient
+            ? createOpenTasksSource(opentasksClient)
+            : {
+                // Fallback adapter when opentasks client is available via TasksAdapter methods
+                queryReady: async (opts) => tasksAdapter.queryReady(opts),
+                claim: async (taskId, claimantIdArg) => {
+                    try {
+                        await tasksAdapter.assignTask(taskId, claimantIdArg);
+                        return { success: true };
+                    }
+                    catch {
+                        return { success: false };
+                    }
+                },
+                release: async (taskId) => tasksAdapter.unclaimTask(taskId),
+                transition: async (taskId, action) => tasksAdapter.transitionTask(taskId, action),
+                getTask: async (taskId) => tasksAdapter.getTask(taskId),
+                listInProgress: async () => tasksAdapter.listTasks({ status: "in_progress" }),
+            };
+        // Adapt AgentManagerV2 → DispatchAgentRuntime
+        const runtime = {
+            spawn: async (opts) => {
+                const spawned = await agentManager.spawn({
+                    task: opts.prompt,
+                    task_id: opts.taskId,
+                    role: opts.role,
+                    parent: null,
+                });
+                return { id: spawned.id };
+            },
+            terminate: async (agentId, reason) => {
+                await agentManager.terminate(agentId, (reason ?? "cancelled"));
+            },
+            onStopped: (callback) => agentManager.onLifecycleEvent((event) => {
+                if (event.type === "stopped") {
+                    callback(event.agent.id, event.reason);
+                }
+            }),
+        };
+        // Phase 2: Wire MessagePort via agent-inbox for mail-based work routing
+        let messagePort;
+        if (config.dispatch.enableMailRouting !== false) {
+            const inbox = inboxAdapter.getInbox();
+            messagePort = createAgentInboxPort(inbox.router, inbox.events, {
+                dispatcherAgentId: dispatchAgentId,
+                classifyMessage: (msg) => {
+                    // Classify inbox messages as dispatchable work when they carry
+                    // the x-dispatch/work schema. Other messages are ignored.
+                    const content = msg.content;
+                    if (content?.schema !== "x-dispatch/work")
+                        return null;
+                    const data = content.data;
+                    if (!data?.taskId)
+                        return null;
+                    return {
+                        messageId: msg.id,
+                        correlationId: msg.thread_tag ?? msg.id,
+                        replyTo: msg.sender_id ? { agentId: msg.sender_id } : undefined,
+                        task: {
+                            id: data.taskId,
+                            title: data.title ?? `Delegated: ${data.taskId}`,
+                            status: "open",
+                            content: data.prompt ?? data.content,
+                            tags: data.tags,
+                            metadata: {
+                                ...data.metadata,
+                                role: data.role,
+                            },
+                        },
+                    };
+                },
+            });
+            // Register the dispatcher as an agent in the inbox so it can receive messages
+            await inboxAdapter.registerAgent(dispatchAgentId, {
+                role: "dispatcher",
+                scope: "default",
+            });
+        }
+        // Phase 2: Wire AgentRoster via inbox agent listing for route-first dispatch
+        let roster;
+        if (config.dispatch.enableRoster !== false) {
+            const inbox = inboxAdapter.getInbox();
+            roster = {
+                async findAvailable(criteria) {
+                    // List agents from inbox storage, filter by role and idle state
+                    const agents = inbox.storage.listAgents();
+                    return agents
+                        .filter((a) => {
+                        if (a.agentId === dispatchAgentId)
+                            return false;
+                        if (criteria.role && a.role && a.role !== criteria.role)
+                            return false;
+                        if (criteria.notBusy && a.status === "busy")
+                            return false;
+                        return true;
+                    })
+                        .map((a) => ({
+                        agentId: a.agentId ?? a.agent_id ?? a.id,
+                        host: a.host,
+                    }));
+                },
+            };
+        }
+        // Determine dispatch mode
+        const hasRouting = !!messagePort && !!roster;
+        const dispatchMode = config.dispatch.dispatchMode ??
+            (hasRouting ? "prefer-route" : "spawn-only");
+        taskDispatcher = createOrchestrator(source, runtime, {
+            claimantId,
+            pollIntervalMs: config.dispatch.pollIntervalMs ?? 15_000,
+            defaultRole: config.dispatch.defaultRole ?? "worker",
+            concurrency: { global: config.dispatch.maxConcurrent ?? 3 },
+            retry: {
+                maxRetries: config.dispatch.maxRetries ?? 3,
+                baseDelayMs: config.dispatch.retryBaseDelayMs ?? 10_000,
+                maxDelayMs: config.dispatch.retryMaxDelayMs ?? 300_000,
+            },
+            eligibility: config.dispatch.eligibility,
+            tags: config.dispatch.tags,
+            reconcile: {
+                enabled: config.dispatch.reconcile?.enabled ?? true,
+                intervalMs: config.dispatch.reconcile?.intervalMs ?? 60_000,
+                stallTimeoutMs: config.dispatch.reconcile?.stallTimeoutMs,
+            },
+            ...(config.dispatch.continuation && {
+                continuation: {
+                    delayMs: config.dispatch.continuation.delayMs ?? 1_000,
+                    maxTurns: config.dispatch.continuation.maxTurns ?? 20,
+                },
+            }),
+            messagePort,
+            roster,
+            dispatchMode,
+        });
+        await taskDispatcher.start();
+    }
+    // 7b. Control Server (lifecycle RPC for MCP subprocesses)
     const controlServer = new ControlServer(agentManager, {
         socketPath: controlSocketPath,
     });
@@ -211,8 +403,12 @@ export async function bootV2(config = {}) {
     // 12. Swarmkit integrations (minimem, skill-tree, sessionlog)
     agentManager.setIntegrationConfigs({
         minimem: config.minimem?.enabled ? config.minimem : undefined,
-        skilltree: config.skilltree?.enabled ? config.skilltree : undefined,
-        sessionlog: config.sessionlog?.enabled ? config.sessionlog : undefined,
+        skilltree: config.skilltree?.enabled
+            ? config.skilltree
+            : undefined,
+        sessionlog: config.sessionlog?.enabled
+            ? config.sessionlog
+            : undefined,
     });
     // 12b. Skill-tree loadout compilation (if enabled)
     if (config.skilltree?.enabled) {
@@ -266,6 +462,17 @@ export async function bootV2(config = {}) {
             await mapSidecar.start();
             // Wire sidecar into agent manager for session-end checkpoints
             agentManager.setSidecar(mapSidecar);
+            // Bridge dispatch events to MAP for observability. Spread the source
+            // event first, then namespace the `type` field — otherwise tsc warns
+            // about the literal key being overwritten by the spread.
+            if (taskDispatcher && mapSidecar.emitEvent) {
+                taskDispatcher.onEvent((event) => {
+                    mapSidecar.emitEvent({
+                        ...event,
+                        type: `dispatch.${event.type}`,
+                    });
+                });
+            }
             // Attach to shared system ref so ACP/MAP handlers can access it
             systemRef.mapSidecar = mapSidecar;
         }
@@ -274,7 +481,133 @@ export async function bootV2(config = {}) {
             console.warn(`[boot-v2] MAP sidecar failed to start: ${err.message}`);
         }
     }
-    // 13. Return system handle
+    // 13. Boot-time agents (opt-in)
+    // Fire after all subsystems are wired so the agent's lifecycle events
+    // (spawned/started) flow through the lifecycle bridge → MAP hub. Non-
+    // blocking: don't gate boot completion on agent process startup, which
+    // takes seconds. Failures are logged but do not abort boot.
+    //
+    // Rehydration on restart: the agent-store persists across process
+    // restarts. When we boot into a workspace that already has one or more
+    // coordinators (e.g. openhive spawned this swarm previously + auto-
+    // revived it), resume THOSE agents instead of spawning a brand-new one.
+    // Otherwise the UI shows a different coordinator name after every
+    // server restart — the prior conversations still exist on disk but get
+    // buried under stale, state='stopped' records that the UI treats as
+    // dead.
+    if (config.bootstrap?.coordinator) {
+        const opts = config.bootstrap.coordinator === true
+            ? {}
+            : config.bootstrap.coordinator;
+        const bootstrapCwd = opts.cwd ?? cwd;
+        const policy = config.bootstrap.rehydrate ?? "coordinators";
+        // Build the revival set based on policy:
+        //   - 'none'          → empty set (always fall through to fresh spawn)
+        //   - 'coordinators'  → root coordinators at this cwd, running or stopped
+        //   - 'all'           → every agent at this cwd, running or stopped
+        //
+        // Both 'running' and 'stopped' count as revival candidates. The
+        // hosted-swarm graceful-restart path transitions agents to 'stopped'
+        // on shutdown; an abrupt parent crash leaves them as 'running'.
+        // Either way, the workspace intent survives the restart and we want
+        // the same coordinators + their children back. Agents that a user
+        // explicitly terminated are tracked with a distinct `stop_reason`
+        // and — since explicit termination clears them from the cascade — do
+        // not appear in the listAgents result at a cwd they no longer
+        // inhabit. The `state='failed'` set is also excluded.
+        let priors = [];
+        if (policy === "coordinators") {
+            priors = agentStore
+                .listAgents({ parent_id: null, role: "coordinator" })
+                .filter((a) => a.cwd === bootstrapCwd &&
+                (a.state === "running" || a.state === "stopped"));
+        }
+        else if (policy === "all") {
+            priors = agentStore
+                .listAgents()
+                .filter((a) => a.cwd === bootstrapCwd &&
+                (a.state === "running" || a.state === "stopped"));
+        }
+        const rehydrateOrSpawn = async () => {
+            if (priors.length > 0) {
+                // Parent-first ordering so a child's `resume()` sees its parent
+                // already back (lineage bookkeeping, inbox subscriptions). Depth
+                // = lineage.length: roots are 0, direct children of roots are 1.
+                const byDepth = new Map();
+                for (const p of priors) {
+                    const d = p.lineage.length;
+                    if (!byDepth.has(d))
+                        byDepth.set(d, []);
+                    byDepth.get(d).push(p);
+                }
+                const depths = Array.from(byDepth.keys()).sort((a, b) => a - b);
+                const priorIds = new Set(priors.map((p) => p.id));
+                const resumed = new Set();
+                const failed = new Set();
+                // Stagger spawns — each resume fires a Claude Code subprocess and
+                // we don't want a coordinator + five workers all booting at once.
+                const CONCURRENCY = 2;
+                for (const depth of depths) {
+                    const atDepth = byDepth.get(depth);
+                    const eligible = atDepth.filter((a) => {
+                        if (!a.parent_id)
+                            return true; // roots are always eligible
+                        // Skip children whose parent isn't being revived at all
+                        // (deliberately stopped, or out of scope for this policy).
+                        if (!priorIds.has(a.parent_id)) {
+                            console.warn(`[boot-v2] Skipping ${a.role} ${a.id}: parent ${a.parent_id} not in revival set`);
+                            return false;
+                        }
+                        // Skip children whose parent resume failed.
+                        if (failed.has(a.parent_id)) {
+                            console.warn(`[boot-v2] Skipping ${a.role} ${a.id}: parent ${a.parent_id} failed to resume`);
+                            return false;
+                        }
+                        return resumed.has(a.parent_id);
+                    });
+                    for (let i = 0; i < eligible.length; i += CONCURRENCY) {
+                        const batch = eligible.slice(i, i + CONCURRENCY);
+                        await Promise.all(batch.map(async (prior) => {
+                            try {
+                                const r = await agentManager.resume(prior.id);
+                                resumed.add(prior.id);
+                                console.log(`[boot-v2] Rehydrated ${prior.role}: ${r.name ?? r.id} at ${prior.cwd}`);
+                            }
+                            catch (err) {
+                                const msg = err.message;
+                                if (/ALREADY_RUNNING/i.test(msg)) {
+                                    // Rare lifecycle race — treat as success so children
+                                    // aren't held back waiting on a parent that's actually
+                                    // already alive.
+                                    resumed.add(prior.id);
+                                }
+                                else {
+                                    failed.add(prior.id);
+                                    console.warn(`[boot-v2] Failed to rehydrate ${prior.role} ${prior.id}: ${msg}`);
+                                }
+                            }
+                        }));
+                    }
+                }
+                return;
+            }
+            // No priors matched the policy → fresh spawn (first boot, or 'none').
+            const spawned = await agentManager.spawn({
+                role: "coordinator",
+                parent: null,
+                cwd: bootstrapCwd,
+                task: opts.task ?? "Default coordinator (auto-spawn on boot)",
+                permissionMode: opts.permissionMode,
+                agentType: opts.agentType,
+                customPrompt: opts.customPrompt,
+            });
+            console.log(`[boot-v2] Bootstrap coordinator spawned: ${spawned.name ?? spawned.id} at ${bootstrapCwd}`);
+        };
+        rehydrateOrSpawn().catch((err) => {
+            console.warn(`[boot-v2] Bootstrap coordinator init failed: ${err.message}`);
+        });
+    }
+    // 14. Return system handle
     return {
         agentManager,
         agentStore,
@@ -284,6 +617,7 @@ export async function bootV2(config = {}) {
         controlServer,
         roleRegistry,
         controlSocketPath,
+        ...(taskDispatcher ? { taskDispatcher } : {}),
         ...(apiServer ? { apiServer } : {}),
         ...(acpServer ? { acpServer } : {}),
         ...(mapServerInstance ? { mapServerInstance } : {}),
@@ -291,6 +625,8 @@ export async function bootV2(config = {}) {
         _sessionlogSyncLevel: config.sessionlog?.sync ?? config.map?.trajectorySyncLevel ?? "full",
         async shutdown() {
             clearInterval(healthCheckTimer);
+            if (taskDispatcher)
+                await taskDispatcher.stop();
             if (mapSidecar)
                 await mapSidecar.stop();
             if (mapServerInstance)

package/dist/boot-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"boot-v2.js","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EACL,mBAAmB,GAEpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,mBAAmB,GAEpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AA6M1D,gFAAgF;AAChF,gBAAgB;AAChB,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,SAAuB,EAAE;IAEzB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACxC,MAAM,OAAO,GACX,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;IAE5D,+BAA+B;IAC/B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3C,kCAAkC;IAClC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC;IAElD,uDAAuD;IACvD,MAAM,eAAe,GACnB,MAAM,CAAC,KAAK,EAAE,UAAU;QACxB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC;QAC3C,UAAU,EAAE,eAAe;QAC3B,UAAU,EAAE,eAAe;QAC3B,YAAY,EAAE,SAAS;QACvB,GAAG,MAAM,CAAC,KAAK;QACf,qCAAqC;QACrC,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI;YACvB,UAAU,EAAE;gBACV,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;gBACpC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;oBAC5B,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,EAAE;oBAC5D,CAAC,CAAC,SAAS;aACd;SACF,CAAC;KACH,CAAC,CAAC;IACH,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;IAEhC,6DAA6D;IAC7D,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC;QAC3C,GAAG,MAAM,CAAC,KAAK;KAChB,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,oDAAoD;QACpD,OAAO,CAAC,IAAI,CACV,sFAAsF,CACvF,CAAC;IACJ,CAAC;IAED,mBAAmB;IACnB,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,mBAAmB,EAAE,CAAC;IAEtE,sBAAsB;IACtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,oBAAoB,CACvC,UAAU,EACV,YAAY,EACZ,YAAY,EACZ;QACE,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,cAAc;QACrE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,aAAa;QAC1D,UAAU,EAAE,GAAG;QACf,YAAY;QACZ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,iBAAiB;QACjB,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc;QAC9C,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc;KAC/C,CACF,CAAC;IAEF,+CAA+C;IAC/C,IAAI,iBAAiB,GAAwB,IAAI,CAAC;IAClD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACrE,iBAAiB,GAAG,eAAe,CAAC,YAAY,EAAE,YAAY,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IACrF,CAAC;IAED,uBAAuB;IACvB,MAAM,aAAa,GAAG,qBAAqB,CACzC;QACE,YAAY;QACZ,UAAU;QACV,YAAY;KACb,EACD;QACE,IAAI,EAAE;YACJ,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK;YACzD,mBAAmB,EAAE,MAAM,CAAC,OAAO,EAAE,mBAAmB;SACzD;KACF,CACF,CAAC;IACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;IAE5B,yDAAyD;IACzD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,YAAY,EAAE;QACpD,UAAU,EAAE,iBAAiB;KAC9B,CAAC,CAAC;IACH,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;IAE5B,kCAAkC;IAClC,oEAAoE;IACpE,yCAAyC;IACzC,MAAM,wBAAwB,GAAG,MAAM,CAAC;IACxC,MAAM,sBAAsB,GAAG,MAAM,CAAC;IAEtC,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9C,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,aAAa,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;YAC3E,KAAK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,SAAS,EAAE,CAAC;gBAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC3C,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;oBAAE,SAAS;gBAElD,uEAAuE;gBACvE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;oBACpB,IAAI,CAAC;wBACH,MAAM,YAAY,CAAC,IAAI,CACrB,QAAQ,EACR,KAAK,CAAC,SAAS,EACf;4BACE,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,aAAa;4BACpB,IAAI,EAAE;gCACJ,OAAO;gCACP,IAAI,EAAE,KAAK,CAAC,IAAI;gCAChB,QAAQ;gCACR,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;6BACpC;yBACF,EACD,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,OAAO,EAAE,EAAE,CACvD,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,2BAA2B;oBAC7B,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;IACH,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC7B,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,6BAA6B;IAEvD,kFAAkF;IAClF,0EAA0E;IAC1E,8EAA8E;IAC9E,iFAAiF;IACjF,MAAM,SAAS,GAAG;QAChB,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,YAAY;QACZ,aAAa;QACb,aAAa;QACb,YAAY;QACZ,iBAAiB;KACX,CAAC;IAET,gCAAgC;IAChC,IAAI,SAAS,GAAqB,IAAI,CAAC;IACvC,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5D,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE;YACrC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,sCAAsC;IACtC,IAAI,SAAS,GAA8B,IAAI,CAAC;IAChD,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC/E,SAAS,GAAG,wBAAwB,CAClC,SAAS,EACT;YACE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;SACtB,CACF,CAAC;QACF,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,0EAA0E;IAC1E,IAAI,iBAAiB,GAAsD,IAAI,CAAC;IAChF,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACpE,iBAAiB,GAAG,uBAAuB,CACzC;gBACE,YAAY;gBACZ,UAAU;gBACV,YAAY;gBACZ,YAAY;gBACZ,MAAM,EAAE,SAAS;aAClB,EACD;gBACE,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;aAC5B,CACF,CAAC;YACF,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAEhC,mEAAmE;YACnE,iEAAiE;YACjE,YAAY,CAAC,eAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CACV,yCAA0C,GAAa,CAAC,OAAO,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,8DAA8D;IAC9D,YAAY,CAAC,qBAAqB,CAAC;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAc,CAAC,CAAC,CAAC,SAAS;QACpE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAgB,CAAC,CAAC,CAAC,SAAS;QAC1E,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAiB,CAAC,CAAC,CAAC,SAAS;KAC9E,CAAC,CAAC;IAEH,mDAAmD;IACnD,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAC/E,sCAAsC;YACtC,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAC3C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EACzB,MAAM,CAAC,SAAS,CACjB,CAAC;gBACF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;oBACvC,YAAY,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,IAAI,UAAU,GAA+C,IAAI,CAAC;IAClE,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAC9D,oEAAoE;YACpE,wDAAwD;YACxD,MAAM,KAAK,GAAG,MAAM,CAAC,gBAMR,CAAC;YACd,MAAM,iBAAiB,GAAG,KAAK,EAAE,oBAAoB,EAAE,EAAE,CAAC;YAC1D,UAAU,GAAG,gBAAgB,CAC3B;gBACE,YAAY;gBACZ,UAAU;gBACV,YAAY;gBACZ,YAAY;gBACZ,aAAa,EAAE,iBAAiB;oBAC9B,CAAC,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,iBAAkB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACtD,CAAC,CAAC,SAAS;gBACb,iBAAiB;aAClB,EACD;gBACE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM;gBACzB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK;gBACvB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK;gBACvB,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;gBAC7B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU;gBACjC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS;gBAC/B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO;gBAC3B,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB;gBACnD,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB;gBACnD,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;aACrD,CACF,CAAC;YACF,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,8DAA8D;YAC9D,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACpC,gEAAgE;YAChE,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,+CAA+C;YAC/C,OAAO,CAAC,IAAI,CACV,0CAA2C,GAAa,CAAC,OAAO,EAAE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,OAAO;QACL,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,YAAY;QACZ,aAAa;QACb,aAAa;QACb,YAAY;QACZ,iBAAiB;QACjB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,oBAAoB,EAAE,MAAM,CAAC,UAAU,EAAE,IAAI,IAAI,MAAM,CAAC,GAAG,EAAE,mBAAmB,IAAI,MAAM;QAE1F,KAAK,CAAC,QAAQ;YACZ,aAAa,CAAC,gBAAgB,CAAC,CAAC;YAChC,IAAI,UAAU;gBAAE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,iBAAiB;gBAAE,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;YACtD,IAAI,iBAAiB;gBAAE,iBAAiB,EAAE,CAAC;YAC3C,IAAI,SAAS;gBAAE,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACtC,IAAI,SAAS;gBAAE,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;YAC3B,YAAY,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"boot-v2.js","sourceRoot":"","sources":["../src/boot-v2.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EACL,mBAAmB,GAEpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,mBAAmB,GAEpB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AA2S1D,gFAAgF;AAChF,gBAAgB;AAChB,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,SAAuB,EAAE;IAEzB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IACxC,2EAA2E;IAC3E,sEAAsE;IACtE,EAAE;IACF,8DAA8D;IAC9D,2EAA2E;IAC3E,0EAA0E;IAC1E,2DAA2D;IAC3D,2EAA2E;IAC3E,6EAA6E;IAC7E,4EAA4E;IAC5E,EAAE;IACF,sEAAsE;IACtE,oEAAoE;IACpE,uEAAuE;IACvE,yEAAyE;IACzE,MAAM,UAAU,GACd,MAAM,CAAC,UAAU;WACd,MAAM,CAAC,GAAG,EAAE,OAAO;WACnB,CAAC,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAClG,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IAEtF,qEAAqE;IACrE,uEAAuE;IACvE,sEAAsE;IACtE,oEAAoE;IACpE,yBAAyB;IACzB,IACE,OAAO,CAAC,GAAG,CAAC,2BAA2B,KAAK,MAAM;QAClD,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,EAC9B,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC/C,MAAM,GAAG;YACP,GAAG,MAAM;YACT,SAAS,EAAE;gBACT,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;gBAC3B,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;aAC7C;SACF,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;IAC3D,IACE,CAAC,YAAY,KAAK,MAAM;QACtB,YAAY,KAAK,cAAc;QAC/B,YAAY,KAAK,KAAK,CAAC;QACzB,MAAM,CAAC,SAAS,EAAE,SAAS,KAAK,SAAS,EACzC,CAAC;QACD,MAAM,GAAG;YACP,GAAG,MAAM;YACT,SAAS,EAAE;gBACT,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;gBAC3B,SAAS,EAAE,YAAY;aACxB;SACF,CAAC;IACJ,CAAC;IAED,+BAA+B;IAC/B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3C,kCAAkC;IAClC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,cAAc,CAAC,CAAC;IAElD,uDAAuD;IACvD,MAAM,eAAe,GACnB,MAAM,CAAC,KAAK,EAAE,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC;QAC3C,UAAU,EAAE,eAAe;QAC3B,UAAU,EAAE,eAAe;QAC3B,YAAY,EAAE,SAAS;QACvB,GAAG,MAAM,CAAC,KAAK;QACf,qCAAqC;QACrC,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI;YACvB,UAAU,EAAE;gBACV,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;gBACpC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;gBAC9B,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;oBAC5B,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,EAAE;oBAC5D,CAAC,CAAC,SAAS;aACd;SACF,CAAC;KACH,CAAC,CAAC;IACH,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;IAEhC,6DAA6D;IAC7D,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC;QAC3C,GAAG,MAAM,CAAC,KAAK;KAChB,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,oDAAoD;QACpD,OAAO,CAAC,IAAI,CACV,sFAAsF,CACvF,CAAC;IACJ,CAAC;IAED,mBAAmB;IACnB,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,mBAAmB,EAAE,CAAC;IAEtE,sBAAsB;IACtB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC7D,MAAM,YAAY,GAAG,oBAAoB,CACvC,UAAU,EACV,YAAY,EACZ,YAAY,EACZ;QACE,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,IAAI,cAAc;QACrE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,aAAa;QAC1D,UAAU,EAAE,GAAG;QACf,YAAY;QACZ,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,iBAAiB;QACjB,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc;QAC9C,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc;KAC/C,CACF,CAAC;IAEF,+CAA+C;IAC/C,IAAI,iBAAiB,GAAwB,IAAI,CAAC;IAClD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACrE,iBAAiB,GAAG,eAAe,CACjC,YAAY,EACZ,YAAY,EACZ,MAAM,CAAC,UAAU,CAClB,CAAC;IACJ,CAAC;IAED,uBAAuB;IACvB,MAAM,aAAa,GAAG,qBAAqB,CACzC;QACE,YAAY;QACZ,UAAU;QACV,YAAY;KACb,EACD;QACE,IAAI,EAAE;YACJ,eAAe,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK;YACzD,mBAAmB,EAAE,MAAM,CAAC,OAAO,EAAE,mBAAmB;SACzD;KACF,CACF,CAAC;IACF,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;IAE5B,2DAA2D;IAC3D,IAAI,cAAc,GAAmD,IAAI,CAAC;IAE1E,IAAI,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,YAAY,EAAE,CAAC;QAC7C,MAAM,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GACvE,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;QACjC,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAE5E,MAAM,UAAU,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,OAAO,CAAC,GAAG,IAAI,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;QACjF,MAAM,eAAe,GAAG,cAAc,UAAU,EAAE,CAAC;QAEnD,8CAA8C;QAC9C,MAAM,eAAe,GAAI,YAAoB,CAAC,MAAM,CAAC;QACrD,MAAM,MAAM,GAAG,eAAe;YAC5B,CAAC,CAAC,qBAAqB,CAAC,eAAe,CAAC;YACxC,CAAC,CAAC;gBACE,+EAA+E;gBAC/E,UAAU,EAAE,KAAK,EAAE,IAA0C,EAAE,EAAE,CAC/D,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC/B,KAAK,EAAE,KAAK,EAAE,MAAc,EAAE,aAAqB,EAAE,EAAE;oBACrD,IAAI,CAAC;wBACH,MAAM,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;wBACrD,OAAO,EAAE,OAAO,EAAE,IAAa,EAAE,CAAC;oBACpC,CAAC;oBAAC,MAAM,CAAC;wBACP,OAAO,EAAE,OAAO,EAAE,KAAc,EAAE,CAAC;oBACrC,CAAC;gBACH,CAAC;gBACD,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC;gBACnE,UAAU,EAAE,KAAK,EACf,MAAc,EACd,MAAqC,EACrC,EAAE,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;gBAChD,OAAO,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC;gBAC/D,cAAc,EAAE,KAAK,IAAI,EAAE,CACzB,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;aACpD,CAAC;QAEN,8CAA8C;QAC9C,MAAM,OAAO,GAAkD;YAC7D,KAAK,EAAE,KAAK,EAAE,IAAsD,EAAE,EAAE;gBACtE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC;oBACvC,IAAI,EAAE,IAAI,CAAC,MAAM;oBACjB,OAAO,EAAE,IAAI,CAAC,MAAM;oBACpB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,MAAM,EAAE,IAAI;iBACb,CAAC,CAAC;gBACH,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;YAC5B,CAAC;YACD,SAAS,EAAE,KAAK,EAAE,OAAe,EAAE,MAAe,EAAE,EAAE;gBACpD,MAAM,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,MAAM,IAAI,WAAW,CAAQ,CAAC,CAAC;YACxE,CAAC;YACD,SAAS,EAAE,CAAC,QAAmD,EAAE,EAAE,CACjE,YAAY,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE;gBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC7B,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC;SACL,CAAC;QAEF,wEAAwE;QACxE,IAAI,WAA6D,CAAC;QAClE,IAAI,MAAM,CAAC,QAAQ,CAAC,iBAAiB,KAAK,KAAK,EAAE,CAAC;YAChD,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YACtC,WAAW,GAAG,oBAAoB,CAChC,KAAK,CAAC,MAAa,EACnB,KAAK,CAAC,MAAa,EACnB;gBACE,iBAAiB,EAAE,eAAe;gBAClC,eAAe,EAAE,CAAC,GAAQ,EAAE,EAAE;oBAC5B,+DAA+D;oBAC/D,0DAA0D;oBAC1D,MAAM,OAAO,GAAG,GAAG,CAAC,OAInB,CAAC;oBACF,IAAI,OAAO,EAAE,MAAM,KAAK,iBAAiB;wBAAE,OAAO,IAAI,CAAC;oBACvD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;oBAC1B,IAAI,CAAC,IAAI,EAAE,MAAM;wBAAE,OAAO,IAAI,CAAC;oBAC/B,OAAO;wBACL,SAAS,EAAE,GAAG,CAAC,EAAE;wBACjB,aAAa,EAAE,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,EAAE;wBACvC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;wBAC/D,IAAI,EAAE;4BACJ,EAAE,EAAE,IAAI,CAAC,MAAM;4BACf,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,cAAc,IAAI,CAAC,MAAM,EAAE;4BAChD,MAAM,EAAE,MAAM;4BACd,OAAO,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO;4BACpC,IAAI,EAAE,IAAI,CAAC,IAAI;4BACf,QAAQ,EAAE;gCACR,GAAG,IAAI,CAAC,QAAQ;gCAChB,IAAI,EAAE,IAAI,CAAC,IAAI;6BAChB;yBACF;qBACF,CAAC;gBACJ,CAAC;aACF,CACF,CAAC;YAEF,8EAA8E;YAC9E,MAAM,YAAY,CAAC,aAAa,CAAC,eAAe,EAAE;gBAChD,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;QAED,6EAA6E;QAC7E,IAAI,MAAwD,CAAC;QAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,KAAK,KAAK,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,GAAG;gBACP,KAAK,CAAC,aAAa,CAAC,QAAQ;oBAC1B,gEAAgE;oBAChE,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;oBAC1C,OAAO,MAAM;yBACV,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE;wBACjB,IAAI,CAAC,CAAC,OAAO,KAAK,eAAe;4BAAE,OAAO,KAAK,CAAC;wBAChD,IAAI,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;4BACrD,OAAO,KAAK,CAAC;wBACf,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,MAAM;4BAAE,OAAO,KAAK,CAAC;wBAC1D,OAAO,IAAI,CAAC;oBACd,CAAC,CAAC;yBACD,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;wBAChB,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,EAAE;wBACxC,IAAI,EAAE,CAAC,CAAC,IAAI;qBACb,CAAC,CAAC,CAAC;gBACR,CAAC;aACF,CAAC;QACJ,CAAC;QAED,0BAA0B;QAC1B,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,MAAM,CAAC;QAC7C,MAAM,YAAY,GAChB,MAAM,CAAC,QAAQ,CAAC,YAAY;YAC5B,CAAC,UAAU,CAAC,CAAC,CAAE,cAAwB,CAAC,CAAC,CAAE,YAAsB,CAAC,CAAC;QAErE,cAAc,GAAG,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE;YACnD,UAAU;YACV,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,cAAc,IAAI,MAAM;YACxD,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,IAAI,QAAQ;YACpD,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,aAAa,IAAI,CAAC,EAAE;YAC3D,KAAK,EAAE;gBACL,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,IAAI,CAAC;gBAC3C,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,gBAAgB,IAAI,MAAM;gBACvD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,eAAe,IAAI,OAAO;aACvD;YACD,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW;YACxC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YAC1B,SAAS,EAAE;gBACT,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,IAAI,IAAI;gBACnD,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,IAAI,MAAM;gBAC3D,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,cAAc;aAC1D;YACD,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,IAAI;gBAClC,YAAY,EAAE;oBACZ,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,IAAI,KAAK;oBACtD,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,IAAI,EAAE;iBACtD;aACF,CAAC;YACF,WAAW;YACX,MAAM;YACN,YAAY;SACb,CAAC,CAAC;QAEH,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAED,0DAA0D;IAC1D,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,YAAY,EAAE;QACpD,UAAU,EAAE,iBAAiB;KAC9B,CAAC,CAAC;IACH,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;IAE5B,kCAAkC;IAClC,oEAAoE;IACpE,yCAAyC;IACzC,MAAM,wBAAwB,GAAG,MAAM,CAAC;IACxC,MAAM,sBAAsB,GAAG,MAAM,CAAC;IAEtC,MAAM,gBAAgB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC9C,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,aAAa,CAAC,kBAAkB,CAChD,sBAAsB,CACvB,CAAC;YACF,KAAK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,SAAS,EAAE,CAAC;gBAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAC3C,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;oBAAE,SAAS;gBAElD,uEAAuE;gBACvE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;oBACpB,IAAI,CAAC;wBACH,MAAM,YAAY,CAAC,IAAI,CACrB,QAAQ,EACR,KAAK,CAAC,SAAS,EACf;4BACE,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,aAAa;4BACpB,IAAI,EAAE;gCACJ,OAAO;gCACP,IAAI,EAAE,KAAK,CAAC,IAAI;gCAChB,QAAQ;gCACR,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ;6BACpC;yBACF,EACD,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,OAAO,EAAE,EAAE,CACvD,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,2BAA2B;oBAC7B,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;IACH,CAAC,EAAE,wBAAwB,CAAC,CAAC;IAC7B,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,6BAA6B;IAEvD,kFAAkF;IAClF,0EAA0E;IAC1E,8EAA8E;IAC9E,iFAAiF;IACjF,MAAM,SAAS,GAAG;QAChB,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,YAAY;QACZ,aAAa;QACb,aAAa;QACb,YAAY;QACZ,iBAAiB;KACX,CAAC;IAET,gCAAgC;IAChC,IAAI,SAAS,GAAqB,IAAI,CAAC;IACvC,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC5D,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE;YACrC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,sCAAsC;IACtC,IAAI,SAAS,GAA8B,IAAI,CAAC;IAChD,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,wBAAwB,EAAE,GAChC,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC5C,SAAS,GAAG,wBAAwB,CAAC,SAAS,EAAE;YAC9C,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YACrB,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;SACtB,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED,0EAA0E;IAC1E,IAAI,iBAAiB,GACnB,IAAI,CAAC;IACP,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACpE,iBAAiB,GAAG,uBAAuB,CACzC;gBACE,YAAY;gBACZ,UAAU;gBACV,YAAY;gBACZ,YAAY;gBACZ,MAAM,EAAE,SAAS;aAClB,EACD;gBACE,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;gBAC3B,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI;aAC5B,CACF,CAAC;YACF,MAAM,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAEhC,mEAAmE;YACnE,iEAAiE;YACjE,YAAY,CAAC,eAAe,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CACV,yCAA0C,GAAa,CAAC,OAAO,EAAE,CAClE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,8DAA8D;IAC9D,YAAY,CAAC,qBAAqB,CAAC;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAE,MAAM,CAAC,OAAe,CAAC,CAAC,CAAC,SAAS;QACtE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO;YAClC,CAAC,CAAE,MAAM,CAAC,SAAiB;YAC3B,CAAC,CAAC,SAAS;QACb,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO;YACpC,CAAC,CAAE,MAAM,CAAC,UAAkB;YAC5B,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IAEH,mDAAmD;IACnD,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,EAAE,sBAAsB,EAAE,GAC9B,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAC9C,sCAAsC;YACtC,MAAM,eAAe,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAC3C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EACzB,MAAM,CAAC,SAAS,CACjB,CAAC;gBACF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;oBACvC,YAAY,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC9C,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;IACH,CAAC;IAED,uDAAuD;IACvD,IAAI,UAAU,GAA+C,IAAI,CAAC;IAClE,IAAI,MAAM,CAAC,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAC7C,IAAI,CAAC;YACH,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAC9D,oEAAoE;YACpE,wDAAwD;YACxD,MAAM,KAAK,GAAG,MAAM,CAAC,gBAMR,CAAC;YACd,MAAM,iBAAiB,GAAG,KAAK,EAAE,oBAAoB,EAAE,EAAE,CAAC;YAC1D,UAAU,GAAG,gBAAgB,CAC3B;gBACE,YAAY;gBACZ,UAAU;gBACV,YAAY;gBACZ,YAAY;gBACZ,aAAa,EAAE,iBAAiB;oBAC9B,CAAC,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,iBAAkB,CAAC,aAAa,CAAC,EAAE,CAAC;oBACtD,CAAC,CAAC,SAAS;gBACb,iBAAiB;aAClB,EACD;gBACE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM;gBACzB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK;gBACvB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK;gBACvB,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ;gBAC7B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU;gBACjC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS;gBAC/B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO;gBAC3B,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB;gBACnD,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,mBAAmB;gBACnD,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY;gBACrC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;aACrD,CACF,CAAC;YACF,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YACzB,8DAA8D;YAC9D,YAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAEpC,qEAAqE;YACrE,qEAAqE;YACrE,yDAAyD;YACzD,IAAI,cAAc,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;gBAC3C,cAAc,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC/B,UAAW,CAAC,SAAU,CAAC;wBACrB,GAAG,KAAK;wBACR,IAAI,EAAE,YAAY,KAAK,CAAC,IAAI,EAAE;qBAC/B,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;YACD,gEAAgE;YAChE,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,+CAA+C;YAC/C,OAAO,CAAC,IAAI,CACV,0CAA2C,GAAa,CAAC,OAAO,EAAE,CACnE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,sEAAsE;IACtE,sEAAsE;IACtE,uEAAuE;IACvE,4DAA4D;IAC5D,EAAE;IACF,kEAAkE;IAClE,uEAAuE;IACvE,oEAAoE;IACpE,wEAAwE;IACxE,kEAAkE;IAClE,uEAAuE;IACvE,oEAAoE;IACpE,QAAQ;IACR,IAAI,MAAM,CAAC,SAAS,EAAE,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW,KAAK,IAAI;YAChD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,IAAI,cAAc,CAAC;QAE5D,yCAAyC;QACzC,uEAAuE;QACvE,0EAA0E;QAC1E,oEAAoE;QACpE,EAAE;QACF,gEAAgE;QAChE,qEAAqE;QACrE,gEAAgE;QAChE,oEAAoE;QACpE,kEAAkE;QAClE,kEAAkE;QAClE,qEAAqE;QACrE,8DAA8D;QAC9D,sDAAsD;QACtD,IAAI,MAAM,GAAmD,EAAE,CAAC;QAChE,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC9B,MAAM,GAAG,UAAU;iBAChB,UAAU,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;iBACpD,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,GAAG,KAAK,YAAY;gBACtB,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CACnD,CAAC;QACN,CAAC;aAAM,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,GAAG,UAAU;iBAChB,UAAU,EAAE;iBACZ,MAAM,CACL,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,GAAG,KAAK,YAAY;gBACtB,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CACnD,CAAC;QACN,CAAC;QAED,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;YAClC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,gEAAgE;gBAChE,iEAAiE;gBACjE,iEAAiE;gBACjE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAC;gBACjD,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;oBACvB,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;oBAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;wBAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC1B,CAAC;gBACD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBAEhE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;gBAClC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;gBAEjC,kEAAkE;gBAClE,kEAAkE;gBAClE,MAAM,WAAW,GAAG,CAAC,CAAC;gBAEtB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC;oBACpC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;wBACpC,IAAI,CAAC,CAAC,CAAC,SAAS;4BAAE,OAAO,IAAI,CAAC,CAAC,4BAA4B;wBAC3D,wDAAwD;wBACxD,2DAA2D;wBAC3D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BAC/B,OAAO,CAAC,IAAI,CACV,sBAAsB,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,SAAS,qBAAqB,CACjF,CAAC;4BACF,OAAO,KAAK,CAAC;wBACf,CAAC;wBACD,4CAA4C;wBAC5C,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;4BAC5B,OAAO,CAAC,IAAI,CACV,sBAAsB,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,SAAS,mBAAmB,CAC/E,CAAC;4BACF,OAAO,KAAK,CAAC;wBACf,CAAC;wBACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAClC,CAAC,CAAC,CAAC;oBAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC;wBACtD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC;wBACjD,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BACxB,IAAI,CAAC;gCACH,MAAM,CAAC,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gCAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gCACtB,OAAO,CAAC,GAAG,CACT,wBAAwB,KAAK,CAAC,IAAI,KAAM,CAAS,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,CACjF,CAAC;4BACJ,CAAC;4BAAC,OAAO,GAAG,EAAE,CAAC;gCACb,MAAM,GAAG,GAAI,GAAa,CAAC,OAAO,CAAC;gCACnC,IAAI,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oCACjC,qDAAqD;oCACrD,uDAAuD;oCACvD,iBAAiB;oCACjB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gCACxB,CAAC;qCAAM,CAAC;oCACN,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oCACrB,OAAO,CAAC,IAAI,CACV,iCAAiC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,KAAK,GAAG,EAAE,CAClE,CAAC;gCACJ,CAAC;4BACH,CAAC;wBACH,CAAC,CAAC,CACH,CAAC;oBACJ,CAAC;gBACH,CAAC;gBACD,OAAO;YACT,CAAC;YACD,sEAAsE;YACtE,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC;gBACvC,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,IAAI;gBACZ,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,0CAA0C;gBAC7D,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CACT,4CAA6C,OAAe,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,OAAO,YAAY,EAAE,CACrG,CAAC;QACJ,CAAC,CAAC;QAEF,gBAAgB,EAAE,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACtC,OAAO,CAAC,IAAI,CACV,gDAAgD,GAAG,CAAC,OAAO,EAAE,CAC9D,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,2BAA2B;IAC3B,OAAO;QACL,YAAY;QACZ,UAAU;QACV,YAAY;QACZ,YAAY;QACZ,aAAa;QACb,aAAa;QACb,YAAY;QACZ,iBAAiB;QACjB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7C,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,oBAAoB,EAClB,MAAM,CAAC,UAAU,EAAE,IAAI,IAAI,MAAM,CAAC,GAAG,EAAE,mBAAmB,IAAI,MAAM;QAEtE,KAAK,CAAC,QAAQ;YACZ,aAAa,CAAC,gBAAgB,CAAC,CAAC;YAChC,IAAI,cAAc;gBAAE,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;YAChD,IAAI,UAAU;gBAAE,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;YACxC,IAAI,iBAAiB;gBAAE,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC;YACtD,IAAI,iBAAiB;gBAAE,iBAAiB,EAAE,CAAC;YAC3C,IAAI,SAAS;gBAAE,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACtC,IAAI,SAAS;gBAAE,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;YAC3B,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;YAC3B,YAAY,CAAC,UAAU,EAAE,CAAC;YAC1B,MAAM,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1B,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/cli/acp.js

@@ -29,6 +29,10 @@ async function main() {
     try {
         const system = await bootV2({
             cwd: defaultCwd,
+            // `--instance-id` picks the on-disk compartment under ~/.macro-agent/
+            // so multiple runs with the same id share state. Omit to auto-derive
+            // from the cwd hash. See `BootV2Config.instanceId`.
+            ...(options.instanceId ? { instanceId: options.instanceId } : {}),
             // Enable ACP WebSocket server if port is specified (server mode)
             ...(options.port
                 ? {

package/dist/cli/acp.js.map

@@ -1 +1 @@
-{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,kDAAkD;AAClD,OAAO,EAAE,SAAS,EAAyB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,oEAAoE;AACpE,mBAAmB;AACnB,oEAAoE;AAEpE,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEhD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC;YAC1B,GAAG,EAAE,UAAU;YACf,iEAAiE;YACjE,GAAG,CAAC,OAAO,CAAC,IAAI;gBACd,CAAC,CAAC;oBACE,GAAG,EAAE;wBACH,OAAO,EAAE,IAAI;wBACb,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,WAAW;qBAClC;iBACF;gBACH,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS;YAC7B,CAAC,CAAC,QAAQ,OAAO,CAAC,IAAI,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,MAAM;YAC3D,CAAC,CAAC,IAAI,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACtD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,wBAAwB,MAAM,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,mBAAmB;QACnB,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;YACzB,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;YACrD,CAAC;QACH,CAAC,CAAC;QAEF,2BAA2B;QAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,OAAO,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAC/B,MAAM,OAAO,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,8DAA8D;YAC9D,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;gBACjC,MAAM,OAAO,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,wCAAwC;YACxC,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC3D,MAAM,IAAI,OAAO,CAAO,GAAG,EAAE;gBAC3B,oDAAoD;YACtD,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,IAAI,EAAE,CAAC"}
+{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../src/cli/acp.ts"],"names":[],"mappings":"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"}

package/dist/lifecycle/cascade.d.ts

@@ -12,7 +12,7 @@
  */
 import type { AgentId } from "../store/types/index.js";
 import type { CascadeOptions, CascadeResult, ConsolidationResult, ConsolidationOptions } from "./types.js";
-import type { Workspace } from "../workspace/types.js";
+import type { Workspace, WorkspaceManager } from "../workspace/types.js";
 /**
  * Minimal agent interface for cascade operations
  */
@@ -56,14 +56,37 @@ export interface WorkspaceProvider {
  * If a merge conflict occurs, the merge is aborted and the child is
  * terminated with a "merge_conflict" reason.
  *
+ * When a `workspaceManager` is provided AND both workspaces carry stream
+ * ids, the merge is routed through `workspaceManager.mergeStream()` so
+ * it flows through git-cascade's tracker — gaining a `stream.merged`
+ * cascade event that propagates to the hub via CascadeBridge. This is
+ * the primary observability win of A3 in the integration plan.
+ *
+ * Falls back to raw `attemptMerge` (unchanged behavior) when either
+ * workspace lacks a stream id or no manager is passed — so
+ * programmatic/legacy callers keep working unchanged.
+ *
  * @param childId - Child agent to terminate
  * @param parentId - Parent agent to consolidate changes into
  * @param agentManager - Agent manager for operations
  * @param workspaceProvider - Optional workspace provider for getting agent workspaces
  * @param options - Optional consolidation options
+ * @param workspaceManager - Optional workspace manager; enables cascade-
+ *   event emission on the consolidation merge when both workspaces are
+ *   stream-backed.
  * @returns ConsolidationResult indicating success or failure
  */
-export declare function terminateWithChangeConsolidation(childId: AgentId, parentId: AgentId, agentManager: CascadeAgentManager, workspaceProvider?: WorkspaceProvider, options?: ConsolidationOptions): Promise<ConsolidationResult>;
+export declare function terminateWithChangeConsolidation(childId: AgentId, parentId: AgentId, agentManager: CascadeAgentManager, workspaceProvider?: WorkspaceProvider, options?: ConsolidationOptions, workspaceManager?: WorkspaceManager, 
+/**
+ * Optional task reference inherited from the parent agent's metadata.
+ * When provided + routing through the tracker, threaded into the
+ * `x-cascade/stream.merged` emit so the hub's cascade_merges row records
+ * which task drove the consolidation.
+ */
+taskRef?: {
+    resource_id: string;
+    node_id: string;
+}): Promise<ConsolidationResult>;
 /**
  * Get all descendants of an agent (children, grandchildren, etc.)
  */

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

@@ -1 +1 @@
-{"version":3,"file":"cascade.d.ts","sourceRoot":"","sources":["../../src/lifecycle/cascade.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAoB,MAAM,uBAAuB,CAAC;AAOzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;IACrD,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,+BAA+B;IAC/B,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,EAAE,CAAC;IAE9C,yBAAyB;IACzB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAMD;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,EACjC,OAAO,GAAE,cAA6C,GACrD,OAAO,CAAC,aAAa,CAAC,CA4CxB;AAMD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,iCAAiC;IACjC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;CAClD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,mBAAmB,EACjC,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CA8E9B;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,GAChC,YAAY,EAAE,CAYhB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAKT"}
+{"version":3,"file":"cascade.d.ts","sourceRoot":"","sources":["../../src/lifecycle/cascade.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOzE;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;IACrD,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,+BAA+B;IAC/B,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,YAAY,EAAE,CAAC;IAE9C,yBAAyB;IACzB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAMD;;;;;;;;;GASG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,EACjC,OAAO,GAAE,cAA6C,GACrD,OAAO,CAAC,aAAa,CAAC,CA4CxB;AAMD;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,iCAAiC;IACjC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;CAClD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,gCAAgC,CACpD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,mBAAmB,EACjC,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,CAAC,EAAE,oBAAoB,EAC9B,gBAAgB,CAAC,EAAE,gBAAgB;AACnC;;;;;GAKG;AACH,OAAO,CAAC,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACjD,OAAO,CAAC,mBAAmB,CAAC,CAoI9B;AAMD;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,GAChC,YAAY,EAAE,CAYhB;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,mBAAmB,GAChC,OAAO,CAKT"}

package/dist/lifecycle/cascade.js

@@ -67,14 +67,34 @@ export async function cascadeTerminateChildren(agentId, agentManager, options =
  * If a merge conflict occurs, the merge is aborted and the child is
  * terminated with a "merge_conflict" reason.
  *
+ * When a `workspaceManager` is provided AND both workspaces carry stream
+ * ids, the merge is routed through `workspaceManager.mergeStream()` so
+ * it flows through git-cascade's tracker — gaining a `stream.merged`
+ * cascade event that propagates to the hub via CascadeBridge. This is
+ * the primary observability win of A3 in the integration plan.
+ *
+ * Falls back to raw `attemptMerge` (unchanged behavior) when either
+ * workspace lacks a stream id or no manager is passed — so
+ * programmatic/legacy callers keep working unchanged.
+ *
  * @param childId - Child agent to terminate
  * @param parentId - Parent agent to consolidate changes into
  * @param agentManager - Agent manager for operations
  * @param workspaceProvider - Optional workspace provider for getting agent workspaces
  * @param options - Optional consolidation options
+ * @param workspaceManager - Optional workspace manager; enables cascade-
+ *   event emission on the consolidation merge when both workspaces are
+ *   stream-backed.
  * @returns ConsolidationResult indicating success or failure
  */
-export async function terminateWithChangeConsolidation(childId, parentId, agentManager, workspaceProvider, options) {
+export async function terminateWithChangeConsolidation(childId, parentId, agentManager, workspaceProvider, options, workspaceManager, 
+/**
+ * Optional task reference inherited from the parent agent's metadata.
+ * When provided + routing through the tracker, threaded into the
+ * `x-cascade/stream.merged` emit so the hub's cascade_merges row records
+ * which task drove the consolidation.
+ */
+taskRef) {
     // If no workspace provider, just terminate normally
     if (!workspaceProvider) {
         await agentManager.terminate(childId, "parent_stopped");
@@ -96,7 +116,55 @@ export async function terminateWithChangeConsolidation(childId, parentId, agentM
         console.warn(`[cascade] Parent worktree is on '${currentParentBranch}' but expected '${parentWorkspace.branch}'`);
         // Continue with merge anyway - use the actual current branch
     }
-    // Attempt to merge child branch into parent's worktree
+    // Attempt to merge child branch into parent's worktree.
+    //
+    // Preferred path: route through workspaceManager.mergeStream when both
+    // workspaces have stream ids. Goes via git-cascade's tracker.mergeStream,
+    // which fires `x-cascade/stream.merged` with source/target stream ids so
+    // the hub's cascade projection + the source stream's `merged` status
+    // update in lockstep with the actual git operation.
+    if (workspaceManager &&
+        childWorkspace.streamId &&
+        parentWorkspace.streamId) {
+        try {
+            const result = workspaceManager.mergeStream({
+                sourceStreamId: childWorkspace.streamId,
+                targetStreamId: parentWorkspace.streamId,
+                agentId: parentId,
+                worktree: parentWorkspace.path,
+                metadata: taskRef ? { task_ref: taskRef } : undefined,
+            });
+            if (result.success) {
+                await agentManager.terminate(childId, "changes_consolidated");
+                return {
+                    success: true,
+                    merged: true,
+                    mergeCommit: result.newHead,
+                };
+            }
+            if (result.conflicts && result.conflicts.length > 0) {
+                // Tracker already aborted; emit and terminate with conflict reason.
+                console.warn(`[cascade] Merge conflict consolidating ${childId} -> ${parentId} via tracker: ${result.conflicts.join(", ")}`);
+                await agentManager.terminate(childId, "merge_conflict");
+                return {
+                    success: false,
+                    merged: false,
+                    conflicts: result.conflicts,
+                };
+            }
+            // Tracker returned a non-conflict failure — fall through to raw
+            // git path so we don't regress the consolidation semantics for
+            // cases the tracker can't handle (e.g., stream in unexpected
+            // status, detached HEAD, branch-name mismatches).
+        }
+        catch (err) {
+            console.warn(`[cascade] tracker.mergeStream failed consolidating ${childId} -> ${parentId}; falling back to raw git: ${err instanceof Error ? err.message : String(err)}`);
+            // Fall through to raw-git path below.
+        }
+    }
+    // Fallback: raw git merge. Preserves pre-A3 behavior when streams
+    // aren't available (programmatic callers, legacy role-shaped
+    // workspaces) or when the tracker path bailed.
     const mergeMessage = options?.mergeMessage ??
         `Merge changes from ${childId} (${childBranch})`;
     const mergeResult = attemptMerge(childBranch, parentWorkspace.path, mergeMessage);