@mysten-incubation/devstack 0.1.0 → 0.2.0

package/dist/substrate/runtime/supervisor/background-tasks.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"background-tasks.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/background-tasks.ts"],"sourcesContent":["// Background tasks: injected command handler runner, snapshot capture,\n// stack restart, and post-acquire hook.\n//\n// Each background task is forked into the supervisor's parent scope so\n// it rides the supervisor's lifetime rather than the command-loop\n// fiber. Interrupt requests use a Ref-typed handle (`idle`/`starting`/\n// `running`) so a sibling command can interrupt a running task without\n// racing the fork.\n\nimport { Cause, Effect, Exit, Fiber, Ref, Scope } from 'effect';\n\nimport type { PluginKey } from '../../brand.ts';\nimport type { EngineCommand, EngineEvent } from '../../events.ts';\nimport { prettyErrorStructured } from '../observability/index.ts';\nimport { PostAcquireTaskFailed } from '../post-acquire-tasks.ts';\nimport { SupervisorPostAcquireFailed } from './errors.ts';\nimport type { SnapshotCaptureTaskState, StackRestartTaskState, SupervisorState } from './state.ts';\nimport { bestEffort, publish } from './wiring.ts';\n\n// Forward reference: the stack-restart background task runs through\n// the same `handleCommand` dispatch path that the command loop uses;\n// imports cycle if we hoist it directly, so we accept a runner from the\n// caller.\ntype HandleCommandRunner = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n) => Effect.Effect<void, SupervisorPostAcquireFailed, Scope.Scope>;\n\n/** `snapshot.captureFailed` / `snapshot.captureSkipped` carry a REQUIRED\n *  `snapshotId`. When the originating command carried an id, surfaces\n *  correlate the outcome with it (the CLI's pending-capture map keys on\n *  it). When the command omitted an id there is nothing to correlate\n *  against — the CLI's bridge does NOT register a pending-capture entry\n *  for an id-less capture (`cli/wirings/up.ts` falls through to a\n *  legacy auto-ack and never keys this synthetic id) — so the minted\n *  `snap-<ts>` here only satisfies the event's required field. */\nconst effectiveSnapshotId = (\n\tcmd: Extract<EngineCommand, { readonly tag: 'snapshot.capture' }>,\n): string => cmd.snapshotId ?? `snap-${Date.now()}`;\n\nexport const runInjectedCommandHandler = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tif (deps.commandHandler === undefined) return;\n\t\tconst publishFromHandler = (event: EngineEvent): Effect.Effect<void, never, never> =>\n\t\t\tpublish(deps.ref, deps.hub, event);\n\t\tconst exit = yield* Effect.exit(\n\t\t\tdeps.commandHandler(cmd, {\n\t\t\t\tpublish: publishFromHandler,\n\t\t\t}),\n\t\t);\n\t\tif (Exit.isSuccess(exit)) {\n\t\t\tfor (const event of exit.value) {\n\t\t\t\tyield* publish(deps.ref, deps.hub, event);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\t\tif (Cause.hasInterruptsOnly(exit.cause)) return;\n\t\tif (cmd.tag === 'snapshot.capture') {\n\t\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\t\ttag: 'snapshot.captureFailed',\n\t\t\t\tsnapshotId: effectiveSnapshotId(cmd),\n\t\t\t\t...(cmd.name === undefined ? {} : { name: cmd.name }),\n\t\t\t\tsummary: Cause.pretty(exit.cause).split('\\n')[0] ?? 'snapshot capture failed',\n\t\t\t\tat: Date.now(),\n\t\t\t});\n\t\t}\n\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\ttag: 'error.reported',\n\t\t\terror: prettyErrorStructured(exit.cause, {\n\t\t\t\tpluginKey: null,\n\t\t\t\tseverity: 'error',\n\t\t\t\tat: Date.now(),\n\t\t\t}),\n\t\t});\n\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\tlevel: 'error',\n\t\t\tmessage: `command handler failed for ${cmd.tag}`,\n\t\t});\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.injectedCommandHandler'));\n\nexport const startBackgroundSnapshotCapture = (\n\tdeps: SupervisorState,\n\tcmd: Extract<EngineCommand, { readonly tag: 'snapshot.capture' }>,\n): Effect.Effect<void, never, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\tconst token = yield* Ref.updateAndGet(deps.snapshotCaptureSeq, (n) => n + 1);\n\t\tconst started = yield* Ref.modify(deps.snapshotCaptureTask, (state) =>\n\t\t\tstate.tag === 'idle'\n\t\t\t\t? [\n\t\t\t\t\t\ttrue,\n\t\t\t\t\t\t{\n\t\t\t\t\t\t\ttag: 'starting' as const,\n\t\t\t\t\t\t\ttoken,\n\t\t\t\t\t\t\tsnapshotId: cmd.snapshotId ?? null,\n\t\t\t\t\t\t} satisfies SnapshotCaptureTaskState,\n\t\t\t\t\t]\n\t\t\t\t: [false, state],\n\t\t);\n\n\t\tif (!started) {\n\t\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\t\ttag: 'snapshot.captureSkipped',\n\t\t\t\treason: 'already-running',\n\t\t\t\tsnapshotId: effectiveSnapshotId(cmd),\n\t\t\t\t...(cmd.name === undefined ? {} : { name: cmd.name }),\n\t\t\t\tat: Date.now(),\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\n\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\ttag: 'snapshot.captureStarted',\n\t\t\t...(cmd.snapshotId === undefined ? {} : { snapshotId: cmd.snapshotId }),\n\t\t\t...(cmd.name === undefined ? {} : { name: cmd.name }),\n\t\t\tat: Date.now(),\n\t\t});\n\n\t\tconst fiber = yield* runInjectedCommandHandler(deps, cmd).pipe(\n\t\t\tEffect.ensuring(\n\t\t\t\tRef.update(deps.snapshotCaptureTask, (state) =>\n\t\t\t\t\tstate.tag !== 'idle' && state.token === token\n\t\t\t\t\t\t? ({ tag: 'idle' } satisfies SnapshotCaptureTaskState)\n\t\t\t\t\t\t: state,\n\t\t\t\t),\n\t\t\t),\n\t\t\tEffect.forkScoped,\n\t\t);\n\n\t\tyield* Ref.update(deps.snapshotCaptureTask, (state) =>\n\t\t\tstate.tag === 'starting' && state.token === token\n\t\t\t\t? ({\n\t\t\t\t\t\ttag: 'running',\n\t\t\t\t\t\ttoken,\n\t\t\t\t\t\tsnapshotId: cmd.snapshotId ?? null,\n\t\t\t\t\t\tfiber,\n\t\t\t\t\t} satisfies SnapshotCaptureTaskState)\n\t\t\t\t: state,\n\t\t);\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.backgroundSnapshotCapture'));\n\nexport const requestBackgroundSnapshotInterrupt = (\n\tdeps: Pick<SupervisorState, 'snapshotCaptureTask'>,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst fiber = yield* Ref.modify(deps.snapshotCaptureTask, (state) =>\n\t\t\tstate.tag === 'running'\n\t\t\t\t? [state.fiber, { tag: 'idle' } as SnapshotCaptureTaskState]\n\t\t\t\t: [null, state],\n\t\t);\n\t\t// Await the interrupt so a follow-up snapshot capture cannot begin\n\t\t// while the previous fiber is still inside `pauseAndCommit` /\n\t\t// `saveImages`. Mirrors `requestBackgroundStackRestartInterrupt`.\n\t\tif (fiber !== null) {\n\t\t\tyield* Fiber.interrupt(fiber);\n\t\t}\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.interruptSnapshotCapture'));\n\nexport const startBackgroundStackRestart = (\n\tdeps: SupervisorState,\n\thandleCommand: HandleCommandRunner,\n): Effect.Effect<void, never, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\tconst token = yield* Ref.updateAndGet(deps.stackRestartSeq, (n) => n + 1);\n\t\tconst started = yield* Ref.modify(deps.stackRestartTask, (state) =>\n\t\t\tstate.tag === 'idle' ? [true, { tag: 'starting' as const, token }] : [false, state],\n\t\t);\n\n\t\tif (!started) {\n\t\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\t\tlevel: 'debug',\n\t\t\t\tmessage: 'stack restart skipped because one is already running',\n\t\t\t});\n\t\t\treturn;\n\t\t}\n\n\t\tconst fiber = yield* handleCommand(deps, { tag: 'stack.restart' }).pipe(\n\t\t\tEffect.catch(() => Effect.void),\n\t\t\tEffect.ensuring(\n\t\t\t\tRef.update(deps.stackRestartTask, (state) =>\n\t\t\t\t\tstate.tag !== 'idle' && state.token === token\n\t\t\t\t\t\t? ({ tag: 'idle' } satisfies StackRestartTaskState)\n\t\t\t\t\t\t: state,\n\t\t\t\t),\n\t\t\t),\n\t\t\tEffect.forkScoped,\n\t\t);\n\n\t\tyield* Ref.update(deps.stackRestartTask, (state) =>\n\t\t\tstate.tag === 'starting' && state.token === token\n\t\t\t\t? ({ tag: 'running', token, fiber } satisfies StackRestartTaskState)\n\t\t\t\t: state,\n\t\t);\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.backgroundStackRestart'));\n\nexport const requestBackgroundStackRestartInterrupt = (\n\tdeps: Pick<SupervisorState, 'stackRestartTask'>,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst fiber = yield* Ref.modify(deps.stackRestartTask, (state) =>\n\t\t\tstate.tag === 'running'\n\t\t\t\t? [state.fiber, { tag: 'idle' } as StackRestartTaskState]\n\t\t\t\t: [null, state],\n\t\t);\n\t\tif (fiber !== null) {\n\t\t\tyield* Fiber.interrupt(fiber);\n\t\t}\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.interruptStackRestart'));\n\n// -----------------------------------------------------------------------------\n// Post-acquire hook\n// -----------------------------------------------------------------------------\n\nconst publishHookFailure = (\n\tdeps: SupervisorState,\n\tcause: Cause.Cause<unknown>,\n\tmessage: string,\n\tpluginKey: PluginKey | null = null,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\ttag: 'error.reported',\n\t\t\terror: prettyErrorStructured(cause, {\n\t\t\t\tpluginKey,\n\t\t\t\tseverity: 'error',\n\t\t\t\tat: Date.now(),\n\t\t\t}),\n\t\t});\n\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\tlevel: 'error',\n\t\t\tmessage,\n\t\t});\n\t});\n\nconst findPostAcquireTaskFailure = (cause: Cause.Cause<unknown>): PostAcquireTaskFailed | null => {\n\tfor (const reason of cause.reasons) {\n\t\tif (!Cause.isFailReason(reason)) continue;\n\t\tif (reason.error instanceof PostAcquireTaskFailed) return reason.error;\n\t}\n\treturn null;\n};\n\nexport const runPostAcquireHook = (\n\tdeps: SupervisorState,\n): Effect.Effect<void, SupervisorPostAcquireFailed, never> =>\n\tEffect.gen(function* () {\n\t\tif (deps.postAcquireHook === undefined) return;\n\t\tconst exit = yield* Effect.exit(\n\t\t\tdeps.postAcquireHook({\n\t\t\t\tgraph: deps.graph,\n\t\t\t\tregistry: deps.registry,\n\t\t\t\tidentity: deps.identity,\n\t\t\t\truntimeRoot: deps.runtimeRoot,\n\t\t\t}),\n\t\t);\n\t\tif (Exit.isSuccess(exit)) {\n\t\t\tfor (const event of exit.value) {\n\t\t\t\tyield* publish(deps.ref, deps.hub, event);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\t\tconst taskFailure = findPostAcquireTaskFailure(exit.cause);\n\t\tif (taskFailure !== null) {\n\t\t\tyield* bestEffort(deps.registry.markFailed(taskFailure.pluginKey, taskFailure.cause));\n\t\t}\n\t\tyield* publishHookFailure(\n\t\t\tdeps,\n\t\t\texit.cause,\n\t\t\ttaskFailure === null\n\t\t\t\t? 'post-acquire hook failed'\n\t\t\t\t: `post-acquire task failed: ${taskFailure.label}`,\n\t\t\ttaskFailure?.pluginKey ?? null,\n\t\t);\n\t\treturn yield* Effect.fail(new SupervisorPostAcquireFailed({ cause: exit.cause }));\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.postAcquireHook'));\n"],"mappings":"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"}
+{"version":3,"file":"background-tasks.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/background-tasks.ts"],"sourcesContent":["// Background tasks: injected command handler runner, snapshot capture,\n// stack restart, and post-acquire hook.\n//\n// Each long-running background task (snapshot capture, stack restart) is\n// forked into the SUPERVISOR-LIFETIME scope via `Effect.forkIn` so it\n// rides the supervisor's lifetime rather than the command-loop fiber — a\n// forked capture must not wedge shutdown (Bug #13). The live fiber IS the\n// task's running state: it's held in a `BackgroundTaskSlot`\n// (`Ref<Fiber | null>`); a second concurrent trigger sees a non-null slot\n// and is skipped (skip-dedup), and a conflicting command reads-and-clears\n// the slot then `Fiber.interrupt`s it. This is the Effect-native\n// replacement for the hand-rolled idle/starting/running token Ref machine.\n\nimport { Cause, Effect, Exit, Fiber, Ref, Scope } from 'effect';\n\nimport type { PluginKey } from '../../brand.ts';\nimport type { EngineCommand, EngineEvent } from '../../events.ts';\nimport { prettyErrorStructured } from '../observability/index.ts';\nimport { PostAcquireTaskFailed } from '../post-acquire-tasks.ts';\nimport { SupervisorPostAcquireFailed, SupervisorRestoreFailed } from './errors.ts';\nimport type { BackgroundTaskSlot, SupervisorState } from './state.ts';\nimport { bestEffort, publish } from './wiring.ts';\n\n// Forward reference: the stack-restart background task runs through\n// the same `handleCommand` dispatch path that the command loop uses;\n// imports cycle if we hoist it directly, so we accept a runner from the\n// caller.\ntype HandleCommandRunner = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n) => Effect.Effect<void, SupervisorPostAcquireFailed | SupervisorRestoreFailed, Scope.Scope>;\n\n/** `snapshot.captureFailed` / `snapshot.captureSkipped` carry a REQUIRED\n *  `snapshotId`. When the originating command carried an id, surfaces\n *  correlate the outcome with it (the CLI's pending-capture map keys on\n *  it). When the command omitted an id there is nothing to correlate\n *  against — the CLI's bridge does NOT register a pending-capture entry\n *  for an id-less capture (`cli/wirings/up.ts` falls through to a plain\n *  auto-ack and never keys this synthetic id) — so the minted\n *  `snap-<ts>` here only satisfies the event's required field. */\nconst effectiveSnapshotId = (\n\tcmd: Extract<EngineCommand, { readonly tag: 'snapshot.capture' }>,\n): string => cmd.snapshotId ?? `snap-${Date.now()}`;\n\n/**\n * Run the injected L3 command handler and report the typed outcome.\n *\n * On success the handler's events are published and `ok: true` is\n * returned. On failure the failure is surfaced on the event stream\n * (`snapshot.captureFailed` for a capture, plus `error.reported`) AND\n * the cause is returned to the caller so a command that must NOT\n * proceed on a half-applied handler (e.g. `snapshot.restore`, which\n * otherwise drains + re-acquires every service off a half-restored\n * tree) can short-circuit and propagate the failure to `submitCommand`.\n *\n * Interrupt-only causes return `ok: true` (the interrupting sibling\n * owns the lifecycle decision) — same as the void runner below.\n */\nexport const runInjectedCommandHandlerExit = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n): Effect.Effect<\n\t{ readonly ok: true } | { readonly ok: false; readonly cause: Cause.Cause<unknown> },\n\tnever,\n\tnever\n> =>\n\tEffect.gen(function* () {\n\t\tif (deps.commandHandler === undefined) return { ok: true } as const;\n\t\tconst publishFromHandler = (event: EngineEvent): Effect.Effect<void, never, never> =>\n\t\t\tpublish(deps.ref, deps.hub, event);\n\t\tconst exit = yield* Effect.exit(\n\t\t\tdeps.commandHandler(cmd, {\n\t\t\t\tpublish: publishFromHandler,\n\t\t\t}),\n\t\t);\n\t\tif (Exit.isSuccess(exit)) {\n\t\t\tfor (const event of exit.value) {\n\t\t\t\tyield* publish(deps.ref, deps.hub, event);\n\t\t\t}\n\t\t\treturn { ok: true } as const;\n\t\t}\n\t\tif (Cause.hasInterruptsOnly(exit.cause)) return { ok: true } as const;\n\t\tif (cmd.tag === 'snapshot.capture') {\n\t\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\t\ttag: 'snapshot.captureFailed',\n\t\t\t\tsnapshotId: effectiveSnapshotId(cmd),\n\t\t\t\t...(cmd.name === undefined ? {} : { name: cmd.name }),\n\t\t\t\tsummary: Cause.pretty(exit.cause).split('\\n')[0] ?? 'snapshot capture failed',\n\t\t\t\tat: Date.now(),\n\t\t\t});\n\t\t}\n\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\ttag: 'error.reported',\n\t\t\terror: prettyErrorStructured(exit.cause, {\n\t\t\t\tpluginKey: null,\n\t\t\t\tseverity: 'error',\n\t\t\t\tat: Date.now(),\n\t\t\t}),\n\t\t});\n\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\tlevel: 'error',\n\t\t\tmessage: `command handler failed for ${cmd.tag}`,\n\t\t});\n\t\treturn { ok: false, cause: exit.cause } as const;\n\t});\n\n/**\n * Fire-and-forget wrapper over {@link runInjectedCommandHandlerExit}:\n * the handler's failure is already surfaced on the event stream, so the\n * void channel suffices for capture / list / delete / wipe / prune,\n * whose callers don't branch on the outcome.\n */\nexport const runInjectedCommandHandler = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n): Effect.Effect<void, never, never> => Effect.asVoid(runInjectedCommandHandlerExit(deps, cmd));\n\n/**\n * Fork `body` into the supervisor-lifetime scope and claim a background\n * task slot atomically.\n *\n * `Effect.forkIn(supervisorScope)` parents the fiber to the supervisor's\n * lifetime — NOT the command-loop fiber that triggered it — so a\n * long-running capture/restart does not block the command loop and\n * cannot wedge a subsequent `shutdown.requested` (Bug #13). The forked\n * fiber is created suspended (`forkIn`'s default `startImmediately`), so\n * the CAS below runs before it executes a single step.\n *\n * Skip-dedup: the slot is the running state. If it is already occupied\n * the just-forked fiber is interrupted (it never ran) and the function\n * returns `'skipped'` so the caller can publish/log the skip. Otherwise\n * the fiber is installed, its `ensuring` clears the slot on completion,\n * and the function returns `'started'`.\n */\nconst forkIntoSlot = (\n\tsupervisorScope: Scope.Scope,\n\tslot: BackgroundTaskSlot,\n\tbody: Effect.Effect<void, never, Scope.Scope>,\n): Effect.Effect<'started' | 'skipped', never, never> =>\n\tEffect.gen(function* () {\n\t\t// Self-clear the slot when the task settles (success OR interrupt),\n\t\t// but only if it still holds THIS fiber — a racing interrupt\n\t\t// (`interruptSlot`) may have already swapped it to `null`, or a\n\t\t// subsequent task may already own the slot. Comparing on the running\n\t\t// fiber's own id makes this self-contained (no fork-then-store hole).\n\t\tconst guarded = Effect.gen(function* () {\n\t\t\tconst selfId = yield* Effect.fiberId;\n\t\t\tyield* body.pipe(\n\t\t\t\tEffect.ensuring(\n\t\t\t\t\tRef.update(slot, (current) =>\n\t\t\t\t\t\tcurrent !== null && current.id === selfId ? null : current,\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t);\n\t\t});\n\t\t// Provide the supervisor scope to the body (so a forked restart's\n\t\t// `doSelectiveRestart` parents its plugin scopes off the supervisor's\n\t\t// lifetime, as the former `forkScoped` did) and fork into that same\n\t\t// scope so the fiber rides the supervisor's lifetime — NOT the\n\t\t// command-loop fiber that triggered it. `forkIn` does not start the\n\t\t// fiber immediately, so the CAS-claim below runs first.\n\t\tconst fiber = yield* Effect.forkIn(Scope.provide(guarded, supervisorScope), supervisorScope);\n\t\tconst claimed = yield* Ref.modify(slot, (current) =>\n\t\t\tcurrent === null ? [true, fiber] : [false, current],\n\t\t);\n\t\tif (!claimed) {\n\t\t\t// Slot already held by a running task — interrupt the fiber we\n\t\t\t// just forked (it has not run yet) and report the skip.\n\t\t\tyield* Fiber.interrupt(fiber);\n\t\t\treturn 'skipped' as const;\n\t\t}\n\t\treturn 'started' as const;\n\t});\n\n/**\n * Read-and-clear a background task slot, then await the fiber's\n * interrupt. Awaiting matters: a follow-up snapshot capture must not\n * begin while the previous fiber is still inside `pauseAndCommit` /\n * `saveImages`, and shutdown must not race a half-torn-down restart.\n */\nconst interruptSlot = (slot: BackgroundTaskSlot): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst fiber = yield* Ref.getAndSet(slot, null);\n\t\tif (fiber !== null) {\n\t\t\tyield* Fiber.interrupt(fiber);\n\t\t}\n\t});\n\nexport const startBackgroundStackRestart = (\n\tdeps: SupervisorState,\n\thandleCommand: HandleCommandRunner,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst outcome = yield* forkIntoSlot(\n\t\t\tdeps.supervisorScope,\n\t\t\tdeps.stackRestartTask,\n\t\t\thandleCommand(deps, { tag: 'stack.restart' }).pipe(Effect.catch(() => Effect.void)),\n\t\t);\n\t\tif (outcome === 'skipped') {\n\t\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\t\tlevel: 'debug',\n\t\t\t\tmessage: 'stack restart skipped because one is already running',\n\t\t\t});\n\t\t}\n\t});\n\nexport const requestBackgroundStackRestartInterrupt = (\n\tdeps: Pick<SupervisorState, 'stackRestartTask'>,\n): Effect.Effect<void, never, never> => interruptSlot(deps.stackRestartTask);\n\n// -----------------------------------------------------------------------------\n// Post-acquire hook\n// -----------------------------------------------------------------------------\n\nconst publishHookFailure = (\n\tdeps: SupervisorState,\n\tcause: Cause.Cause<unknown>,\n\tmessage: string,\n\tpluginKey: PluginKey | null,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\ttag: 'error.reported',\n\t\t\terror: prettyErrorStructured(cause, {\n\t\t\t\tpluginKey,\n\t\t\t\tseverity: 'error',\n\t\t\t\tat: Date.now(),\n\t\t\t}),\n\t\t});\n\t\tyield* deps.logger.log('supervisor', null, {\n\t\t\tlevel: 'error',\n\t\t\tmessage,\n\t\t});\n\t});\n\nconst findPostAcquireTaskFailure = (cause: Cause.Cause<unknown>): PostAcquireTaskFailed | null => {\n\tfor (const reason of cause.reasons) {\n\t\tif (!Cause.isFailReason(reason)) continue;\n\t\tif (reason.error instanceof PostAcquireTaskFailed) return reason.error;\n\t}\n\treturn null;\n};\n\nexport const runPostAcquireHook = (\n\tdeps: SupervisorState,\n): Effect.Effect<void, SupervisorPostAcquireFailed, never> =>\n\tEffect.gen(function* () {\n\t\tif (deps.postAcquireHook === undefined) return;\n\t\tconst exit = yield* Effect.exit(\n\t\t\tdeps.postAcquireHook({\n\t\t\t\tgraph: deps.graph,\n\t\t\t\tregistry: deps.registry,\n\t\t\t\tidentity: deps.identity,\n\t\t\t\truntimeRoot: deps.runtimeRoot,\n\t\t\t}),\n\t\t);\n\t\tif (Exit.isSuccess(exit)) {\n\t\t\tfor (const event of exit.value) {\n\t\t\t\tyield* publish(deps.ref, deps.hub, event);\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\t\tconst taskFailure = findPostAcquireTaskFailure(exit.cause);\n\t\tif (taskFailure !== null) {\n\t\t\tyield* bestEffort(deps.registry.markFailed(taskFailure.pluginKey, taskFailure.cause));\n\t\t}\n\t\tyield* publishHookFailure(\n\t\t\tdeps,\n\t\t\texit.cause,\n\t\t\ttaskFailure === null\n\t\t\t\t? 'post-acquire hook failed'\n\t\t\t\t: `post-acquire task failed: ${taskFailure.label}`,\n\t\t\ttaskFailure?.pluginKey ?? null,\n\t\t);\n\t\treturn yield* Effect.fail(new SupervisorPostAcquireFailed({ cause: exit.cause }));\n\t});\n"],"mappings":"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"}

