ethagent 2.1.1 → 2.3.0

package/src/identity/hub/{flows/custody/custodyFlowTypes.ts → custody/types.ts}

@@ -1,10 +1,10 @@
 import type React from 'react'
 import type { Address } from 'viem'
-import type { EthagentConfig, EthagentIdentity } from '../../../../storage/config.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { EffectCallbacks } from '../../effects/types.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import type { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
+import type { EthagentConfig, EthagentIdentity } from '../../../storage/config.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
 
 export type GuardOwnership = (
   identity: EthagentIdentity,
@@ -35,7 +35,7 @@ export interface CustodyFlowDeps {
 export interface CustodyFlow {
   beginVaultDeposit: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
   beginVaultUnwrap: (currentStep: Step, returnTo: Step, profileUpdates: ProfileUpdates) => void
-  beginWithdrawToken: (currentStep: Step, returnTo: Step) => void
+  beginWithdrawToken: (currentStep: Step, returnTo: Step, returnContext?: 'ens' | 'simple-exit') => void
   beginReturnToVault: (currentStep: Step, returnTo: Step, vaultAddress: Address) => void
   renderCustodyStep: () => React.ReactElement | null
   renderRebackupSubtitle: (

package/src/identity/hub/{flows/custody/custodyFlowEffects.ts → custody/useCustodyEffects.ts}

@@ -1,16 +1,16 @@
 import { useEffect } from 'react'
-import { createErc8004PublicClient } from '../../../registry/erc8004.js'
-import { confirmAgentInVault } from '../../../registry/vault.js'
-import { invalidateOwnershipCache } from '../../reconciliation/index.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
-import type { CustodyFlowDeps } from './custodyFlowTypes.js'
-import { humanOwnerAddress } from './custodyFlowHelpers.js'
+import { createErc8004PublicClient } from '../../registry/erc8004.js'
+import { confirmAgentInVault } from '../../registry/vault.js'
+import { invalidateOwnershipCache } from '../shared/reconciliation/index.js'
+import type { ProfileUpdates } from '../identityHubReducer.js'
+import type { CustodyFlowDeps } from './types.js'
+import { humanOwnerAddress } from './helpers.js'
 import {
   runVaultDeployTransaction,
   runVaultDepositTransaction,
   runVaultUnwrapTransaction,
   runVaultWithdrawTransaction,
-} from './custodyEffects.js'
+} from './transactions.js'
 
 export function useCustodyTransactionEffects({
   step,

package/src/identity/hub/{flows/custody → custody}/useCustodyFlow.tsx

@@ -1,10 +1,10 @@
-import type { CustodyFlow, CustodyFlowDeps } from './custodyFlowTypes.js'
-import { createCustodyFlowActions } from './custodyFlowActions.js'
-import { useCustodyTransactionEffects } from './custodyFlowEffects.js'
+import type { CustodyFlow, CustodyFlowDeps } from './types.js'
+import { createCustodyFlowActions } from './actions.js'
+import { useCustodyTransactionEffects } from './useCustodyEffects.js'
 import {
   renderCustodyStep,
   renderRebackupSubtitle,
-} from './custodyFlowRoutes.js'
+} from './routes.js'
 
 export function useCustodyFlow(deps: CustodyFlowDeps): CustodyFlow {
   useCustodyTransactionEffects(deps)
@@ -22,4 +22,4 @@ export type {
   CustodyFlowDeps,
   GuardOwnership,
   TriggerRebackup,
-} from './custodyFlowTypes.js'
+} from './types.js'

package/src/identity/hub/ens/EnsEditAdvancedScreens.tsx

@@ -0,0 +1,241 @@
+import React from 'react'
+import { Box, Text } from 'ink'
+import { type Address } from 'viem'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
+import {
+  normalizeEthDomain,
+  sanitizeSubdomainPrefix,
+} from '../../ens/ensLookup.js'
+import { isRootEthName } from '../../ens/ensAutomation.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import {
+  type CustodyMode,
+} from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
+import {
+  footerHint,
+} from './EnsEditShared.js'
+import { IdentitySummary } from '../shared/components/IdentitySummary.js'
+import {
+  EnsSetupBlockedScreen,
+  EnsSetupReviewScreen,
+} from './EnsEditReviewScreens.js'
+import { EscCancel } from './EnsEditRunners.js'
+import type {
+  EnsEditProps,
+  EnsPhase,
+} from './types.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
+
+type AdvancedScreenProps = {
+  phase: EnsPhase
+  identity: EnsEditProps['identity']
+  ownerAddress: Address
+  agentId: EnsEditProps['identity']['agentId']
+  reconciliation: AgentReconciliation
+  savedSubdomainLabel: string
+  agentNameSuggestion: string
+  currentEnsName: string
+  savedCustodyMode: CustodyMode | undefined
+  registry: Erc8004RegistryConfig
+  setPhase: (phase: EnsPhase) => void
+  runDiscovery: (mode?: 'simple' | 'advanced') => void
+  runAdvancedSubdomainCheck: (rootName: string, label: string) => void
+  onEnsSetup: EnsEditProps['onEnsSetup']
+  onEnsLink: EnsEditProps['onEnsLink']
+  onWithdrawToken: () => void
+}
+
+export function renderAdvancedEnsPhase({
+  phase,
+  identity,
+  ownerAddress,
+  agentId,
+  reconciliation,
+  savedSubdomainLabel,
+  agentNameSuggestion,
+  currentEnsName,
+  savedCustodyMode,
+  registry,
+  setPhase,
+  runDiscovery,
+  runAdvancedSubdomainCheck,
+  onEnsSetup,
+  onEnsLink,
+  onWithdrawToken,
+}: AdvancedScreenProps): React.ReactNode | null {
+  if (phase.kind === 'advanced-transfer-check') {
+    type TransferCheckAction = 'continue' | 'withdraw' | 'back'
+    const custody = reconciliation.custody
+    const tokenInVault = custody === 'advanced' || custody === 'mid-flow-uri-pending'
+    const tokenInOwnerWallet = custody === 'simple' || custody === 'withdrawn'
+    const probePending = custody === 'unknown' && reconciliation.rpc !== 'failing'
+    const probeFailed = reconciliation.rpc === 'failing'
+
+    const options: Array<{ value: TransferCheckAction; role?: 'section' | 'utility'; label: string; hint?: string }> = []
+    options.push({ value: 'continue', role: 'section', label: 'Setup' })
+    if (tokenInOwnerWallet) {
+      options.push({
+        value: 'continue',
+        label: 'Continue ENS Setup',
+        hint: 'Owner wallet holds this token onchain.',
+      })
+    } else if (tokenInVault) {
+      options.push({
+        value: 'withdraw',
+        label: 'Withdraw Token',
+        hint: 'Pull token out to sign ENS records. Redeposit to the Vault any time after.',
+      })
+    } else if (probePending) {
+      options.push({
+        value: 'continue',
+        label: 'Checking onchain state…',
+        hint: 'Try again in a moment.',
+      })
+    } else if (probeFailed) {
+      options.push({
+        value: 'continue',
+        label: 'Onchain check unavailable',
+        hint: 'RPC unreachable. Resolve connectivity, then retry.',
+      })
+    } else {
+      options.push({
+        value: 'continue',
+        label: 'Token Owner Unknown',
+        hint: 'Try again in a moment.',
+      })
+    }
+    options.push({ value: 'back', role: 'section', label: 'Navigation' })
+    options.push({ value: 'back', label: 'Back', hint: 'Return to setup type', role: 'utility' })
+
+    return (
+      <Surface
+        title="Token Custody Check"
+        subtitle="ENS setup continues only after the owner wallet holds this token onchain."
+        footer={footerHint('enter select · esc back')}
+      >
+        <Box marginTop={1}>
+          <Select<TransferCheckAction>
+            options={options}
+            hintLayout="inline"
+            onSubmit={choice => {
+              if (choice === 'withdraw') {
+                onWithdrawToken()
+                return
+              }
+              if (choice === 'continue' && tokenInOwnerWallet) {
+                runDiscovery('advanced')
+                return
+              }
+              if (choice === 'back') {
+                return setPhase({ kind: 'mode-select' })
+              }
+            }}
+            onCancel={() => setPhase({ kind: 'mode-select' })}
+          />
+        </Box>
+      </Surface>
+    )
+  }
+
+  if (phase.kind === 'advanced-root-check') {
+    return (
+      <Surface
+        title="Checking ENS and Token Ownership"
+        subtitle={`Verifying the connected wallet manages ${phase.rootName} and owns the ERC-8004 token.`}
+        footer={footerHint('esc back')}
+      >
+        <Box marginTop={1}>
+          <Text color={theme.textSubtle}>Reading from Ethereum mainnet...</Text>
+        </Box>
+      </Surface>
+    )
+  }
+
+  if (phase.kind === 'advanced-subdomain') {
+    const rootName = phase.rootName
+    return (
+      <Surface
+        title="Agent Subdomain"
+        subtitle={`Pick a subdomain label under ${rootName}.`}
+        footer={footerHint('enter next · esc back')}
+      >
+        {phase.error ? (
+          <Box flexDirection="column">
+            <Text color={theme.accentError}>{phase.error}</Text>
+          </Box>
+        ) : null}
+        <Box marginTop={1}>
+          <TextInput
+            key={`advanced-subdomain-${rootName}`}
+            initialValue={phase.label || savedSubdomainLabel || ''}
+            placeholder={agentNameSuggestion || 'agent-name'}
+            validate={value => {
+              const trimmed = value.trim()
+              const label = sanitizeSubdomainPrefix(trimmed)
+              if (!label) return 'Enter a subdomain label'
+              if (trimmed.includes('.')) return 'Enter only the subdomain label'
+              if (label !== trimmed.toLowerCase()) return 'Use lowercase letters, numbers, and hyphens only'
+              return null
+            }}
+            onSubmit={value => runAdvancedSubdomainCheck(rootName, sanitizeSubdomainPrefix(value))}
+            onCancel={() => setPhase({ kind: 'pick-parent', mode: 'advanced' })}
+          />
+        </Box>
+      </Surface>
+    )
+  }
+
+  if (phase.kind === 'advanced-subdomain-check') {
+    return (
+      <Surface
+        title="Check Agent Subdomain"
+        subtitle={`Verifying ${phase.label}.${phase.rootName} on Ethereum Mainnet.`}
+        footer={footerHint('esc back')}
+      >
+        <Box marginTop={1}>
+          <Spinner label="checking agent subdomain..." />
+        </Box>
+        <EscCancel onCancel={() => setPhase({ kind: 'advanced-subdomain', rootName: phase.rootName, label: phase.label })} />
+      </Surface>
+    )
+  }
+
+  if (phase.kind === 'advanced-review') {
+    return (
+      <EnsSetupReviewScreen
+        setup={phase.setup}
+        currentEnsName={currentEnsName}
+        currentMode={savedCustodyMode}
+        registry={registry}
+        onBegin={() => {
+          if (phase.setup.txCount > 0) {
+            onEnsSetup(phase.setup)
+            return
+          }
+          onEnsLink(phase.setup.fullName, {
+            mode: 'advanced',
+            ownerAddress: phase.setup.ownerAddress,
+          })
+        }}
+        onBack={() => setPhase({ kind: 'advanced-subdomain', rootName: phase.setup.rootName, label: phase.setup.label })}
+      />
+    )
+  }
+
+  if (phase.kind === 'advanced-manual') {
+    return (
+      <EnsSetupBlockedScreen
+        fallback={phase.fallback}
+        onCheckAgain={() => runAdvancedSubdomainCheck(phase.fallback.rootName, phase.fallback.label)}
+        onBack={() => setPhase({ kind: 'advanced-subdomain', rootName: phase.fallback.rootName, label: phase.fallback.label })}
+      />
+    )
+  }
+
+  return null
+}

package/src/identity/hub/{flows/ens → ens}/EnsEditFlow.tsx

@@ -1,35 +1,34 @@
 import React from 'react'
 import { getAddress, type Address } from 'viem'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import { requestBrowserWalletAccount } from '../../../wallet/browserWallet.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
   AGENT_RECORD_READ_KEY_LIST,
   buildAgentEnsRecords,
   diffRecords,
   recordsFromTextMap,
-} from '../../../ens/agentRecords.js'
+} from '../../ens/agentRecords.js'
 import {
   discoverOwnedEnsNameDetails,
   readEthagentTextRecords,
   sanitizeSubdomainPrefix,
   splitSubdomainName,
   validateAgentEnsLink,
-} from '../../../ens/ensLookup.js'
+} from '../../ens/ensLookup.js'
 import {
   preflightDeleteSubdomain,
   preflightEnsRoot,
   preflightEnsSetup,
-} from '../../../ens/ensAutomation.js'
+} from '../../ens/ensAutomation.js'
 import {
   readCustodyMode,
   readIdentityStateString,
-} from '../../model/custody.js'
+} from '../custody/state.js'
 import {
   discoveryErrorMessage,
   emptyAgentEnsRecords,
   networkLabelForChainId,
   type EnsLinkOptions,
-} from './ensEditCopy.js'
+} from './editCopy.js'
 import { rootErrorMessage } from './EnsEditShared.js'
 import { renderAdvancedEnsPhase } from './EnsEditAdvancedScreens.js'
 import { renderEnsMaintenancePhase } from './EnsEditMaintenanceScreens.js'
