ethagent 2.1.1 → 2.3.0

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

@@ -4,236 +4,236 @@ import {
   RegisterAgentPreflightError,
   createErc8004PublicClient,
   supportedErc8004ChainForId,
-} from '../../../registry/erc8004.js'
-import { encodeSetEthagentTextRecords } from '../../../ens/ensLookup.js'
-import { encodeEnsRecordsTransaction, encodeEnsRegistryTransaction, type EnsSetupPlan } from '../../../ens/ensAutomation.js'
-import type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import { changedRecords } from '../../../ens/agentRecords.js'
-import { sendBrowserWalletTransaction, type BrowserWalletSession, type WalletPurpose } from '../../../wallet/browserWallet.js'
-import type { EffectCallbacks } from '../types.js'
-function chainLabel(chainId: number): string {
-  return supportedErc8004ChainForId(chainId)?.name ?? `chain ${chainId}`
-}
-
-function ensTokenChainName(chainId: number): string | undefined {
-  return chainId !== 1 ? chainLabel(chainId) : undefined
-}
-
-export async function runUpdateEnsRecords(args: {
-  fullName: string
-  ownerAddress: Address
-  records: AgentEnsRecords
-  currentRecords?: AgentEnsRecordState
-  callbacks: EffectCallbacks
-  purpose?: WalletPurpose
-  clearRecords?: boolean
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string }> {
-  const next = ensRecordWritesForUpdate({
-    records: args.records,
-    currentRecords: args.currentRecords,
-    clearRecords: args.clearRecords,
-  })
-  if (Object.keys(next).length === 0) {
-    throw new Error('No ENS records to update')
-  }
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const encoded = await encodeSetEthagentTextRecords(args.fullName, next, { publicClient })
-  await preflightEnsRecordTransaction({
-    fullName: args.fullName,
-    account: args.ownerAddress,
-    to: encoded.resolverAddress,
-    data: encoded.data,
-    publicClient,
-    purpose: args.purpose ?? 'update-ens-records',
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  const purpose = args.purpose ?? 'update-ens-records'
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.ownerAddress,
-      to: encoded.resolverAddress,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-    })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.ownerAddress,
-    to: encoded.resolverAddress,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  return { txHash: result.txHash }
-}
-
-export function ensRecordWritesForUpdate(args: {
-  records: AgentEnsRecords
-  currentRecords?: AgentEnsRecordState
-  clearRecords?: boolean
-}): Record<string, string> {
-  if (args.clearRecords) {
-    return changedRecords(args.currentRecords ?? {}, { token: '', profile: '' })
-  }
-  return changedRecords(args.currentRecords ?? { token: '', profile: '' }, args.records)
-}
-
-export async function runEnsSetupRegistryTransaction(args: {
-  setup: EnsSetupPlan
-  callbacks: EffectCallbacks
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string } | null> {
-  const encoded = encodeEnsRegistryTransaction(args.setup)
-  if (!encoded) return null
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'create-simple-ens-subdomain' : 'create-agent-ens-subdomain'
-  await preflightEnsRecordTransaction({
-    fullName: args.setup.fullName,
-    account: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    publicClient,
-    purpose,
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.setup.ownerAddress,
-      to: encoded.to,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
-    })
-    await publicClient.waitForTransactionReceipt({ hash: result.txHash })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  await publicClient.waitForTransactionReceipt({ hash: result.txHash })
-  return { txHash: result.txHash }
-}
-
-export async function runEnsSetupRecordsTransaction(args: {
-  setup: EnsSetupPlan
-  callbacks: EffectCallbacks
-  publicClient?: PublicClient
-  tokenChainId?: number
-  session?: BrowserWalletSession
-  flowId?: string
-  flowStep?: number
-}): Promise<{ txHash: string } | null> {
-  const encoded = encodeEnsRecordsTransaction(args.setup)
-  if (!encoded) return null
-  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
-  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'set-simple-ens-records' : 'set-agent-ens-records'
-  await preflightEnsRecordTransaction({
-    fullName: args.setup.fullName,
-    account: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    publicClient,
-    purpose,
-  })
-  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
-  if (args.session) {
-    const result = await args.session.sendTransaction({
-      chainId: 1,
-      expectedAccount: args.setup.ownerAddress,
-      to: encoded.to,
-      data: encoded.data,
-      purpose,
-      ...(tokenChainName ? { tokenChainName } : {}),
-      ...(args.flowId ? { flowId: args.flowId } : {}),
-      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
-    })
-    return { txHash: result.txHash }
-  }
-  const result = await sendBrowserWalletTransaction({
-    chainId: 1,
-    expectedAccount: args.setup.ownerAddress,
-    to: encoded.to,
-    data: encoded.data,
-    purpose,
-    onReady: args.callbacks.onWalletReady,
-    ...(tokenChainName ? { tokenChainName } : {}),
-  })
-  args.callbacks.onWalletReady(null)
-  return { txHash: result.txHash }
-}
-
+} from '../../registry/erc8004.js'
+import { encodeSetEthagentTextRecords } from '../../ens/ensLookup.js'
+import { encodeEnsRecordsTransaction, encodeEnsRegistryTransaction, type EnsSetupPlan } from '../../ens/ensAutomation.js'
+import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import { changedRecords } from '../../ens/agentRecords.js'
+import { sendBrowserWalletTransaction, type BrowserWalletSession, type WalletPurpose } from '../../wallet/browserWallet.js'
+import type { EffectCallbacks } from '../shared/effects/types.js'
+function chainLabel(chainId: number): string {
+  return supportedErc8004ChainForId(chainId)?.name ?? `chain ${chainId}`
+}
+
+function ensTokenChainName(chainId: number): string | undefined {
+  return chainId !== 1 ? chainLabel(chainId) : undefined
+}
+
+export async function runUpdateEnsRecords(args: {
+  fullName: string
+  ownerAddress: Address
+  records: AgentEnsRecords
+  currentRecords?: AgentEnsRecordState
+  callbacks: EffectCallbacks
+  purpose?: WalletPurpose
+  clearRecords?: boolean
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string }> {
+  const next = ensRecordWritesForUpdate({
+    records: args.records,
+    currentRecords: args.currentRecords,
+    clearRecords: args.clearRecords,
+  })
+  if (Object.keys(next).length === 0) {
+    throw new Error('No ENS records to update')
+  }
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const encoded = await encodeSetEthagentTextRecords(args.fullName, next, { publicClient })
+  await preflightEnsRecordTransaction({
+    fullName: args.fullName,
+    account: args.ownerAddress,
+    to: encoded.resolverAddress,
+    data: encoded.data,
+    publicClient,
+    purpose: args.purpose ?? 'update-ens-records',
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  const purpose = args.purpose ?? 'update-ens-records'
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.ownerAddress,
+      to: encoded.resolverAddress,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+    })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.ownerAddress,
+    to: encoded.resolverAddress,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  return { txHash: result.txHash }
+}
+
+export function ensRecordWritesForUpdate(args: {
+  records: AgentEnsRecords
+  currentRecords?: AgentEnsRecordState
+  clearRecords?: boolean
+}): Record<string, string> {
+  if (args.clearRecords) {
+    return changedRecords(args.currentRecords ?? {}, { token: '' })
+  }
+  return changedRecords(args.currentRecords ?? { token: '' }, args.records)
+}
+
+export async function runEnsSetupRegistryTransaction(args: {
+  setup: EnsSetupPlan
+  callbacks: EffectCallbacks
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string } | null> {
+  const encoded = encodeEnsRegistryTransaction(args.setup)
+  if (!encoded) return null
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'create-simple-ens-subdomain' : 'create-agent-ens-subdomain'
+  await preflightEnsRecordTransaction({
+    fullName: args.setup.fullName,
+    account: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    publicClient,
+    purpose,
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.setup.ownerAddress,
+      to: encoded.to,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
+    })
+    await publicClient.waitForTransactionReceipt({ hash: result.txHash })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  await publicClient.waitForTransactionReceipt({ hash: result.txHash })
+  return { txHash: result.txHash }
+}
+
+export async function runEnsSetupRecordsTransaction(args: {
+  setup: EnsSetupPlan
+  callbacks: EffectCallbacks
+  publicClient?: PublicClient
+  tokenChainId?: number
+  session?: BrowserWalletSession
+  flowId?: string
+  flowStep?: number
+}): Promise<{ txHash: string } | null> {
+  const encoded = encodeEnsRecordsTransaction(args.setup)
+  if (!encoded) return null
+  const publicClient = args.publicClient ?? createMainnetEnsPublicClient()
+  const purpose: WalletPurpose = args.setup.mode === 'simple' ? 'set-simple-ens-records' : 'set-agent-ens-records'
+  await preflightEnsRecordTransaction({
+    fullName: args.setup.fullName,
+    account: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    publicClient,
+    purpose,
+  })
+  const tokenChainName = typeof args.tokenChainId === 'number' ? ensTokenChainName(args.tokenChainId) : undefined
+  if (args.session) {
+    const result = await args.session.sendTransaction({
+      chainId: 1,
+      expectedAccount: args.setup.ownerAddress,
+      to: encoded.to,
+      data: encoded.data,
+      purpose,
+      ...(tokenChainName ? { tokenChainName } : {}),
+      ...(args.flowId ? { flowId: args.flowId } : {}),
+      ...(typeof args.flowStep === 'number' ? { flowStep: args.flowStep } : {}),
+    })
+    return { txHash: result.txHash }
+  }
+  const result = await sendBrowserWalletTransaction({
+    chainId: 1,
+    expectedAccount: args.setup.ownerAddress,
+    to: encoded.to,
+    data: encoded.data,
+    purpose,
+    onReady: args.callbacks.onWalletReady,
+    ...(tokenChainName ? { tokenChainName } : {}),
+  })
+  args.callbacks.onWalletReady(null)
+  return { txHash: result.txHash }
+}
+
 export function createMainnetEnsPublicClient(): PublicClient {
-  return createErc8004PublicClient({
-    chainId: 1,
-    rpcUrl: DEFAULT_ETHEREUM_RPC_URL,
-  })
-}
-
-async function preflightEnsRecordTransaction(args: {
-  fullName: string
-  account: Address
-  to: Address
-  data: Hex
-  publicClient: Pick<PublicClient, 'estimateGas'>
-  purpose: WalletPurpose
-}): Promise<void> {
-  try {
-    await args.publicClient.estimateGas({
-      account: args.account,
-      to: args.to,
-      data: args.data,
-    })
-  } catch (err: unknown) {
-    throw new RegisterAgentPreflightError({
-      code: 'simulation-failed',
-      title: ensPreflightErrorTitle(args.purpose),
-      detail: cleanPreflightError(err),
-      hint: ensPreflightErrorHint(args),
-    })
-  }
-}
-
-function ensPreflightErrorTitle(_purpose: WalletPurpose): string {
-  return 'ENS Record Update Blocked'
-}
-
-function ensPreflightErrorHint(args: {
-  fullName: string
-  purpose: WalletPurpose
-}): string {
-  const wallet = args.purpose === 'set-simple-ens-records' || args.purpose === 'update-ens-records' || args.purpose === 'clear-ens-records'
-    ? 'ENS owner wallet'
-    : 'owner wallet'
-  return `No transaction was sent. Connect the ${wallet} and confirm it can write ENS resolver records on ${args.fullName}.`
-}
-
-function cleanPreflightError(err: unknown): string {
-  return (err instanceof Error ? err.message : String(err))
-    .replace(/\s+/g, ' ')
-    .slice(0, 220)
-}
+  return createErc8004PublicClient({
+    chainId: 1,
+    rpcUrl: DEFAULT_ETHEREUM_RPC_URL,
+  })
+}
+
+async function preflightEnsRecordTransaction(args: {
+  fullName: string
+  account: Address
+  to: Address
+  data: Hex
+  publicClient: Pick<PublicClient, 'estimateGas'>
+  purpose: WalletPurpose
+}): Promise<void> {
+  try {
+    await args.publicClient.estimateGas({
+      account: args.account,
+      to: args.to,
+      data: args.data,
+    })
+  } catch (err: unknown) {
+    throw new RegisterAgentPreflightError({
+      code: 'simulation-failed',
+      title: ensPreflightErrorTitle(args.purpose),
+      detail: cleanPreflightError(err),
+      hint: ensPreflightErrorHint(args),
+    })
+  }
+}
+
+function ensPreflightErrorTitle(_purpose: WalletPurpose): string {
+  return 'ENS Record Update Blocked'
+}
+
+function ensPreflightErrorHint(args: {
+  fullName: string
+  purpose: WalletPurpose
+}): string {
+  const wallet = args.purpose === 'set-simple-ens-records' || args.purpose === 'update-ens-records' || args.purpose === 'clear-ens-records'
+    ? 'ENS owner wallet'
+    : 'owner wallet'
+  return `No transaction was sent. Connect the ${wallet} and confirm it can write ENS resolver records on ${args.fullName}.`
+}
+
+function cleanPreflightError(err: unknown): string {
+  return (err instanceof Error ? err.message : String(err))
+    .replace(/\s+/g, ' ')
+    .slice(0, 220)
+}

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

@@ -1,38 +1,27 @@
 import type { Address } from 'viem'
-import type { EthagentIdentity } from '../../../../storage/config.js'
+import type { EthagentIdentity } from '../../../storage/config.js'
 import type {
   AgentEnsRecordState,
   AgentEnsRecords,
   AgentRecordDiff,
-} from '../../../ens/agentRecords.js'
-import type { EnsValidation } from '../../../ens/ensLookup.js'
+} from '../../ens/agentRecords.js'
+import type { EnsValidation } from '../../ens/ensLookup.js'
 import type {
   EnsRegistryAction,
   EnsSetupBlockedPlan,
   EnsSetupPlan,
   EnsSubdomainDeletePlan,
-} from '../../../ens/ensAutomation.js'
-import type { Erc8004RegistryConfig } from '../../../registry/erc8004.js'
-import type { EnsLinkOptions } from './ensEditCopy.js'
+} from '../../ens/ensAutomation.js'
+import type { Erc8004RegistryConfig } from '../../registry/erc8004.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
+import type { EnsLinkOptions } from './editCopy.js'
 
 export type EnsIssueValidation = Extract<EnsValidation, { ok: false }>
 