package/dist/substrate/runtime/supervisor/command-loop.mjs

@@ -1,15 +1,16 @@
-import "./errors.mjs";
-import { planFullDrain } from "../lifecycle/selective-restart.mjs";
+import { SupervisorRestoreFailed } from "./errors.mjs";
+import { planExcluding } from "../lifecycle/selective-restart.mjs";
 import "../lifecycle/index.mjs";
-import { runInjectedCommandHandler, runPostAcquireHook, startBackgroundSnapshotCapture, startBackgroundStackRestart } from "./background-tasks.mjs";
+import { allReadyOrTerminal } from "./state.mjs";
+import { publish } from "./wiring.mjs";
+import { runInjectedCommandHandler, runInjectedCommandHandlerExit, runPostAcquireHook, startBackgroundStackRestart } from "./background-tasks.mjs";
 import { doSelectiveRestart } from "./teardown.mjs";
 import { handleHardKillRequested, handleShutdownRequested } from "./shutdown.mjs";
-import { allReadyOrTerminal } from "./state.mjs";
-import { Deferred, Effect, Queue, Ref } from "effect";
+import { Cause, Deferred, Effect, Queue, Ref } from "effect";
 //#region src/substrate/runtime/supervisor/command-loop.ts
 const maybeRunPostAcquire = (deps, options) => options.failOnPostAcquireHook === true ? runPostAcquireHook(deps) : runPostAcquireHook(deps).pipe(Effect.catch(() => Effect.void));
 const handleCommand = (deps, cmd, options = {}) => Effect.gen(function* () {
-	const { graph, registry, pluginContext, sinks, logger, identity, runtimeRoot } = deps;
+	const { graph, registry, pluginContext, dispatcher, logger, identity } = deps;
 	const parentScope = yield* Effect.scope;
 	switch (cmd.tag) {
 		case "shutdown.requested":
@@ -19,17 +20,15 @@ const handleCommand = (deps, cmd, options = {}) => Effect.gen(function* () {
 		case "shutdown.hardKillRequested":
 			yield* handleHardKillRequested(deps, cmd);
 			return;
-		case "stack.restart": {
-			const plan = planFullDrain(graph);
-			if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set(plan.slice), pluginContext, sinks, logger, identity, runtimeRoot, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
+		case "stack.restart":
+			if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set(graph.nodes.keys()), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
 			return;
-		}
 		case "selective-restart.requested":
-			if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set([cmd.pluginKey]), pluginContext, sinks, logger, identity, runtimeRoot, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
+			if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set([cmd.pluginKey]), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
 			return;
 		case "apply.requested":
 			if (cmd.pluginKey !== void 0) {
-				if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set([cmd.pluginKey]), pluginContext, sinks, logger, identity, runtimeRoot, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
+				if ((yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set([cmd.pluginKey]), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)))) && (yield* allReadyOrTerminal(graph, registry))) yield* maybeRunPostAcquire(deps, options);
 				return;
 			}
 			if (yield* allReadyOrTerminal(graph, registry)) yield* maybeRunPostAcquire(deps, options);
@@ -37,10 +36,53 @@ const handleCommand = (deps, cmd, options = {}) => Effect.gen(function* () {
 		case "codegen.requested":
 			if (yield* allReadyOrTerminal(graph, registry)) yield* maybeRunPostAcquire(deps, options);
 			return;
-		case "snapshot.capture":
-			yield* startBackgroundSnapshotCapture(deps, cmd);
+		case "snapshot.capture": {
+			const captureOutcome = yield* runInjectedCommandHandlerExit(deps, cmd);
+			if (!captureOutcome.ok) {
+				const recoverPlan = planExcluding(graph, (node) => node.keepAliveOnRestore);
+				if (recoverPlan.slice.size > 0) yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set(recoverPlan.slice), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.catch(() => Effect.void));
+				return yield* Effect.fail(new SupervisorRestoreFailed({
+					reason: "handler",
+					cause: captureOutcome.cause
+				}));
+			}
+			const plan = planExcluding(graph, (node) => node.keepAliveOnRestore);
+			if (plan.slice.size === 0) {
+				if (yield* allReadyOrTerminal(graph, registry)) yield* maybeRunPostAcquire(deps, options);
+				return;
+			}
+			const recovered = yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set(plan.slice), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)));
+			if (!(recovered && (yield* allReadyOrTerminal(graph, registry)))) return yield* Effect.fail(new SupervisorRestoreFailed({
+				reason: "reacquire",
+				cause: Cause.fail(/* @__PURE__ */ new Error(recovered ? "snapshot capture resume left one or more services not ready" : "snapshot capture resume failed"))
+			}));
+			yield* maybeRunPostAcquire(deps, options);
 			return;
-		case "snapshot.restore":
+		}
+		case "snapshot.restore": {
+			const restoreOutcome = yield* runInjectedCommandHandlerExit(deps, cmd);
+			if (!restoreOutcome.ok) return yield* Effect.fail(new SupervisorRestoreFailed({
+				reason: "handler",
+				cause: restoreOutcome.cause
+			}));
+			const plan = planExcluding(graph, (node) => node.keepAliveOnRestore);
+			if (plan.slice.size === 0) {
+				yield* publish(deps.ref, deps.hub, {
+					tag: "restart.completed",
+					target: "stack",
+					at: Date.now()
+				});
+				if (yield* allReadyOrTerminal(graph, registry)) yield* maybeRunPostAcquire(deps, options);
+				return;
+			}
+			const restarted = yield* doSelectiveRestart(graph, registry, deps.ref, deps.hub, new Set(plan.slice), pluginContext, dispatcher, logger, identity, parentScope).pipe(Effect.as(true), Effect.catch(() => Effect.succeed(false)));
+			if (!(restarted && (yield* allReadyOrTerminal(graph, registry)))) return yield* Effect.fail(new SupervisorRestoreFailed({
+				reason: "reacquire",
+				cause: Cause.fail(/* @__PURE__ */ new Error(restarted ? "snapshot restore re-acquire left one or more services not ready" : "snapshot restore re-acquire failed"))
+			}));
+			yield* maybeRunPostAcquire(deps, options);
+			return;
+		}
 		case "snapshot.list":
 		case "snapshot.delete":
 		case "wipe.requested":
