@moretea-labs/forge 1.7.2 → 1.8.0

package/src/runtime/control-plane/facade/controller-round-relay.ts

@@ -1,1118 +1,3 @@
-import { createHash, randomUUID } from 'crypto';
-import { withControllerLock } from '../../../cli/repositories/locks';
-import { readRequirement } from '../persistence/requirement-store';
-import {
-  listControlPlaneRecords,
-  readControlPlaneRecord,
-  writeControlPlaneRecord,
-  type ControlPlaneRecord,
-} from '../persistence/sqlite-store';
-import { workHasActiveExecution } from '../../execution/work-activity';
-import { controllerSessionBlocksRecovery, getControllerSession } from './controller-session-store';
-import { getHandoffItem, listHandoffItems } from './handoff-inbox-store';
-import { getWorkContract, readWorkContractStore } from './work-contract-store';
-import {
-  isTerminalHandoffStatus,
-  isTerminalWorkContractStatus,
-  type ControllerSession,
-  type WorkContract,
-} from './types';
-
-export const CONTROLLER_ROUND_DISPOSITIONS = [
-  'continue_immediately',
-  'wait',
-  'wait_for_user',
-  'goal_complete',
-] as const;
-export type ControllerRoundDisposition = (typeof CONTROLLER_ROUND_DISPOSITIONS)[number];
-
-export const CONTROLLER_RELAY_ABANDONED_RELEASE_ERROR = 'CONTROLLER_RELAY_CLAIM_RELEASED_WITHOUT_DISPOSITION';
-const CONTROLLER_DISPOSITION_COMPATIBILITY_PREFIX = 'controller.disposition:';
-
-export function parseControllerDispositionCompatibilityCapability(
-  operation: string,
-  capabilityId: unknown,
-): { disposition: ControllerRoundDisposition; relayScopeId: string } | undefined {
-  if (operation !== 'repair' || typeof capabilityId !== 'string') return undefined;
-  const normalized = capabilityId.trim();
-  if (!normalized.startsWith(CONTROLLER_DISPOSITION_COMPATIBILITY_PREFIX)) return undefined;
-  const payload = normalized.slice(CONTROLLER_DISPOSITION_COMPATIBILITY_PREFIX.length);
-  const separator = payload.indexOf(':');
-  if (separator <= 0) throw new Error('CONTROLLER_RELAY_DISPOSITION_COMPATIBILITY_INVALID');
-  const disposition = payload.slice(0, separator) as ControllerRoundDisposition;
-  const relayScopeId = payload.slice(separator + 1).trim();
-  if (!CONTROLLER_ROUND_DISPOSITIONS.includes(disposition) || !relayScopeId) {
-    throw new Error('CONTROLLER_RELAY_DISPOSITION_COMPATIBILITY_INVALID');
-  }
-  return { disposition, relayScopeId };
-}
-
-export type ControllerRoundRelayStatus =
-  | 'pending_release'
-  | 'dispatching'
-  | 'dispatched'
-  | 'claimed'
-  | 'waiting'
-  | 'waiting_for_user'
-  | 'goal_complete'
-  | 'blocked'
-  | 'failed';
-
-export type ControllerRoundTabSettlementStatus =
-  | 'round_open'
-  | 'retained_for_immediate_continuation'
-  | 'closed'
-  | 'preserved_user_owned'
-  | 'session_closed'
-  | 'failed';
-
-export interface ControllerRoundRelayRecord {
-  schemaVersion: 1;
-  repoId: string;
-  relayScopeId: string;
-  originWorkId: string;
-  requirementId?: string;
-  disposition: ControllerRoundDisposition;
-  status: ControllerRoundRelayStatus;
-  controllerId: string;
-  principalId: string;
-  controllerInstanceId: string;
-  sessionId: string;
-  claimGeneration: number;
-  /** Opaque per-round capability. Rotates when Forge dispatches a new ChatGPT round. */
-  authorityId?: string;
-  stateFingerprint: string;
-  roundCount: number;
-  repeatedStateCount: number;
-  consecutiveFailures: number;
-  maxRounds: number;
-  maxRepeatedState: number;
-  maxFailures: number;
-  handoffId?: string;
-  reason?: string;
-  browserSessionId?: string;
-  conversationUrl?: string;
-  blockedReason?: string;
-  lastError?: string;
-  nextRecoveryAt?: string;
-  submittedAt: string;
-  updatedAt: string;
-  dispatchedAt?: string;
-  claimedAt?: string;
-  tabSettlementStatus?: ControllerRoundTabSettlementStatus;
-  tabSettlementAt?: string;
-  tabSettlementError?: string;
-}
-
-export interface ControllerRoundRelayStoreOptions {
-  controllerHome: string;
-  repoId: string;
-  now?: () => string;
-}
-
-export interface ControllerRoundRelayIdentity {
-  controllerId: string;
-  principalId: string;
-  controllerInstanceId: string;
-  sessionId: string;
-}
-
-export interface SubmitControllerRoundDispositionInput {
-  workId: string;
-  identity: ControllerRoundRelayIdentity;
-  disposition: ControllerRoundDisposition;
-  relayScopeId?: string;
-  requirementId?: string;
-  handoffId?: string;
-  stateFingerprint?: string;
-  reason?: string;
-  browserSessionId?: string;
-  conversationUrl?: string;
-  maxRounds?: number;
-  maxRepeatedState?: number;
-  maxFailures?: number;
-}
-
-export interface BeginInitialControllerRoundDispatchInput {
-  workId: string;
-  identity: ControllerRoundRelayIdentity;
-  relayScopeId?: string;
-  requirementId?: string;
-  browserSessionId?: string;
-  conversationUrl?: string;
-  maxRounds?: number;
-  maxRepeatedState?: number;
-  maxFailures?: number;
-}
-
-const NAMESPACE = 'controller_round_relay';
-const SCHEMA_VERSION = 1;
-const DEFAULT_MAX_ROUNDS = 8;
-const DEFAULT_MAX_REPEATED_STATE = 2;
-const DEFAULT_MAX_FAILURES = 3;
-const DEFAULT_UNCLOSED_ROUND_GRACE_MS = 10 * 60_000;
-const MAX_UNCLOSED_ROUND_GRACE_MS = 60 * 60_000;
-const DEFAULT_STALLED_RECOVERY_BACKOFF_MS = 60_000;
-const MAX_STALLED_RECOVERY_BACKOFF_MS = 15 * 60_000;
-
-function nowIso(options: ControllerRoundRelayStoreOptions): string {
-  return options.now?.() ?? new Date().toISOString();
-}
-
-function newControllerRoundAuthorityId(): string {
-  return `cra_${randomUUID().replace(/-/g, '')}`;
-}
-
-function bounded(value: string | undefined, max: number): string | undefined {
-  const normalized = value?.trim();
-  return normalized ? normalized.slice(0, max) : undefined;
-}
-
-function normalizeScopeId(value: string): string {
-  const normalized = value.trim();
-  if (!normalized || /[\r\n]/.test(normalized)) throw new Error('CONTROLLER_RELAY_SCOPE_INVALID');
-  return normalized.slice(0, 240);
-}
-
-function boundedInteger(value: number | undefined, fallback: number, min: number, max: number): number {
-  if (value === undefined || !Number.isFinite(value)) return fallback;
-  return Math.max(min, Math.min(Math.trunc(value), max));
-}
-
-function relayLock<T>(
-  options: ControllerRoundRelayStoreOptions,
-  relayScopeId: string,
-  actor: string,
-  operation: () => T,
-): T {
-  const lockId = createHash('sha256').update(relayScopeId).digest('hex').slice(0, 20);
-  return withControllerLock(
-    options.controllerHome,
-    { scope: 'task', repoId: options.repoId, taskId: `controller-round-relay-${lockId}` },
-    actor,
-    operation,
-  );
-}
-
-function readRelayRecord(
-  options: ControllerRoundRelayStoreOptions,
-  workId: string,
-): ControlPlaneRecord<ControllerRoundRelayRecord> | undefined {
-  return readControlPlaneRecord<ControllerRoundRelayRecord>(options.controllerHome, NAMESPACE, options.repoId, workId);
-}
-
-export function getControllerRoundRelay(
-  options: ControllerRoundRelayStoreOptions,
-  workId: string,
-): ControllerRoundRelayRecord | undefined {
-  return readRelayRecord(options, workId)?.value;
-}
-
-export function recordControllerRoundTabSettlement(
-  options: ControllerRoundRelayStoreOptions,
-  input: {
-    workId: string;
-    status: ControllerRoundTabSettlementStatus;
-    error?: string;
-  },
-): ControllerRoundRelayRecord | undefined {
-  const initial = readRelayRecord(options, input.workId);
-  if (!initial) return undefined;
-  return relayLock(options, initial.value.relayScopeId, `controller-relay-tab-settlement:${input.workId}`, () => {
-    const current = readRelayRecord(options, input.workId);
-    if (!current) return undefined;
-    const at = nowIso(options);
-    const next: ControllerRoundRelayRecord = {
-      ...current.value,
-      tabSettlementStatus: input.status,
-      tabSettlementAt: at,
-      tabSettlementError: bounded(input.error, 2_000),
-      updatedAt: at,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: input.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: next,
-      action: 'controller_round_tab_settled',
-      expectedRevision: current.revision,
-    });
-    return next;
-  });
-}
-
-function relayHistory(options: ControllerRoundRelayStoreOptions, relayScopeId: string): ControllerRoundRelayRecord[] {
-  return listControlPlaneRecords<ControllerRoundRelayRecord>(options.controllerHome, {
-    namespace: NAMESPACE,
-    scope: options.repoId,
-    limit: 5_000,
-  })
-    .map((entry) => entry.value)
-    .filter((entry) => entry.relayScopeId === relayScopeId)
-    .sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));
-}
-
-function latestRelayRecordsByScope(options: ControllerRoundRelayStoreOptions): ControllerRoundRelayRecord[] {
-  const latest = new Map<string, ControllerRoundRelayRecord>();
-  for (const entry of listControlPlaneRecords<ControllerRoundRelayRecord>(options.controllerHome, {
-    namespace: NAMESPACE,
-    scope: options.repoId,
-    limit: 5_000,
-  }).map((record) => record.value)) {
-    const current = latest.get(entry.relayScopeId);
-    if (!current || entry.updatedAt > current.updatedAt) latest.set(entry.relayScopeId, entry);
-  }
-  return [...latest.values()].sort((left, right) => left.updatedAt.localeCompare(right.updatedAt));
-}
-
-function requirementForRelay(options: ControllerRoundRelayStoreOptions, requirementId: string | undefined) {
-  return requirementId ? readRequirement({ controllerHome: options.controllerHome }, requirementId)?.value : undefined;
-}
-
-function relevantWork(options: ControllerRoundRelayStoreOptions, record: Pick<ControllerRoundRelayRecord, 'relayScopeId' | 'originWorkId' | 'requirementId'>): WorkContract[] {
-  const all = readWorkContractStore({ controllerHome: options.controllerHome, repoId: options.repoId }).contracts;
-  const linkedWorkIds = new Set([
-    record.originWorkId,
-    ...relayHistory(options, record.relayScopeId).map((entry) => entry.originWorkId),
-  ]);
-  if (record.requirementId) {
-    for (const work of all) {
-      if (work.requirementId === record.requirementId) linkedWorkIds.add(work.workId);
-    }
-  }
-  let expanded = true;
-  while (expanded) {
-    expanded = false;
-    for (const work of all) {
-      if (linkedWorkIds.has(work.workId)) {
-        if (work.parentWorkId && !linkedWorkIds.has(work.parentWorkId)) {
-          linkedWorkIds.add(work.parentWorkId);
-          expanded = true;
-        }
-        continue;
-      }
-      if (work.parentWorkId && linkedWorkIds.has(work.parentWorkId)) {
-        linkedWorkIds.add(work.workId);
-        expanded = true;
-      }
-    }
-  }
-  return all
-    .filter((work) => linkedWorkIds.has(work.workId))
-    .sort((left, right) => right.updatedAt.localeCompare(left.updatedAt));
-}
-
-function mechanicalStateFingerprint(
-  options: ControllerRoundRelayStoreOptions,
-  work: WorkContract,
-  requirementId: string | undefined,
-  relayScopeId: string,
-): string {
-  const requirement = requirementForRelay(options, requirementId);
-  const works = relevantWork(options, { relayScopeId, originWorkId: work.workId, requirementId })
-    .map((entry) => ({
-      workId: entry.workId,
-      parentWorkId: entry.parentWorkId,
-      status: entry.status,
-      phase: entry.phase,
-      dispatchState: entry.dispatchState,
-      evidenceState: entry.evidenceState,
-      completionOutcome: entry.completionOutcome,
-      updatedAt: entry.updatedAt,
-    }))
-    .sort((left, right) => left.workId.localeCompare(right.workId));
-  const linkedWorkIds = new Set(works.map((entry) => entry.workId));
-  const handoffs = listHandoffItems({ controllerHome: options.controllerHome, repoId: options.repoId, status: 'active', limit: 100 })
-    .filter((handoff) => !handoff.workId || linkedWorkIds.has(handoff.workId))
-    .map((handoff) => ({ id: handoff.id, status: handoff.status, updatedAt: handoff.updatedAt }));
-  return createHash('sha256').update(JSON.stringify({
-    requirement: requirement ? {
-      requirementId: requirement.requirementId,
-      state: requirement.state,
-      revision: requirement.revision,
-      updatedAt: requirement.updatedAt,
-    } : undefined,
-    works,
-    handoffs,
-  })).digest('hex');
-}
-
-function resolveRequirementId(
-  options: ControllerRoundRelayStoreOptions,
-  work: WorkContract,
-  requestedRequirementId: string | undefined,
-): string | undefined {
-  const requested = bounded(requestedRequirementId, 160);
-  if (work.requirementId && requested && work.requirementId !== requested) {
-    throw new Error(`CONTROLLER_RELAY_REQUIREMENT_MISMATCH: Work ${work.workId} belongs to ${work.requirementId}`);
-  }
-  const requirementId = work.requirementId ?? requested;
-  if (requirementId && !requirementForRelay(options, requirementId)) {
-    throw new Error(`REQUIREMENT_NOT_FOUND: ${requirementId}`);
-  }
-  return requirementId;
-}
-
-function resolveRelayScope(
-  work: WorkContract,
-  requirementId: string | undefined,
-  requestedScopeId: string | undefined,
-): string {
-  const canonicalRequirementScope = requirementId ? `requirement:${requirementId}` : undefined;
-  if (canonicalRequirementScope) {
-    if (requestedScopeId && normalizeScopeId(requestedScopeId) !== canonicalRequirementScope) {
-      throw new Error(`CONTROLLER_RELAY_SCOPE_MISMATCH: expected ${canonicalRequirementScope}`);
-    }
-    return canonicalRequirementScope;
-  }
-  return requestedScopeId ? normalizeScopeId(requestedScopeId) : `goal:${work.workId}`;
-}
-
-function assertChatgptOwner(
-  options: ControllerRoundRelayStoreOptions,
-  workId: string,
-  identity: ControllerRoundRelayIdentity,
-): ControllerSession & { claimGeneration: number } {
-  const owner = getControllerSession(options, workId);
-  if (!owner) throw new Error(`WORK_CONTROLLER_OWNER_REQUIRED: ${workId}`);
-  if (owner.controllerType !== 'chatgpt') throw new Error(`CONTROLLER_RELAY_CHATGPT_ONLY: ${workId}`);
-  if (owner.controllerId !== identity.controllerId) throw new Error(`WORK_CONTROLLER_OWNER_MISMATCH: ${workId}`);
-  const ownerPrincipal = owner.principalId?.trim() || owner.controllerId;
-  if (ownerPrincipal !== identity.principalId.trim()) throw new Error(`WORK_CONTROLLER_PRINCIPAL_MISMATCH: ${workId}`);
-  if (owner.sessionId !== identity.sessionId.trim()) throw new Error(`WORK_CONTROLLER_SESSION_MISMATCH: ${workId}`);
-  const ownerInstanceId = owner.controllerInstanceId?.trim();
-  if (ownerInstanceId && ownerInstanceId !== identity.controllerInstanceId.trim()) {
-    throw new Error(`WORK_CONTROLLER_INSTANCE_MISMATCH: ${workId}`);
-  }
-  if (typeof owner.claimGeneration !== 'number' || owner.claimGeneration < 1) throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_REQUIRED: ${workId}`);
-  return owner as ControllerSession & { claimGeneration: number };
-}
-
-export function submitControllerRoundDisposition(
-  options: ControllerRoundRelayStoreOptions,
-  input: SubmitControllerRoundDispositionInput,
-): ControllerRoundRelayRecord {
-  if (!CONTROLLER_ROUND_DISPOSITIONS.includes(input.disposition)) throw new Error('CONTROLLER_RELAY_DISPOSITION_INVALID');
-  const work = getWorkContract(options, input.workId);
-  if (!work) throw new Error(`WORK_NOT_FOUND: ${input.workId}`);
-  const requirementId = resolveRequirementId(options, work, input.requirementId);
-  const relayScopeId = resolveRelayScope(work, requirementId, input.relayScopeId);
-  const terminal = isTerminalWorkContractStatus(work.status);
-
-  return relayLock(options, relayScopeId, `controller-relay-submit:${input.identity.controllerId}`, () => {
-    const existing = readRelayRecord(options, work.workId);
-    if (!existing) throw new Error(`CONTROLLER_RELAY_ROUND_NOT_OPEN: ${work.workId}`);
-    if (existing.value.relayScopeId !== relayScopeId) {
-      throw new Error(`CONTROLLER_RELAY_SCOPE_MISMATCH: Work ${work.workId} is already bound to ${existing.value.relayScopeId}`);
-    }
-    if (existing.value.status !== 'claimed') {
-      throw new Error(`CONTROLLER_RELAY_ROUND_NOT_CLAIMED: ${existing.value.status}`);
-    }
-    if (terminal && (work.status !== 'completed' || input.disposition !== 'goal_complete')) {
-      throw new Error(`CONTROLLER_RELAY_WORK_TERMINAL: ${work.status}`);
-    }
-
-    const liveOwner = getControllerSession(options, work.workId);
-    const authority = terminal
-      ? (() => {
-          // The physical Work may be completed while its old live lease still exists.
-          // goal_complete is semantic round closure, not a terminal Work reclaim: use
-          // the authenticated controller/principal plus the already-claimed relay as
-          // authority and allow MCP session / Runtime instance rotation. If a live
-          // owner remains, it must still agree on controller type and principal.
-          const principalId = input.identity.principalId.trim();
-          const controllerInstanceId = input.identity.controllerInstanceId.trim();
-          const sessionId = input.identity.sessionId.trim();
-          if (!principalId || !controllerInstanceId || !sessionId) throw new Error(`CONTROLLER_RELAY_TERMINAL_AUTHORITY_REQUIRED: ${work.workId}`);
-          if (liveOwner) {
-            if (liveOwner.controllerType !== 'chatgpt') throw new Error(`CONTROLLER_RELAY_CHATGPT_ONLY: ${work.workId}`);
-            if (liveOwner.controllerId !== input.identity.controllerId) throw new Error(`WORK_CONTROLLER_OWNER_MISMATCH: ${work.workId}`);
-            if ((liveOwner.principalId?.trim() || liveOwner.controllerId) !== principalId) {
-              throw new Error(`WORK_CONTROLLER_PRINCIPAL_MISMATCH: ${work.workId}`);
-            }
-          }
-          if (existing.value.controllerId !== input.identity.controllerId) throw new Error(`CONTROLLER_RELAY_CLAIM_CONTROLLER_MISMATCH: ${work.workId}`);
-          if (existing.value.principalId !== principalId) throw new Error(`CONTROLLER_RELAY_CLAIM_PRINCIPAL_MISMATCH: ${work.workId}`);
-          if (existing.value.claimGeneration < 1) throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_REQUIRED: ${work.workId}`);
-          return {
-            controllerId: existing.value.controllerId,
-            principalId: existing.value.principalId,
-            controllerInstanceId,
-            sessionId,
-            claimGeneration: existing.value.claimGeneration,
-          };
-        })()
-      : (() => {
-          const owner = assertChatgptOwner(options, work.workId, input.identity);
-          return {
-            controllerId: owner.controllerId,
-            principalId: owner.principalId?.trim() || owner.controllerId,
-            controllerInstanceId: owner.controllerInstanceId?.trim() || '',
-            sessionId: owner.sessionId,
-            claimGeneration: owner.claimGeneration,
-          };
-        })();
-    if (existing.value.controllerId !== authority.controllerId) {
-      throw new Error(`CONTROLLER_RELAY_CLAIM_CONTROLLER_MISMATCH: ${work.workId}`);
-    }
-    if (existing.value.principalId !== authority.principalId) {
-      throw new Error(`CONTROLLER_RELAY_CLAIM_PRINCIPAL_MISMATCH: ${work.workId}`);
-    }
-    // A completed Work may have already released its live controller session before
-    // the prompt-required terminal disposition arrives. At that point the exact
-    // authenticated controller/principal + Work + relay scope remain the lineage
-    // fence; MCP session and canonical Runtime instance are allowed to rotate.
-    const terminalLineageMigration = terminal;
-    if (!terminalLineageMigration && existing.value.controllerInstanceId !== authority.controllerInstanceId) {
-      throw new Error(`CONTROLLER_RELAY_CLAIM_INSTANCE_MISMATCH: ${work.workId}`);
-    }
-    if (!terminalLineageMigration && existing.value.claimGeneration !== authority.claimGeneration) {
-      throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_MISMATCH: ${work.workId}`);
-    }
-    const previous = relayHistory(options, relayScopeId)[0];
-    const requestedMaxRounds = boundedInteger(input.maxRounds, DEFAULT_MAX_ROUNDS, 1, 32);
-    const requestedMaxRepeatedState = boundedInteger(input.maxRepeatedState, DEFAULT_MAX_REPEATED_STATE, 1, 8);
-    const requestedMaxFailures = boundedInteger(input.maxFailures, DEFAULT_MAX_FAILURES, 1, 8);
-    const maxRounds = previous ? Math.min(previous.maxRounds, requestedMaxRounds) : requestedMaxRounds;
-    const maxRepeatedState = previous ? Math.min(previous.maxRepeatedState, requestedMaxRepeatedState) : requestedMaxRepeatedState;
-    const maxFailures = previous ? Math.min(previous.maxFailures, requestedMaxFailures) : requestedMaxFailures;
-    const stateFingerprint = bounded(input.stateFingerprint, 256) ?? mechanicalStateFingerprint(options, work, requirementId, relayScopeId);
-    const continuing = input.disposition === 'continue_immediately';
-    const roundCount = (previous?.roundCount ?? 0) + (continuing ? 1 : 0);
-    const repeatedStateCount = continuing
-      ? (previous?.stateFingerprint === stateFingerprint ? (previous.repeatedStateCount + 1) : 0)
-      : (previous?.repeatedStateCount ?? 0);
-    const consecutiveFailures = previous?.consecutiveFailures ?? 0;
-    const browserSessionId = bounded(input.browserSessionId, 500) ?? previous?.browserSessionId;
-    const conversationUrl = bounded(input.conversationUrl, 2_000) ?? previous?.conversationUrl;
-
-    let status: ControllerRoundRelayStatus = input.disposition === 'continue_immediately'
-      ? 'pending_release'
-      : input.disposition === 'wait'
-        ? 'waiting'
-        : input.disposition === 'wait_for_user'
-          ? 'waiting_for_user'
-          : 'goal_complete';
-    let blockedReason: string | undefined;
-
-    const handoffId = bounded(input.handoffId, 200);
-    if (input.disposition === 'wait_for_user') {
-      if (!handoffId) throw new Error('CONTROLLER_RELAY_WAIT_FOR_USER_HANDOFF_REQUIRED');
-      const handoff = getHandoffItem(options, handoffId);
-      if (!handoff) throw new Error(`HANDOFF_NOT_FOUND: ${handoffId}`);
-      if (isTerminalHandoffStatus(handoff.status)) throw new Error(`CONTROLLER_RELAY_HANDOFF_TERMINAL: ${handoff.status}`);
-      if (handoff.workId && handoff.workId !== work.workId) throw new Error(`CONTROLLER_RELAY_HANDOFF_WORK_MISMATCH: ${handoffId}`);
-    }
-
-    if (continuing) {
-      if (roundCount > maxRounds) blockedReason = `round_budget_exhausted:${roundCount}>${maxRounds}`;
-      else if (repeatedStateCount >= maxRepeatedState) blockedReason = `repeated_state:${repeatedStateCount}>=${maxRepeatedState}`;
-      else if (consecutiveFailures >= maxFailures) blockedReason = `consecutive_failures:${consecutiveFailures}>=${maxFailures}`;
-      if (blockedReason) status = 'blocked';
-    }
-
-    const at = nowIso(options);
-    const record: ControllerRoundRelayRecord = {
-      schemaVersion: 1,
-      repoId: options.repoId,
-      relayScopeId,
-      originWorkId: work.workId,
-      ...(requirementId ? { requirementId } : {}),
-      disposition: input.disposition,
-      status,
-      controllerId: authority.controllerId,
-      principalId: authority.principalId,
-      controllerInstanceId: authority.controllerInstanceId,
-      sessionId: authority.sessionId,
-      claimGeneration: authority.claimGeneration,
-      authorityId: existing.value.authorityId,
-      stateFingerprint,
-      roundCount,
-      repeatedStateCount,
-      consecutiveFailures,
-      maxRounds,
-      maxRepeatedState,
-      maxFailures,
-      ...(handoffId ? { handoffId } : {}),
-      ...(bounded(input.reason, 1_000) ? { reason: bounded(input.reason, 1_000) } : {}),
-      ...(browserSessionId ? { browserSessionId } : {}),
-      ...(conversationUrl ? { conversationUrl } : {}),
-      ...(blockedReason ? { blockedReason } : {}),
-      tabSettlementStatus: existing.value.tabSettlementStatus ?? 'round_open',
-      submittedAt: at,
-      updatedAt: at,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: work.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: record,
-      action: 'controller_round_disposition_submitted',
-      expectedRevision: existing?.revision ?? null,
-    });
-    return record;
-  });
-}
-
-export function beginInitialControllerRoundDispatch(
-  options: ControllerRoundRelayStoreOptions,
-  input: BeginInitialControllerRoundDispatchInput,
-): ControllerRoundRelayRecord {
-  const work = getWorkContract(options, input.workId);
-  if (!work) throw new Error(`WORK_NOT_FOUND: ${input.workId}`);
-  if (isTerminalWorkContractStatus(work.status)) throw new Error(`CONTROLLER_RELAY_WORK_TERMINAL: ${work.status}`);
-  const requirementId = resolveRequirementId(options, work, input.requirementId);
-  const requirement = requirementForRelay(options, requirementId);
-  if (requirement && !['planned', 'active'].includes(requirement.state)) {
-    throw new Error(`CONTROLLER_RELAY_REQUIREMENT_TERMINAL: ${requirement.state}`);
-  }
-  const relayScopeId = resolveRelayScope(work, requirementId, input.relayScopeId);
-
-  return relayLock(options, relayScopeId, `controller-relay-launch:${input.identity.controllerId}`, () => {
-    const existing = readRelayRecord(options, work.workId);
-    if (existing && existing.value.relayScopeId !== relayScopeId) {
-      throw new Error(`CONTROLLER_RELAY_SCOPE_MISMATCH: Work ${work.workId} is already bound to ${existing.value.relayScopeId}`);
-    }
-    const previous = relayHistory(options, relayScopeId)[0];
-    if (previous && ['pending_release', 'dispatching', 'dispatched', 'claimed'].includes(previous.status)) {
-      throw new Error(`CONTROLLER_RELAY_ROUND_ALREADY_OPEN: ${relayScopeId}`);
-    }
-    const abandonedReleasedRound = previous?.status === 'failed'
-      && previous.lastError === CONTROLLER_RELAY_ABANDONED_RELEASE_ERROR;
-    const requestedMaxRounds = boundedInteger(input.maxRounds, DEFAULT_MAX_ROUNDS, 1, 32);
-    const requestedMaxRepeatedState = boundedInteger(input.maxRepeatedState, DEFAULT_MAX_REPEATED_STATE, 1, 8);
-    const requestedMaxFailures = boundedInteger(input.maxFailures, DEFAULT_MAX_FAILURES, 1, 8);
-    const maxRounds = previous ? Math.min(previous.maxRounds, requestedMaxRounds) : requestedMaxRounds;
-    const maxRepeatedState = previous ? Math.min(previous.maxRepeatedState, requestedMaxRepeatedState) : requestedMaxRepeatedState;
-    const maxFailures = previous ? Math.min(previous.maxFailures, requestedMaxFailures) : requestedMaxFailures;
-    const stateFingerprint = mechanicalStateFingerprint(options, work, requirementId, relayScopeId);
-    // Ordinary later schedule/manual occurrences intentionally receive a fresh
-    // mechanical budget. A claimed round explicitly released without any semantic
-    // disposition is different: launcher_start is recovering the same abandoned
-    // relay chain, so it must consume round/repeated-state budget rather than reset
-    // it and thereby weaken repeated-state fencing.
-    const roundCount = abandonedReleasedRound ? previous!.roundCount + 1 : 1;
-    const repeatedStateCount = abandonedReleasedRound
-      ? (previous!.stateFingerprint === stateFingerprint ? previous!.repeatedStateCount + 1 : 0)
-      : 0;
-    const consecutiveFailures = abandonedReleasedRound ? previous!.consecutiveFailures : 0;
-    let blockedReason: string | undefined;
-    if (roundCount > maxRounds) blockedReason = `round_budget_exhausted:${roundCount}>${maxRounds}`;
-    else if (repeatedStateCount >= maxRepeatedState) blockedReason = `repeated_state:${repeatedStateCount}>=${maxRepeatedState}`;
-    else if (consecutiveFailures >= maxFailures) blockedReason = `consecutive_failures:${consecutiveFailures}>=${maxFailures}`;
-
-    const at = nowIso(options);
-    const record: ControllerRoundRelayRecord = {
-      schemaVersion: 1,
-      repoId: options.repoId,
-      relayScopeId,
-      originWorkId: work.workId,
-      ...(requirementId ? { requirementId } : {}),
-      // launcher_start is itself an explicit request to continue the Work. The
-      // launched controller must still submit its own end-of-round disposition.
-      disposition: 'continue_immediately',
-      status: blockedReason ? 'blocked' : 'dispatching',
-      controllerId: input.identity.controllerId.trim().slice(0, 240) || 'chatgpt-launcher',
-      principalId: input.identity.principalId.trim().slice(0, 240) || input.identity.controllerId.trim().slice(0, 240),
-      controllerInstanceId: input.identity.controllerInstanceId.trim().slice(0, 240),
-      sessionId: input.identity.sessionId.trim().slice(0, 240),
-      claimGeneration: 0,
-      authorityId: newControllerRoundAuthorityId(),
-      stateFingerprint,
-      roundCount,
-      repeatedStateCount,
-      consecutiveFailures,
-      maxRounds,
-      maxRepeatedState,
-      maxFailures,
-      reason: abandonedReleasedRound ? 'launcher_start_recovered_abandoned_claim' : 'launcher_start_requested_continuation',
-      ...(bounded(input.browserSessionId, 500) ? { browserSessionId: bounded(input.browserSessionId, 500) } : previous?.browserSessionId ? { browserSessionId: previous.browserSessionId } : {}),
-      ...(bounded(input.conversationUrl, 2_000) ? { conversationUrl: bounded(input.conversationUrl, 2_000) } : previous?.conversationUrl ? { conversationUrl: previous.conversationUrl } : {}),
-      ...(blockedReason ? { blockedReason } : {}),
-      submittedAt: at,
-      updatedAt: at,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: work.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: record,
-      action: blockedReason ? 'controller_round_initial_launch_blocked' : 'controller_round_initial_launch_begin',
-      expectedRevision: existing?.revision ?? null,
-    });
-    return record;
-  });
-}
-
-export function beginControllerRoundRelayAfterRelease(
-  options: ControllerRoundRelayStoreOptions,
-  input: { workId: string; releasedSession: ControllerSession },
-): ControllerRoundRelayRecord | undefined {
-  const initial = readRelayRecord(options, input.workId);
-  if (!initial || initial.value.status !== 'pending_release') return undefined;
-  return relayLock(options, initial.value.relayScopeId, `controller-relay-begin:${input.releasedSession.controllerId}`, () => {
-    const current = readRelayRecord(options, input.workId);
-    if (!current || current.value.status !== 'pending_release') return undefined;
-    const record = current.value;
-    const releasedPrincipal = input.releasedSession.principalId?.trim() || input.releasedSession.controllerId;
-    if (
-      record.claimGeneration !== input.releasedSession.claimGeneration
-      || record.controllerId !== input.releasedSession.controllerId
-      || record.principalId !== releasedPrincipal
-    ) {
-      throw new Error(`CONTROLLER_RELAY_RELEASE_FENCE_MISMATCH: ${input.workId}`);
-    }
-    const at = nowIso(options);
-    // A released round is semantically closed. The successor dispatch receives a
-    // fresh capability so a stale tab/conversation cannot mutate the next round.
-    const dispatching: ControllerRoundRelayRecord = {
-      ...record,
-      authorityId: newControllerRoundAuthorityId(),
-      status: 'dispatching',
-      updatedAt: at,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: input.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: dispatching,
-      action: 'controller_round_relay_dispatch_begin',
-      expectedRevision: current.revision,
-    });
-    return dispatching;
-  });
-}
-
-/**
- * Mechanically close a claimed ChatGPT round only after its exact controller
- * epoch has been released and durable state proves no controller lease remains.
- * This never invents a semantic disposition; launcher_start must open a new round.
- */
-export function reconcileControllerRoundAfterAbandonedRelease(
-  options: ControllerRoundRelayStoreOptions,
-  input: { workId: string; releasedSession: ControllerSession },
-): ControllerRoundRelayRecord | undefined {
-  const initial = readRelayRecord(options, input.workId);
-  if (!initial || initial.value.status !== 'claimed') return undefined;
-  return relayLock(options, initial.value.relayScopeId, `controller-relay-abandoned-release:${input.releasedSession.controllerId}`, () => {
-    const current = readRelayRecord(options, input.workId);
-    if (!current || current.value.status !== 'claimed') return undefined;
-    const record = current.value;
-    const releasedPrincipal = input.releasedSession.principalId?.trim() || input.releasedSession.controllerId;
-    const releasedInstanceId = input.releasedSession.controllerInstanceId?.trim() || '';
-    if (
-      record.claimGeneration !== input.releasedSession.claimGeneration
-      || record.controllerId !== input.releasedSession.controllerId
-      || record.principalId !== releasedPrincipal
-      || record.controllerInstanceId !== releasedInstanceId
-      || record.sessionId !== input.releasedSession.sessionId
-    ) {
-      throw new Error(`CONTROLLER_RELAY_RELEASE_FENCE_MISMATCH: ${input.workId}`);
-    }
-    if (getControllerSession(options, input.workId)) {
-      throw new Error(`CONTROLLER_RELAY_ABANDONED_RELEASE_ACTIVE_CLAIM: ${input.workId}`);
-    }
-    const work = getWorkContract(options, input.workId);
-    if (!work || isTerminalWorkContractStatus(work.status)) return undefined;
-
-    const at = nowIso(options);
-    const abandoned: ControllerRoundRelayRecord = {
-      ...record,
-      status: 'failed',
-      lastError: CONTROLLER_RELAY_ABANDONED_RELEASE_ERROR,
-      claimedAt: undefined,
-      updatedAt: at,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: input.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: abandoned,
-      action: 'controller_round_relay_claim_abandoned_after_release',
-      expectedRevision: current.revision,
-    });
-    return abandoned;
-  });
-}
-
-export function finishControllerRoundRelayDispatch(
-  options: ControllerRoundRelayStoreOptions,
-  input: { workId: string; ok: boolean; browserSessionId?: string; conversationUrl?: string; error?: string; recovery?: boolean; nowMs?: number },
-): ControllerRoundRelayRecord | undefined {
-  const initial = readRelayRecord(options, input.workId);
-  if (!initial || initial.value.status !== 'dispatching') return initial?.value;
-  return relayLock(options, initial.value.relayScopeId, `controller-relay-finish:${input.workId}`, () => {
-    const current = readRelayRecord(options, input.workId);
-    if (!current || current.value.status !== 'dispatching') return current?.value;
-    const at = typeof input.nowMs === 'number' ? new Date(input.nowMs).toISOString() : nowIso(options);
-    const nextFailureCount = current.value.consecutiveFailures + 1;
-    const recoveryBlocked = input.recovery === true && nextFailureCount >= current.value.maxFailures;
-    const recoveryDelayMs = Math.min(
-      MAX_STALLED_RECOVERY_BACKOFF_MS,
-      DEFAULT_STALLED_RECOVERY_BACKOFF_MS * 2 ** Math.max(0, nextFailureCount - 1),
-    );
-    const next: ControllerRoundRelayRecord = input.ok
-      ? {
-          ...current.value,
-          status: 'dispatched',
-          consecutiveFailures: 0,
-          lastError: undefined,
-          nextRecoveryAt: undefined,
-          blockedReason: undefined,
-          tabSettlementStatus: 'round_open',
-          tabSettlementAt: undefined,
-          tabSettlementError: undefined,
-          ...(bounded(input.browserSessionId, 500) ? { browserSessionId: bounded(input.browserSessionId, 500) } : {}),
-          ...(bounded(input.conversationUrl, 2_000) ? { conversationUrl: bounded(input.conversationUrl, 2_000) } : {}),
-          dispatchedAt: at,
-          updatedAt: at,
-        }
-      : input.recovery
-        ? {
-            ...current.value,
-            status: recoveryBlocked ? 'blocked' : 'dispatching',
-            consecutiveFailures: nextFailureCount,
-            lastError: bounded(input.error, 2_000) ?? 'CHATGPT_CONTROLLER_RELAY_RECOVERY_FAILED',
-            blockedReason: recoveryBlocked
-              ? `consecutive_failures:${nextFailureCount}>=${current.value.maxFailures}`
-              : undefined,
-            nextRecoveryAt: recoveryBlocked
-              ? undefined
-              : new Date(Date.parse(at) + recoveryDelayMs).toISOString(),
-            updatedAt: at,
-          }
-        : {
-            ...current.value,
-            status: 'failed',
-            consecutiveFailures: nextFailureCount,
-            nextRecoveryAt: undefined,
-            lastError: bounded(input.error, 2_000) ?? 'CONTROLLER_RELAY_DISPATCH_FAILED',
-            updatedAt: at,
-          };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: input.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: next,
-      action: input.ok
-        ? 'controller_round_relay_dispatched'
-        : input.recovery
-          ? recoveryBlocked ? 'controller_round_relay_recovery_blocked' : 'controller_round_relay_recovery_retry_scheduled'
-          : 'controller_round_relay_failed',
-      expectedRevision: current.revision,
-    });
-    return next;
-  });
-}
-
-export function acknowledgeControllerRoundClaim(
-  options: ControllerRoundRelayStoreOptions,
-  input: { workId: string; session: ControllerSession },
-): ControllerRoundRelayRecord | undefined {
-  const initial = readRelayRecord(options, input.workId);
-  if (!initial) return undefined;
-  if (initial.value.status === 'claimed') {
-    if (
-      initial.value.controllerId === input.session.controllerId
-      && initial.value.sessionId === input.session.sessionId
-      && initial.value.claimGeneration === input.session.claimGeneration
-    ) return initial.value;
-  } else if (initial.value.status === 'blocked') {
-    if (!initial.value.blockedReason?.startsWith('repeated_state:')) return initial.value;
-  } else if (!['dispatching', 'dispatched'].includes(initial.value.status)) return initial.value;
-  if (input.session.controllerType !== 'chatgpt') throw new Error(`CONTROLLER_RELAY_CHATGPT_CLAIM_REQUIRED: ${input.workId}`);
-
-  return relayLock(options, initial.value.relayScopeId, `controller-relay-claim:${input.session.controllerId}`, () => {
-    const current = readRelayRecord(options, input.workId);
-    if (!current) return undefined;
-    if (current.value.status === 'claimed') {
-      if (
-        current.value.controllerId === input.session.controllerId
-        && current.value.sessionId === input.session.sessionId
-        && current.value.claimGeneration === input.session.claimGeneration
-      ) return current.value;
-
-      const owner = getControllerSession(options, input.workId);
-      const ownerPrincipal = owner?.principalId?.trim() || owner?.controllerId;
-      const sessionPrincipal = input.session.principalId?.trim() || input.session.controllerId;
-      if (
-        !owner
-        || owner.controllerType !== 'chatgpt'
-        || owner.controllerId !== input.session.controllerId
-        || owner.sessionId !== input.session.sessionId
-        || owner.claimGeneration !== input.session.claimGeneration
-        || ownerPrincipal !== sessionPrincipal
-        || (owner.controllerInstanceId?.trim() || '') !== (input.session.controllerInstanceId?.trim() || '')
-      ) throw new Error(`CONTROLLER_RELAY_CLAIM_IDENTITY_MISMATCH: ${input.workId}`);
-      if (current.value.controllerId !== owner.controllerId || current.value.principalId !== ownerPrincipal) {
-        throw new Error(`CONTROLLER_RELAY_CLAIM_CONFLICT: ${input.workId}`);
-      }
-      if (typeof owner.claimGeneration !== 'number' || owner.claimGeneration < 1) {
-        throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_REQUIRED: ${input.workId}`);
-      }
-      const controllerInstanceId = owner.controllerInstanceId?.trim();
-      if (!controllerInstanceId) throw new Error(`CONTROLLER_RELAY_CLAIM_INSTANCE_REQUIRED: ${input.workId}`);
-      const at = nowIso(options);
-      const migrated: ControllerRoundRelayRecord = {
-        ...current.value,
-        controllerInstanceId,
-        sessionId: owner.sessionId,
-        claimGeneration: owner.claimGeneration,
-        claimedAt: at,
-        updatedAt: at,
-        lastError: undefined,
-      };
-      writeControlPlaneRecord(options.controllerHome, {
-        namespace: NAMESPACE,
-        scope: options.repoId,
-        key: input.workId,
-        schemaVersion: SCHEMA_VERSION,
-        value: migrated,
-        action: 'controller_round_relay_claim_migrated',
-        expectedRevision: current.revision,
-      });
-      return migrated;
-    }
-    if (current.value.status === 'blocked') {
-      if (!current.value.blockedReason?.startsWith('repeated_state:')) return current.value;
-      if (current.value.roundCount > current.value.maxRounds || current.value.consecutiveFailures >= current.value.maxFailures) {
-        return current.value;
-      }
-      const work = getWorkContract(options, input.workId);
-      if (!work || isTerminalWorkContractStatus(work.status)) return current.value;
-      const owner = getControllerSession(options, input.workId);
-      const ownerPrincipal = owner?.principalId?.trim() || owner?.controllerId;
-      const sessionPrincipal = input.session.principalId?.trim() || input.session.controllerId;
-      if (
-        !owner
-        || owner.controllerType !== 'chatgpt'
-        || owner.controllerId !== input.session.controllerId
-        || owner.sessionId !== input.session.sessionId
-        || owner.claimGeneration !== input.session.claimGeneration
-        || ownerPrincipal !== sessionPrincipal
-        || (owner.controllerInstanceId?.trim() || '') !== (input.session.controllerInstanceId?.trim() || '')
-      ) throw new Error(`CONTROLLER_RELAY_CLAIM_IDENTITY_MISMATCH: ${input.workId}`);
-      if (current.value.controllerId !== owner.controllerId || current.value.principalId !== ownerPrincipal) {
-        throw new Error(`CONTROLLER_RELAY_CLAIM_CONFLICT: ${input.workId}`);
-      }
-      if (typeof owner.claimGeneration !== 'number' || owner.claimGeneration < 1) {
-        throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_REQUIRED: ${input.workId}`);
-      }
-      const controllerInstanceId = owner.controllerInstanceId?.trim();
-      if (!controllerInstanceId) throw new Error(`CONTROLLER_RELAY_CLAIM_INSTANCE_REQUIRED: ${input.workId}`);
-      const stateFingerprint = mechanicalStateFingerprint(options, work, current.value.requirementId, current.value.relayScopeId);
-      if (stateFingerprint === current.value.stateFingerprint) return current.value;
-      const at = nowIso(options);
-      const rearmed: ControllerRoundRelayRecord = {
-        ...current.value,
-        status: 'claimed',
-        controllerId: owner.controllerId,
-        principalId: ownerPrincipal,
-        controllerInstanceId,
-        sessionId: owner.sessionId,
-        claimGeneration: owner.claimGeneration,
-        stateFingerprint,
-        repeatedStateCount: 0,
-        blockedReason: undefined,
-        lastError: undefined,
-        claimedAt: at,
-        updatedAt: at,
-      };
-      writeControlPlaneRecord(options.controllerHome, {
-        namespace: NAMESPACE,
-        scope: options.repoId,
-        key: input.workId,
-        schemaVersion: SCHEMA_VERSION,
-        value: rearmed,
-        action: 'controller_round_relay_claim_rearmed_after_state_change',
-        expectedRevision: current.revision,
-      });
-      return rearmed;
-    }
-    if (!['dispatching', 'dispatched'].includes(current.value.status)) return current.value;
-    const owner = getControllerSession(options, input.workId);
-    if (!owner) throw new Error(`CONTROLLER_RELAY_ACTIVE_CLAIM_REQUIRED: ${input.workId}`);
-    if (
-      owner.controllerType !== 'chatgpt'
-      || owner.controllerId !== input.session.controllerId
-      || owner.sessionId !== input.session.sessionId
-      || owner.claimGeneration !== input.session.claimGeneration
-      || (owner.principalId?.trim() || owner.controllerId) !== (input.session.principalId?.trim() || input.session.controllerId)
-    ) throw new Error(`CONTROLLER_RELAY_CLAIM_IDENTITY_MISMATCH: ${input.workId}`);
-    if (typeof owner.claimGeneration !== 'number' || owner.claimGeneration < 1) {
-      throw new Error(`CONTROLLER_RELAY_CLAIM_GENERATION_REQUIRED: ${input.workId}`);
-    }
-    const claimGeneration = owner.claimGeneration;
-    const at = nowIso(options);
-    const next: ControllerRoundRelayRecord = {
-      ...current.value,
-      status: 'claimed',
-      controllerId: owner.controllerId,
-      principalId: owner.principalId?.trim() || owner.controllerId,
-      controllerInstanceId: owner.controllerInstanceId?.trim() || current.value.controllerInstanceId,
-      sessionId: owner.sessionId,
-      claimGeneration,
-      claimedAt: at,
-      updatedAt: at,
-      lastError: undefined,
-    };
-    writeControlPlaneRecord(options.controllerHome, {
-      namespace: NAMESPACE,
-      scope: options.repoId,
-      key: input.workId,
-      schemaVersion: SCHEMA_VERSION,
-      value: next,
-      action: 'controller_round_relay_claim_acknowledged',
-      expectedRevision: current.revision,
-    });
-    return next;
-  });
-}
-
-export function claimStalledControllerRoundRelays(
-  options: ControllerRoundRelayStoreOptions,
-  input: { nowMs?: number; graceMs?: number; limit?: number } = {},
-): ControllerRoundRelayRecord[] {
-  const nowMs = input.nowMs ?? Date.now();
-  const graceMs = Math.max(60_000, Math.min(input.graceMs ?? DEFAULT_UNCLOSED_ROUND_GRACE_MS, MAX_UNCLOSED_ROUND_GRACE_MS));
-  const limit = Math.max(1, Math.min(Math.trunc(input.limit ?? 2), 16));
-  const claimed: ControllerRoundRelayRecord[] = [];
-
-  for (const candidate of latestRelayRecordsByScope(options)) {
-    if (claimed.length >= limit) break;
-    if (!['pending_release', 'dispatching', 'dispatched', 'claimed'].includes(candidate.status)) continue;
-    const scheduledRecoveryAtMs = candidate.nextRecoveryAt ? Date.parse(candidate.nextRecoveryAt) : Number.NaN;
-    if (Number.isFinite(scheduledRecoveryAtMs)) {
-      if (nowMs < scheduledRecoveryAtMs) continue;
-    } else {
-      const roundOpenedAtMs = Date.parse(candidate.claimedAt ?? candidate.dispatchedAt ?? candidate.updatedAt);
-      if (!Number.isFinite(roundOpenedAtMs) || nowMs - roundOpenedAtMs < graceMs) continue;
-    }
-    const requirement = requirementForRelay(options, candidate.requirementId);
-    if (requirement && !['planned', 'active'].includes(requirement.state)) continue;
-    const candidateWorks = relevantWork(options, candidate);
-    const activeCandidateWorks = candidateWorks.filter((work) => !isTerminalWorkContractStatus(work.status));
-    if (activeCandidateWorks.length === 0) continue;
-    if (activeCandidateWorks.some((work) => workHasActiveExecution(options.controllerHome, options.repoId, work.workId) || controllerSessionBlocksRecovery(options, work.workId, { nowMs, graceMs }))) continue;
-
-    const next = relayLock(options, candidate.relayScopeId, `controller-relay-recover:${candidate.originWorkId}`, () => {
-      const latest = relayHistory(options, candidate.relayScopeId)[0];
-      if (!latest || latest.originWorkId !== candidate.originWorkId || latest.updatedAt !== candidate.updatedAt || latest.status !== candidate.status) return undefined;
-      const latestRecoveryAtMs = latest.nextRecoveryAt ? Date.parse(latest.nextRecoveryAt) : Number.NaN;
-      if (Number.isFinite(latestRecoveryAtMs)) {
-        if (nowMs < latestRecoveryAtMs) return undefined;
-      } else {
-        const latestRoundOpenedAtMs = Date.parse(latest.claimedAt ?? latest.dispatchedAt ?? latest.updatedAt);
-        if (!Number.isFinite(latestRoundOpenedAtMs) || nowMs - latestRoundOpenedAtMs < graceMs) return undefined;
-      }
-      const latestRequirement = requirementForRelay(options, latest.requirementId);
-      if (latestRequirement && !['planned', 'active'].includes(latestRequirement.state)) return undefined;
-      const works = relevantWork(options, latest);
-      const activeWorks = works.filter((work) => !isTerminalWorkContractStatus(work.status));
-      if (activeWorks.length === 0) return undefined;
-      if (activeWorks.some((work) => workHasActiveExecution(options.controllerHome, options.repoId, work.workId) || controllerSessionBlocksRecovery(options, work.workId, { nowMs, graceMs }))) return undefined;
-
-      const currentRecord = readRelayRecord(options, latest.originWorkId);
-      if (!currentRecord || currentRecord.value.updatedAt !== latest.updatedAt || currentRecord.value.status !== latest.status) return undefined;
-      const fingerprintWork = activeWorks[0] ?? getWorkContract(options, latest.originWorkId);
-      const stateFingerprint = fingerprintWork
-        ? mechanicalStateFingerprint(options, fingerprintWork, latest.requirementId, latest.relayScopeId)
-        : latest.stateFingerprint;
-      const resumesUndispatchedRound = latest.status === 'pending_release' || latest.status === 'dispatching';
-      const roundCount = latest.roundCount + (resumesUndispatchedRound ? 0 : 1);
-      const repeatedStateCount = resumesUndispatchedRound
-        ? latest.repeatedStateCount
-        : latest.stateFingerprint === stateFingerprint ? latest.repeatedStateCount + 1 : 0;
-      let blockedReason: string | undefined;
-      if (roundCount > latest.maxRounds) blockedReason = `round_budget_exhausted:${roundCount}>${latest.maxRounds}`;
-      else if (repeatedStateCount >= latest.maxRepeatedState) blockedReason = `repeated_state:${repeatedStateCount}>=${latest.maxRepeatedState}`;
-
-      const at = new Date(nowMs).toISOString();
-      const recovered: ControllerRoundRelayRecord = {
-        ...latest,
-        // Re-dispatching an already dispatched/claimed round creates a new
-        // controller epoch. Retrying an in-flight dispatch keeps its capability.
-        authorityId: blockedReason
-          ? latest.authorityId
-          : latest.status === 'dispatching' && latest.authorityId
-            ? latest.authorityId
-            : newControllerRoundAuthorityId(),
-        status: blockedReason ? 'blocked' : 'dispatching',
-        stateFingerprint,
-        roundCount,
-        repeatedStateCount,
-        lastError: latest.nextRecoveryAt
-          ? latest.lastError
-          : latest.status === 'pending_release'
-            ? 'CONTROLLER_RELAY_RELEASE_TRANSITION_INCOMPLETE'
-            : latest.status === 'dispatching'
-              ? 'CONTROLLER_RELAY_DISPATCH_TRANSITION_INCOMPLETE'
-              : latest.status === 'claimed' ? 'CONTROLLER_RELAY_CLAIMED_ROUND_UNCLOSED' : 'CONTROLLER_RELAY_ROUND_UNCLOSED',
-        nextRecoveryAt: undefined,
-        claimedAt: undefined,
-        ...(blockedReason ? { blockedReason } : { blockedReason: undefined }),
-        updatedAt: at,
-      };
-      writeControlPlaneRecord(options.controllerHome, {
-        namespace: NAMESPACE,
-        scope: options.repoId,
-        key: latest.originWorkId,
-        schemaVersion: SCHEMA_VERSION,
-        value: recovered,
-        action: blockedReason ? 'controller_round_relay_stalled_blocked' : 'controller_round_relay_stalled_recovery_begin',
-        expectedRevision: currentRecord.revision,
-      });
-      return blockedReason ? undefined : recovered;
-    });
-    if (next) claimed.push(next);
-  }
-  return claimed;
-}
-
-export function buildControllerRoundRelayPrompt(
-  options: ControllerRoundRelayStoreOptions,
-  record: ControllerRoundRelayRecord,
-  promptOptions: { exactOriginWork?: boolean } = {},
-): string {
-  const requirement = requirementForRelay(options, record.requirementId);
-  const relevantWorks = relevantWork(options, record);
-  const works = relevantWorks.slice(0, 8);
-  const workIds = new Set(relevantWorks.map((work) => work.workId));
-  const handoffs = listHandoffItems({ controllerHome: options.controllerHome, repoId: options.repoId, status: 'active', limit: 100 })
-    .filter((handoff) => !handoff.workId || workIds.has(handoff.workId))
-    .slice(0, 8);
-  const requirementLine = requirement
-    ? `Requirement ${requirement.requirementId}: state=${requirement.state}; outcome=${requirement.outcomeStatement.slice(0, 800)}`
-    : `No durable Requirement is bound; semantic relay scope is ${record.relayScopeId}.`;
-  const workLines = works.length > 0
-    ? works.map((work) => `- ${work.workId}: status=${work.status}; phase=${work.phase}; updated=${work.updatedAt}; objective=${work.objective.slice(0, 500)}`).join('\n')
-    : '- no linked Work snapshot found';
-  const handoffLines = handoffs.length > 0
-    ? handoffs.map((handoff) => `- ${handoff.id}: status=${handoff.status}; work=${handoff.workId ?? 'repo'}; ${handoff.title}; reason=${handoff.reason.slice(0, 300)}`).join('\n')
-    : '- no active linked Handoff';
-  return [
-    `Continue Forge Requirement/Goal relay ${record.relayScopeId} in repo ${record.repoId}.`,
-    'This is a new ChatGPT controller round. First reread the latest Forge Requirement/Work/Handoff state; the snapshot below is only a launch hint.',
-    requirementLine,
-    `Linked Work snapshot:\n${workLines}`,
-    `Active Handoff snapshot:\n${handoffLines}`,
-    promptOptions.exactOriginWork
-      ? `This is a Work-bound scheduled round. Claim and advance only origin Work ${record.originWorkId}. Do not select, start, delegate, or resume a sibling Work, create another schedule, or widen scope. If this Work cannot safely advance after one bounded diagnostic or repair attempt, record the exact evidence, submit wait or wait_for_user, release ownership, and end the round.`
-      : `Previous relay origin Work: ${record.originWorkId}. Do not assume the next action must continue that Work; select, start, or claim the appropriate Work from the latest semantic state.`,
-    `Mechanical relay budget: round=${record.roundCount}/${record.maxRounds}; repeated_state=${record.repeatedStateCount}/${record.maxRepeatedState}; consecutive_failures=${record.consecutiveFailures}/${record.maxFailures}.`,
-    record.authorityId
-      ? `This round's durable controller authority is controller_authority_id=${record.authorityId}. Pass this exact controller_authority_id together with relay_scope_id=${record.relayScopeId} on controller_claim, continue, finalize, stop, and controller_release. The opaque authority survives MCP transport/Runtime rotation within this round and rotates before a successor round; never substitute another Work/conversation's authority.`
-      : `This is a legacy relay record without a controller authority capability. Forge permits only the exact already-claimed MCP/controller epoch to finish it; a replacement transport must reopen/recover the round before mutating Work lifecycle.`,
-    ...(['CONTROLLER_RELAY_ROUND_UNCLOSED', 'CONTROLLER_RELAY_CLAIMED_ROUND_UNCLOSED'].includes(record.lastError ?? '')
-      ? ['The previous ChatGPT round did not submit an explicit disposition before its liveness grace elapsed. Forge is only recovering liveness: reread durable state, make the semantic decision in ChatGPT, and close this round explicitly.']
-      : []),
-    `If the overall Requirement/Goal still needs another controller round, explicitly submit rh_work controller_disposition=continue_immediately with relay_scope_id=${record.relayScopeId} before releasing the Work you own. Otherwise use wait, wait_for_user with an active Handoff, or goal_complete. If a frozen client schema does not expose controller_disposition, use rh_work operation=repair with capability_id=controller.disposition:<disposition>:${record.relayScopeId}; Forge maps that compatibility call to the same canonical disposition path and fences it identically.`,
-    'Forge must not infer the semantic next step. Existing Work ownership, Handoff authority, and external-effect authorization remain authoritative; claim the exact Work before any mutation.',
-  ].join('\n');
-}
+/** @deprecated Kernel V2 compatibility shim. ControllerRound authority is packages/kernel/controller; MCP compatibility is adapters/mcp. */
+export * from '../../../../packages/kernel/controller/application/controller-round-service';
+export * from '../../../../adapters/mcp/controller-round-compatibility';