ethagent 1.1.2 → 2.0.0

package/src/identity/hub/flows/token-transfer/TokenTransferScreens.tsx

@@ -0,0 +1,256 @@
+import React from 'react'
+import { Box, Text } from 'ink'
+import { Surface } from '../../../../ui/Surface.js'
+import { Select } from '../../../../ui/Select.js'
+import { Spinner } from '../../../../ui/Spinner.js'
+import { TextInput } from '../../../../ui/TextInput.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 type { BrowserWalletReady } from '../../../wallet/browserWallet.js'
+import type { TokenTransferProgress } from '../../effects/types.js'
+import { readCustodyMode } from '../../model/custody.js'
+import { shortAddress, shortCid } from '../../model/format.js'
+import { FlowTimeline } from '../../components/FlowTimeline.js'
+import { OPEN_BROWSER_HINT } from '../../components/WalletApprovalScreen.js'
+
+const TRANSFER_STEPS = ['Choose Receiver', 'Sender Signs', 'Receiver Signs', 'Sender Updates URI', 'Transfer Token']
+const APPROVAL_GUARDRAIL = 'No approve(), setApprovalForAll(), transferFrom(), or token approval is requested.'
+
+type TokenTransferTargetScreenProps = {
+  identity: EthagentIdentity
+  tokenNetworkLabel: string
+  error?: string
+  initialValue?: string
+  onSubmit: (value: string) => void
+  onBack: () => void
+}
+
+export const TokenTransferTargetScreen: React.FC<TokenTransferTargetScreenProps> = ({
+  identity,
+  tokenNetworkLabel,
+  error,
+  initialValue,
+  onSubmit,
+  onBack,
+}) => {
+  const tokenValue = identity.agentId ? `#${identity.agentId}` : 'not created'
+  const senderValue = shortAddress(identity.ownerAddress ?? identity.address)
+  const custodyMode = readCustodyMode(identity.state)
+  return (
+    <Surface
+      title="Prepare Token Transfer"
+      subtitle={<FlowTimeline steps={TRANSFER_STEPS} current={1} />}
+      footer={<Text color={theme.dim}>Enter Next · Esc Back</Text>}
+    >
+      <Box flexDirection="column">
+        <StatusRow label="Token" value={tokenValue} />
+        <StatusRow label="Network" value={tokenNetworkLabel} />
+        <StatusRow label="Sender" value={senderValue} />
+        <Box marginTop={1} flexDirection="column">
+          <Text color={theme.textSubtle}>Use this before any ERC-8004 token transfer.</Text>
+          <Text color={theme.textSubtle}>Both signed wallets can read this snapshot; after transfer, restore with the receiver wallet.</Text>
+          <Text color={theme.textSubtle}>{APPROVAL_GUARDRAIL}</Text>
+          {custodyMode === 'advanced' ? (
+            <Text color={theme.textSubtle}>Advanced custody: connect the owner wallet ({senderValue}) to sign as sender.</Text>
+          ) : null}
+        </Box>
+        <Box marginTop={1} flexDirection="column">
+          <TextInput
+            label="Receiver Wallet"
+            initialValue={initialValue ?? ''}
+            placeholder="ENS name or 0x address"
+            validate={value => validateTargetInput(value)}
+            onSubmit={onSubmit}
+            onCancel={onBack}
+          />
+        </Box>
+        {error ? <Box marginTop={1}><Text color={theme.accentError}>{error}</Text></Box> : null}
+      </Box>
+    </Surface>
+  )
+}
+
+type TokenTransferSigningScreenProps = {
+  identity: EthagentIdentity
+  tokenNetworkLabel: string
+  targetHandle: string
+  targetAddress: string
+  progress: TokenTransferProgress | null
+  walletSession: BrowserWalletReady | null
+  onCancel: () => void
+}
+
+export const TokenTransferSigningScreen: React.FC<TokenTransferSigningScreenProps> = ({
+  identity,
+  tokenNetworkLabel,
+  targetHandle,
+  targetAddress,
+  progress,
+  walletSession,
+  onCancel,
+}) => {
+  useAppInput((_input, key) => {
+    if (key.escape) onCancel()
+    if (key.return && walletSession?.url) {
+      openExternalUrl(walletSession.url)
+    }
+  }, { isActive: true })
+
+  const senderAddress = identity.ownerAddress ?? identity.address
+  const resolvedProgress = progress ?? {
+    phase: 'sender-sign' as const,
+    walletRole: 'sender' as const,
+    expectedAddress: senderAddress as TokenTransferProgress['expectedAddress'],
+    title: 'Use Sender Wallet',
+    detail: 'Sign to save a transfer snapshot.',
+    walletAction: 'Sign Snapshot',
+    label: 'preparing transfer snapshot...',
+  }
+  const phase = resolvedProgress.phase
+  const spinnerLabel = tokenTransferSpinnerLabel(resolvedProgress)
+  const activeRoleLabel = resolvedProgress.walletRole === 'receiver' ? 'Receiver' : 'Sender'
+  const otherWallet = resolvedProgress.walletRole === 'sender'
+    ? { label: 'Receiver', value: `${shortAddress(targetAddress)}${targetHandle !== targetAddress ? ` (${targetHandle})` : ''}` }
+    : { label: 'Sender', value: shortAddress(senderAddress) }
+  return (
+    <Surface
+      title="Prepare Token Transfer"
+      subtitle={<FlowTimeline steps={TRANSFER_STEPS} current={transferTimelineStep(phase)} />}
+      footer={<Text color={theme.dim}>Esc Back</Text>}
+    >
+      <Box flexDirection="column">
+        <StatusRow label="Token" value={identity.agentId ? `#${identity.agentId}` : 'not created'} />
+        <StatusRow label="Network" value={tokenNetworkLabel} />
+        <StatusRow label="Sender" value={shortAddress(senderAddress)} />
+        <StatusRow label="Receiver" value={`${shortAddress(targetAddress)}${targetHandle !== targetAddress ? ` (${targetHandle})` : ''}`} />
+        <Box marginTop={1} flexDirection="column">
+          <Text color={resolvedProgress.walletRole === 'none' ? theme.text : theme.accentPeriwinkle} bold={resolvedProgress.walletRole !== 'none'}>
+            {resolvedProgress.title}
+          </Text>
+          <Text color={theme.textSubtle}>{resolvedProgress.detail}</Text>
+          {resolvedProgress.expectedAddress ? (
+            <>
+              <StatusRow label={activeRoleLabel} value={shortAddress(resolvedProgress.expectedAddress)} emphasize />
+              <StatusRow label={otherWallet.label} value={otherWallet.value} />
+            </>
+          ) : null}
+        </Box>
+        {walletSession ? (
+          <Box marginTop={1} flexDirection="column">
+            <Text color={theme.accentPeriwinkle} underline>{walletSession.url}</Text>
+            <Text color={theme.dim}>{OPEN_BROWSER_HINT}</Text>
+          </Box>
+        ) : null}
+        <Box marginTop={1}>
+          <Spinner label={spinnerLabel} />
+        </Box>
+      </Box>
+    </Surface>
+  )
+}
+
+type TokenTransferReadyScreenProps = {
+  identity: EthagentIdentity
+  tokenNetworkLabel: string
+  targetHandle: string
+  targetAddress: string
+  snapshotCid: string
+  txHash: string
+  footer: React.ReactNode
+  backHint: string
+  onBack: () => void
+}
+
+export const TokenTransferReadyScreen: React.FC<TokenTransferReadyScreenProps> = ({
+  identity,
+  tokenNetworkLabel,
+  targetHandle,
+  targetAddress,
+  snapshotCid,
+  txHash,
+  footer,
+  backHint,
+  onBack,
+}) => (
+  <Surface
+    title="Transfer Snapshot Ready"
+    subtitle={<FlowTimeline steps={TRANSFER_STEPS} current={5} />}
+    footer={footer}
+  >
+    <Box flexDirection="column">
+      <Text color={theme.text}>Snapshot published. Transfer the ERC-8004 token externally on {tokenNetworkLabel} from sender to receiver.</Text>
+      <Box marginTop={1} flexDirection="column">
+        <StatusRow label="Token" value={identity.agentId ? `#${identity.agentId}` : 'not created'} tone={identity.agentId ? 'ok' : 'warn'} />
+        <StatusRow label="Network" value={tokenNetworkLabel} tone="ok" />
+        <StatusRow label="Sender" value={shortAddress(identity.ownerAddress ?? identity.address)} tone="ok" />
+        <StatusRow label="Receiver" value={`${shortAddress(targetAddress)}${targetHandle !== targetAddress ? ` (${targetHandle})` : ''}`} tone="ok" />
+        <StatusRow label="Snapshot" value={shortCid(snapshotCid)} tone="ok" />
+        <StatusRow label="Token URI tx" value={shortHash(txHash)} tone="ok" />
+      </Box>
+      <Box marginTop={1} flexDirection="column">
+        <Text color={theme.textSubtle}>Use this process for every ERC-8004 token transfer.</Text>
+        <Text color={theme.textSubtle}>Both sender and receiver signatures can decrypt this snapshot.</Text>
+        <Text color={theme.textSubtle}>After transfer, use Load Agent with the receiver wallet.</Text>
+        <Text color={theme.textSubtle}>{APPROVAL_GUARDRAIL}</Text>
+      </Box>
+      <Box marginTop={1}>
+        <Select<'back'>
+          options={[
+            { value: 'back', role: 'section', label: 'Navigation' },
+            { value: 'back', label: 'Back', hint: backHint, role: 'utility' },
+          ]}
+          hintLayout="inline"
+          onSubmit={onBack}
+          onCancel={onBack}
+        />
+      </Box>
+    </Box>
+  </Surface>
+)
+
+type StatusRowProps = { label: string; value: string; tone?: 'ok' | 'warn'; emphasize?: boolean }
+const StatusRow: React.FC<StatusRowProps> = ({ label, value, tone, emphasize }) => {
+  const color = emphasize ? theme.accentPeriwinkle : tone === 'ok' ? theme.text : tone === 'warn' ? theme.accentPeriwinkle : theme.text
+  return (
+    <Text>
+      <Text color={theme.textSubtle}>{label.padEnd(12)} </Text>
+      <Text color={color} bold={emphasize}>{value}</Text>
+    </Text>
+  )
+}
+
+function transferTimelineStep(phase: TokenTransferProgress['phase'] | undefined): number {
+  switch (phase) {
+    case 'sender-sign':
+      return 2
+    case 'target-sign':
+      return 3
+    case 'pinning':
+    case 'sender-transaction':
+    case 'confirming':
+      return 4
+    default:
+      return 2
+  }
+}
+
+function validateTargetInput(value: string): string | null {
+  const trimmed = value.trim()
+  if (!trimmed) return 'Enter the receiver wallet ENS name or 0x address'
+  if (trimmed.startsWith('0x') && !/^0x[0-9a-fA-F]{40}$/.test(trimmed)) return 'Enter a valid 0x address'
+  if (!trimmed.startsWith('0x') && !trimmed.includes('.')) return 'Enter an ENS name or 0x address'
+  return null
+}
+
+function shortHash(hash: string): string {
+  return hash.length > 14 ? `${hash.slice(0, 10)}...${hash.slice(-6)}` : hash
+}
+
+function tokenTransferSpinnerLabel(progress: TokenTransferProgress): string {
+  const label = progress.walletRole === 'none'
+    ? progress.title
+    : progress.walletAction ?? progress.title
+  return `${label.replace(/[.]+$/g, '')}...`
+}