@@ -50,18 +92,35 @@ const handleCommand = (deps, cmd, options = {}) => Effect.gen(function* () {
 		case "advance-clock.requested":
 		case "stack.start": return;
 	}
-}).pipe(Effect.withSpan("lifecycle.supervisor.handleCommand"));
+});
+/**
+* Dispatch one dequeued command. The loop is the SOLE consumer of the
+* command queue, so the spine is: `dequeue → handle → await Exit →
+* ack|fail`. Three intents:
+*
+*  - `submitted` — the caller (`submitCommand`, the dashboard restore
+*    path) awaits the real exit, so run inline (`failOnPostAcquireHook`)
+*    and feed the Exit back through the completion deferred (the ack/fail).
+*  - fire-and-forget `stack.restart` — the watcher/keypress must not
+*    block the loop on a full re-acquire, so it forks into the
+*    supervisor scope (a second concurrent restart is skip-deduped).
+*  - every other fire-and-forget — run inline, swallowing failures (the
+*    handler already surfaced them on the event stream).
+*/
+const dispatch = (deps, next) => {
+	if (next.kind === "submitted") return Effect.gen(function* () {
+		const exit = yield* Effect.exit(handleCommand(deps, next.submission.command, { failOnPostAcquireHook: true }));
+		yield* Deferred.succeed(next.submission.completion, exit).pipe(Effect.ignore);
+	});
+	if (next.command.tag === "stack.restart") return startBackgroundStackRestart(deps, handleCommand);
+	return handleCommand(deps, next.command).pipe(Effect.catch(() => Effect.void));
+};
 const commandLoop = (deps) => Effect.gen(function* () {
 	while (true) {
-		const next = yield* Queue.take(deps.queuedCommands);
-		if (next.kind === "submitted") {
-			const exit = yield* Effect.exit(handleCommand(deps, next.submission.command, { failOnPostAcquireHook: true }));
-			yield* Deferred.succeed(next.submission.completion, exit).pipe(Effect.ignore);
-		} else if (next.command.tag === "stack.restart") yield* startBackgroundStackRestart(deps, handleCommand);
-		else yield* handleCommand(deps, next.command).pipe(Effect.catch(() => Effect.void));
+		yield* dispatch(deps, yield* Queue.take(deps.queuedCommands));
 		if (yield* Ref.get(deps.shutdownLatch)) return;
 	}
-}).pipe(Effect.withSpan("lifecycle.supervisor.commandLoop"));
+});
 //#endregion
 export { commandLoop };
 