-export type RegisterCommitPhase = {
-  label: string
-  secret: `0x${string}`
-  price: { base: bigint; premium: bigint; total: bigint }
-}
-
 export type SimpleEnsPhase =
-  | { kind: 'discovering' }
-  | { kind: 'pick-parent' }
-  | { kind: 'manual-parent' }
-  | { kind: 'register-root-input'; error?: string }
-  | { kind: 'register-root-pricing'; label: string; secret: `0x${string}`; busy: boolean; error?: string; price?: { base: bigint; premium: bigint; total: bigint } }
-  | { kind: 'register-root-commit-tx'; label: string; secret: `0x${string}`; price: { base: bigint; premium: bigint; total: bigint } }
-  | { kind: 'register-root-wait'; label: string; secret: `0x${string}`; price: { base: bigint; premium: bigint; total: bigint }; commitMinedAt: number }
-  | { kind: 'register-root-tx'; label: string; secret: `0x${string}`; price: { base: bigint; premium: bigint; total: bigint } }
-  | { kind: 'register-root-done'; fullName: string }
+  | { kind: 'discovering'; mode?: 'simple' | 'advanced' }
+  | { kind: 'pick-parent'; mode?: 'simple' | 'advanced'; error?: string }
+  | { kind: 'manual-parent'; mode?: 'simple' | 'advanced'; error?: string }
   | { kind: 'pick-subdomain'; parent: string; label?: string; error?: string }
   | { kind: 'simple-name-missing'; fullName: string; validation: EnsIssueValidation }
   | { kind: 'simple-create-preflight'; rootName: string; label: string; fullName: string }
