ethagent 2.1.1 → 2.3.0

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

@@ -1,37 +1,28 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { formatEther, type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../../ui/Select.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { theme } from '../../../../ui/theme.js'
+import { type Address } from 'viem'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
 import {
-  createMainnetClient,
   isEthDomain,
   normalizeEthDomain,
-} from '../../../ens/ensLookup.js'
+} 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 {
-  generateRegistrationSecret,
-  ONE_YEAR_SECONDS,
-  readNameAvailable,
-  readRentPrice,
-  validateRegistrableName,
-} from '../../../ens/ensRegistration.js'
-import { isRootEthName } from '../../../ens/ensAutomation.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import {
-  readIdentityStateString,
   type CustodyMode,
-} from '../../model/custody.js'
-import { shortAddress } from '../../model/format.js'
+} from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
 import {
   recordsDiffHasChanges,
   type EnsLinkOptions,
-} from './ensEditCopy.js'
+} from './editCopy.js'
+import { openExternalUrl } from '../../../utils/openExternal.js'
+import { TextInput } from '../../../ui/TextInput.js'
 import {
-  EnsSetupRow,
   EnsStatusBanner,
   footerHint,
   SubdomainEntry,
@@ -42,17 +33,14 @@ import {
   ReviewScreen,
   SimpleEnsIssueScreen,
 } from './EnsEditReviewScreens.js'
-import {
-  EscCancel,
-  RegisterRootCommitRunner,
-  RegisterRootTxRunner,
-  RegisterRootWaitScreen,
-} from './EnsEditRunners.js'
+import { EscCancel } from './EnsEditRunners.js'
 import type {
   DiscoveryState,
   EnsEditProps,
   EnsPhase,
-} from './ensEditTypes.js'
+} from './types.js'
+
+const ENS_DOMAINS_URL = 'https://app.ens.domains'
 
 type SimpleScreenProps = {
   phase: EnsPhase
@@ -69,8 +57,9 @@ type SimpleScreenProps = {
   setOperatorWalletSession: (session: BrowserWalletReady | null) => void
   setPhase: (phase: EnsPhase) => void
   cancelDiscoveryToModeSelect: () => void
-  runDiscovery: () => void
+  runDiscovery: (mode?: 'simple' | 'advanced') => void
   runValidation: (fullName: string, mode: 'simple' | 'advanced', phaseOwnerAddress?: Address, operatorWallet?: Address) => Promise<void>
+  runAdvancedRootCheck: (rootName: string) => void
   backToSimpleSubdomain: (fullName: string) => void
   runSimpleCreatePreflight: (fullName: string) => void
   onEnsSetup: EnsEditProps['onEnsSetup']
@@ -96,6 +85,7 @@ export function renderSimpleEnsPhase({
   cancelDiscoveryToModeSelect,
   runDiscovery,
   runValidation,
+  runAdvancedRootCheck,
   backToSimpleSubdomain,
   runSimpleCreatePreflight,
   onEnsSetup,
@@ -126,7 +116,7 @@ export function renderSimpleEnsPhase({
   }
 
   if (phase.kind === 'pick-parent') {
-    type DomainAction = `pick:${string}` | 'register-root' | 'manual' | 'retry' | 'back'
+    type DomainAction = `pick:${string}` | 'open-ens-domains' | 'manual' | 'retry' | 'back'
     const ownedNames = discovery.status === 'ok' || discovery.status === 'error' ? discovery.names : []
     const errorMessage = discovery.status === 'error' ? 'Root ENS Lookup Failed' : null
     const warningMessage = discovery.status === 'ok' ? discovery.warning : null
@@ -144,10 +134,10 @@ export function renderSimpleEnsPhase({
             })),
           ]
         : []),
-      { value: 'register-root' as DomainAction, role: 'section' as const, label: 'Get a New One' },
-      { value: 'register-root' as DomainAction, label: 'Register New ENS Name', hint: 'Register an ENS name through ENS to use as a root' },
-      ...(noOwnedNames
-        ? [{ value: 'retry' as DomainAction, label: 'Scan Again', hint: 'Retry the search after registering' }]
+      { value: 'open-ens-domains' as DomainAction, role: 'section' as const, label: 'No Parent Name?' },
+      { value: 'open-ens-domains' as DomainAction, label: 'Register .eth Name', hint: 'Open the ENS app in your browser; come back when this wallet owns one' },
+      ...(noOwnedNames || discovery.status === 'ok'
+        ? [{ value: 'retry' as DomainAction, label: 'Scan Again', hint: 'Re-run root .eth name discovery for this wallet' }]
         : []),
       ...(discovery.status === 'error'
         ? [
@@ -159,6 +149,7 @@ export function renderSimpleEnsPhase({
       { value: 'back', label: 'Back', hint: 'Return to setup type', role: 'utility' },
     ]
 
+    const advancedMode = phase.mode === 'advanced'
     return (
       <Surface
         title="Assign ENS Name"
@@ -166,198 +157,45 @@ export function renderSimpleEnsPhase({
         footer={footerHint('enter select · esc back')}
       >
         <EnsStatusBanner identity={identity} noRootEnsName={noOwnedNames} />
+        {advancedMode
+          ? <Text color={theme.dim}>Owner wallet: <Text color={theme.text}>{shortAddress(ownerAddress)}</Text></Text>
+          : null}
         {validationError ? <Text color={theme.accentError}>{validationError}</Text> : null}
+        {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
         {errorMessage ? <Text color={theme.accentError}>{errorMessage}: {discovery.status === 'error' ? discovery.message : ''}</Text> : null}
         {warningMessage ? <Text color={theme.accentPeriwinkle}>{warningMessage}</Text> : null}
+        {noOwnedNames
+          ? (
+              <Box marginTop={1} flexDirection="column">
+                <Text color={theme.dim}>This wallet does not own a parent <Text color={theme.text}>.eth</Text> name yet.</Text>
+                <Text color={theme.dim}>Register one at <Text color={theme.text}>{ENS_DOMAINS_URL}</Text>, then come back and Scan Again.</Text>
+              </Box>
+            )
+          : null}
         <Box marginTop={1}>
           <Select<DomainAction>
             options={options}
             hintLayout="inline"
             onSubmit={choice => {
               if (choice === 'back') return setPhase({ kind: 'mode-select' })
-              if (choice === 'manual') { setPhase({ kind: 'manual-parent' }); return }
-              if (choice === 'register-root') { setPhase({ kind: 'register-root-input' }); return }
+              if (choice === 'manual') { setPhase({ kind: 'manual-parent', ...(advancedMode ? { mode: 'advanced' as const } : {}) }); return }
+              if (choice === 'open-ens-domains') {
+                openExternalUrl(ENS_DOMAINS_URL)
+                return
+              }
               if (choice === 'retry') {
-                runDiscovery()
+                runDiscovery(advancedMode ? 'advanced' : 'simple')
                 return
               }
               if (choice.startsWith('pick:')) {
                 const name = choice.slice('pick:'.length)
-                if (name) setPhase({ kind: 'pick-subdomain', parent: name })
-              }
-            }}
-            onCancel={() => setPhase({ kind: 'mode-select' })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'register-root-input') {
-    return (
-      <Surface
-        title="Register an ENS Name"
-        subtitle="Pick a name to register on Ethereum mainnet for 1 year. The connected wallet pays and becomes the owner."
-        footer={footerHint('enter continues · esc back')}
-      >
-        {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
-        <Box marginTop={1}>
-          <TextInput
-            placeholder="myname"
-            validate={value => {
-              const result = validateRegistrableName(value)
-              return result.ok ? null : result.detail
-            }}
-            onSubmit={value => {
-              const result = validateRegistrableName(value)
-              if (!result.ok) {
-                setPhase({ kind: 'register-root-input', error: result.detail })
-                return
-              }
-              const secret = generateRegistrationSecret()
-              setPhase({ kind: 'register-root-pricing', label: result.label, secret, busy: true })
-              const client = createMainnetClient()
-              Promise.all([
-                readNameAvailable(client, result.label),
-                readRentPrice(client, result.label, BigInt(ONE_YEAR_SECONDS)),
-              ])
-                .then(([available, price]) => {
-                  if (!available) {
-                    setPhase({ kind: 'register-root-input', error: `${result.label}.eth is already registered. Pick a different name.` })
-                    return
-                  }
-                  setPhase({ kind: 'register-root-pricing', label: result.label, secret, busy: false, price })
-                })
-                .catch((err: unknown) => {
-                  setPhase({ kind: 'register-root-input', error: err instanceof Error ? err.message : String(err) })
-                })
-            }}
-            onCancel={() => setPhase({ kind: 'pick-parent' })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'register-root-pricing') {
-    const fullName = `${phase.label}.eth`
-    if (phase.busy || !phase.price) {
-      return (
-        <Surface
-          title="Register an ENS Name"
-          subtitle={`Checking availability and price for ${fullName}...`}
-          footer={footerHint('esc back')}
-        >
-          <Box marginTop={1}><Text color={theme.textSubtle}>Reading from Ethereum mainnet...</Text></Box>
-        </Surface>
-      )
-    }
-    const totalEth = formatEther(phase.price.total)
-    const baseEth = formatEther(phase.price.base)
-    const premiumEth = formatEther(phase.price.premium)
-    return (
-      <Surface
-        title="Register an ENS Name"
-        subtitle={`${fullName} is available. Review the cost and continue with two transactions.`}
-        footer={footerHint('enter select · esc back')}
-      >
-        <Box flexDirection="column">
-          <EnsSetupRow label="Name" value={fullName} />
-          <EnsSetupRow label="Owner" value={shortAddress(ownerAddress)} />
-          <EnsSetupRow label="Duration" value="1 year" />
-          <EnsSetupRow label="Rent" value={`${baseEth} ETH`} />
-          {phase.price.premium > 0n ? <EnsSetupRow label="Premium" value={`${premiumEth} ETH`} /> : null}
-          <EnsSetupRow label="Total" value={`${totalEth} ETH`} />
-          <Box marginTop={1}><Text color={theme.dim}>Two transactions: a commit, a 60-second wait, then the registration. Keep this tab open through both.</Text></Box>
-          <Box marginTop={1}><Text color={theme.dim}>Manage renewals on https://app.ens.domains/ before the year is up.</Text></Box>
-        </Box>
-        <Box marginTop={1}>
-          <Select<'commit' | 'pick-different' | 'back'>
-            options={[
-              { value: 'commit', role: 'section', label: 'Continue' },
-              { value: 'commit', label: 'Continue to Commit', hint: 'Sign the first transaction' },
-              { value: 'pick-different', label: 'Pick a Different Name', hint: 'Return to name input' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back', hint: 'Return to root selection', role: 'utility' },
-            ]}
-            hintLayout="inline"
-            onSubmit={choice => {
-              if (choice === 'commit') {
-                setPhase({ kind: 'register-root-commit-tx', label: phase.label, secret: phase.secret, price: phase.price! })
-                return
+                if (!name) return
+                if (advancedMode) {
+                  runAdvancedRootCheck(name)
+                  return
+                }
+                setPhase({ kind: 'pick-subdomain', parent: name })
               }
-              if (choice === 'pick-different') return setPhase({ kind: 'register-root-input' })
-              setPhase({ kind: 'pick-parent' })
-            }}
-            onCancel={() => setPhase({ kind: 'pick-parent' })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
-  if (phase.kind === 'register-root-commit-tx') {
-    return (
-      <RegisterRootCommitRunner
-        phase={phase}
-        ownerAddress={ownerAddress}
-        walletSession={operatorWalletSession}
-        onWalletReady={setOperatorWalletSession}
-        onCommitted={() => setPhase({ kind: 'register-root-wait', label: phase.label, secret: phase.secret, price: phase.price, commitMinedAt: Date.now() })}
-        onError={msg => setPhase({ kind: 'register-root-input', error: msg })}
-      />
-    )
-  }
-
-  if (phase.kind === 'register-root-wait') {
-    return (
-      <RegisterRootWaitScreen
-        phase={phase}
-        onReady={() => setPhase({ kind: 'register-root-tx', label: phase.label, secret: phase.secret, price: phase.price })}
-        onCancel={() => setPhase({ kind: 'register-root-input', error: 'Commit cancelled. Names must be re-committed; secrets do not carry over.' })}
-      />
-    )
-  }
-
-  if (phase.kind === 'register-root-tx') {
-    return (
-      <RegisterRootTxRunner
-        phase={phase}
-        ownerAddress={ownerAddress}
-        walletSession={operatorWalletSession}
-        onWalletReady={setOperatorWalletSession}
-        onRegistered={() => setPhase({ kind: 'register-root-done', fullName: `${phase.label}.eth` })}
-        onError={msg => setPhase({ kind: 'register-root-input', error: msg })}
-      />
-    )
-  }
-
-  if (phase.kind === 'register-root-done') {
-    return (
-      <Surface
-        title="ENS Name Registered"
-        subtitle={`${phase.fullName} is now owned by ${shortAddress(ownerAddress)}.`}
-        footer={footerHint('enter select · esc back')}
-      >
-        <Box flexDirection="column">
-          <Text color={theme.text}>Manage renewals and other settings on https://app.ens.domains/ before the year is up.</Text>
-          <Text color={theme.dim}>The name will appear in the picker on the next scan.</Text>
-        </Box>
-        <Box marginTop={1}>
-          <Select<'scan' | 'back'>
-            options={[
-              { value: 'scan', role: 'section', label: 'Next' },
-              { value: 'scan', label: 'Scan Again', hint: 'Re-run root ENS name discovery' },
-              { value: 'back', role: 'section', label: 'Navigation' },
-              { value: 'back', label: 'Back to ENS', hint: 'Return to ENS menu', role: 'utility' },
-            ]}
-            hintLayout="inline"
-            onSubmit={choice => {
-              if (choice === 'scan') {
-                runDiscovery()
-                return
-              }
-              setPhase({ kind: 'mode-select' })
             }}
             onCancel={() => setPhase({ kind: 'mode-select' })}
           />
@@ -367,6 +205,7 @@ export function renderSimpleEnsPhase({
   }
 
   if (phase.kind === 'manual-parent') {
+    const advancedMode = phase.mode === 'advanced'
     return (
       <Surface
         title="Your Root .eth Name"
@@ -374,11 +213,15 @@ export function renderSimpleEnsPhase({
         footer={footerHint('enter continues · esc back')}
       >
         {statusBanner}
+        {advancedMode
+          ? <Text color={theme.dim}>Owner wallet: <Text color={theme.text}>{shortAddress(ownerAddress)}</Text></Text>
+          : null}
         <Box marginTop={1}>
           <Text color={theme.dim}>Only root .eth names on Ethereum mainnet are supported.</Text>
         </Box>
+        {phase.error ? <Text color={theme.accentError}>{phase.error}</Text> : null}
         <TextInput
-          key="edit-ens-parent-manual"
+          key={`edit-ens-parent-manual-${advancedMode ? 'advanced' : 'simple'}`}
           placeholder="e.g. name.eth"
           validate={value => {
             const v = normalizeEthDomain(value)
@@ -387,8 +230,15 @@ export function renderSimpleEnsPhase({
             if (!isRootEthName(v)) return 'Enter a root .eth name, e.g. name.eth'
             return null
           }}
-          onSubmit={value => setPhase({ kind: 'pick-subdomain', parent: normalizeEthDomain(value) })}
-          onCancel={() => setPhase({ kind: 'pick-parent' })}
+          onSubmit={value => {
+            const root = normalizeEthDomain(value)
+            if (advancedMode) {
+              runAdvancedRootCheck(root)
+              return
+            }
+            setPhase({ kind: 'pick-subdomain', parent: root })
+          }}
+          onCancel={() => setPhase({ kind: 'pick-parent', ...(advancedMode ? { mode: 'advanced' as const } : {}) })}
         />
       </Surface>
     )
@@ -399,7 +249,8 @@ export function renderSimpleEnsPhase({
       <SubdomainEntry
         parent={phase.parent}
         ownerAddress={ownerAddress}
-        suggestion={phase.label || agentNameSuggestion}
+        initialValue={phase.label}
+        placeholder={agentNameSuggestion || 'subdomain name'}
         error={phase.error}
         onConfirm={fullName => { void runValidation(fullName, 'simple') }}
         onBack={() => setPhase({ kind: 'pick-parent' })}

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

@@ -1,13 +1,14 @@
 import React from 'react'
-import { openImageFilePicker } from '../../../profile/imagePicker.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { OperatorWalletsScreen } from './OperatorWalletsScreen.js'
+import { openImageFilePicker } from '../../profile/imagePicker.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import { readCustodyMode } from '../custody/state.js'
+import { OperatorWalletsScreen } from './EnsOperatorWalletsScreen.js'
 import { EDIT_PROFILE_STEPS, EditProfileFlow } from '../profile/EditProfileFlow.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { WalletApprovalScreen } from '../../components/WalletApprovalScreen.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { WalletApprovalScreen } from '../shared/components/WalletApprovalScreen.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type StepOf<K extends Step['kind']> = Extract<Step, { kind: K }>
 
@@ -24,17 +25,19 @@ type IdentityHubEnsStep = StepOf<
   | 'public-profile-signing'
 >
 
-type IdentityHubEnsFlowProps = {
+type EnsFlowProps = {
   step: IdentityHubEnsStep
   walletSession: BrowserWalletReady | null
+  reconciliation: AgentReconciliation
   onSetStep: (step: Step) => void
   onBack: () => void
   onWalletReady: (session: BrowserWalletReady | null) => void
   onTriggerRebackup: (backStep: Step, profileUpdates?: ProfileUpdates) => void
   onTriggerPublicProfileSave: (backStep: Step, profileUpdates: ProfileUpdates) => void
+  onWithdrawTokenForEns: (step: Step) => void
 }
 
-export function isIdentityHubEnsStep(step: Step): step is IdentityHubEnsStep {
+export function isEnsStep(step: Step): step is IdentityHubEnsStep {
   return step.kind === 'manage-ens-operators'
     || step.kind === 'edit-profile-name'
     || step.kind === 'edit-profile-description'
@@ -47,14 +50,16 @@ export function isIdentityHubEnsStep(step: Step): step is IdentityHubEnsStep {
     || step.kind === 'public-profile-signing'
 }
 
-export const IdentityHubEnsFlow: React.FC<IdentityHubEnsFlowProps> = ({
+export const EnsFlow: React.FC<EnsFlowProps> = ({
   step,
   walletSession,
+  reconciliation,
   onSetStep,
   onBack,
   onWalletReady,
   onTriggerRebackup,
   onTriggerPublicProfileSave,
+  onWithdrawTokenForEns,
 }) => {
   if (step.kind === 'manage-ens-operators') {
     return (
@@ -75,6 +80,8 @@ export const IdentityHubEnsFlow: React.FC<IdentityHubEnsFlowProps> = ({
     return (
       <EditProfileFlow
         step={step}
+        reconciliation={reconciliation}
+        onWithdrawToken={() => onWithdrawTokenForEns(step)}
         onNameSubmit={name => {
           if (step.kind !== 'edit-profile-name') return
           onSetStep({

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

@@ -1,35 +1,31 @@
 import React from 'react'
 import { Box, Text } from 'ink'
 import { getAddress, isAddress, type Address } from 'viem'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select, type SelectOption } from '../../../../ui/Select.js'
-import { Spinner } from '../../../../ui/Spinner.js'
-import { theme } from '../../../../ui/theme.js'
-import { useAppInput } from '../../../../app/input/AppInputProvider.js'
-import { openExternalUrl } from '../../../../utils/openExternal.js'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import { readOwnerAddressField } from '../../../identityCompat.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select, type SelectOption } from '../../../ui/Select.js'
+import { Spinner } from '../../../ui/Spinner.js'
+import { theme } from '../../../ui/theme.js'
+import { useAppInput } from '../../../app/input/AppInputProvider.js'
+import { openExternalUrl } from '../../../utils/openExternal.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import { readOwnerAddressField } from '../../identityCompat.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   createWalletRestoreAccessChallenge,
   createWalletRestoreAccessKey,
-} from '../../../continuity/envelope.js'
-import { requestBrowserWalletSignature, type BrowserWalletReady } from '../../../wallet/browserWallet.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { OPEN_BROWSER_HINT } from '../../components/WalletApprovalScreen.js'
-import { readCustodyMode } from '../../model/custody.js'
-import { shortAddress } from '../../model/format.js'
-import type { ProfileUpdates } from '../../identityHubReducer.js'
+} from '../../continuity/envelope.js'
+import { requestBrowserWalletSignature, type BrowserWalletReady } from '../../wallet/browserWallet.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { OPEN_BROWSER_HINT } from '../shared/components/WalletApprovalScreen.js'
+import { readCustodyMode } from '../custody/state.js'
+import { shortAddress } from '../shared/model/format.js'
+import type { ProfileUpdates } from '../identityHubReducer.js'
 import {
   normalizeApprovedOperatorWallets,
   removeApprovedOperatorWallet,
   upsertApprovedOperatorWallet,
   type ApprovedOperatorWalletRecord,
-} from '../../operatorWallets.js'
-import {
-  reconcileWalletSetup,
-  type RecordsFixPlan,
-} from '../../reconciliation/index.js'
+} from '../shared/operatorWallets.js'
 
 type OperatorPhase =
   | { kind: 'main'; notice?: string; error?: string }
@@ -71,28 +67,11 @@ export const OperatorWalletsScreen: React.FC<OperatorWalletsScreenProps> = ({
   const restoreAccessEpoch = readStateNumber(state, 'restoreAccessEpoch') ?? 0
   const records = normalizeApprovedOperatorWallets(state.approvedOperatorWallets)
   const [phase, setPhase] = React.useState<OperatorPhase>({ kind: 'main', notice, error })
-  const [fixPlan, setFixPlan] = React.useState<RecordsFixPlan | null>(null)
 
   React.useEffect(() => {
     setPhase(current => current.kind === 'main' ? { kind: 'main', notice, error } : current)
   }, [notice, error])
 
-  React.useEffect(() => {
-    if (custodyMode !== 'advanced' || records.length === 0) {
-      setFixPlan(null)
-      return
-    }
-    let cancelled = false
-    reconcileWalletSetup({ identity, registry })
-      .then(plan => { if (!cancelled) setFixPlan(plan) })
-      .catch(() => { if (!cancelled) setFixPlan(null) })
-    return () => { cancelled = true }
-  }, [identity, registry, custodyMode, records.length])
-
-  const driftItems = fixPlan?.items.filter(item =>
-    item.kind === 'missing-approval' || item.kind === 'stale-approval',
-  ) ?? []
-
   const saveOperators = React.useCallback((
     approvedOperatorWallets: ApprovedOperatorWalletRecord[],
     activeOperator: Address | '' | undefined,
@@ -253,16 +232,6 @@ export const OperatorWalletsScreen: React.FC<OperatorWalletsScreenProps> = ({
           <Text color={theme.dim}>Add as many operator wallets as needed; unlink any saved wallet here.</Text>
           <Text color={theme.dim}>No approve(), setApprovalForAll(), transferFrom(), or token approval is requested.</Text>
         </Box>
-        {driftItems.length > 0
-          ? (
-              <Box marginTop={1} flexDirection="column">
-                <Text color="#e8a070">
-                  {`! ENS resolver drift: ${driftItems.length} operator wallet${driftItems.length === 1 ? '' : 's'} missing onchain approval.`}
-                </Text>
-                <Text color={theme.dim}>Run "Fix Records" from Custody Mode to re-sync; onchain ENS writes will fail until then.</Text>
-              </Box>
-            )
-          : null}
         {phaseNotice ? <Text color={theme.accentPeriwinkle}>{phaseNotice}</Text> : null}
         {phaseError ? <Text color={theme.accentError}>{phaseError}</Text> : null}
       </Box>

package/src/identity/hub/{advancedEnsValidation.ts → ens/advancedEnsValidation.ts}

@@ -1,9 +1,9 @@
 import { getAddress, type Address, type PublicClient } from 'viem'
-import { validateAgentEnsLink, type DiscoverOptions, type EnsValidation } from '../ens/ensLookup.js'
+import { validateAgentEnsLink, type DiscoverOptions, type EnsValidation } from '../../ens/ensLookup.js'
 import {
   validateErc8004TokenOwner,
   type Erc8004RegistryConfig,
-} from '../registry/erc8004.js'
+} from '../../registry/erc8004.js'
 
 type TokenOwnerReadClient = Pick<PublicClient, 'readContract'>
 

package/src/identity/hub/{flows/ens/ensEditCopy.ts → ens/editCopy.ts}

@@ -1,7 +1,7 @@
 import { getAddress, type Address } from 'viem'
-import type { AgentEnsRecords, AgentRecordDiff } from '../../../ens/agentRecords.js'
-import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../../ens/ensAutomation.js'
-import type { CustodyMode } from '../../model/custody.js'
+import type { AgentEnsRecords, AgentRecordDiff } from '../../ens/agentRecords.js'
+import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../ens/ensAutomation.js'
+import type { CustodyMode } from '../custody/state.js'
 
 export type EnsLinkOptions = {
   mode: 'simple' | 'advanced'
@@ -18,7 +18,7 @@ export function recordsHaveCurrentValues(recordsDiff: AgentRecordDiff[]): boolea
 }
 
 export function emptyAgentEnsRecords(): AgentEnsRecords {
-  return { token: '', profile: '' }
+  return { token: '' }
 }
 
 export function unlinkEnsLinkOptions(savedCustodyMode: CustodyMode | undefined, savedOwnerAddress: string): EnsLinkOptions {

package/src/identity/hub/{effects/ens/flows.ts → ens/effects.ts}

@@ -1,19 +1,19 @@
 import type { Address, PublicClient } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
-import type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
+import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
 import {
   openBrowserWalletSession,
   type WalletPurpose,
-} from '../../../wallet/browserWallet.js'
-import type { ProfileUpdates, Step } from '../../identityHubReducer.js'
-import type { EffectCallbacks, EnsClearProgress, EnsLinkProgress, EnsUpdateProgress } from '../types.js'
+} from '../../wallet/browserWallet.js'
+import type { ProfileUpdates, Step } from '../identityHubReducer.js'
+import type { EffectCallbacks, EnsClearProgress, EnsLinkProgress, EnsUpdateProgress } from '../shared/effects/types.js'
 import {
   runEnsSetupRecordsTransaction,
   runEnsSetupRegistryTransaction,
   runUpdateEnsRecords,
 } from './transactions.js'
-import { runRebackupSigningInSession } from '../rebackup/runRebackup.js'
+import { runRebackupSigningInSession } from '../continuity/effects.js'
 
 type EnsRecordsFlowArgs = {
   identity: EthagentIdentity

package/src/identity/hub/{effects/ens → ens}/index.ts

@@ -2,7 +2,7 @@ export {
   runEnsLinkFlow,
   runEnsUnlinkFlow,
   runEnsUpdateFlow,
-} from './flows.js'
+} from './effects.js'
 export {
   ensRecordWritesForUpdate,
   runEnsSetupRecordsTransaction,

package/src/identity/hub/{model/ens.ts → ens/state.ts}

@@ -1,5 +1,5 @@
 import type { EthagentIdentity } from '../../../storage/config.js'
-import { readIdentityStateString } from './custody.js'
+import { readIdentityStateString } from '../custody/state.js'
 
 export type EnsStatusView =
   | { kind: 'none' }