@@ -38,18 +37,20 @@ import type {
   DiscoveryState,
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
 
 export type { EnsLinkOptions }
 
 export const EnsEditFlow: React.FC<EnsEditProps> = ({
   identity,
   registry,
+  reconciliation,
   onEnsLink,
   onEnsUnlink,
   onEnsRecordsUpdate,
   onEnsSetup,
   onManageOperatorWalletAccess,
+  onWithdrawToken,
   initialView,
   onBack,
 }) => {
@@ -59,7 +60,6 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
   const savedRootName = currentEnsParts?.parent ?? ''
   const savedSubdomainLabel = currentEnsParts?.label ?? ''
   const agentNameSuggestion = sanitizeSubdomainPrefix(readIdentityStateString(identity.state, 'name'))
-  const agentCardCid = identity.publicSkills?.agentCardCid
   const savedCustodyMode = readCustodyMode(identity.state)
   const savedOwnerAddress = readIdentityStateString(identity.state, 'ownerAddress')
   const savedOperator = readIdentityStateString(identity.state, 'activeOperatorAddress')
@@ -76,13 +76,13 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
   const [operatorWalletSession, setOperatorWalletSession] = React.useState<BrowserWalletReady | null>(null)
   const discoveryControllerRef = React.useRef<AbortController | null>(null)
 
-  const runDiscovery = React.useCallback(() => {
+  const runDiscovery = React.useCallback((targetMode: 'simple' | 'advanced' = 'simple') => {
     discoveryControllerRef.current?.abort()
     const controller = new AbortController()
     discoveryControllerRef.current = controller
     setDiscovery({ status: 'loading' })
     setDiscoveryStartedAt(Date.now())
-    setPhase({ kind: 'discovering' })
+    setPhase({ kind: 'discovering', mode: targetMode })
     discoverOwnedEnsNameDetails(ownerAddress, {
       signal: controller.signal,
       budgetMs: 30_000,
@@ -93,7 +93,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
         if (discoveryControllerRef.current === controller) discoveryControllerRef.current = null
         if (result.status === 'error') {
           setDiscovery({ status: 'error', message: discoveryErrorMessage(result.errors), names: [] })
-          setPhase({ kind: 'pick-parent' })
+          setPhase({ kind: 'pick-parent', mode: targetMode })
           return
         }
         setDiscovery({
@@ -101,13 +101,13 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
           names: result.names,
           ...(result.status === 'partial' ? { warning: 'Some ENS lookup sources failed; showing root names found so far.' } : {}),
         })
-        setPhase({ kind: 'pick-parent' })
+        setPhase({ kind: 'pick-parent', mode: targetMode })
       })
       .catch((err: unknown) => {
         if (controller.signal.aborted) return
         if (discoveryControllerRef.current === controller) discoveryControllerRef.current = null
         setDiscovery({ status: 'error', message: err instanceof Error ? err.message : String(err), names: [] })
-        setPhase({ kind: 'pick-parent' })
+        setPhase({ kind: 'pick-parent', mode: targetMode })
       })
   }, [ownerAddress])
 
@@ -145,7 +145,6 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
         chainId: registry.chainId,
         identityRegistryAddress: registry.identityRegistryAddress,
         agentId: identity.agentId,
-        agentCardCid,
       })
       const recordsDiff = diffRecords(current, next)
       if (mode === 'simple' && !validation.ok && validation.reason === 'no-owner') {
@@ -157,36 +156,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
       setValidationError(err instanceof Error ? err.message : String(err))
       setPhase({ kind: 'pick-parent' })
     }
-  }, [ownerAddress, registry, identity.agentId, agentCardCid])
-
-  const runAdvancedPreflight = React.useCallback((
-    rootName: string,
-    label: string,
-    operatorWallet: Address,
-  ): void => {
-    setPhase({ kind: 'advanced-preflight', rootName, label, operatorWallet })
-    preflightEnsSetup({
-      rootName,
-      label,
-      operatorAddress: operatorWallet,
-      registry,
-      agentId: identity.agentId,
-      agentCardCid,
-    }).then(result => {
-      if (result.ok) {
-        setPhase({ kind: 'advanced-review', setup: result.setup })
-        return
-      }
-      setPhase({ kind: 'advanced-manual', fallback: result.fallback })
-    }).catch((err: unknown) => {
-      setPhase({
-        kind: 'advanced-operator-wallet',
-        rootName,
-        label,
-        error: err instanceof Error ? err.message : String(err),
-      })
-    })
-  }, [agentCardCid, identity.agentId, registry])
+  }, [ownerAddress, registry, identity.agentId])
 
   const runAdvancedRootCheck = React.useCallback((rootName: string): void => {
     setPhase({ kind: 'advanced-root-check', rootName })
@@ -197,12 +167,12 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
       agentId: identity.agentId,
     }).then(result => {
       if (result.ok) {
-        setPhase({ kind: 'advanced-subdomain', rootName, label: savedSubdomainLabel || agentNameSuggestion })
+        setPhase({ kind: 'advanced-subdomain', rootName, label: savedSubdomainLabel })
         return
       }
-      setPhase({ kind: 'advanced-root', rootName, error: rootErrorMessage(result.reason, result.detail, rootName) })
+      setPhase({ kind: 'pick-parent', mode: 'advanced', error: rootErrorMessage(result.reason, result.detail, rootName) })
     }).catch((err: unknown) => {
-      setPhase({ kind: 'advanced-root', rootName, error: err instanceof Error ? err.message : String(err) })
+      setPhase({ kind: 'pick-parent', mode: 'advanced', error: err instanceof Error ? err.message : String(err) })
     })
   }, [agentNameSuggestion, identity.agentId, ownerAddress, registry, savedSubdomainLabel])
 