package/dist/substrate/runtime/supervisor/command-loop.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"command-loop.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/command-loop.ts"],"sourcesContent":["// Supervisor command-loop.\n//\n// One consumer of the `queuedCommands` channel. Each iteration:\n//   1. Take the next queued command (fire-and-forget OR submitted).\n//   2. Dispatch via `handleCommand`. Submitted commands carry a\n//      `completion` deferred so the publisher can await the exit.\n//   3. Re-check the shutdown latch — exit the loop when set.\n//\n// `handleCommand` switches by tag and delegates to the per-concern\n// modules (shutdown, teardown, selective-restart, background-tasks).\n\nimport { Deferred, Effect, Queue, Ref, Scope } from 'effect';\n\nimport type { EngineCommand } from '../../events.ts';\nimport {\n\trunInjectedCommandHandler,\n\trunPostAcquireHook,\n\tstartBackgroundSnapshotCapture,\n\tstartBackgroundStackRestart,\n} from './background-tasks.ts';\nimport { SupervisorPostAcquireFailed } from './errors.ts';\nimport { handleHardKillRequested, handleShutdownRequested } from './shutdown.ts';\nimport { allReadyOrTerminal, type SupervisorState } from './state.ts';\nimport { doSelectiveRestart } from './teardown.ts';\nimport { planFullDrain } from '../lifecycle/index.ts';\n\nconst maybeRunPostAcquire = (\n\tdeps: SupervisorState,\n\toptions: { readonly failOnPostAcquireHook?: boolean },\n): Effect.Effect<void, SupervisorPostAcquireFailed, never> =>\n\toptions.failOnPostAcquireHook === true\n\t\t? runPostAcquireHook(deps)\n\t\t: runPostAcquireHook(deps).pipe(Effect.catch(() => Effect.void));\n\nexport const handleCommand = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n\toptions: { readonly failOnPostAcquireHook?: boolean } = {},\n): Effect.Effect<void, SupervisorPostAcquireFailed, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\tconst { graph, registry, pluginContext, sinks, logger, identity, runtimeRoot } = deps;\n\t\tconst parentScope = yield* Effect.scope;\n\t\tswitch (cmd.tag) {\n\t\t\tcase 'shutdown.requested':\n\t\t\tcase 'stack.stop': {\n\t\t\t\tyield* handleShutdownRequested(deps);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'shutdown.hardKillRequested': {\n\t\t\t\tyield* handleHardKillRequested(deps, cmd);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'stack.restart': {\n\t\t\t\tconst plan = planFullDrain(graph);\n\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set(plan.slice),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tsinks,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\truntimeRoot,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'selective-restart.requested': {\n\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set([cmd.pluginKey]),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tsinks,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\truntimeRoot,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'apply.requested': {\n\t\t\t\t// Re-acquire after watch invalidation. Caller may target a\n\t\t\t\t// specific plugin; otherwise no-op (the watcher already fed\n\t\t\t\t// `selective-restart.requested` for the affected keys).\n\t\t\t\tif (cmd.pluginKey !== undefined) {\n\t\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\t\tgraph,\n\t\t\t\t\t\tregistry,\n\t\t\t\t\t\tdeps.ref,\n\t\t\t\t\t\tdeps.hub,\n\t\t\t\t\t\tnew Set([cmd.pluginKey]),\n\t\t\t\t\t\tpluginContext,\n\t\t\t\t\t\tsinks,\n\t\t\t\t\t\tlogger,\n\t\t\t\t\t\tidentity,\n\t\t\t\t\t\truntimeRoot,\n\t\t\t\t\t\tparentScope,\n\t\t\t\t\t).pipe(\n\t\t\t\t\t\tEffect.as(true),\n\t\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t\t);\n\t\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t\t}\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'codegen.requested': {\n\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t// Snapshot/wipe/prune are owned by injected L3 handlers. The\n\t\t\t// supervisor keeps one consumer of the command queue and only\n\t\t\t// publishes the handler's typed events / errors.\n\t\t\tcase 'snapshot.capture':\n\t\t\t\tyield* startBackgroundSnapshotCapture(deps, cmd);\n\t\t\t\treturn;\n\t\t\tcase 'snapshot.restore':\n\t\t\tcase 'snapshot.list':\n\t\t\tcase 'snapshot.delete':\n\t\t\tcase 'wipe.requested':\n\t\t\tcase 'prune.requested':\n\t\t\t\tyield* runInjectedCommandHandler(deps, cmd);\n\t\t\t\treturn;\n\t\t\tcase 'advance-clock.requested':\n\t\t\tcase 'stack.start':\n\t\t\t\treturn;\n\t\t}\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.handleCommand'));\n\nexport const commandLoop = (deps: SupervisorState): Effect.Effect<void, never, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\twhile (true) {\n\t\t\tconst next = yield* Queue.take(deps.queuedCommands);\n\t\t\tif (next.kind === 'submitted') {\n\t\t\t\tconst exit = yield* Effect.exit(\n\t\t\t\t\thandleCommand(deps, next.submission.command, { failOnPostAcquireHook: true }),\n\t\t\t\t);\n\t\t\t\tyield* Deferred.succeed(next.submission.completion, exit).pipe(Effect.ignore);\n\t\t\t} else if (next.command.tag === 'stack.restart') {\n\t\t\t\tyield* startBackgroundStackRestart(deps, handleCommand);\n\t\t\t} else {\n\t\t\t\tyield* handleCommand(deps, next.command).pipe(Effect.catch(() => Effect.void));\n\t\t\t}\n\t\t\tconst drained = yield* Ref.get(deps.shutdownLatch);\n\t\t\tif (drained) return;\n\t\t}\n\t}).pipe(Effect.withSpan('lifecycle.supervisor.commandLoop'));\n"],"mappings":";;;;;;;;;AA0BA,MAAM,uBACL,MACA,YAEA,QAAQ,0BAA0B,OAC/B,mBAAmB,KAAK,GACxB,mBAAmB,KAAK,CAAC,KAAK,OAAO,YAAY,OAAO,KAAK,CAAC;AAElE,MAAa,iBACZ,MACA,KACA,UAAwD,EAAE,KAE1D,OAAO,IAAI,aAAa;CACvB,MAAM,EAAE,OAAO,UAAU,eAAe,OAAO,QAAQ,UAAU,gBAAgB;CACjF,MAAM,cAAc,OAAO,OAAO;AAClC,SAAQ,IAAI,KAAZ;EACC,KAAK;EACL,KAAK;AACJ,UAAO,wBAAwB,KAAK;AACpC;EAED,KAAK;AACJ,UAAO,wBAAwB,MAAM,IAAI;AACzC;EAED,KAAK,iBAAiB;GACrB,MAAM,OAAO,cAAc,MAAM;AAiBjC,QAAI,OAhBqB,mBACxB,OACA,UACA,KAAK,KACL,KAAK,KACL,IAAI,IAAI,KAAK,MAAM,EACnB,eACA,OACA,QACA,UACA,aACA,YACA,CAAC,KACD,OAAO,GAAG,KAAK,EACf,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CACzC,MACiB,OAAO,mBAAmB,OAAO,SAAS,EAC3D,QAAO,oBAAoB,MAAM,QAAQ;AAE1C;;EAED,KAAK;AAiBJ,QAAI,OAhBqB,mBACxB,OACA,UACA,KAAK,KACL,KAAK,KACL,IAAI,IAAI,CAAC,IAAI,UAAU,CAAC,EACxB,eACA,OACA,QACA,UACA,aACA,YACA,CAAC,KACD,OAAO,GAAG,KAAK,EACf,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CACzC,MACiB,OAAO,mBAAmB,OAAO,SAAS,EAC3D,QAAO,oBAAoB,MAAM,QAAQ;AAE1C;EAED,KAAK;AAIJ,OAAI,IAAI,cAAc,KAAA,GAAW;AAiBhC,SAAI,OAhBqB,mBACxB,OACA,UACA,KAAK,KACL,KAAK,KACL,IAAI,IAAI,CAAC,IAAI,UAAU,CAAC,EACxB,eACA,OACA,QACA,UACA,aACA,YACA,CAAC,KACD,OAAO,GAAG,KAAK,EACf,OAAO,YAAY,OAAO,QAAQ,MAAM,CAAC,CACzC,MACiB,OAAO,mBAAmB,OAAO,SAAS,EAC3D,QAAO,oBAAoB,MAAM,QAAQ;AAE1C;;AAED,OAAI,OAAO,mBAAmB,OAAO,SAAS,CAC7C,QAAO,oBAAoB,MAAM,QAAQ;AAE1C;EAED,KAAK;AACJ,OAAI,OAAO,mBAAmB,OAAO,SAAS,CAC7C,QAAO,oBAAoB,MAAM,QAAQ;AAE1C;EAKD,KAAK;AACJ,UAAO,+BAA+B,MAAM,IAAI;AAChD;EACD,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;EACL,KAAK;AACJ,UAAO,0BAA0B,MAAM,IAAI;AAC3C;EACD,KAAK;EACL,KAAK,cACJ;;EAED,CAAC,KAAK,OAAO,SAAS,qCAAqC,CAAC;AAE/D,MAAa,eAAe,SAC3B,OAAO,IAAI,aAAa;AACvB,QAAO,MAAM;EACZ,MAAM,OAAO,OAAO,MAAM,KAAK,KAAK,eAAe;AACnD,MAAI,KAAK,SAAS,aAAa;GAC9B,MAAM,OAAO,OAAO,OAAO,KAC1B,cAAc,MAAM,KAAK,WAAW,SAAS,EAAE,uBAAuB,MAAM,CAAC,CAC7E;AACD,UAAO,SAAS,QAAQ,KAAK,WAAW,YAAY,KAAK,CAAC,KAAK,OAAO,OAAO;aACnE,KAAK,QAAQ,QAAQ,gBAC/B,QAAO,4BAA4B,MAAM,cAAc;MAEvD,QAAO,cAAc,MAAM,KAAK,QAAQ,CAAC,KAAK,OAAO,YAAY,OAAO,KAAK,CAAC;AAG/E,MAAI,OADmB,IAAI,IAAI,KAAK,cAAc,CACrC;;EAEb,CAAC,KAAK,OAAO,SAAS,mCAAmC,CAAC"}
+{"version":3,"file":"command-loop.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/command-loop.ts"],"sourcesContent":["// Supervisor command-loop.\n//\n// One consumer of the `queuedCommands` channel. Each iteration:\n//   1. Take the next queued command (fire-and-forget OR submitted).\n//   2. Dispatch via `handleCommand`. Submitted commands carry a\n//      `completion` deferred so the publisher can await the exit.\n//   3. Re-check the shutdown latch — exit the loop when set.\n//\n// `handleCommand` switches by tag and delegates to the per-concern\n// modules (shutdown, teardown, selective-restart, background-tasks).\n\nimport { Cause, Deferred, Effect, Queue, Ref, Scope } from 'effect';\n\nimport type { EngineCommand } from '../../events.ts';\nimport {\n\trunInjectedCommandHandler,\n\trunInjectedCommandHandlerExit,\n\trunPostAcquireHook,\n\tstartBackgroundStackRestart,\n} from './background-tasks.ts';\nimport { SupervisorRestoreFailed, SupervisorPostAcquireFailed } from './errors.ts';\nimport { handleHardKillRequested, handleShutdownRequested } from './shutdown.ts';\nimport { allReadyOrTerminal, type QueuedCommand, type SupervisorState } from './state.ts';\nimport { doSelectiveRestart } from './teardown.ts';\nimport { publish } from './wiring.ts';\nimport { planExcluding } from '../lifecycle/index.ts';\n\nconst maybeRunPostAcquire = (\n\tdeps: SupervisorState,\n\toptions: { readonly failOnPostAcquireHook?: boolean },\n): Effect.Effect<void, SupervisorPostAcquireFailed, never> =>\n\toptions.failOnPostAcquireHook === true\n\t\t? runPostAcquireHook(deps)\n\t\t: runPostAcquireHook(deps).pipe(Effect.catch(() => Effect.void));\n\nexport const handleCommand = (\n\tdeps: SupervisorState,\n\tcmd: EngineCommand,\n\toptions: { readonly failOnPostAcquireHook?: boolean } = {},\n): Effect.Effect<void, SupervisorPostAcquireFailed | SupervisorRestoreFailed, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\tconst { graph, registry, pluginContext, dispatcher, logger, identity } = deps;\n\t\tconst parentScope = yield* Effect.scope;\n\t\tswitch (cmd.tag) {\n\t\t\tcase 'shutdown.requested':\n\t\t\tcase 'stack.stop': {\n\t\t\t\tyield* handleShutdownRequested(deps);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'shutdown.hardKillRequested': {\n\t\t\t\tyield* handleHardKillRequested(deps, cmd);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'stack.restart': {\n\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set(graph.nodes.keys()),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tdispatcher,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'selective-restart.requested': {\n\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set([cmd.pluginKey]),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tdispatcher,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'apply.requested': {\n\t\t\t\t// Re-acquire after watch invalidation. Caller may target a\n\t\t\t\t// specific plugin; otherwise no-op (the watcher already fed\n\t\t\t\t// `selective-restart.requested` for the affected keys).\n\t\t\t\tif (cmd.pluginKey !== undefined) {\n\t\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\t\tgraph,\n\t\t\t\t\t\tregistry,\n\t\t\t\t\t\tdeps.ref,\n\t\t\t\t\t\tdeps.hub,\n\t\t\t\t\t\tnew Set([cmd.pluginKey]),\n\t\t\t\t\t\tpluginContext,\n\t\t\t\t\t\tdispatcher,\n\t\t\t\t\t\tlogger,\n\t\t\t\t\t\tidentity,\n\t\t\t\t\t\tparentScope,\n\t\t\t\t\t).pipe(\n\t\t\t\t\t\tEffect.as(true),\n\t\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t\t);\n\t\t\t\t\tif (restarted && (yield* allReadyOrTerminal(graph, registry))) {\n\t\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t\t}\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'codegen.requested': {\n\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t}\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t// Snapshot/wipe/prune are owned by injected L3 handlers. The\n\t\t\t// supervisor keeps one consumer of the command queue and only\n\t\t\t// publishes the handler's typed events / errors.\n\t\t\tcase 'snapshot.capture': {\n\t\t\t\t// Capture is the lifecycle bounce, structurally IDENTICAL to\n\t\t\t\t// restore: the handler (`runCapture`) gathers (live) → graceful-\n\t\t\t\t// stops (flushes RocksDB) → commits + tars + writes meta → retags\n\t\t\t\t// each committed image onto its container's ORIGINAL name + HARD-rms\n\t\t\t\t// the stopped containers. This loop then runs the RESUME (CONVERGE\n\t\t\t\t// recreate-from-image + wait-write-ready): R1 removed the live\n\t\t\t\t// containers, so the re-acquire sees facts:null and recreates fresh\n\t\t\t\t// from the retagged committed images (whose names now resolve to the\n\t\t\t\t// flushed layers), inheriting walrus's write-ready ready-gate — so\n\t\t\t\t// the just-captured stack comes back write-ready (NEVER `docker\n\t\t\t\t// start`, which walrus nodes exit on). Mirrors `snapshot.restore`.\n\t\t\t\tconst captureOutcome = yield* runInjectedCommandHandlerExit(deps, cmd);\n\t\t\t\tif (!captureOutcome.ok) {\n\t\t\t\t\t// The handler already surfaced the failure on the event stream\n\t\t\t\t\t// (`snapshot.captureFailed` + `error.reported`). A failed capture\n\t\t\t\t\t// left the containers only STOPPED (recoverable) — converge them\n\t\t\t\t\t// back so the stack returns to running, then propagate.\n\t\t\t\t\tconst recoverPlan = planExcluding(graph, (node) => node.keepAliveOnRestore);\n\t\t\t\t\tif (recoverPlan.slice.size > 0) {\n\t\t\t\t\t\tyield* doSelectiveRestart(\n\t\t\t\t\t\t\tgraph,\n\t\t\t\t\t\t\tregistry,\n\t\t\t\t\t\t\tdeps.ref,\n\t\t\t\t\t\t\tdeps.hub,\n\t\t\t\t\t\t\tnew Set(recoverPlan.slice),\n\t\t\t\t\t\t\tpluginContext,\n\t\t\t\t\t\t\tdispatcher,\n\t\t\t\t\t\t\tlogger,\n\t\t\t\t\t\t\tidentity,\n\t\t\t\t\t\t\tparentScope,\n\t\t\t\t\t\t).pipe(Effect.catch(() => Effect.void));\n\t\t\t\t\t}\n\t\t\t\t\treturn yield* Effect.fail(\n\t\t\t\t\t\tnew SupervisorRestoreFailed({ reason: 'handler', cause: captureOutcome.cause }),\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tconst plan = planExcluding(graph, (node) => node.keepAliveOnRestore);\n\t\t\t\tif (plan.slice.size === 0) {\n\t\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t\t}\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst recovered = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set(plan.slice),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tdispatcher,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\tconst allReady = recovered && (yield* allReadyOrTerminal(graph, registry));\n\t\t\t\tif (!allReady) {\n\t\t\t\t\treturn yield* Effect.fail(\n\t\t\t\t\t\tnew SupervisorRestoreFailed({\n\t\t\t\t\t\t\treason: 'reacquire',\n\t\t\t\t\t\t\tcause: Cause.fail(\n\t\t\t\t\t\t\t\tnew Error(\n\t\t\t\t\t\t\t\t\trecovered\n\t\t\t\t\t\t\t\t\t\t? 'snapshot capture resume left one or more services not ready'\n\t\t\t\t\t\t\t\t\t\t: 'snapshot capture resume failed',\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t}),\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'snapshot.restore': {\n\t\t\t\t// Restore is the unified reconcile's ORDERED 4-step body\n\t\t\t\t// split across this loop and the injected handler: the handler\n\t\t\t\t// (`runRestore`) runs step0 (identity-guard\n\t\t\t\t// precondition, fail-closed) → step1 (fsPlan swap-tree(untar))\n\t\t\t\t// → step2 R1 (HARD container rm). This loop runs step2 R2\n\t\t\t\t// (CONVERGE recreate-from-fresh): since R1 already removed the\n\t\t\t\t// live managed containers, the next acquire sees facts:null and\n\t\t\t\t// creates fresh from the restored images. The CLI offline path\n\t\t\t\t// gets that converge for free (supervisor was DOWN, boots fresh\n\t\t\t\t// after). For a LIVE supervisor (the dashboard path) nothing else\n\t\t\t\t// re-acquires — so we chain a drain + re-acquire here via\n\t\t\t\t// `doSelectiveRestart`, which sequences `teardownKeys` (drain)\n\t\t\t\t// then `acquireKeys` (converge) directly, mirroring\n\t\t\t\t// `stack.restart`. The handler runs first (and publishes\n\t\t\t\t// `snapshot.restored`); we only converge once it succeeded.\n\t\t\t\t//\n\t\t\t\t// Drain EXCLUDES any plugin that declared `keepAliveOnRestore`\n\t\t\t\t// (the operator transport answering this restore) so a\n\t\t\t\t// restore-initiating connection isn't torn down mid-flight —\n\t\t\t\t// otherwise the `submitCommand` completion the resolver awaits\n\t\t\t\t// never reaches the client (502) even though the restore +\n\t\t\t\t// re-acquire succeeded. The substrate planner filters on that\n\t\t\t\t// node flag alone, with no knowledge of which plugins set it.\n\t\t\t\t//\n\t\t\t\t// The handler runs via the TYPED-exit runner (not the\n\t\t\t\t// error-swallowing void wrapper) so a FAILED restore (bad\n\t\t\t\t// snapshot id, or a failure AFTER the on-disk swap)\n\t\t\t\t// short-circuits: we must NOT drain + re-acquire every service off\n\t\t\t\t// a half-applied tree, and the submitted-command completion must\n\t\t\t\t// FAIL so the dashboard mutation reports `{ ok:false }` instead of\n\t\t\t\t// resolving success on `id:\"does-not-exist\"`.\n\t\t\t\tconst restoreOutcome = yield* runInjectedCommandHandlerExit(deps, cmd);\n\t\t\t\tif (!restoreOutcome.ok) {\n\t\t\t\t\treturn yield* Effect.fail(\n\t\t\t\t\t\tnew SupervisorRestoreFailed({ reason: 'handler', cause: restoreOutcome.cause }),\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tconst plan = planExcluding(graph, (node) => node.keepAliveOnRestore);\n\t\t\t\tif (plan.slice.size === 0) {\n\t\t\t\t\t// Empty re-acquire slice (the stack's only members are\n\t\t\t\t\t// dashboard()/host-service(...), which carry `keepAliveOnRestore`):\n\t\t\t\t\t// `doSelectiveRestart` emits its `restart.*` settle events\n\t\t\t\t\t// per-root, so an empty slice would fire NONE and leave the\n\t\t\t\t\t// projection stuck at the `restoring` phase set on\n\t\t\t\t\t// `snapshot.restored`. Emit the settle ourselves so the phase\n\t\t\t\t\t// returns to `running`.\n\t\t\t\t\tyield* publish(deps.ref, deps.hub, {\n\t\t\t\t\t\ttag: 'restart.completed',\n\t\t\t\t\t\ttarget: 'stack',\n\t\t\t\t\t\tat: Date.now(),\n\t\t\t\t\t});\n\t\t\t\t\tif (yield* allReadyOrTerminal(graph, registry)) {\n\t\t\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\t\t}\n\t\t\t\t\treturn;\n\t\t\t\t}\n\t\t\t\tconst restarted = yield* doSelectiveRestart(\n\t\t\t\t\tgraph,\n\t\t\t\t\tregistry,\n\t\t\t\t\tdeps.ref,\n\t\t\t\t\tdeps.hub,\n\t\t\t\t\tnew Set(plan.slice),\n\t\t\t\t\tpluginContext,\n\t\t\t\t\tdispatcher,\n\t\t\t\t\tlogger,\n\t\t\t\t\tidentity,\n\t\t\t\t\tparentScope,\n\t\t\t\t).pipe(\n\t\t\t\t\tEffect.as(true),\n\t\t\t\t\tEffect.catch(() => Effect.succeed(false)),\n\t\t\t\t);\n\t\t\t\t// Feed the REAL re-acquire outcome into the completion: a valid\n\t\t\t\t// snapshot whose re-acquire leaves any row `failed` (port conflict,\n\t\t\t\t// broken dep) must report `{ ok:false }`, not a green dashboard with\n\t\t\t\t// failed rows. `allReadyOrTerminal` collapses a failed/unreadable\n\t\t\t\t// node to non-ready, so this is the all-rows-ready gate.\n\t\t\t\tconst allReady = restarted && (yield* allReadyOrTerminal(graph, registry));\n\t\t\t\tif (!allReady) {\n\t\t\t\t\treturn yield* Effect.fail(\n\t\t\t\t\t\tnew SupervisorRestoreFailed({\n\t\t\t\t\t\t\treason: 'reacquire',\n\t\t\t\t\t\t\tcause: Cause.fail(\n\t\t\t\t\t\t\t\tnew Error(\n\t\t\t\t\t\t\t\t\trestarted\n\t\t\t\t\t\t\t\t\t\t? 'snapshot restore re-acquire left one or more services not ready'\n\t\t\t\t\t\t\t\t\t\t: 'snapshot restore re-acquire failed',\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t}),\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tyield* maybeRunPostAcquire(deps, options);\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tcase 'snapshot.list':\n\t\t\tcase 'snapshot.delete':\n\t\t\tcase 'wipe.requested':\n\t\t\tcase 'prune.requested':\n\t\t\t\tyield* runInjectedCommandHandler(deps, cmd);\n\t\t\t\treturn;\n\t\t\tcase 'advance-clock.requested':\n\t\t\tcase 'stack.start':\n\t\t\t\treturn;\n\t\t}\n\t});\n\n/**\n * Dispatch one dequeued command. The loop is the SOLE consumer of the\n * command queue, so the spine is: `dequeue → handle → await Exit →\n * ack|fail`. Three intents:\n *\n *  - `submitted` — the caller (`submitCommand`, the dashboard restore\n *    path) awaits the real exit, so run inline (`failOnPostAcquireHook`)\n *    and feed the Exit back through the completion deferred (the ack/fail).\n *  - fire-and-forget `stack.restart` — the watcher/keypress must not\n *    block the loop on a full re-acquire, so it forks into the\n *    supervisor scope (a second concurrent restart is skip-deduped).\n *  - every other fire-and-forget — run inline, swallowing failures (the\n *    handler already surfaced them on the event stream).\n */\nconst dispatch = (\n\tdeps: SupervisorState,\n\tnext: QueuedCommand,\n): Effect.Effect<void, never, Scope.Scope> => {\n\tif (next.kind === 'submitted') {\n\t\treturn Effect.gen(function* () {\n\t\t\tconst exit = yield* Effect.exit(\n\t\t\t\thandleCommand(deps, next.submission.command, { failOnPostAcquireHook: true }),\n\t\t\t);\n\t\t\tyield* Deferred.succeed(next.submission.completion, exit).pipe(Effect.ignore);\n\t\t});\n\t}\n\tif (next.command.tag === 'stack.restart') {\n\t\treturn startBackgroundStackRestart(deps, handleCommand);\n\t}\n\treturn handleCommand(deps, next.command).pipe(Effect.catch(() => Effect.void));\n};\n\nexport const commandLoop = (deps: SupervisorState): Effect.Effect<void, never, Scope.Scope> =>\n\tEffect.gen(function* () {\n\t\twhile (true) {\n\t\t\tyield* dispatch(deps, yield* Queue.take(deps.queuedCommands));\n\t\t\tif (yield* Ref.get(deps.shutdownLatch)) return;\n\t\t}\n\t});\n"],"mappings":"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"}