package/src/identity/hub/identityHubReducer.ts

@@ -1,117 +1,114 @@
-import type { EthagentConfig, EthagentIdentity, SelectableNetwork } from '../../storage/config.js'
+import type { EthagentIdentity, SelectableNetwork } from '../../storage/config.js'
 import type { Erc8004AgentCandidate, Erc8004RegistryConfig } from '../registry/erc8004.js'
+import { networkForChainId } from '../registry/erc8004.js'
 import type { RegistryResolution } from '../registry/registryConfig.js'
 import type { AgentStateBackupEnvelope } from '../crypto/backupEnvelope.js'
 import type { ContinuitySnapshotEnvelope } from '../continuity/envelope.js'
-import type { IdentityHubErrorView } from './identityHubModel.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'
 
 export type RestorePurpose = 'restore' | 'switch'
-export type DetailsView = Extract<Step, { kind: 'details' }>
-export type ProfileUpdates = { name?: string; description?: string; imagePath?: string }
-export type RestorableBackupEnvelope = AgentStateBackupEnvelope | ContinuitySnapshotEnvelope
+type RestoreNotFoundReason = 'no-owner-or-operator' | 'search-incomplete' | 'cancelled'
+export type ProfileUpdates = {
+  name?: string
+  description?: string
+  imagePath?: string
+  ensName?: string
+  custodyMode?: 'simple' | 'advanced'
+  ownerAddress?: string
+  approvedOperatorWallets?: ApprovedOperatorWalletInput[]
+  activeOperatorAddress?: string
+  operatorVaultAddress?: string
+  restoreAccessEpoch?: number
+  bumpRestoreAccessEpoch?: boolean
+  custodyPhase?: 'switch-advanced' | 'switch-simple'
+}
+
+type RestorableBackupEnvelope = AgentStateBackupEnvelope | ContinuitySnapshotEnvelope
 
 export type Step =
   | { kind: 'menu' }
   | { kind: 'replace-confirm'; next: 'create' | 'restore' }