@@ -43,14 +32,9 @@ export type SimpleEnsPhase =
 
 export type AdvancedEnsPhase =
   | { kind: 'advanced-transfer-check' }
-  | { kind: 'advanced-root'; rootName?: string; error?: string }
   | { kind: 'advanced-root-check'; rootName: string }
   | { kind: 'advanced-subdomain'; rootName: string; label?: string; error?: string }
   | { kind: 'advanced-subdomain-check'; rootName: string; label: string }
-  | { kind: 'advanced-operator-wallet'; rootName: string; label: string; registryAction?: EnsRegistryAction; error?: string }
-  | { kind: 'advanced-operator-wallet-manual'; rootName: string; label: string; error?: string }
-  | { kind: 'advanced-operator-wallet-connecting'; rootName: string; label: string }
-  | { kind: 'advanced-preflight'; rootName: string; label: string; operatorWallet: Address }
   | { kind: 'advanced-review'; setup: EnsSetupPlan }
   | { kind: 'advanced-manual'; fallback: EnsSetupBlockedPlan }
 
@@ -81,11 +65,13 @@ export type DiscoveryState =
 export type EnsEditProps = {
   identity: EthagentIdentity
   registry: Erc8004RegistryConfig
+  reconciliation: AgentReconciliation
   onEnsLink: (fullName: string, options: EnsLinkOptions) => void
   onEnsUnlink: () => void
   onEnsRecordsUpdate: (fullName: string, records: AgentEnsRecords, options: EnsLinkOptions, clearRecords?: boolean, currentRecords?: AgentEnsRecordState) => void
   onEnsSetup: (setup: EnsSetupPlan) => void
   onManageOperatorWalletAccess: () => void
+  onWithdrawToken: () => void
   initialView?: 'advanced'
   onBack: () => void
 }