package/dist/substrate/runtime/supervisor/contribution-dispatcher.mjs

@@ -0,0 +1,16 @@
+import { Effect } from "effect";
+//#region src/substrate/runtime/supervisor/contribution-dispatcher.ts
+/** A dispatcher whose methods are all no-ops. Used by bare smoke-test
+*  `supervise()` paths that layer no orchestrators — the buffered
+*  contributions simply have nowhere to go. */
+const noopContributionDispatcher = {
+	snapshotable: () => Effect.void,
+	routable: () => Effect.void,
+	codegenable: () => Effect.void,
+	projection: () => Effect.void,
+	strategyContributor: () => Effect.void
+};
+//#endregion
+export { noopContributionDispatcher };
+
+//# sourceMappingURL=contribution-dispatcher.mjs.map

package/dist/substrate/runtime/supervisor/contribution-dispatcher.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"contribution-dispatcher.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/contribution-dispatcher.ts"],"sourcesContent":["// ContributionDispatcher — the closed, typed post-start contribution seam.\n//\n// A CLOSED set of five typed dispatch methods, one per built-in\n// contribution kind. The supervisor reads the buffered ctx contributions\n// after a successful `start` and calls the matching method directly (an\n// exhaustive switch on the decl discriminant — no string-kind matching,\n// no UnknownContributionKind arm).\n//\n// Substrate name-blindness (ARCHITECTURE.md §\"Substrate name-blindness\"):\n// each method's BODY lives in L3 orchestrator composition\n// (`orchestrators/boot.ts buildProductionContributionDispatcher`),\n// where the backing orchestrator services (Snapshot/Codegen/Router/\n// ManifestEndpoint) are in scope. The supervisor only holds this opaque\n// record of effects — it never imports an orchestrator service and never\n// names a concrete contract beyond the five substrate-owned decl shapes.\n//\n// The four buffered verbs' backing services are SUPERVISOR-FRAME-ONLY\n// (absent from plugin scope), which is exactly why they are buffered and\n// replayed here rather than run inline in the plugin's `start`.\n\nimport { Effect, type Scope } from 'effect';\n\nimport type { ProjectionDecl } from '../../../contracts/projection.ts';\nimport type { RoutableDecl } from '../../../contracts/routable.ts';\nimport type { SnapshotableDecl } from '../../../contracts/snapshotable.ts';\nimport type { StrategyContributorDecl } from '../../../contracts/strategy-contributor.ts';\nimport type { CodegenableDecl } from '../../../contracts/codegenable.ts';\nimport type { PluginKey } from '../../brand.ts';\nimport type { EngineEvent } from '../../events.ts';\nimport type { StrategyRegistry } from '../../../contracts/strategy-contributor.ts';\n\n/**\n * Per-plugin context the dispatcher methods receive. Carries the\n * plugin's key + the supervisor-owned `publish` (so dispatcher-emitted\n * events keep lifecycle/log/error ordering) + the scope-local\n * StrategyRegistry the `strategyContributor` body registers against.\n *\n * The dispatcher methods run on the plugin's scope (the supervisor\n * `Scope.provide`s it), so any `addFinalizer` they arm reaps on plugin\n * teardown (selective-restart / shutdown).\n */\nexport interface ContributionDispatchContext {\n\treadonly pluginKey: PluginKey;\n\treadonly publish: (event: EngineEvent) => Effect.Effect<void, never, never>;\n\treadonly strategyRegistry: StrategyRegistry;\n}\n\n/**\n * The closed, typed contribution-dispatch seam. EXACTLY five methods —\n * one per built-in contribution kind. Each `accept*` body is an effect\n * that may FAIL (`unknown` error channel): a failure is the\n * orchestrator-fault path (a broken sink, e.g. a router-route\n * collision), surfaced by the supervisor as\n * `engine.orchestrator.dispatchFailed` WITHOUT marking the plugin\n * failed.\n *\n * The bodies live in L3 (`buildProductionContributionDispatcher`); the\n * supervisor holds this record opaquely.\n */\nexport interface ContributionDispatcher {\n\treadonly snapshotable: (\n\t\tdecl: SnapshotableDecl,\n\t\tctx: ContributionDispatchContext,\n\t) => Effect.Effect<void, unknown, Scope.Scope>;\n\treadonly routable: (\n\t\tdecl: RoutableDecl,\n\t\tctx: ContributionDispatchContext,\n\t) => Effect.Effect<void, unknown, Scope.Scope>;\n\treadonly codegenable: (\n\t\tdecl: CodegenableDecl<string>,\n\t\tctx: ContributionDispatchContext,\n\t) => Effect.Effect<void, unknown, Scope.Scope>;\n\treadonly projection: (\n\t\tdecl: ProjectionDecl,\n\t\tctx: ContributionDispatchContext,\n\t) => Effect.Effect<void, unknown, Scope.Scope>;\n\treadonly strategyContributor: (\n\t\tdecl: StrategyContributorDecl<string, unknown>,\n\t\tctx: ContributionDispatchContext,\n\t) => Effect.Effect<void, unknown, Scope.Scope>;\n}\n\n/** A dispatcher whose methods are all no-ops. Used by bare smoke-test\n *  `supervise()` paths that layer no orchestrators — the buffered\n *  contributions simply have nowhere to go. */\nexport const noopContributionDispatcher: ContributionDispatcher = {\n\tsnapshotable: () => Effect.void,\n\troutable: () => Effect.void,\n\tcodegenable: () => Effect.void,\n\tprojection: () => Effect.void,\n\tstrategyContributor: () => Effect.void,\n};\n"],"mappings":";;;;;AAqFA,MAAa,6BAAqD;CACjE,oBAAoB,OAAO;CAC3B,gBAAgB,OAAO;CACvB,mBAAmB,OAAO;CAC1B,kBAAkB,OAAO;CACzB,2BAA2B,OAAO;AACnC"}