-  | { kind: 'create-name'; error?: string }
-  | { kind: 'create-description'; name: string }
+  | { kind: 'create-name'; name?: string; error?: string }
+  | { kind: 'create-description'; name: string; description?: string }
   | { kind: 'create-network'; name: string; description: string }
-  | { kind: 'create-preflight'; name: string; description: string; network?: SelectableNetwork }
-  | { kind: 'create-registry'; name: string; description: string; resolution: RegistryResolution; error?: string }
-  | { kind: 'create-signing'; name: string; description: string; registry: Erc8004RegistryConfig; pinataJwt?: string }
-  | { kind: 'create-storage'; name: string; description: string; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string }
-  | { kind: 'restore-owner'; purpose?: RestorePurpose }
+  | { kind: 'create-custody'; name: string; description: string; network?: SelectableNetwork }
+  | { kind: 'create-preflight'; name: string; description: string; network?: SelectableNetwork; custodyMode: CustodyMode }
+  | { kind: 'create-registry'; name: string; description: string; resolution: RegistryResolution; custodyMode: CustodyMode; error?: string }
+  | { kind: 'create-signing'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; pinataJwt?: string }
+  | { kind: 'create-storage'; name: string; description: string; registry: Erc8004RegistryConfig; custodyMode: CustodyMode; error?: string; pinataJwt?: string }
+  | { kind: 'first-run-ens-prompt'; identity: EthagentIdentity; registry: Erc8004RegistryConfig }
   | { kind: 'restore-wallet'; purpose?: RestorePurpose }
   | { kind: 'restore-network'; ownerHandle: string; purpose?: RestorePurpose }
   | { kind: 'restore-registry'; ownerHandle: string; error?: string; purpose?: RestorePurpose }