package/src/identity/hub/identityHubReducer.ts

@@ -7,9 +7,9 @@ import type { ContinuitySnapshotEnvelope } from '../continuity/envelope.js'
 import type { AgentEnsRecordState, AgentEnsRecords } from '../ens/agentRecords.js'
 import type { EnsSetupPlan } from '../ens/ensAutomation.js'
 import type { WalletPurpose } from '../wallet/browserWallet.js'
-import type { IdentityHubErrorView } from './model/errors.js'
-import type { ApprovedOperatorWalletInput } from './operatorWallets.js'
-import type { CustodyMode } from './model/custody.js'
+import type { IdentityHubErrorView } from './shared/model/errors.js'
+import type { ApprovedOperatorWalletInput } from './shared/operatorWallets.js'
+import type { CustodyMode } from './custody/state.js'
 
 export type RestorePurpose = 'restore' | 'switch'
 type RestoreNotFoundReason = 'no-owner-or-operator' | 'search-incomplete' | 'cancelled'

package/src/identity/hub/{flows/profile → profile}/EditProfileFlow.tsx

@@ -1,19 +1,21 @@
 import React from 'react'
 import { Box, Text } from 'ink'
-import { Surface } from '../../../../ui/Surface.js'
-import { Select } from '../../../../ui/Select.js'
-import { TextInput } from '../../../../ui/TextInput.js'
-import { theme } from '../../../../ui/theme.js'
-import type { AgentEnsRecordState, AgentEnsRecords } from '../../../ens/agentRecords.js'
-import type { EnsSetupPlan } from '../../../ens/ensAutomation.js'
-import type { Step } from '../../identityHubReducer.js'
-import { readIdentityStateString } from '../../model/custody.js'
-import { FlowTimeline } from '../../components/FlowTimeline.js'
-import { validateAgentIconReference } from '../../../profile/agentIcon.js'
+import { Surface } from '../../../ui/Surface.js'
+import { Select } from '../../../ui/Select.js'
+import { TextInput } from '../../../ui/TextInput.js'
+import { theme } from '../../../ui/theme.js'
+import type { AgentEnsRecordState, AgentEnsRecords } from '../../ens/agentRecords.js'
+import type { EnsSetupPlan } from '../../ens/ensAutomation.js'
+import type { Step } from '../identityHubReducer.js'
+import { readIdentityStateString } from '../custody/state.js'
+import { FlowTimeline } from '../shared/components/FlowTimeline.js'
+import { validateAgentIconReference } from '../../profile/agentIcon.js'
 import { EnsEditFlow, type EnsLinkOptions } from '../ens/EnsEditFlow.js'