package/dist/substrate/runtime/supervisor/errors.mjs

@@ -2,8 +2,17 @@ import { Data } from "effect";
 //#region src/substrate/runtime/supervisor/errors.ts
 var SupervisorBootError = class extends Data.TaggedError("SupervisorBootError") {};
 var SupervisorPostAcquireFailed = class extends Data.TaggedError("SupervisorPostAcquireFailed") {};
-var CapabilityFactoryFailed = class extends Data.TaggedError("CapabilityFactoryFailed") {};
+/**
+* A live `snapshot.restore` did not leave the stack in a good state.
+* Raised by the command-loop so the submitted-command completion fails
+* (and the dashboard mutation reports `{ ok: false, detail }`) instead
+* of resolving success off a half-applied tree. Carries the failing
+* cause — either the injected restore handler's failure (`reason:
+* 'handler'`, drain skipped) or a post-restore re-acquire that left
+* rows `failed` (`reason: 'reacquire'`).
+*/
+var SupervisorRestoreFailed = class extends Data.TaggedError("SupervisorRestoreFailed") {};
 //#endregion
-export { CapabilityFactoryFailed, SupervisorBootError, SupervisorPostAcquireFailed };
+export { SupervisorBootError, SupervisorPostAcquireFailed, SupervisorRestoreFailed };
 
 //# sourceMappingURL=errors.mjs.map