-  | { kind: 'restore-discovering'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose }
-  | { kind: 'restore-token-id'; ownerHandle: string; registry: Erc8004RegistryConfig; error?: string; purpose?: RestorePurpose }
-  | { kind: 'restore-select-token'; ownerHandle: string; registry: Erc8004RegistryConfig; candidates: Erc8004AgentCandidate[]; purpose?: RestorePurpose }
-  | { kind: 'restore-fetching'; cid: string; apiUrl: string; candidate: Erc8004AgentCandidate; purpose?: RestorePurpose }
-  | { kind: 'restore-authorizing'; cid: string; apiUrl: string; envelope: RestorableBackupEnvelope; candidate: Erc8004AgentCandidate; purpose?: RestorePurpose }
-  | { kind: 'rebackup-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step }
-  | { kind: 'rebackup-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step }
+  | { kind: 'restore-discovering'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose; abortSignal?: AbortSignal }
+  | { kind: 'restore-recovery-input'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose }
+  | { kind: 'restore-ens-input'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose; busy?: boolean; error?: string }
+  | { kind: 'restore-token-id-input'; ownerHandle: string; registry: Erc8004RegistryConfig; purpose?: RestorePurpose; busy?: boolean; error?: string }
+  | { kind: 'restore-not-found'; ownerHandle: string; registry: Erc8004RegistryConfig; requesterAddress?: string; reason: RestoreNotFoundReason; purpose?: RestorePurpose }
+  | { kind: 'restore-select-token'; ownerHandle: string; registry: Erc8004RegistryConfig; candidates: Erc8004AgentCandidate[]; requesterAddress?: string; purpose?: RestorePurpose }
+  | { kind: 'restore-fetching'; cid: string; apiUrl: string; candidate: Erc8004AgentCandidate; requesterAddress?: string; purpose?: RestorePurpose }
+  | { kind: 'restore-authorizing'; cid: string; apiUrl: string; envelope: RestorableBackupEnvelope; candidate: Erc8004AgentCandidate; requesterAddress?: string; purpose?: RestorePurpose }
+  | { kind: 'rebackup-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; walletPurpose?: WalletPurpose; vaultAddress?: `0x${string}` }
+  | { kind: 'rebackup-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; walletPurpose?: WalletPurpose; vaultAddress?: `0x${string}` }
+  | { kind: 'public-profile-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; vaultAddress?: `0x${string}` }
+  | { kind: 'public-profile-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; pinataJwt?: string; profileUpdates?: ProfileUpdates; returnTo?: Step; vaultAddress?: `0x${string}` }
   | { kind: 'continuity-private'; notice?: string; editorOpened?: boolean }
   | { kind: 'continuity-public'; notice?: string; editorOpened?: boolean }
   | { kind: 'rebackup-confirm'; back: Step }
   | { kind: 'recovery-refetch-confirm'; back: Step }
   | { kind: 'recovery-refetching'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; back: Step }
   | { kind: 'rebackup-start'; back: Step }
-  | { kind: 'edit-profile-name'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step }
-  | { kind: 'edit-profile-description'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; returnTo?: Step }
-  | { kind: 'edit-profile-image'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description: string; error?: string; returnTo?: Step }
+  | { kind: 'edit-profile-name'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name?: string; description?: string; imagePath?: string; returnTo?: Step }
+  | { kind: 'edit-profile-description'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description?: string; imagePath?: string; returnTo?: Step }
+  | { kind: 'edit-profile-image'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description: string; imagePath?: string; error?: string; returnTo?: Step }
+  | { kind: 'edit-profile-review'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; name: string; description: string; imagePath?: string; returnTo?: Step }
+  | { kind: 'edit-profile-ens'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; initialView?: 'advanced' }
+  | { kind: 'ens-records-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; ownerAddress?: string; returnTo?: Step; clearRecords?: boolean }
+  | { kind: 'ens-setup-registry-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; returnTo?: Step }
+  | { kind: 'ens-setup-records-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; returnTo?: Step; registryTxHash?: string }
+  | { kind: 'ens-clear-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; ownerAddress: `0x${string}`; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; pinataJwt?: string; returnTo?: Step }
+  | { kind: 'ens-update-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; fullName: string; ownerAddress: `0x${string}`; records: AgentEnsRecords; currentRecords?: AgentEnsRecordState; pinataJwt?: string; returnTo?: Step }
+  | { kind: 'ens-link-flow-running'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; setup: EnsSetupPlan; pinataJwt?: string; returnTo?: Step }
+  | { kind: 'manage-ens-operators'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; notice?: string; error?: string }
+  | { kind: 'custody-model'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step; notice?: string }
+  | { kind: 'custody-advanced-confirm'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step }
+  | { kind: 'custody-simple-confirm'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step }
+  | { kind: 'custody-vault-deploy-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; profileUpdates: ProfileUpdates; returnTo?: Step }
+  | { kind: 'custody-vault-deposit-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; profileUpdates: ProfileUpdates; returnTo?: Step }
+  | { kind: 'custody-vault-unwrap-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; profileUpdates: ProfileUpdates; returnTo?: Step; agentIds?: string[] }
+  | { kind: 'custody-vault-withdraw-discovering'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; returnTo?: Step; returnContext?: 'ens' | 'simple-exit' }
+  | { kind: 'custody-vault-withdraw-pick-token'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; tokens: ReadonlyArray<{ agentId: string }>; returnTo?: Step; returnContext?: 'ens' | 'simple-exit' }
+  | { kind: 'custody-vault-withdraw-tx'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; agentId?: string; returnTo?: Step; returnContext?: 'ens' | 'simple-exit' }
+  | { kind: 'custody-vault-withdraw-done'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress: `0x${string}`; recipient: `0x${string}`; returnTo?: Step; returnContext?: 'ens' | 'simple-exit' }
+  | { kind: 'custody-advanced-done'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; vaultAddress?: `0x${string}`; returnTo?: Step }
+  | { kind: 'custody-simple-done'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; returnTo?: Step }
+  | { kind: 'token-transfer-target'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; error?: string; previousTarget?: string; returnTo?: Step }
+  | { kind: 'token-transfer-resolving'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; targetHandle: string; returnTo?: Step }
+  | { kind: 'token-transfer-storage'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; targetHandle: string; targetAddress: string; error?: string; pinataJwt?: string; returnTo?: Step }
+  | { kind: 'token-transfer-signing'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; targetHandle: string; targetAddress: string; pinataJwt?: string; returnTo?: Step }
+  | { kind: 'token-transfer-ready'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; targetHandle: string; targetAddress: string; snapshotCid: string; txHash: string; returnTo?: Step }
   | { kind: 'storage-credential' }
   | { kind: 'storage-credential-input'; error?: string }
   | { kind: 'storage-credential-forget-confirm' }
   | { kind: 'details' }
+  | { kind: 'save-prompt'; back: Step }
   | { kind: 'busy'; label: string }
   | { kind: 'error'; error: IdentityHubErrorView; back: Step }
+  | { kind: 'identity-unlinked'; identity: EthagentIdentity; registry: Erc8004RegistryConfig; onChainOwner?: string; back: Step }
 
 export type Action =
-  | { type: 'goMenu' }
-  | { type: 'startCreate'; hasIdentity: boolean }
-  | { type: 'confirmReplace' }
-  | { type: 'cancelReplace' }
-  | { type: 'nameSubmitted'; name: string }
-  | { type: 'descriptionSubmitted'; name: string; description: string }
-  | { type: 'preflightResolved'; step: Step }
-  | { type: 'registrySubmitted'; step: Step }
-  | { type: 'storageSubmitted'; step: Step }
-  | { type: 'walletSigned'; step: Step }
-  | { type: 'pinned'; step: Step }
-  | { type: 'registered'; step: Step }
-  | { type: 'startRestore' }
-  | { type: 'ownerSubmitted'; step: Step }
-  | { type: 'restoreRegistrySubmitted'; step: Step }
-  | { type: 'discovered'; step: Step }
-  | { type: 'tokenSelected'; step: Step }
-  | { type: 'fetched'; step: Step }
-  | { type: 'authorized' }
-  | { type: 'openDetails' }
-  | { type: 'openCopyPicker' }
-  | { type: 'closeCopyPicker' }
-  | { type: 'error'; error: IdentityHubErrorView; back: Step }
+  | { type: 'setStep'; step: Step }
   | { type: 'back'; from: Step }
 
 export function identityHubReducer(state: Step, action: Action): Step {
   switch (action.type) {
-    case 'goMenu':
-      return { kind: 'menu' }
-    case 'startCreate':
-      if (action.hasIdentity) return { kind: 'replace-confirm', next: 'create' }
-      return { kind: 'create-name' }
-    case 'confirmReplace':
-      return { kind: 'create-name' }
-    case 'cancelReplace':
-      return { kind: 'menu' }
-    case 'nameSubmitted':
-      return { kind: 'create-description', name: action.name }
-    case 'descriptionSubmitted':
-      return { kind: 'create-network', name: action.name, description: action.description }
-    case 'preflightResolved':
-    case 'registrySubmitted':
-    case 'storageSubmitted':
-    case 'walletSigned':
-    case 'pinned':
-    case 'registered':
-    case 'ownerSubmitted':
-    case 'restoreRegistrySubmitted':
-    case 'discovered':
-    case 'tokenSelected':
-    case 'fetched':
+    case 'setStep':
       return action.step
-    case 'startRestore':
-      return { kind: 'restore-wallet' }
-    case 'openDetails':
-      return { kind: 'details' }
-    case 'openCopyPicker':
-      if (state.kind === 'details') return { kind: 'details' }
-      return state
-    case 'closeCopyPicker':
-      if (state.kind === 'details') return { kind: 'details' }
-      return state
-    case 'error':
-      return { kind: 'error', error: action.error, back: action.back }
     case 'back':
       return backStep(action.from)
     default:
@@ -124,35 +121,46 @@ function backStep(from: Step): Step {
     case 'create-name':
       return { kind: 'menu' }
     case 'create-description':
-      return { kind: 'create-name' }
+      return { kind: 'create-name', name: from.name }
     case 'create-network':
-      return { kind: 'create-description', name: from.name }
-    case 'create-preflight':
+      return { kind: 'create-description', name: from.name, description: from.description }
+    case 'create-custody':
       return { kind: 'create-network', name: from.name, description: from.description }
+    case 'create-preflight':
+      return { kind: 'create-custody', name: from.name, description: from.description, ...(from.network ? { network: from.network } : {}) }
     case 'create-registry':
-      return { kind: 'create-network', name: from.name, description: from.description }
-    case 'create-signing':
-      return { kind: 'create-network', name: from.name, description: from.description }
-    case 'create-storage':
-      return { kind: 'create-network', name: from.name, description: from.description }
-    case 'restore-owner':
+      return { kind: 'create-custody', name: from.name, description: from.description, ...(from.resolution.network ? { network: from.resolution.network } : {}) }
+    case 'create-signing': {
+      const sigNetwork = networkForChainId(from.registry.chainId)
+      return { kind: 'create-custody', name: from.name, description: from.description, ...(sigNetwork ? { network: sigNetwork } : {}) }
+    }
+    case 'create-storage': {
+      const stoNetwork = networkForChainId(from.registry.chainId)
+      return { kind: 'create-custody', name: from.name, description: from.description, ...(stoNetwork ? { network: stoNetwork } : {}) }
+    }
+    case 'first-run-ens-prompt':
       return { kind: 'menu' }
     case 'restore-wallet':
-      return { kind: 'restore-owner', purpose: from.purpose }
     case 'restore-network':
-      return { kind: 'restore-owner', purpose: from.purpose }
+      return { kind: 'menu' }
     case 'restore-registry':
       return { kind: 'restore-network', ownerHandle: from.ownerHandle, purpose: from.purpose }
     case 'restore-discovering':
       return { kind: 'restore-network', ownerHandle: from.ownerHandle, purpose: from.purpose }
-    case 'restore-token-id':
+    case 'restore-recovery-input':
+      return { kind: 'restore-network', ownerHandle: from.ownerHandle, purpose: from.purpose }
+    case 'restore-ens-input':
+      return { kind: 'restore-recovery-input', ownerHandle: from.ownerHandle, registry: from.registry, purpose: from.purpose }
+    case 'restore-token-id-input':
+      return { kind: 'restore-recovery-input', ownerHandle: from.ownerHandle, registry: from.registry, purpose: from.purpose }
+    case 'restore-not-found':
       return { kind: 'restore-network', ownerHandle: from.ownerHandle, purpose: from.purpose }
     case 'restore-select-token':
       return { kind: 'restore-network', ownerHandle: from.ownerHandle, purpose: from.purpose }
     case 'restore-fetching':
-      return { kind: 'restore-network', ownerHandle: from.candidate.ownerAddress, purpose: from.purpose }
+      return { kind: 'restore-network', ownerHandle: from.requesterAddress ?? from.candidate.ownerAddress, purpose: from.purpose }
     case 'restore-authorizing':
-      return { kind: 'restore-network', ownerHandle: from.candidate.ownerAddress, purpose: from.purpose }
+      return { kind: 'restore-network', ownerHandle: from.requesterAddress ?? from.candidate.ownerAddress, purpose: from.purpose }
     case 'details':
       return { kind: 'menu' }
     case 'rebackup-signing':
@@ -172,21 +180,76 @@ function backStep(from: Step): Step {
     case 'edit-profile-name':
       return from.returnTo ?? { kind: 'continuity-public' }
     case 'edit-profile-description':
-      return { kind: 'edit-profile-name', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
+      return { kind: 'edit-profile-name', identity: from.identity, registry: from.registry, name: from.name, description: from.description, imagePath: from.imagePath, returnTo: from.returnTo }
     case 'edit-profile-image':
-      return { kind: 'edit-profile-description', identity: from.identity, registry: from.registry, name: from.name, returnTo: from.returnTo }
+      return { kind: 'edit-profile-description', identity: from.identity, registry: from.registry, name: from.name, description: from.description, imagePath: from.imagePath, returnTo: from.returnTo }
+    case 'edit-profile-review':
+      return { kind: 'edit-profile-image', identity: from.identity, registry: from.registry, name: from.name, description: from.description, imagePath: from.imagePath, returnTo: from.returnTo }
+    case 'edit-profile-ens':
+      return from.returnTo ?? { kind: 'menu' }
+    case 'ens-records-tx':
+      return { kind: 'edit-profile-ens', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
+    case 'ens-setup-registry-tx':
+    case 'ens-setup-records-tx':
+      return {
+        kind: 'edit-profile-ens',
+        identity: from.identity,
+        registry: from.registry,
+        returnTo: from.returnTo,
+        ...(from.setup.mode === 'advanced' ? { initialView: 'advanced' as const } : {}),
+      }
+    case 'ens-clear-flow-running':
+    case 'ens-update-flow-running':
+      return { kind: 'edit-profile-ens', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
+    case 'ens-link-flow-running':
+      return {
+        kind: 'edit-profile-ens',
+        identity: from.identity,
+        registry: from.registry,
+        returnTo: from.returnTo,
+        ...(from.setup.mode === 'advanced' ? { initialView: 'advanced' as const } : {}),
+      }
+    case 'manage-ens-operators':
+      return from.returnTo ?? { kind: 'menu' }
+    case 'custody-model':
+      return from.returnTo ?? { kind: 'menu' }
+    case 'custody-advanced-confirm':
+    case 'custody-simple-confirm':
+    case 'custody-vault-deploy-tx':
+    case 'custody-vault-deposit-tx':
+    case 'custody-vault-unwrap-tx':
+    case 'custody-vault-withdraw-discovering':
+    case 'custody-vault-withdraw-pick-token':
+    case 'custody-vault-withdraw-tx':
+    case 'custody-vault-withdraw-done':
+      return { kind: 'custody-model', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
+    case 'custody-advanced-done':
+    case 'custody-simple-done':
+      return from.returnTo ?? { kind: 'menu' }
+    case 'token-transfer-target':
+      return from.returnTo ?? { kind: 'menu' }
+    case 'token-transfer-resolving':
+    case 'token-transfer-storage':
+    case 'token-transfer-signing':
+      return { kind: 'token-transfer-target', identity: from.identity, registry: from.registry, returnTo: from.returnTo }
+    case 'token-transfer-ready':
+      return from.returnTo ?? { kind: 'menu' }
     case 'storage-credential':
     case 'storage-credential-input':
     case 'storage-credential-forget-confirm':
       return { kind: 'menu' }
+    case 'save-prompt':
+      return from.back
     case 'error':
       return from.back
+    case 'identity-unlinked':
+      return from.back
     default:
       return { kind: 'menu' }
   }
 }
 
-export const CREATE_STEP_LABELS = ['name', 'describe', 'network', 'create']
+export const CREATE_STEP_LABELS = ['Name', 'Describe', 'Network', 'Custody', 'Create']
 
 export function createStepNumber(step: Step): number {
   switch (step.kind) {
@@ -196,11 +259,13 @@ export function createStepNumber(step: Step): number {
       return 2
     case 'create-network':
       return 3
+    case 'create-custody':
+      return 4
     case 'create-preflight':
     case 'create-storage':
     case 'create-registry':
     case 'create-signing':
-      return 4
+      return 5
     default:
       return 0
   }