@zachwill/pi-orchestrate 0.9.0 → 0.10.0

package/extension/{runtime.ts → orchestration/service.ts}

@@ -1,5 +1,3 @@
-import type { Api, Model } from "@earendil-works/pi-ai";
-import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
 import {
   Cause,
   Clock,
@@ -11,71 +9,75 @@ import {
   FiberMap,
   FiberSet,
   Layer,
-  Schema,
 } from "effect";
+import type { WorkerDefinition } from "../catalog/definition.js";
 import {
   CANCELLATION_GRACE_MS,
   EMPTY_WORKER_USAGE,
   MAX_WORKER_INSTRUCTIONS_LENGTH,
-  MAX_WORKER_TITLE_LENGTH,
-  OrchestrateTaskInput,
   RunId,
   WorkerId,
   createRandomIdFactories,
-  findWorkerByName,
   isTerminalWorkerStatus,
   transitionWorkerStatus,
   type OrchestrateIdFactories,
+  type OrchestrateTaskInput,
   type RunMode,
   type RunRecord,
-  type WorkerCatalog,
-  type WorkerDefinition,
+  type SettledWorkerOutcome,
+  type SettledWorkerRecord,
+  type SettledWorkerStatus,
   type WorkerOutcome,
   type WorkerRecord,
   type WorkerUsage,
-} from "./domain.js";
+} from "./model.js";
+import {
+  OrchestrationActionRejected,
+  accepted,
+  rejected,
+  validateAbortTarget,
+  validateContextOwner,
+  validateMode,
+  validateOrchestrateRequest,
+  validateText,
+  validateWorkerId,
+  type AbortTarget,
+  type Decision,
+  type OrchestrationContext,
+  type OrchestrationOperation,
+  type ValidatedAbortTarget,
+} from "./admission.js";
+import {
+  createWorkerSettlement,
+  type SettlementFailureStage,
+  type WorkerSettlement,
+} from "./settlement.js";
 import {
   ChildSessions,
   type ChildSessionsService,
-  type WorkerSessionAbortError,
-  type WorkerSessionHandle,
-  type WorkerSessionObservation,
-} from "./worker-session.js";
+} from "../worker/child-sessions.js";
 import type {
-  SettlementFailureStage,
-  WorkerSettlement,
-} from "./worker-settlement.js";
+  WorkerSessionAbortError,
+  WorkerSessionHandle,
+  WorkerSessionObservation,
+} from "../worker/session.js";
 
 export const MAX_TERMINAL_WORKER_HISTORY = 100;
 export const MAX_COMPLETED_RUN_HISTORY = 100;
 export const SHUTDOWN_CLEANUP_GRACE_MS = CANCELLATION_GRACE_MS;
 
-export interface OrchestrationContext {
-  readonly ownerSessionId: string;
-  readonly cwd: string;
-  readonly agentDir: string;
-  readonly parentSessionFile: string | undefined;
-  readonly projectTrusted: boolean;
-  readonly catalog: WorkerCatalog;
-  readonly parentModel?: Model<Api>;
-  readonly modelRegistry: ModelRegistry;
-  readonly synthesisGroup?: {
-    readonly id: string;
-    readonly size: number;
-  };
-}
-
 export interface AcceptedRun {
   readonly id: RunId;
   readonly workerId: WorkerId;
 }
 