package/dist/substrate/runtime/supervisor/errors.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"errors.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/errors.ts"],"sourcesContent":["// Supervisor-owned typed errors.\n//\n// Split out of the monolith. These shapes are part of the public\n// supervisor surface (re-exported from `./index.ts`).\n\nimport { Cause, Data } from 'effect';\n\nimport type { PluginKey } from '../../brand.ts';\nimport type { DepGraphError } from '../lifecycle/index.ts';\nimport type {\n\tPluginAcquireFailed,\n\tRestartTargetMissing,\n\tUnknownDependency,\n} from '../lifecycle/index.ts';\n\nexport class SupervisorBootError extends Data.TaggedError('SupervisorBootError')<{\n\treadonly cause: DepGraphError;\n}> {}\n\nexport class SupervisorPostAcquireFailed extends Data.TaggedError('SupervisorPostAcquireFailed')<{\n\treadonly cause: Cause.Cause<unknown>;\n}> {}\n\nexport class CapabilityFactoryFailed extends Data.TaggedError('CapabilityFactoryFailed')<{\n\treadonly pluginKey: PluginKey;\n\treadonly message: string;\n\treadonly cause: unknown;\n}> {}\n\nexport type SupervisorError =\n\t| SupervisorBootError\n\t| SupervisorPostAcquireFailed\n\t| CapabilityFactoryFailed\n\t| PluginAcquireFailed\n\t| RestartTargetMissing\n\t| UnknownDependency;\n"],"mappings":";;AAeA,IAAa,sBAAb,cAAyC,KAAK,YAAY,sBAAsB,CAE7E;AAEH,IAAa,8BAAb,cAAiD,KAAK,YAAY,8BAA8B,CAE7F;AAEH,IAAa,0BAAb,cAA6C,KAAK,YAAY,0BAA0B,CAIrF"}
+{"version":3,"file":"errors.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/errors.ts"],"sourcesContent":["// Supervisor-owned typed errors.\n//\n// Split out of the monolith. These shapes are part of the public\n// supervisor surface (re-exported from `./index.ts`).\n\nimport { Cause, Data } from 'effect';\n\nimport type { DepGraphError } from '../lifecycle/index.ts';\nimport type {\n\tPluginAcquireFailed,\n\tRestartTargetMissing,\n\tUnknownDependency,\n} from '../lifecycle/index.ts';\n\nexport class SupervisorBootError extends Data.TaggedError('SupervisorBootError')<{\n\treadonly cause: DepGraphError;\n}> {}\n\nexport class SupervisorPostAcquireFailed extends Data.TaggedError('SupervisorPostAcquireFailed')<{\n\treadonly cause: Cause.Cause<unknown>;\n}> {}\n\n/**\n * A live `snapshot.restore` did not leave the stack in a good state.\n * Raised by the command-loop so the submitted-command completion fails\n * (and the dashboard mutation reports `{ ok: false, detail }`) instead\n * of resolving success off a half-applied tree. Carries the failing\n * cause — either the injected restore handler's failure (`reason:\n * 'handler'`, drain skipped) or a post-restore re-acquire that left\n * rows `failed` (`reason: 'reacquire'`).\n */\nexport class SupervisorRestoreFailed extends Data.TaggedError('SupervisorRestoreFailed')<{\n\treadonly reason: 'handler' | 'reacquire';\n\treadonly cause: Cause.Cause<unknown>;\n}> {}\n\nexport type SupervisorError =\n\t| SupervisorBootError\n\t| SupervisorPostAcquireFailed\n\t| SupervisorRestoreFailed\n\t| PluginAcquireFailed\n\t| RestartTargetMissing\n\t| UnknownDependency;\n"],"mappings":";;AAcA,IAAa,sBAAb,cAAyC,KAAK,YAAY,qBAAqB,CAAC,CAE7E,CAAC;AAEJ,IAAa,8BAAb,cAAiD,KAAK,YAAY,6BAA6B,CAAC,CAE7F,CAAC;;;;;;;;;;AAWJ,IAAa,0BAAb,cAA6C,KAAK,YAAY,yBAAyB,CAAC,CAGrF,CAAC"}

package/dist/substrate/runtime/supervisor/index.mjs

@@ -1,3 +1,5 @@
 import "./errors.mjs";
+import "./contribution-dispatcher.mjs";
+import "./state.mjs";
 import "./start-supervisor.mjs";
 export {};

package/dist/substrate/runtime/supervisor/shutdown.mjs

@@ -1,14 +1,12 @@
-import { planFullDrain } from "../lifecycle/selective-restart.mjs";
-import "../lifecycle/index.mjs";
+import { plan } from "../reconcile/graph.mjs";
 import { publish, setCyclePhase } from "./wiring.mjs";