+import type { AgentReconciliation } from '../shared/reconciliation/index.js'
 
 type EditProfileFlowProps = {
   step: Extract<Step, { kind: 'edit-profile-name' | 'edit-profile-description' | 'edit-profile-image' | 'edit-profile-review' | 'edit-profile-ens' }>
+  reconciliation: AgentReconciliation
   onNameSubmit: (name: string) => void
   onDescriptionSubmit: (description: string) => void
   onIconSubmit: (iconPath?: string) => void
@@ -24,6 +26,7 @@ type EditProfileFlowProps = {
   onEnsRecordsUpdate: (fullName: string, records: AgentEnsRecords, options: EnsLinkOptions, clearRecords?: boolean, currentRecords?: AgentEnsRecordState) => void
   onEnsSetup: (setup: EnsSetupPlan) => void
   onManageOperatorWalletAccess: () => void
+  onWithdrawToken: () => void
   onBack: () => void
   onMenu: () => void
 }
@@ -35,6 +38,7 @@ const EDIT_DESCRIPTION_FOOTER = 'enter next · shift+enter newline · esc back'
 
 export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   step,
+  reconciliation,
   onNameSubmit,
   onDescriptionSubmit,
   onIconSubmit,
@@ -45,6 +49,7 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   onEnsRecordsUpdate,
   onEnsSetup,
   onManageOperatorWalletAccess,
+  onWithdrawToken,
   onBack,
   onMenu,
 }) => {
@@ -90,11 +95,13 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
       <EnsEditFlow
         identity={step.identity}
         registry={step.registry}
+        reconciliation={reconciliation}
         onEnsLink={onEnsLink}
         onEnsUnlink={onEnsUnlink}
         onEnsRecordsUpdate={onEnsRecordsUpdate}
         onEnsSetup={onEnsSetup}
         onManageOperatorWalletAccess={onManageOperatorWalletAccess}
+        onWithdrawToken={onWithdrawToken}
         initialView={step.initialView}
         onBack={onBack}
       />