@@ -215,15 +185,9 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
       allowSameOwnerOperator: true,
       registry,
       agentId: identity.agentId,
-      agentCardCid,
     }).then(result => {
       if (result.ok) {
-        setPhase({
-          kind: 'advanced-operator-wallet',
-          rootName: result.setup.rootName,
-          label: result.setup.label,
-          registryAction: result.setup.registryAction,
-        })
+        setPhase({ kind: 'advanced-review', setup: result.setup })
         return
       }
       setPhase({ kind: 'advanced-manual', fallback: result.fallback })
@@ -235,7 +199,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
         error: err instanceof Error ? err.message : String(err),
       })
     })
-  }, [agentCardCid, identity.agentId, ownerAddress, registry])
+  }, [identity.agentId, ownerAddress, registry])
 
   const runSimpleCreatePreflight = React.useCallback((fullName: string): void => {
     const parts = splitSubdomainName(fullName)
@@ -253,7 +217,6 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
       allowSameOwnerOperator: true,
       registry,
       agentId: identity.agentId,
-      agentCardCid,
     }).then(result => {
       if (result.ok) {
         setPhase({ kind: 'simple-create-review', setup: result.setup })
@@ -268,23 +231,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
         error: err instanceof Error ? err.message : String(err),
       })
     })
-  }, [agentCardCid, identity.agentId, ownerAddress, registry])
-
-  const connectOperatorWallet = React.useCallback((rootName: string, label: string): void => {
-    setOperatorWalletSession(null)
-    setPhase({ kind: 'advanced-operator-wallet-connecting', rootName, label })
-    requestBrowserWalletAccount({
-      purpose: 'connect-operator-wallet',
-      onReady: ready => setOperatorWalletSession(ready),
-    }).then(wallet => {
-      const operatorWallet = getAddress(wallet.account)
-      setOperatorWalletSession(null)
-      runAdvancedPreflight(rootName, label, operatorWallet)
-    }).catch((err: unknown) => {
-      setOperatorWalletSession(null)
-      setPhase({ kind: 'advanced-operator-wallet', rootName, label, error: err instanceof Error ? err.message : String(err) })
-    })
-  }, [runAdvancedPreflight])
+  }, [identity.agentId, ownerAddress, registry])
 
   const runDeleteSubdomainPreflight = React.useCallback((fullName: string): void => {
     setValidationError(null)
@@ -323,6 +270,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
 
   const maintenanceScreen = renderEnsMaintenancePhase({
     phase,
+    identity,
     currentEnsName,
     currentEnsCanDelete: Boolean(currentEnsParts),
     savedCustodyMode,
@@ -340,30 +288,26 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     onBack,
     onEnsUnlink,
     onEnsRecordsUpdate,
-    onManageOperatorWalletAccess,
   })
   if (maintenanceScreen) return maintenanceScreen
 
   const advancedScreen = renderAdvancedEnsPhase({
     phase,
+    identity,
     ownerAddress,
     agentId: identity.agentId,
-    savedOwnerAddress,
-    savedOperator,
-    savedRootName,
+    reconciliation,
     savedSubdomainLabel,
     agentNameSuggestion,
     currentEnsName,
     savedCustodyMode,
     registry,
-    operatorWalletSession,
     setPhase,
-    connectOperatorWallet,
-    runAdvancedRootCheck,
+    runDiscovery,
     runAdvancedSubdomainCheck,
-    runAdvancedPreflight,
     onEnsSetup,
     onEnsLink,
+    onWithdrawToken,
   })
   if (advancedScreen) return advancedScreen
 
@@ -384,6 +328,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     cancelDiscoveryToModeSelect,
     runDiscovery,
     runValidation,
+    runAdvancedRootCheck,
     backToSimpleSubdomain,
     runSimpleCreatePreflight,
     onEnsSetup,