-import { requestBackgroundSnapshotInterrupt, requestBackgroundStackRestartInterrupt } from "./background-tasks.mjs";
+import { requestBackgroundStackRestartInterrupt } from "./background-tasks.mjs";
 import { teardownKeys } from "./teardown.mjs";
 import { Deferred, Effect, Ref } from "effect";
 //#region src/substrate/runtime/supervisor/shutdown.ts
 const handleShutdownRequested = (deps) => Effect.gen(function* () {
 	const { graph, registry, ref, shutdownLatch, logger } = deps;
 	yield* Effect.uninterruptible(Effect.gen(function* () {
-		yield* requestBackgroundSnapshotInterrupt(deps);
 		yield* setCyclePhase(ref, "shutting-down");
 		yield* Ref.set(shutdownLatch, true);
 		yield* logger.log("supervisor", null, {
@@ -16,14 +14,16 @@ const handleShutdownRequested = (deps) => Effect.gen(function* () {
 			message: "shutdown requested"
 		});
 		yield* requestBackgroundStackRestartInterrupt(deps);
-		yield* teardownKeys(graph, registry, planFullDrain(graph).teardownOrder);
+		yield* teardownKeys(graph, registry, plan(graph, {
+			kind: "graph-keys",
+			keys: [...graph.nodes.keys()]
+		}).teardownOrder);
 		yield* Effect.yieldNow;
 		yield* Deferred.succeed(deps.shutdownComplete, void 0).pipe(Effect.ignore);
 	}));
 });
 const handleHardKillRequested = (deps, cmd) => Effect.gen(function* () {
 	const { ref, hub, shutdownLatch, logger } = deps;
-	yield* requestBackgroundSnapshotInterrupt(deps);
 	yield* publish(ref, hub, {
 		tag: "shutdown.escalated",
 		signal: cmd.signal,

package/dist/substrate/runtime/supervisor/shutdown.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/shutdown.ts"],"sourcesContent":["// Shutdown branches.\n//\n// Two paths handled here:\n//\n//   - `shutdown.requested` / `stack.stop` — graceful drain. Teardown +\n//     the deferred resolution live in one `Effect.uninterruptible`\n//     block (Bug #13 fix, regression test in\n//     `test/substrate/runtime/supervisor-hard-shutdown.test.ts`).\n//\n//   - `shutdown.hardKillRequested` — escalated shutdown. The graceful\n//     teardown is owned by the supervisor's scope-close finalizer\n//     (which is already uninterruptible); this branch atomically\n//     signals `shutdownComplete` + emits the fatal log so a third SIGINT\n//     can't slip an Effect-level interrupt between the two writes.\n//     `process.exit` from `signals.ts` IS still a hard kill — that\n//     escape hatch is intentional double-Ctrl-C semantics.\n\nimport { Deferred, Effect, Ref } from 'effect';\n\nimport type { EngineCommand } from '../../events.ts';\nimport { planFullDrain } from '../lifecycle/index.ts';\nimport {\n\trequestBackgroundSnapshotInterrupt,\n\trequestBackgroundStackRestartInterrupt,\n} from './background-tasks.ts';\nimport type { SupervisorState } from './state.ts';\nimport { publish, setCyclePhase } from './wiring.ts';\nimport { teardownKeys } from './teardown.ts';\n\nexport const handleShutdownRequested = (deps: SupervisorState): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst { graph, registry, ref, shutdownLatch, logger } = deps;\n\t\t// Uninterruptible covers the Effect-level interrupt a second\n\t\t// SIGINT would inject anywhere between the awaited snapshot/restart\n\t\t// interrupts, the latch set, and the shutdownComplete signal —\n\t\t// scope close racing the in-loop teardown leaks Docker containers,\n\t\t// and a second SIGINT landing during the awaited snapshot-interrupt\n\t\t// must not interrupt the command loop before teardown runs. The\n\t\t// latch set + deferred resolution live in the same block so callers\n\t\t// blocked on `awaitShutdown` only release AFTER teardown has run.\n\t\t// The signal handler's `process.exit` (signals.ts:75-102) is\n\t\t// still a hard kill — that's intentional; double-Ctrl-C is\n\t\t// the operator asking for abort.\n\t\tyield* Effect.uninterruptible(\n\t\t\tEffect.gen(function* () {\n\t\t\t\tyield* requestBackgroundSnapshotInterrupt(deps);\n\t\t\t\tyield* setCyclePhase(ref, 'shutting-down');\n\t\t\t\tyield* Ref.set(shutdownLatch, true);\n\t\t\t\tyield* logger.log('supervisor', null, {\n\t\t\t\t\tlevel: 'info',\n\t\t\t\t\tmessage: 'shutdown requested',\n\t\t\t\t});\n\t\t\t\tyield* requestBackgroundStackRestartInterrupt(deps);\n\t\t\t\tconst plan = planFullDrain(graph);\n\t\t\t\tyield* teardownKeys(graph, registry, plan.teardownOrder);\n\t\t\t\tyield* Effect.yieldNow;\n\t\t\t\tyield* Deferred.succeed(deps.shutdownComplete, void 0).pipe(Effect.ignore);\n\t\t\t}),\n\t\t);\n\t});\n\nexport const handleHardKillRequested = (\n\tdeps: SupervisorState,\n\tcmd: Extract<EngineCommand, { readonly tag: 'shutdown.hardKillRequested' }>,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst { ref, hub, shutdownLatch, logger } = deps;\n\t\tyield* requestBackgroundSnapshotInterrupt(deps);\n\t\tyield* publish(ref, hub, {\n\t\t\ttag: 'shutdown.escalated',\n\t\t\tsignal: cmd.signal,\n\t\t\texitCode: cmd.exitCode,\n\t\t\tat: cmd.at,\n\t\t});\n\t\tyield* setCyclePhase(ref, 'shutting-down');\n\t\tyield* Ref.set(shutdownLatch, true);\n\t\tyield* requestBackgroundStackRestartInterrupt(deps);\n\t\t// Hard-kill path: graceful teardown is owned by the\n\t\t// scope-close finalizer (start-supervisor.ts addFinalizer) which\n\t\t// already runs uninterruptibly. We only need to atomically signal\n\t\t// `shutdownComplete` + emit the fatal log so a third SIGINT\n\t\t// can't slip an Effect-level interrupt between the two.\n\t\t// `process.exit` from signals.ts:75-102 IS still the hard\n\t\t// kill — that escape hatch is intentional.\n\t\tyield* Effect.uninterruptible(\n\t\t\tEffect.gen(function* () {\n\t\t\t\tyield* Deferred.succeed(deps.shutdownComplete, void 0).pipe(Effect.ignore);\n\t\t\t\tyield* logger.log('supervisor', null, {\n\t\t\t\t\tlevel: 'fatal',\n\t\t\t\t\tmessage: `shutdown escalated by ${cmd.signal}`,\n\t\t\t\t\tfields: { signal: cmd.signal, exitCode: cmd.exitCode },\n\t\t\t\t});\n\t\t\t}),\n\t\t);\n\t});\n"],"mappings":";;;;;;;AA6BA,MAAa,2BAA2B,SACvC,OAAO,IAAI,aAAa;CACvB,MAAM,EAAE,OAAO,UAAU,KAAK,eAAe,WAAW;AAYxD,QAAO,OAAO,gBACb,OAAO,IAAI,aAAa;AACvB,SAAO,mCAAmC,KAAK;AAC/C,SAAO,cAAc,KAAK,gBAAgB;AAC1C,SAAO,IAAI,IAAI,eAAe,KAAK;AACnC,SAAO,OAAO,IAAI,cAAc,MAAM;GACrC,OAAO;GACP,SAAS;GACT,CAAC;AACF,SAAO,uCAAuC,KAAK;AAEnD,SAAO,aAAa,OAAO,UADd,cAAc,MACc,CAAC,cAAc;AACxD,SAAO,OAAO;AACd,SAAO,SAAS,QAAQ,KAAK,kBAAkB,KAAK,EAAE,CAAC,KAAK,OAAO,OAAO;GACzE,CACF;EACA;AAEH,MAAa,2BACZ,MACA,QAEA,OAAO,IAAI,aAAa;CACvB,MAAM,EAAE,KAAK,KAAK,eAAe,WAAW;AAC5C,QAAO,mCAAmC,KAAK;AAC/C,QAAO,QAAQ,KAAK,KAAK;EACxB,KAAK;EACL,QAAQ,IAAI;EACZ,UAAU,IAAI;EACd,IAAI,IAAI;EACR,CAAC;AACF,QAAO,cAAc,KAAK,gBAAgB;AAC1C,QAAO,IAAI,IAAI,eAAe,KAAK;AACnC,QAAO,uCAAuC,KAAK;AAQnD,QAAO,OAAO,gBACb,OAAO,IAAI,aAAa;AACvB,SAAO,SAAS,QAAQ,KAAK,kBAAkB,KAAK,EAAE,CAAC,KAAK,OAAO,OAAO;AAC1E,SAAO,OAAO,IAAI,cAAc,MAAM;GACrC,OAAO;GACP,SAAS,yBAAyB,IAAI;GACtC,QAAQ;IAAE,QAAQ,IAAI;IAAQ,UAAU,IAAI;IAAU;GACtD,CAAC;GACD,CACF;EACA"}
+{"version":3,"file":"shutdown.mjs","names":[],"sources":["../../../../src/substrate/runtime/supervisor/shutdown.ts"],"sourcesContent":["// Shutdown branches.\n//\n// Two paths handled here:\n//\n//   - `shutdown.requested` / `stack.stop` — graceful drain. Teardown +\n//     the deferred resolution live in one `Effect.uninterruptible`\n//     block (Bug #13 fix, regression test in\n//     `test/substrate/runtime/supervisor-hard-shutdown.test.ts`).\n//\n//   - `shutdown.hardKillRequested` — escalated shutdown. The graceful\n//     teardown is owned by the supervisor's scope-close finalizer\n//     (which is already uninterruptible); this branch atomically\n//     signals `shutdownComplete` + emits the fatal log so a third SIGINT\n//     can't slip an Effect-level interrupt between the two writes.\n//     `process.exit` from `signals.ts` IS still a hard kill — that\n//     escape hatch is intentional double-Ctrl-C semantics.\n\nimport { Deferred, Effect, Ref } from 'effect';\n\nimport type { EngineCommand } from '../../events.ts';\nimport { plan } from '../reconcile/graph.ts';\nimport { requestBackgroundStackRestartInterrupt } from './background-tasks.ts';\nimport type { SupervisorState } from './state.ts';\nimport { teardownKeys } from './teardown.ts';\nimport { publish, setCyclePhase } from './wiring.ts';\n\nexport const handleShutdownRequested = (deps: SupervisorState): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst { graph, registry, ref, shutdownLatch, logger } = deps;\n\t\t// Uninterruptible covers the Effect-level interrupt a second\n\t\t// SIGINT would inject anywhere between the awaited snapshot/restart\n\t\t// interrupts, the latch set, and the shutdownComplete signal —\n\t\t// scope close racing the in-loop teardown leaks Docker containers,\n\t\t// and a second SIGINT landing during the awaited snapshot-interrupt\n\t\t// must not interrupt the command loop before teardown runs. The\n\t\t// latch set + deferred resolution live in the same block so callers\n\t\t// blocked on `awaitShutdown` only release AFTER teardown has run.\n\t\t// The signal handler's `process.exit` (signals.ts:75-102) is\n\t\t// still a hard kill — that's intentional; double-Ctrl-C is\n\t\t// the operator asking for abort.\n\t\tyield* Effect.uninterruptible(\n\t\t\tEffect.gen(function* () {\n\t\t\t\tyield* setCyclePhase(ref, 'shutting-down');\n\t\t\t\tyield* Ref.set(shutdownLatch, true);\n\t\t\t\tyield* logger.log('supervisor', null, {\n\t\t\t\t\tlevel: 'info',\n\t\t\t\t\tmessage: 'shutdown requested',\n\t\t\t\t});\n\t\t\t\tyield* requestBackgroundStackRestartInterrupt(deps);\n\t\t\t\t// Graceful drain of the WHOLE graph: the kept `teardownKeys`\n\t\t\t\t// over reverse-dep order, over the full key set. This whole\n\t\t\t\t// block stays `Effect.uninterruptible` so a second SIGINT can't\n\t\t\t\t// slip an interrupt between the teardown and the latch/deferred\n\t\t\t\t// writes (Bug #13).\n\t\t\t\tconst fullDrain = plan(graph, {\n\t\t\t\t\tkind: 'graph-keys',\n\t\t\t\t\tkeys: [...graph.nodes.keys()],\n\t\t\t\t});\n\t\t\t\tyield* teardownKeys(graph, registry, fullDrain.teardownOrder);\n\t\t\t\tyield* Effect.yieldNow;\n\t\t\t\tyield* Deferred.succeed(deps.shutdownComplete, void 0).pipe(Effect.ignore);\n\t\t\t}),\n\t\t);\n\t});\n\nexport const handleHardKillRequested = (\n\tdeps: SupervisorState,\n\tcmd: Extract<EngineCommand, { readonly tag: 'shutdown.hardKillRequested' }>,\n): Effect.Effect<void, never, never> =>\n\tEffect.gen(function* () {\n\t\tconst { ref, hub, shutdownLatch, logger } = deps;\n\t\tyield* publish(ref, hub, {\n\t\t\ttag: 'shutdown.escalated',\n\t\t\tsignal: cmd.signal,\n\t\t\texitCode: cmd.exitCode,\n\t\t\tat: cmd.at,\n\t\t});\n\t\tyield* setCyclePhase(ref, 'shutting-down');\n\t\tyield* Ref.set(shutdownLatch, true);\n\t\tyield* requestBackgroundStackRestartInterrupt(deps);\n\t\t// Hard-kill path: graceful teardown is owned by the\n\t\t// scope-close finalizer (start-supervisor.ts addFinalizer) which\n\t\t// already runs uninterruptibly. We only need to atomically signal\n\t\t// `shutdownComplete` + emit the fatal log so a third SIGINT\n\t\t// can't slip an Effect-level interrupt between the two.\n\t\t// `process.exit` from signals.ts:75-102 IS still the hard\n\t\t// kill — that escape hatch is intentional.\n\t\tyield* Effect.uninterruptible(\n\t\t\tEffect.gen(function* () {\n\t\t\t\tyield* Deferred.succeed(deps.shutdownComplete, void 0).pipe(Effect.ignore);\n\t\t\t\tyield* logger.log('supervisor', null, {\n\t\t\t\t\tlevel: 'fatal',\n\t\t\t\t\tmessage: `shutdown escalated by ${cmd.signal}`,\n\t\t\t\t\tfields: { signal: cmd.signal, exitCode: cmd.exitCode },\n\t\t\t\t});\n\t\t\t}),\n\t\t);\n\t});\n"],"mappings":";;;;;;AA0BA,MAAa,2BAA2B,SACvC,OAAO,IAAI,aAAa;CACvB,MAAM,EAAE,OAAO,UAAU,KAAK,eAAe,WAAW;CAYxD,OAAO,OAAO,gBACb,OAAO,IAAI,aAAa;EACvB,OAAO,cAAc,KAAK,eAAe;EACzC,OAAO,IAAI,IAAI,eAAe,IAAI;EAClC,OAAO,OAAO,IAAI,cAAc,MAAM;GACrC,OAAO;GACP,SAAS;EACV,CAAC;EACD,OAAO,uCAAuC,IAAI;EAUlD,OAAO,aAAa,OAAO,UAJT,KAAK,OAAO;GAC7B,MAAM;GACN,MAAM,CAAC,GAAG,MAAM,MAAM,KAAK,CAAC;EAC7B,CAC6C,CAAC,CAAC,aAAa;EAC5D,OAAO,OAAO;EACd,OAAO,SAAS,QAAQ,KAAK,kBAAkB,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,MAAM;CAC1E,CAAC,CACF;AACD,CAAC;AAEF,MAAa,2BACZ,MACA,QAEA,OAAO,IAAI,aAAa;CACvB,MAAM,EAAE,KAAK,KAAK,eAAe,WAAW;CAC5C,OAAO,QAAQ,KAAK,KAAK;EACxB,KAAK;EACL,QAAQ,IAAI;EACZ,UAAU,IAAI;EACd,IAAI,IAAI;CACT,CAAC;CACD,OAAO,cAAc,KAAK,eAAe;CACzC,OAAO,IAAI,IAAI,eAAe,IAAI;CAClC,OAAO,uCAAuC,IAAI;CAQlD,OAAO,OAAO,gBACb,OAAO,IAAI,aAAa;EACvB,OAAO,SAAS,QAAQ,KAAK,kBAAkB,KAAK,CAAC,CAAC,CAAC,KAAK,OAAO,MAAM;EACzE,OAAO,OAAO,IAAI,cAAc,MAAM;GACrC,OAAO;GACP,SAAS,yBAAyB,IAAI;GACtC,QAAQ;IAAE,QAAQ,IAAI;IAAQ,UAAU,IAAI;GAAS;EACtD,CAAC;CACF,CAAC,CACF;AACD,CAAC"}