-export interface RunResult {
+/** One settled worker generation, as returned to the owner that requested it. */
+export interface WorkerRunResult {
   readonly workerId: WorkerId;
   readonly worker: string;
   readonly title: string;
-  readonly status: "completed" | "ready" | "failed" | "aborted";
-  readonly outcome: Exclude<WorkerOutcome, { readonly status: "closed" }>;
+  readonly status: SettledWorkerStatus;
+  readonly outcome: SettledWorkerOutcome;
   readonly usage: WorkerUsage;
   readonly startedAt: number;
   readonly settledAt: number;
@@ -86,56 +88,23 @@ export interface CompletedRun {
   readonly id: RunId;
   readonly ownerSessionId: string;
   readonly mode: RunMode;
-  readonly result: RunResult;
+  readonly result: WorkerRunResult;
 }
 
-export interface RuntimeSnapshot {
+/** Runs and workers visible to exactly one owner session. */
+export interface OwnerSnapshot {
   readonly runs: readonly RunRecord[];
   readonly workers: readonly WorkerRecord[];
 }
 
 export type SettlementListener = (settlement: WorkerSettlement) => void;
 export type UnsubscribeSettlement = () => void;
-export type StateListener = (snapshot: RuntimeSnapshot) => void;
-
-export interface AbortTarget {
-  readonly workerIds?: readonly string[];
-  readonly all?: boolean;
-}
+export type StateListener = (snapshot: OwnerSnapshot) => void;
 
 export interface OrchestrationLayerOptions {
   readonly idFactories?: OrchestrateIdFactories;
 }
 
-const OrchestrationOperation = Schema.Literals([
-  "orchestrate",
-  "sendInteractive",
-  "abort",
-  "closeInteractive",
-  "snapshot",
-]);
-type OrchestrationOperation = typeof OrchestrationOperation.Type;
-
-const OrchestrationRejectionReason = Schema.Literals([
-  "shutdown",
-  "validation",
-  "ownership",
-  "target",
-  "worker-state",
-  "unknown-worker",
-  "model-unavailable",
-]);
-type OrchestrationRejectionReason = typeof OrchestrationRejectionReason.Type;
-
-export class OrchestrationActionRejected extends Schema.TaggedError<OrchestrationActionRejected>()(
-  "Orchestration.ActionRejected",
-  {
-    operation: OrchestrationOperation,
-    reason: OrchestrationRejectionReason,
-    message: Schema.String,
-  },
-) {}
-
 export interface OrchestrationService {
   orchestrate(
     context: OrchestrationContext,
@@ -186,7 +155,7 @@ export interface OrchestrationService {
   ) => Effect.Effect<void, OrchestrationActionRejected>;
   readonly snapshot: (
     ownerSessionId: string,
-  ) => Effect.Effect<RuntimeSnapshot, OrchestrationActionRejected>;
+  ) => Effect.Effect<OwnerSnapshot, OrchestrationActionRejected>;
   readonly subscribeSettlement: (
     listener: SettlementListener,
   ) => UnsubscribeSettlement;
@@ -201,38 +170,39 @@ export class Orchestration extends Context.Service<Orchestration, OrchestrationS
   "@zachwill/pi-orchestrate/Orchestration",
 ) {}
 
-interface RuntimeWorker {
+interface WorkerEntry {
   readonly record: WorkerRecord;
   readonly context: OrchestrationContext;
   readonly definition: WorkerDefinition;
-  readonly generation: number;
+  // Worker-local authority fence; stale asynchronous callbacks must revalidate it.
+  readonly workerEpoch: number;
   readonly session?: WorkerSessionHandle;
   readonly observationRelease?: () => void;
   readonly cancellation?: Deferred.Deferred<void>;
 }
 
-interface RunningRuntimeRun {
+interface ActiveRunEntry {
   readonly _tag: "running";
   readonly record: RunRecord;
   readonly completion: Deferred.Deferred<CompletedRun>;
   readonly settlementListener?: SettlementListener;
 }
 
-type RuntimeRun = RunningRuntimeRun | RunRecord;
-type RuntimeLifecycle = "open" | "shutting-down" | "shutdown";
+type RunEntry = ActiveRunEntry | RunRecord;
+type OrchestrationLifecycle = "open" | "shutting-down" | "shutdown";
 
-interface RuntimeState {
-  workers: Map<WorkerId, RuntimeWorker>;
-  runs: Map<RunId, RuntimeRun>;
+interface OrchestrationState {
+  workers: Map<WorkerId, WorkerEntry>;
+  runs: Map<RunId, RunEntry>;
   terminalWorkerOrder: WorkerId[];
   completedRunOrder: RunId[];
   settlementSequence: number;
-  lifecycle: RuntimeLifecycle;
+  lifecycle: OrchestrationLifecycle;
 }
 
 type CommittedAction = () => void;
 type PostCommitAction = (
-  state: RuntimeState,
+  state: OrchestrationState,
   settlementListeners: ReadonlySet<SettlementListener>,
   stateListeners: ReadonlyMap<string, ReadonlySet<StateListener>>,
 ) => CommittedAction;
@@ -242,27 +212,17 @@ interface TransactionMutation<A> {
   readonly actions?: readonly PostCommitAction[];
 }
 
-type Decision<A> =
-  | {
-      readonly _tag: "accepted";
-      readonly value: A;
-    }
-  | {
-      readonly _tag: "rejected";
-      readonly error: OrchestrationActionRejected;
-    };
-
-class StatefulOrchestration implements OrchestrationService {
+class OrchestrationEngine implements OrchestrationService {
   private readonly actionQueue: CommittedAction[] = [];
   private readonly settlementListeners = new Set<SettlementListener>();
   private readonly stateListeners = new Map<string, Set<StateListener>>();
   private drainingActions = false;
-  private state: RuntimeState;
+  private state: OrchestrationState;
 
   constructor(
     private readonly childSessions: ChildSessionsService,
-    private readonly generations: FiberMap.FiberMap<WorkerId, void, never>,
-    private readonly runGeneration: (
+    private readonly workerWorkflows: FiberMap.FiberMap<WorkerId, void, never>,
+    private readonly runWorkerWorkflow: (
       key: WorkerId,
       effect: Effect.Effect<void, never>,
     ) => Fiber.Fiber<void, never>,
@@ -271,9 +231,6 @@ class StatefulOrchestration implements OrchestrationService {
       effect: Effect.Effect<void, never>,
     ) => Fiber.Fiber<void, never>,
     private readonly cleanups: FiberSet.FiberSet<void, never>,
-    private readonly runCleanup: (
-      effect: Effect.Effect<void, never>,
-    ) => Fiber.Fiber<void, never>,
     private readonly clock: Clock.Clock,
     private readonly idFactories: OrchestrateIdFactories,
     private readonly shutdownCompletion: Deferred.Deferred<void>,
@@ -306,9 +263,9 @@ class StatefulOrchestration implements OrchestrationService {
     onSettlement?: SettlementListener,
   ): Effect.Effect<AcceptedRun | CompletedRun, OrchestrationActionRejected> {
     return Effect.fn("Orchestration.orchestrate")(function* (
-      this: StatefulOrchestration,
+      this: OrchestrationEngine,
     ) {
-      const validated = yield* this.validateTask(context, task, mode);
+      const validated = yield* validateOrchestrateRequest(context, task, mode);
       const preflight = this.preflightOpen("orchestrate");
       if (preflight._tag === "rejected") yield* Effect.fail(preflight.error);
       // Keep user-supplied ID factories outside the transaction: a reentrant
@@ -346,7 +303,7 @@ class StatefulOrchestration implements OrchestrationService {
           record: workerRecord,
           context,
           definition: validated.definition,
-          generation: 1,
+          workerEpoch: 1,
         });
 
         return {
@@ -395,7 +352,7 @@ class StatefulOrchestration implements OrchestrationService {
     onSettlement?: SettlementListener,
   ): Effect.Effect<AcceptedRun | CompletedRun, OrchestrationActionRejected> {
     return Effect.fn("Orchestration.sendInteractive")(function* (
-      this: StatefulOrchestration,
+      this: OrchestrationEngine,
     ) {
       yield* validateContextOwner("sendInteractive", context.ownerSessionId);
       yield* validateMode("sendInteractive", mode);
@@ -429,34 +386,16 @@ class StatefulOrchestration implements OrchestrationService {
       };
 
       const admission = this.transact((draft) => {
-        const open = openDecision(draft, "sendInteractive");
-        if (open._tag === "rejected") return { value: open };
-        const ownership = ownedWorkerDecision(
+        const ready = readyInteractiveDecision(
           draft,
-          "sendInteractive",
           context.ownerSessionId,
           validatedWorkerId,
         );
-        if (ownership._tag === "rejected") return { value: ownership };
-
-        const worker = ownership.value;
-        if (
-          worker.record.lifecycle !== "interactive" ||
-          worker.record.status !== "ready" ||
-          !worker.session
-        ) {
-          return {
-            value: rejected(
-              "sendInteractive",
-              "worker-state",
-              "interactive_send requires an owned ready interactive worker",
-            ),
-          };
-        }
+        if (ready._tag === "rejected") return { value: ready };
         if (draft.runs.has(runId)) throw new Error(`Duplicate run ID: ${runId}`);
 
-        const generation = worker.generation + 1;
-        const session = worker.session;
+        const { worker, session } = ready.value;
+        const workerEpoch = worker.workerEpoch + 1;
         const runningRecord: WorkerRecord = {
           ...transitionWorkerStatus(worker.record, "running"),
           runId,
@@ -475,7 +414,7 @@ class StatefulOrchestration implements OrchestrationService {
         draft.workers.set(validatedWorkerId, {
           ...worker,
           record: runningRecord,
-          generation,
+          workerEpoch,
           observationRelease: undefined,
           cancellation: undefined,
         });
@@ -485,13 +424,13 @@ class StatefulOrchestration implements OrchestrationService {
           actions: [
             runAction(() => {
               safelyCall(worker.observationRelease);
-              this.subscribeObservation(validatedWorkerId, generation, session);
+              this.subscribeObservation(validatedWorkerId, workerEpoch, session);
             }),
             publishState(context.ownerSessionId),
             runAction(() => {
               this.launchPrompt(
                 validatedWorkerId,
-                generation,
+                workerEpoch,
                 session,
                 instructions,
               );
@@ -513,7 +452,7 @@ class StatefulOrchestration implements OrchestrationService {
     target: AbortTarget,
   ): Effect.Effect<void, OrchestrationActionRejected> {
     return Effect.fn("Orchestration.abort")(function* (
-      this: StatefulOrchestration,
+      this: OrchestrationEngine,
     ) {
       yield* validateContextOwner("abort", ownerSessionId);
       const validatedTarget = yield* validateAbortTarget(target);
@@ -539,7 +478,7 @@ class StatefulOrchestration implements OrchestrationService {
     workerId: string,
   ): Effect.Effect<void, OrchestrationActionRejected> {
     return Effect.fn("Orchestration.closeInteractive")(function* (
-      this: StatefulOrchestration,
+      this: OrchestrationEngine,
     ) {
       yield* validateContextOwner("closeInteractive", ownerSessionId);
       const id = yield* validateWorkerId("closeInteractive", workerId);
@@ -579,7 +518,7 @@ class StatefulOrchestration implements OrchestrationService {
 
   snapshot(
     ownerSessionId: string,
-  ): Effect.Effect<RuntimeSnapshot, OrchestrationActionRejected> {
+  ): Effect.Effect<OwnerSnapshot, OrchestrationActionRejected> {
     return validateContextOwner("snapshot", ownerSessionId).pipe(
       Effect.andThen(Effect.sync(() => snapshotFor(this.current(), ownerSessionId))),
     );
@@ -644,7 +583,7 @@ class StatefulOrchestration implements OrchestrationService {
           this.transact((draft) => {
             draft.lifecycle = "shutdown";
             for (const [runId, run] of draft.runs) {
-              if (isRunningRuntimeRun(run) && run.settlementListener) {
+              if (isActiveRunEntry(run) && run.settlementListener) {
                 draft.runs.set(runId, { ...run, settlementListener: undefined });
               }
             }
@@ -660,7 +599,7 @@ class StatefulOrchestration implements OrchestrationService {
 
   private performShutdown(): Effect.Effect<void> {
     return Effect.fn("Orchestration.shutdown")(function* (
-      this: StatefulOrchestration,
+      this: OrchestrationEngine,
     ) {
       const now = this.clock.currentTimeMillisUnsafe();
       this.transact((draft) => {
@@ -692,151 +631,61 @@ class StatefulOrchestration implements OrchestrationService {
     }).call(this);
   }
 
-  private validateTask(
-    context: OrchestrationContext,
-    task: OrchestrateTaskInput,
-    mode: RunMode,
-  ): Effect.Effect<
-    { definition: WorkerDefinition; task: OrchestrateTaskInput },
-    OrchestrationActionRejected
-  > {
-    return Effect.gen(function* () {
-      yield* validateContextOwner("orchestrate", context.ownerSessionId);
-      yield* validateMode("orchestrate", mode);
-      if (!task || typeof task !== "object" || Array.isArray(task)) {
-        return yield* rejectAction(
-          "orchestrate",
-          "validation",
-          "orchestrate requires one task object",
-        );
-      }
-      if (context.synthesisGroup) {
-        yield* validateText(
-          "orchestrate",
-          "synthesis group ID",
-          context.synthesisGroup.id,
-          MAX_WORKER_TITLE_LENGTH,
-        );
-        if (mode !== "async") {
-          return yield* rejectAction(
-            "orchestrate",
-            "validation",
-            "Sibling synthesis requires an async task",
-          );
-        }
-        if (
-          !Number.isSafeInteger(context.synthesisGroup.size) ||
-          context.synthesisGroup.size < 2
-        ) {
-          return yield* rejectAction(
-            "orchestrate",
-            "validation",
-            "Synthesis group size must be an integer of at least 2",
-          );
-        }
-      }
-      yield* validateText(
-        "orchestrate",
-        "worker",
-        task.worker,
-        MAX_WORKER_TITLE_LENGTH,
-      );
-      yield* validateText(
-        "orchestrate",
-        "title",
-        task.title,
-        MAX_WORKER_TITLE_LENGTH,
-      );
-      yield* validateText(
-        "orchestrate",
-        "instructions",
-        task.instructions,
-        MAX_WORKER_INSTRUCTIONS_LENGTH,
-      );
-      const definition = findWorkerByName(context.catalog, task.worker);
-      if (!definition) {
-        return yield* rejectAction(
-          "orchestrate",
-          "unknown-worker",
-          `Unknown worker: ${task.worker}`,
-        );
-      }
-      const configured = definition.model;
-      if (!configured && !context.parentModel) {
-        return yield* rejectAction(
-          "orchestrate",
-          "model-unavailable",
-          `Worker "${definition.name}" has no configured model and no parent model is available`,
-        );
-      }
-      if (
-        configured &&
-        !context.modelRegistry.find(configured.provider, configured.modelId)
-      ) {
-        return yield* rejectAction(
-          "orchestrate",
-          "model-unavailable",
-          `Worker "${definition.name}" configured model "${configured.provider}/${configured.modelId}" was not found`,
-        );
-      }
-      return { definition, task };
-    });
-  }
-
-  private launchBootstrap(workerId: WorkerId, generation: number): void {
-    this.launchGeneration(
+  private launchBootstrap(workerId: WorkerId, workerEpoch: number): void {
+    this.launchWorkerWorkflow(
       workerId,
-      generation,
-      this.bootstrapAndPrompt(workerId, generation),
+      workerEpoch,
+      this.bootstrapAndPrompt(workerId, workerEpoch),
     );
   }
 
   private launchPrompt(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
     instructions: string,
   ): void {
-    this.launchGeneration(
+    this.launchWorkerWorkflow(
       workerId,
-      generation,
-      this.executePrompt(workerId, generation, session, instructions),
+      workerEpoch,
+      this.executePrompt(workerId, workerEpoch, session, instructions),
     );
   }
 
-  private launchGeneration(
+  private launchWorkerWorkflow(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     workflow: Effect.Effect<void, never>,
   ): void {
     try {
-      const fiber = this.runGeneration(
+      const fiber = this.runWorkerWorkflow(
         workerId,
         workflow.pipe(
           Effect.catchCause((cause) => {
             if (Cause.hasInterruptsOnly(cause)) return Effect.void;
             return Effect.sync(() => {
-              this.settleWorkflowDefect(workerId, generation, Cause.squash(cause));
+              this.settleWorkflowDefect(workerId, workerEpoch, Cause.squash(cause));
             });
           }),
         ),
       );
       const exit = fiber.pollUnsafe();
+      // A closed FiberMap rejects admission with an interrupted sentinel.
       if (exit && Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) {
-        this.settleGenerationLaunchFailure(workerId, generation);
+        this.settleWorkflowLaunchFailure(workerId, workerEpoch);
       }
     } catch (error) {
-      this.settleWorkflowDefect(workerId, generation, error);
+      this.settleWorkflowDefect(workerId, workerEpoch, error);
     }
   }
 
-  private settleGenerationLaunchFailure(
+  private settleWorkflowLaunchFailure(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
   ): void {
     this.settleActiveWorker(
       workerId,
-      generation,
+      workerEpoch,
       ["starting", "running"],
       "failed",
       {
@@ -850,16 +699,16 @@ class StatefulOrchestration implements OrchestrationService {
 
   private bootstrapAndPrompt(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
   ): Effect.Effect<void, never> {
     return Effect.gen({ self: this }, function* () {
-      const session = yield* this.bootstrap(workerId, generation);
+      const session = yield* this.bootstrap(workerId, workerEpoch);
       if (!session) return;
       const worker = this.current().workers.get(workerId);
       if (!worker) return;
       yield* this.executePrompt(
         workerId,
-        generation,
+        workerEpoch,
         session,
         worker.record.instructions,
       );
@@ -868,11 +717,11 @@ class StatefulOrchestration implements OrchestrationService {
 
   private bootstrap(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
   ): Effect.Effect<WorkerSessionHandle | undefined, never> {
     return Effect.suspend(() => {
       const expected = this.current().workers.get(workerId);
-      if (!expected || expected.generation !== generation) {
+      if (!expected || expected.workerEpoch !== workerEpoch) {
         return Effect.succeed(undefined);
       }
       return this.childSessions.acquire(
@@ -885,11 +734,11 @@ class StatefulOrchestration implements OrchestrationService {
           parentModel: expected.context.parentModel,
           modelRegistry: expected.context.modelRegistry,
         },
-        (session) => this.adoptCreatedSession(workerId, generation, session),
+        (session) => this.adoptCreatedSession(workerId, workerEpoch, session),
       ).pipe(
         Effect.match({
           onFailure: (error) => {
-            this.settleCreationFailure(workerId, generation, error);
+            this.settleCreationFailure(workerId, workerEpoch, error);
             return undefined;
           },
           onSuccess: (session) => session,
@@ -900,16 +749,16 @@ class StatefulOrchestration implements OrchestrationService {
 
   private adoptCreatedSession(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
   ): WorkerSessionHandle | undefined {
     let release: () => void;
     try {
       release = session.subscribeObservation((observation) => {
-        this.updateObservation(workerId, generation, session, observation);
+        this.updateObservation(workerId, workerEpoch, session, observation);
       });
     } catch (error) {
-      this.settleCreationFailure(workerId, generation, error);
+      this.settleCreationFailure(workerId, workerEpoch, error);
       return undefined;
     }
 
@@ -918,7 +767,7 @@ class StatefulOrchestration implements OrchestrationService {
       if (
         draft.lifecycle !== "open" ||
         !worker ||
-        worker.generation !== generation ||
+        worker.workerEpoch !== workerEpoch ||
         worker.record.status !== "starting"
       ) {
         return {
@@ -945,16 +794,16 @@ class StatefulOrchestration implements OrchestrationService {
 
   private subscribeObservation(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
   ): void {
     let release: () => void;
     try {
       release = session.subscribeObservation((observation) => {
-        this.updateObservation(workerId, generation, session, observation);
+        this.updateObservation(workerId, workerEpoch, session, observation);
       });
     } catch (error) {
-      this.settleWorkflowDefect(workerId, generation, error);
+      this.settleWorkflowDefect(workerId, workerEpoch, error);
       return;
     }
 
@@ -962,7 +811,7 @@ class StatefulOrchestration implements OrchestrationService {
       const worker = draft.workers.get(workerId);
       if (
         !worker ||
-        worker.generation !== generation ||
+        worker.workerEpoch !== workerEpoch ||
         worker.session !== session ||
         worker.record.status !== "running"
       ) {
@@ -978,7 +827,7 @@ class StatefulOrchestration implements OrchestrationService {
 
   private executePrompt(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
     instructions: string,
   ): Effect.Effect<void, never> {
@@ -987,7 +836,7 @@ class StatefulOrchestration implements OrchestrationService {
       if (
         !worker ||
         worker.record.status !== "running" ||
-        worker.generation !== generation ||
+        worker.workerEpoch !== workerEpoch ||
         worker.session !== session
       ) {
         return Effect.void;
@@ -1001,7 +850,7 @@ class StatefulOrchestration implements OrchestrationService {
           onSuccess: (outcome) => outcome,
         }),
         Effect.tap((outcome) => Effect.sync(() => {
-          this.settleOutcome(workerId, generation, session, outcome);
+          this.settleOutcome(workerId, workerEpoch, session, outcome);
         })),
         Effect.asVoid,
       );
@@ -1010,12 +859,12 @@ class StatefulOrchestration implements OrchestrationService {
 
   private settleCreationFailure(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     error: unknown,
   ): void {
     this.settleActiveWorker(
       workerId,
-      generation,
+      workerEpoch,
       ["starting"],
       "failed",
       {
@@ -1029,12 +878,12 @@ class StatefulOrchestration implements OrchestrationService {
 
   private settleWorkflowDefect(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     error: unknown,
   ): void {
     this.settleActiveWorker(
       workerId,
-      generation,
+      workerEpoch,
       ["starting", "running", "stopping"],
       "failed",
       {
@@ -1048,14 +897,14 @@ class StatefulOrchestration implements OrchestrationService {
 
   private settleOutcome(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
     outcome: WorkerOutcome,
   ): void {
     const worker = this.current().workers.get(workerId);
     if (
       !worker ||
-      worker.generation !== generation ||
+      worker.workerEpoch !== workerEpoch ||
       worker.session !== session ||
       worker.record.status !== "running"
     ) {
@@ -1085,7 +934,7 @@ class StatefulOrchestration implements OrchestrationService {
     }
     this.settleActiveWorker(
       workerId,
-      generation,
+      workerEpoch,
       ["running"],
       status,
       settledOutcome,
@@ -1096,9 +945,9 @@ class StatefulOrchestration implements OrchestrationService {
 
   private settleActiveWorker(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     expectedStatuses: readonly WorkerRecord["status"][],
-    status: "ready" | "completed" | "failed" | "aborted",
+    status: SettledWorkerStatus,
     outcome: WorkerOutcome,
     failureStage: SettlementFailureStage | undefined,
     dispose: boolean,
@@ -1108,7 +957,7 @@ class StatefulOrchestration implements OrchestrationService {
       const worker = draft.workers.get(workerId);
       if (
         !worker ||
-        worker.generation !== generation ||
+        worker.workerEpoch !== workerEpoch ||
         !expectedStatuses.includes(worker.record.status)
       ) {
         return { value: undefined };
@@ -1121,7 +970,7 @@ class StatefulOrchestration implements OrchestrationService {
         settledAt,
       };
       const actions: PostCommitAction[] = [];
-      let settledWorker: RuntimeWorker = { ...worker, record: settledRecord };
+      let settledWorker: WorkerEntry = { ...worker, record: settledRecord };
       if (dispose) {
         actions.push(...this.releaseWorkerResources(settledWorker));
         settledWorker = {
@@ -1147,7 +996,7 @@ class StatefulOrchestration implements OrchestrationService {
 
   private updateObservation(
     workerId: WorkerId,
-    generation: number,
+    workerEpoch: number,
     session: WorkerSessionHandle,
     observation: WorkerSessionObservation,
   ): void {
@@ -1155,7 +1004,7 @@ class StatefulOrchestration implements OrchestrationService {
       const worker = draft.workers.get(workerId);
       if (
         !worker ||
-        worker.generation !== generation ||
+        worker.workerEpoch !== workerEpoch ||
         worker.session !== session ||
         (worker.record.status !== "starting" && worker.record.status !== "running")
       ) {
@@ -1227,7 +1076,7 @@ class StatefulOrchestration implements OrchestrationService {
         }
       }
 
-      const activeWorkers = workers.filter(isRuntimeWorker);
+      const activeWorkers = workers.filter(isWorkerEntry);
       const marked = this.markWorkersStopping(draft, activeWorkers, candidates);
       return {
         value: accepted(marked.completions),
@@ -1261,9 +1110,11 @@ class StatefulOrchestration implements OrchestrationService {
     });
   }
 
+  // Commit stopping and one shared completion before post-commit physical abort
+  // and worker-workflow interruption; every cancellation caller joins it.
   private markWorkersStopping(
-    draft: RuntimeState,
-    workers: readonly RuntimeWorker[],
+    draft: OrchestrationState,
+    workers: readonly WorkerEntry[],
     candidates: ReadonlyMap<WorkerId, Deferred.Deferred<void>>,
   ): {
     readonly completions: readonly Deferred.Deferred<void>[];
@@ -1305,13 +1156,14 @@ class StatefulOrchestration implements OrchestrationService {
   ): void {
     const fiber = this.runCancellation(this.cancelWorker(workerId, completion));
     const exit = fiber.pollUnsafe();
+    // A closed FiberSet rejects admission with an interrupted sentinel.
     if (!exit || Exit.isSuccess(exit) || !Cause.hasInterruptsOnly(exit.cause)) return;
 
     const worker = this.current().workers.get(workerId);
     if (worker?.record.status === "stopping") {
       this.settleActiveWorker(
         workerId,
-        worker.generation,
+        worker.workerEpoch,
         ["stopping"],
         "aborted",
         { status: "aborted" },
@@ -1340,7 +1192,7 @@ class StatefulOrchestration implements OrchestrationService {
       }
       const removal = yield* FiberSet.run(
         this.cancellations,
-        FiberMap.remove(this.generations, workerId).pipe(
+        FiberMap.remove(this.workerWorkflows, workerId).pipe(
           Effect.catchCause(() => Effect.void),
         ),
       );
@@ -1350,7 +1202,7 @@ class StatefulOrchestration implements OrchestrationService {
       );
       this.settleActiveWorker(
         workerId,
-        this.current().workers.get(workerId)?.generation ?? -1,
+        this.current().workers.get(workerId)?.workerEpoch ?? -1,
         ["stopping"],
         "aborted",
         { status: "aborted" },
@@ -1359,11 +1211,11 @@ class StatefulOrchestration implements OrchestrationService {
       );
     }).pipe(
       Effect.catchCause((cause) => Effect.sync(() => {
-        const generation = this.current().workers.get(workerId)?.generation;
-        if (generation === undefined) return;
+        const workerEpoch = this.current().workers.get(workerId)?.workerEpoch;
+        if (workerEpoch === undefined) return;
         this.settleActiveWorker(
           workerId,
-          generation,
+          workerEpoch,
           ["stopping"],
           "failed",
           {
@@ -1431,8 +1283,8 @@ class StatefulOrchestration implements OrchestrationService {
   }
 
   private closeReadyWorker(
-    draft: RuntimeState,
-    worker: RuntimeWorker,
+    draft: OrchestrationState,
+    worker: WorkerEntry,
     settledAt: number,
     actions: PostCommitAction[] = [],
   ): PostCommitAction[] {
@@ -1453,7 +1305,7 @@ class StatefulOrchestration implements OrchestrationService {
     return actions;
   }
 
-  private releaseWorkerResources(worker: RuntimeWorker): PostCommitAction[] {
+  private releaseWorkerResources(worker: WorkerEntry): PostCommitAction[] {
     const actions: PostCommitAction[] = [];
     if (worker.observationRelease) {
       actions.push(runAction(() => safelyCall(worker.observationRelease)));
@@ -1461,7 +1313,7 @@ class StatefulOrchestration implements OrchestrationService {
     const session = worker.session;
     if (session) {
       actions.push(runAction(() => {
-        this.launchCleanupOrJoinAfterClosure(
+        this.launchCleanup(
           Effect.suspend(() => session.dispose()).pipe(
             Effect.catchCause(() => Effect.void),
             Effect.uninterruptible,
@@ -1472,19 +1324,9 @@ class StatefulOrchestration implements OrchestrationService {
     return actions;
   }
 
-  private launchCleanupOrJoinAfterClosure(cleanup: Effect.Effect<void>): void {
-    if (this.cleanups.state._tag === "Closed") {
-      Effect.runFork(cleanup);
-      return;
-    }
-    const fiber = this.runCleanup(cleanup);
-    const exit = fiber.pollUnsafe();
-    if (exit && Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) {
-      // FiberSet.runtime returns an already-interrupted sentinel when closure
-      // wins admission. If admission won and closure interrupted the real fiber,
-      // repeating the cached uninterruptible disposal only joins that cleanup.
-      Effect.runFork(cleanup);
-    }
+  private launchCleanup(cleanup: Effect.Effect<void>): void {
+    const fiber = Effect.runFork(cleanup);
+    FiberSet.addUnsafe(this.cleanups, fiber);
   }
 
   private preflightOpen(
@@ -1500,42 +1342,25 @@ class StatefulOrchestration implements OrchestrationService {
     workerId: WorkerId,
   ): Decision<void> {
     return this.transact((draft) => {
-      const open = openDecision(draft, "sendInteractive");
-      if (open._tag === "rejected") return { value: open };
-      const ownership = ownedWorkerDecision(
-        draft,
-        "sendInteractive",
-        ownerSessionId,
-        workerId,
-      );
-      if (ownership._tag === "rejected") return { value: ownership };
-      const worker = ownership.value;
-      if (
-        worker.record.lifecycle !== "interactive" ||
-        worker.record.status !== "ready" ||
-        !worker.session
-      ) {
-        return {
-          value: rejected(
-            "sendInteractive",
-            "worker-state",
-            "interactive_send requires an owned ready interactive worker",
-          ),
-        };
-      }
-      return { value: accepted(undefined) };
+      const ready = readyInteractiveDecision(draft, ownerSessionId, workerId);
+      return {
+        value: ready._tag === "accepted"
+          ? accepted(undefined)
+          : ready,
+      };
     });
   }
 
-  private current(): RuntimeState {
+  private current(): OrchestrationState {
     return this.state;
   }
 
   private transact<A>(
-    reducer: (draft: RuntimeState) => TransactionMutation<A>,
+    reducer: (draft: OrchestrationState) => TransactionMutation<A>,
   ): A {
     const draft = makeDraft(this.state);
     const mutation = reducer(draft);
+    // Commit before action factories capture the snapshot and callbacks can run.
     this.state = Object.freeze(draft);
     this.enqueueActions((mutation.actions ?? []).map((action) => action(
       this.state,
@@ -1546,6 +1371,7 @@ class StatefulOrchestration implements OrchestrationService {
   }
 
   private enqueueActions(actions: readonly CommittedAction[]): void {
+    // Reentrant actions queue behind this drain; drain all before rethrowing the first failure.
     this.actionQueue.push(...actions);
     if (this.drainingActions) return;
 
@@ -1578,23 +1404,21 @@ export function orchestrationLayer(
     Effect.gen(function* () {
       const childSessions = yield* ChildSessions;
       // Scope finalizers run in reverse acquisition order. Keep cleanup open while
-      // generation and cancellation interruption settle workers and enqueue disposal.
+      // worker-workflow and cancellation interruption settle workers and enqueue disposal.
       const cleanups = yield* FiberSet.make<void, never>();
-      const runCleanup = yield* FiberSet.runtime(cleanups)<never>();
       const cancellations = yield* FiberSet.make<void, never>();
       const runCancellation = yield* FiberSet.runtime(cancellations)<never>();
-      const generations = yield* FiberMap.make<WorkerId, void, never>();
-      const runGeneration = yield* FiberMap.runtime(generations)<never>();
+      const workerWorkflows = yield* FiberMap.make<WorkerId, void, never>();
+      const runWorkerWorkflow = yield* FiberMap.runtime(workerWorkflows)<never>();
       const clock = yield* Clock.Clock;
       const shutdownCompletion = yield* Deferred.make<void>();
-      return Orchestration.of(new StatefulOrchestration(
+      return Orchestration.of(new OrchestrationEngine(
         childSessions,
-        generations,
-        runGeneration,
+        workerWorkflows,
+        runWorkerWorkflow,
         cancellations,
         runCancellation,
         cleanups,
-        runCleanup,
         clock,
         options.idFactories ?? createRandomIdFactories(),
         shutdownCompletion,
@@ -1603,10 +1427,10 @@ export function orchestrationLayer(
   );
 }
 
-function initialState(): RuntimeState {
+function initialState(): OrchestrationState {
   return Object.freeze({
-    workers: new Map<WorkerId, RuntimeWorker>(),
-    runs: new Map<RunId, RuntimeRun>(),
+    workers: new Map<WorkerId, WorkerEntry>(),
+    runs: new Map<RunId, RunEntry>(),
     terminalWorkerOrder: [],
     completedRunOrder: [],
     settlementSequence: 0,
@@ -1614,7 +1438,7 @@ function initialState(): RuntimeState {
   });
 }
 
-function makeDraft(state: RuntimeState): RuntimeState {
+function makeDraft(state: OrchestrationState): OrchestrationState {
   return {
     ...state,
     workers: new Map(state.workers),
@@ -1625,13 +1449,13 @@ function makeDraft(state: RuntimeState): RuntimeState {
 }
 
 function completeRun(
-  state: RuntimeState,
+  state: OrchestrationState,
   workerId: WorkerId,
 ): PostCommitAction[] {
   const worker = state.workers.get(workerId);
   if (!worker) return [];
   const run = state.runs.get(worker.record.runId);
-  if (!run || !isRunningRuntimeRun(run) || !isCompletedRunWorker(worker.record)) {
+  if (!run || !isActiveRunEntry(run) || !isSettledWorkerRecord(worker.record)) {
     return [];
   }
 
@@ -1644,53 +1468,35 @@ function completeRun(
 }
 
 function makeSettlement(
-  draft: RuntimeState,
-  worker: RuntimeWorker,
+  draft: OrchestrationState,
+  worker: WorkerEntry,
   settledAt: number,
   failureStage: SettlementFailureStage | undefined,
 ): PostCommitAction | undefined {
   const run = draft.runs.get(worker.record.runId);
-  if (!run || !isCompletedRunWorker(worker.record)) {
+  if (!run || !isSettledWorkerRecord(worker.record)) {
     return undefined;
   }
-  const runRecord = runtimeRunRecord(run);
   const sequence = draft.settlementSequence + 1;
   draft.settlementSequence = sequence;
-  const settlement: WorkerSettlement = Object.freeze({
-    eventId: `${sequence}:${runRecord.id}:${worker.record.id}:${worker.generation}`,
+  // Persisted generation records this authority epoch for reconstruction and
+  // diagnostics.
+  const settlement = createWorkerSettlement({
     sequence,
-    ownerSessionId: worker.record.ownerSessionId,
-    runId: runRecord.id,
-    workerId: worker.record.id,
-    generation: worker.generation,
-    mode: runRecord.mode,
-    worker: worker.record.worker,
-    title: worker.record.title,
-    lifecycle: worker.record.lifecycle,
-    status: worker.record.status,
-    outcome: Object.freeze(copyOutcome(worker.record.outcome)),
-    ...(failureStage ? { failureStage } : {}),
-    usage: Object.freeze(copyUsage(worker.record.usage)),
-    startedAt: worker.record.startedAt,
+    generation: worker.workerEpoch,
+    run: runRecordFromEntry(run),
+    worker: worker.record,
     settledAt,
-    ...(runRecord.synthesisGroupId && runRecord.synthesisGroupSize
-      ? {
-          synthesisGroupId: runRecord.synthesisGroupId,
-          synthesisGroupSize: runRecord.synthesisGroupSize,
-        }
-      : {}),
-    ...(worker.record.sessionFile !== undefined
-      ? { sessionFile: worker.record.sessionFile }
-      : {}),
+    ...(failureStage ? { failureStage } : {}),
   });
   return publishSettlement(
     settlement,
-    isRunningRuntimeRun(run) ? run.settlementListener : undefined,
+    isActiveRunEntry(run) ? run.settlementListener : undefined,
   );
 }
 
 function stateActionsAfterPrune(
-  draft: RuntimeState,
+  draft: OrchestrationState,
   ownerSessionId: string,
 ): PostCommitAction[] {
   const owners = pruneHistory(draft);
@@ -1698,13 +1504,13 @@ function stateActionsAfterPrune(
   return publishOwners(owners);
 }
 
-function pruneHistory(draft: RuntimeState): Set<string> {
+function pruneHistory(draft: OrchestrationState): Set<string> {
   const owners = new Set<string>();
   while (draft.completedRunOrder.length > MAX_COMPLETED_RUN_HISTORY) {
     const runId = draft.completedRunOrder.shift();
     if (!runId) break;
     const run = draft.runs.get(runId);
-    if (run) owners.add(runtimeRunRecord(run).ownerSessionId);
+    if (run) owners.add(runRecordFromEntry(run).ownerSessionId);
     draft.runs.delete(runId);
   }
   while (draft.terminalWorkerOrder.length > MAX_TERMINAL_WORKER_HISTORY) {
@@ -1723,7 +1529,7 @@ function pruneHistory(draft: RuntimeState): Set<string> {
 }
 
 function rememberTerminalWorker(
-  draft: RuntimeState,
+  draft: OrchestrationState,
   workerId: WorkerId,
 ): void {
   if (!draft.terminalWorkerOrder.includes(workerId)) {
@@ -1732,13 +1538,13 @@ function rememberTerminalWorker(
 }
 
 function snapshotFor(
-  state: RuntimeState,
+  state: OrchestrationState,
   ownerSessionId: string,
-): RuntimeSnapshot {
+): OwnerSnapshot {
   return Object.freeze({
     runs: Object.freeze(
       [...state.runs.values()]
-        .map(runtimeRunRecord)
+        .map(runRecordFromEntry)
         .filter((run) => run.ownerSessionId === ownerSessionId)
         .map(copyRunRecord),
     ),
@@ -1751,11 +1557,11 @@ function snapshotFor(
   });
 }
 
-function runtimeRunRecord(run: RuntimeRun): RunRecord {
-  return isRunningRuntimeRun(run) ? run.record : run;
+function runRecordFromEntry(run: RunEntry): RunRecord {
+  return isActiveRunEntry(run) ? run.record : run;
 }
 
-function isRunningRuntimeRun(run: RuntimeRun): run is RunningRuntimeRun {
+function isActiveRunEntry(run: RunEntry): run is ActiveRunEntry {
   return "_tag" in run;
 }
 
@@ -1847,7 +1653,7 @@ function runAction(run: () => void): PostCommitAction {
 }
 
 function openDecision(
-  draft: RuntimeState,
+  draft: OrchestrationState,
   operation: OrchestrationOperation,
 ): Decision<void> {
   return draft.lifecycle === "open"
@@ -1855,16 +1661,16 @@ function openDecision(
     : rejected(
         operation,
         "shutdown",
-        "Orchestrator runtime is shutting down",
+        "Orchestration is shutting down",
       );
 }
 
 function ownedWorkerDecision(
-  draft: RuntimeState,
+  draft: OrchestrationState,
   operation: OrchestrationOperation,
   ownerSessionId: string,
   workerId: WorkerId,
-): Decision<RuntimeWorker> {
+): Decision<WorkerEntry> {
   const worker = draft.workers.get(workerId);
   return !worker || worker.record.ownerSessionId !== ownerSessionId
     ? rejected(
@@ -1875,135 +1681,36 @@ function ownedWorkerDecision(
     : accepted(worker);
 }
 
-function accepted<A>(value: A): Decision<A> {
-  return { _tag: "accepted", value };
-}
-
-function rejected(
-  operation: OrchestrationOperation,
-  reason: OrchestrationRejectionReason,
-  message: string,
-): Decision<never> {
-  return {
-    _tag: "rejected",
-    error: actionRejection(operation, reason, message),
-  };
-}
-
-function actionRejection(
-  operation: OrchestrationOperation,
-  reason: OrchestrationRejectionReason,
-  message: string,
-): OrchestrationActionRejected {
-  return new OrchestrationActionRejected({ operation, reason, message });
-}
-
-function rejectAction(
-  operation: OrchestrationOperation,
-  reason: OrchestrationRejectionReason,
-  message: string,
-): Effect.Effect<never, OrchestrationActionRejected> {
-  return Effect.fail(actionRejection(operation, reason, message));
-}
-
-function validateContextOwner(
-  operation: OrchestrationOperation,
+function readyInteractiveDecision(
+  draft: OrchestrationState,
   ownerSessionId: string,
-): Effect.Effect<void, OrchestrationActionRejected> {
-  return typeof ownerSessionId !== "string" || ownerSessionId.trim() === ""
-    ? rejectAction(
-        operation,
-        "validation",
-        "ownerSessionId must not be blank",
-      )
-    : Effect.void;
-}
-
-function validateWorkerId(
-  operation: OrchestrationOperation,
-  workerId: string,
-): Effect.Effect<WorkerId, OrchestrationActionRejected> {
-  if (typeof workerId !== "string" || workerId.trim() === "") {
-    return rejectAction(
-      operation,
-      "validation",
-      "worker_id must not be blank",
-    );
-  }
-  return Schema.decodeUnknownEffect(WorkerId)(workerId).pipe(
-    Effect.mapError(() => actionRejection(
-      operation,
-      "validation",
-      "worker_id must use the canonical worker- prefix",
-    )),
+  workerId: WorkerId,
+): Decision<{
+  readonly worker: WorkerEntry;
+  readonly session: WorkerSessionHandle;
+}> {
+  const open = openDecision(draft, "sendInteractive");
+  if (open._tag === "rejected") return open;
+  const ownership = ownedWorkerDecision(
+    draft,
+    "sendInteractive",
+    ownerSessionId,
+    workerId,
   );
-}
-
-function validateMode(
-  operation: OrchestrationOperation,
-  mode: RunMode,
-): Effect.Effect<void, OrchestrationActionRejected> {
-  return mode !== "async" && mode !== "inline"
-    ? rejectAction(operation, "validation", "Invalid orchestration mode")
-    : Effect.void;
-}
-
-function validateText(
-  operation: OrchestrationOperation,
-  name: string,
-  value: string,
-  maximumLength: number,
-): Effect.Effect<void, OrchestrationActionRejected> {
-  if (typeof value !== "string" || value.trim() === "") {
-    return rejectAction(operation, "validation", `${name} must not be blank`);
-  }
-  return value.length > maximumLength
-    ? rejectAction(
-        operation,
-        "validation",
-        `${name} must be at most ${maximumLength} characters`,
-      )
-    : Effect.void;
-}
-
-type ValidatedAbortTarget =
-  | {
-      readonly _tag: "ids";
-      readonly workerIds: readonly WorkerId[];
-    }
-  | {
-      readonly _tag: "all";
-    };
-
-function validateAbortTarget(
-  target: AbortTarget,
-): Effect.Effect<ValidatedAbortTarget, OrchestrationActionRejected> {
-  return Effect.gen(function* () {
-    if (!target || typeof target !== "object") {
-      return yield* rejectAction("abort", "target", "Invalid abort target");
-    }
-    const selected = [target.workerIds !== undefined, target.all !== undefined]
-      .filter(Boolean).length;
-    if (selected !== 1 || (target.all !== undefined && target.all !== true)) {
-      return yield* rejectAction(
-        "abort",
-        "target",
-        "Abort target must specify exactly one of workerIds or all: true",
-      );
-    }
-    if (target.workerIds === undefined) return { _tag: "all" };
-    if (!Array.isArray(target.workerIds) || target.workerIds.length === 0) {
-      return yield* rejectAction(
-        "abort",
-        "target",
-        "workerIds must contain at least one worker ID",
-      );
-    }
-    const workerIds = yield* Effect.all(
-      [...new Set(target.workerIds)].map((id) => validateWorkerId("abort", id)),
+  if (ownership._tag === "rejected") return ownership;
+  const worker = ownership.value;
+  if (
+    worker.record.lifecycle !== "interactive" ||
+    worker.record.status !== "ready" ||
+    !worker.session
+  ) {
+    return rejected(
+      "sendInteractive",
+      "worker-state",
+      "interactive_send requires an owned ready interactive worker",
     );
-    return { _tag: "ids", workerIds };
-  });
+  }
+  return accepted({ worker, session: worker.session });
 }
 
 function makeCancellationCandidates(
@@ -2015,7 +1722,7 @@ function makeCancellationCandidates(
 }
 
 function activeWorkerIds(
-  state: RuntimeState,
+  state: OrchestrationState,
   ownerSessionId?: string,
 ): WorkerId[] {
   return [...state.workers.values()]
@@ -2037,9 +1744,9 @@ function awaitAll(
   );
 }
 
-function isRuntimeWorker(
-  worker: RuntimeWorker | undefined,
-): worker is RuntimeWorker {
+function isWorkerEntry(
+  worker: WorkerEntry | undefined,
+): worker is WorkerEntry {
   return worker !== undefined;
 }
 
@@ -2047,13 +1754,9 @@ function isActiveWorkerStatus(status: WorkerRecord["status"]): boolean {
   return status === "starting" || status === "running" || status === "stopping";
 }
 
-function isCompletedRunWorker(
+function isSettledWorkerRecord(
   record: WorkerRecord,
-): record is WorkerRecord & {
-  readonly status: RunResult["status"];
-  readonly outcome: Exclude<WorkerOutcome, { readonly status: "closed" }>;
-  readonly settledAt: number;
-} {
+): record is SettledWorkerRecord {
   return (
     (record.status === "completed" ||
       record.status === "ready" ||
@@ -2124,13 +1827,9 @@ function freezeAcceptedRun(id: RunId, workerId: WorkerId): AcceptedRun {
 
 function freezeCompletedRun(
   run: RunRecord,
-  record: WorkerRecord & {
-    readonly status: RunResult["status"];
-    readonly outcome: Exclude<WorkerOutcome, { readonly status: "closed" }>;
-    readonly settledAt: number;
-  },
+  record: SettledWorkerRecord,
 ): CompletedRun {
-  const result: RunResult = Object.freeze({
+  const result: WorkerRunResult = Object.freeze({
     workerId: record.id,
     worker: record.worker,
     title: record.title,