ethagent 2.1.1 → 2.2.0

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

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { getAddress, type Address } from 'viem'
+import { type Address } from 'viem'
 import { Surface } from '../../../../ui/Surface.js'
 import { Select } from '../../../../ui/Select.js'
 import { TextInput } from '../../../../ui/TextInput.js'
@@ -12,17 +12,14 @@ import {
 } from '../../../ens/ensLookup.js'
 import { isRootEthName } from '../../../ens/ensAutomation.js'
 import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
 import {
   type CustodyMode,
 } from '../../model/custody.js'
 import { shortAddress } from '../../model/format.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
-import { advancedSubdomainStatusText } from './ensEditCopy.js'
 import {
-  EnsSetupRow,
   footerHint,
 } from './EnsEditShared.js'
+import { IdentitySummary } from '../../components/IdentitySummary.js'
 import {
   EnsSetupBlockedScreen,
   EnsSetupReviewScreen,
@@ -32,109 +29,112 @@ import type {
   EnsEditProps,
   EnsPhase,
 } from './ensEditTypes.js'
+import type { AgentReconciliation } from '../../reconciliation/index.js'
 
 type AdvancedScreenProps = {
   phase: EnsPhase
+  identity: EnsEditProps['identity']
   ownerAddress: Address
   agentId: EnsEditProps['identity']['agentId']
-  savedOwnerAddress: string
-  savedOperator: string
-  savedRootName: string
+  reconciliation: AgentReconciliation
   savedSubdomainLabel: string
   agentNameSuggestion: string
   currentEnsName: string
   savedCustodyMode: CustodyMode | undefined
   registry: Erc8004RegistryConfig
-  operatorWalletSession: BrowserWalletReady | null
   setPhase: (phase: EnsPhase) => void
-  connectOperatorWallet: (rootName: string, label: string) => void
-  runAdvancedRootCheck: (rootName: string) => void
+  runDiscovery: (mode?: 'simple' | 'advanced') => void
   runAdvancedSubdomainCheck: (rootName: string, label: string) => void
-  runAdvancedPreflight: (rootName: string, label: string, operatorWallet: Address) => void
   onEnsSetup: EnsEditProps['onEnsSetup']
   onEnsLink: EnsEditProps['onEnsLink']
+  onWithdrawToken: () => void
 }
 
 export function renderAdvancedEnsPhase({
   phase,
+  identity,
   ownerAddress,
   agentId,
-  savedOwnerAddress,
-  savedOperator,
-  savedRootName,
+  reconciliation,
   savedSubdomainLabel,
   agentNameSuggestion,
   currentEnsName,
   savedCustodyMode,
   registry,
-  operatorWalletSession,
   setPhase,
-  connectOperatorWallet,
-  runAdvancedRootCheck,
+  runDiscovery,
   runAdvancedSubdomainCheck,
-  runAdvancedPreflight,
   onEnsSetup,
   onEnsLink,
+  onWithdrawToken,
 }: AdvancedScreenProps): React.ReactNode | null {
   if (phase.kind === 'advanced-transfer-check') {
-    type TransferCheckAction = 'skip' | 'back'
+    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."
+        subtitle="ENS setup continues only after the owner wallet holds this token onchain."
         footer={footerHint('enter select · esc back')}
       >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>Current token owner: <Text color={theme.text}>{shortAddress(ownerAddress)}</Text></Text>
-          <Box marginTop={1} flexDirection="column">
-            <EnsSetupRow label="Owner wallet" value={`Holds ERC-8004 token #${agentId ?? 'unknown'} and signs ENS records.`} />
-            <EnsSetupRow label="Operator wallet" value="Restores snapshots; never controls the token." />
-            <EnsSetupRow label="Token moves" value="If the token is in the Vault, withdraw it first from Custody Mode." />
-          </Box>
-        </Box>
         <Box marginTop={1}>
           <Select<TransferCheckAction>
-            options={[
-              { value: 'skip', role: 'section', label: 'Setup' },
-              { value: 'skip', label: 'Continue ENS Setup', hint: 'The connected wallet is already the owner wallet' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back', hint: 'Return to setup type', role: 'utility' },
-            ]}
+            options={options}
             hintLayout="inline"
             onSubmit={choice => {
-              if (choice === 'skip') return setPhase({ kind: 'advanced-root', rootName: savedRootName })
-              return setPhase({ kind: 'mode-select' })
-            }}
-            onCancel={() => setPhase({ kind: 'mode-select' })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'advanced-root') {
-    return (
-      <Surface
-        title="Root ENS"
-        footer={footerHint('enter next · esc back')}
-      >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>Enter the parent .eth name. The owner wallet must manage it and own this ERC-8004 token.</Text>
-          {savedOwnerAddress ? <Text color={theme.dim}>Saved owner wallet: <Text color={theme.text}>{shortAddress(savedOwnerAddress)}</Text></Text> : null}
-          {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
-        </Box>
-        <Box marginTop={1}>
-          <TextInput
-            key="advanced-root"
-            initialValue={phase.rootName || savedRootName}
-            placeholder="name.eth"
-            validate={value => {
-              const root = normalizeEthDomain(value)
-              if (!root) return 'Enter a parent .eth name'
-              if (!isRootEthName(root)) return 'Enter the parent .eth name, e.g. name.eth'
-              return null
+              if (choice === 'withdraw') {
+                onWithdrawToken()
+                return
+              }
+              if (choice === 'continue' && tokenInOwnerWallet) {
+                runDiscovery('advanced')
+                return
+              }
+              if (choice === 'back') {
+                return setPhase({ kind: 'mode-select' })
+              }
             }}
-            onSubmit={value => runAdvancedRootCheck(normalizeEthDomain(value))}
             onCancel={() => setPhase({ kind: 'mode-select' })}
           />
         </Box>
@@ -161,18 +161,19 @@ export function renderAdvancedEnsPhase({
     return (
       <Surface
         title="Agent Subdomain"
+        subtitle={`Pick a subdomain label under ${rootName}.`}
         footer={footerHint('enter next · esc back')}
       >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>Create one subdomain for this agent only. Root .eth names stay parent names.</Text>
-          <Text color={theme.dim}>Parent: <Text color={theme.text}>{rootName}</Text></Text>
-          {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
-        </Box>
+        {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 || agentNameSuggestion}
-            placeholder="agent-name"
+            initialValue={phase.label || savedSubdomainLabel || ''}
+            placeholder={agentNameSuggestion || 'agent-name'}
             validate={value => {
               const trimmed = value.trim()
               const label = sanitizeSubdomainPrefix(trimmed)
@@ -182,7 +183,7 @@ export function renderAdvancedEnsPhase({
               return null
             }}
             onSubmit={value => runAdvancedSubdomainCheck(rootName, sanitizeSubdomainPrefix(value))}
-            onCancel={() => setPhase({ kind: 'advanced-root', rootName })}
+            onCancel={() => setPhase({ kind: 'pick-parent', mode: 'advanced' })}
           />
         </Box>
       </Surface>
@@ -193,12 +194,9 @@ export function renderAdvancedEnsPhase({
     return (
       <Surface
         title="Check Agent Subdomain"
+        subtitle={`Verifying ${phase.label}.${phase.rootName} on Ethereum Mainnet.`}
         footer={footerHint('esc back')}
       >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>Agent ENS: <Text color={theme.text}>{phase.label}.{phase.rootName}</Text></Text>
-          <Text color={theme.dim}>Checking whether the subdomain is ready or needs the owner wallet to create it.</Text>
-        </Box>
         <Box marginTop={1}>
           <Spinner label="checking agent subdomain..." />
         </Box>
@@ -207,98 +205,6 @@ export function renderAdvancedEnsPhase({
     )
   }
 
-  if (phase.kind === 'advanced-operator-wallet') {
-    const { rootName, label } = phase
-    return (
-      <Surface
-        title="Operator Wallet"
-        footer={footerHint('enter select · esc back')}
-      >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>Agent ENS: <Text color={theme.text}>{label}.{rootName}</Text></Text>
-          {phase.registryAction ? <Text color={theme.dim}>{advancedSubdomainStatusText(phase.registryAction)}</Text> : null}
-          <Text color={theme.dim}>Choose the operator wallet for snapshot restore access and onchain ERC-8004 URI rotation via the Vault.</Text>
-          <Text color={theme.dim}>The operator wallet has no authority over this ENS subdomain or any token transfer; the owner wallet is the sole signer for both.</Text>
-          <Text color={theme.dim}>We only read the operator's address here so it can be added to the snapshot envelope and vault operator list later.</Text>
-          {savedOperator ? <Text color={theme.dim}>Saved operator wallet: <Text color={theme.text}>{shortAddress(savedOperator)}</Text></Text> : null}
-          {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
-        </Box>
-        <Box marginTop={1}>
-          <Select<'connect' | 'enter' | 'back'>
-            options={[
-              { value: 'connect', role: 'section', label: 'Operator Wallet' },
-              { value: 'connect', label: 'Connect Wallet', hint: 'Connect the wallet that will be the operator' },
-              { value: 'enter', label: 'Enter Wallet Address', hint: 'Paste the operator wallet address' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back', hint: 'Return to subdomain', role: 'utility' },
-            ]}
-            hintLayout="inline"
-            onSubmit={choice => {
-              if (choice === 'connect') return connectOperatorWallet(rootName, label)
-              if (choice === 'enter') return setPhase({ kind: 'advanced-operator-wallet-manual', rootName, label })
-              return setPhase({ kind: 'advanced-subdomain', rootName, label })
-            }}
-            onCancel={() => setPhase({ kind: 'advanced-subdomain', rootName, label })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'advanced-operator-wallet-manual') {
-    const { rootName, label } = phase
-    return (
-      <Surface
-        title="Operator Wallet"
-        footer={footerHint('enter next · esc back')}
-      >
-        <Box flexDirection="column">
-          <Text color={theme.dim}>The operator wallet is saved in ERC-8004 metadata for lookup and restore access.</Text>
-          <Text color={theme.dim}>It gets no token approval or transfer right.</Text>
-          <Text color={theme.dim}>Owner wallet signs the ENS and ERC-8004 transactions after this address is checked.</Text>
-          <Text color={theme.dim}>Any future token move still starts with Prepare Token Transfer.</Text>
-          {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
-        </Box>
-        <Box marginTop={1}>
-          <TextInput
-            key="advanced-operator-wallet-manual"
-            initialValue={savedOperator}
-            placeholder="0x..."
-            validate={value => /^0x[0-9a-fA-F]{40}$/.test(value.trim()) ? null : 'enter a valid 0x address'}
-            onSubmit={value => runAdvancedPreflight(rootName, label, getAddress(value.trim()))}
-            onCancel={() => setPhase({ kind: 'advanced-operator-wallet', rootName, label })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'advanced-operator-wallet-connecting') {
-    return (
-      <WalletApprovalScreen
-        title="Connect Wallet"
-        subtitle="Connect the operator wallet only to read its address for ERC-8004 metadata. It does not sign or submit a transaction."
-        walletSession={operatorWalletSession}
-        label="waiting for wallet connection..."
-        onCancel={() => setPhase({ kind: 'advanced-operator-wallet', rootName: phase.rootName, label: phase.label })}
-      />
-    )
-  }
-
-  if (phase.kind === 'advanced-preflight') {
-    return (
-      <Surface
-        title="Check ENS Setup"
-        footer={footerHint('esc back')}
-      >
-        <Box marginTop={1}>
-          <Spinner label="checking ens setup..." />
-        </Box>
-        <EscCancel onCancel={() => setPhase({ kind: 'advanced-operator-wallet', rootName: phase.rootName, label: phase.label })} />
-      </Surface>
-    )
-  }
-
   if (phase.kind === 'advanced-review') {
     return (
       <EnsSetupReviewScreen
@@ -314,10 +220,9 @@ export function renderAdvancedEnsPhase({
           onEnsLink(phase.setup.fullName, {
             mode: 'advanced',
             ownerAddress: phase.setup.ownerAddress,
-            operatorWallet: phase.setup.operatorAddress,
           })
         }}
-        onBack={() => setPhase({ kind: 'advanced-operator-wallet', rootName: phase.setup.rootName, label: phase.setup.label })}
+        onBack={() => setPhase({ kind: 'advanced-subdomain', rootName: phase.setup.rootName, label: phase.setup.label })}
       />
     )
   }
@@ -326,8 +231,8 @@ export function renderAdvancedEnsPhase({
     return (
       <EnsSetupBlockedScreen
         fallback={phase.fallback}
-        onCheckAgain={() => runAdvancedPreflight(phase.fallback.rootName, phase.fallback.label, phase.fallback.operatorAddress)}
-        onBack={() => setPhase({ kind: 'advanced-operator-wallet', rootName: phase.fallback.rootName, label: phase.fallback.label })}
+        onCheckAgain={() => runAdvancedSubdomainCheck(phase.fallback.rootName, phase.fallback.label)}
+        onBack={() => setPhase({ kind: 'advanced-subdomain', rootName: phase.fallback.rootName, label: phase.fallback.label })}
       />
     )
   }

package/src/identity/hub/flows/ens/EnsEditFlow.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import { getAddress, type Address } from 'viem'
 import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import { requestBrowserWalletAccount } from '../../../wallet/browserWallet.js'
 import {
   AGENT_RECORD_READ_KEY_LIST,
   buildAgentEnsRecords,
@@ -45,11 +44,13 @@ 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,