ethagent 3.2.0 → 3.3.1

package/src/identity/hub/continuity/vault.ts

@@ -4,7 +4,6 @@ import {
   prepareSyncedIdentityMarkdownScaffold,
   prepareSyncedSkillsTree,
   readContinuityFiles,
-  readPublicSkillsFile,
   writeIdentityMarkdownScaffold,
   type IdentityMarkdownScaffold,
 } from '../../continuity/storage.js'
@@ -16,14 +15,7 @@ import {
   type WalletChallengePurpose,
 } from '../../continuity/envelope.js'
 import {
-  appendPublicSkillEntries,
-  createAgentCard,
-  defaultPublicSkillsProfile,
-  serializeAgentCard,
-} from '../../continuity/publicSkills.js'
-import {
-  derivePublicSkillEntries,
-  syncPublicSkillsManifest,
+  syncAgentCardManifest,
 } from '../../continuity/skills/publicSkillsSync.js'
 import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
 import { addToIpfs, DEFAULT_IPFS_API_URL } from '../../storage/ipfs.js'
@@ -60,7 +52,7 @@ import {
 import { markCurrentContinuityFilesPublished } from '../shared/effects/sync.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
-type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>
+type AgentCardMetadata = NonNullable<EthagentIdentity['agentCard']>
 
 type VaultPublishPrepared = {
   nextIdentity: EthagentIdentity
@@ -68,7 +60,7 @@ type VaultPublishPrepared = {
   completionMessage: string
   publishedSources: {
     privateFiles: ContinuityFiles
-    publicSkills: string
+    agentCard: string
     skills: ContinuitySkillsTree
   }
 }
@@ -142,20 +134,8 @@ export async function runOperatorWalletRebackup(args: {
   const continuityFiles = markdownScaffold
     ? { 'SOUL.md': markdownScaffold['SOUL.md'], 'MEMORY.md': markdownScaffold['MEMORY.md'] }
     : await readContinuityFiles(nextIdentityForFiles)
-  const publicSkillsJson = await syncPublicSkillsManifest(nextIdentityForFiles)
-  const publicSkillsPin = await addToIpfs(DEFAULT_IPFS_API_URL, publicSkillsJson, fetch, { pinataJwt: step.pinataJwt })
-  assertVerifiedPin(publicSkillsPin)
-  const publicSkillEntries = await derivePublicSkillEntries(nextIdentityForFiles)
-  const augmentedPublicProfile = appendPublicSkillEntries(
-    defaultPublicSkillsProfile(nextIdentityForFiles),
-    publicSkillEntries,
-  )
-  const agentCardPin = await addToIpfs(
-    DEFAULT_IPFS_API_URL,
-    serializeAgentCard(createAgentCard(augmentedPublicProfile)),
-    fetch,
-    { pinataJwt: step.pinataJwt },
-  )
+  const agentCardJson = await syncAgentCardManifest(nextIdentityForFiles)
+  const agentCardPin = await addToIpfs(DEFAULT_IPFS_API_URL, agentCardJson, fetch, { pinataJwt: step.pinataJwt })
   assertVerifiedPin(agentCardPin)
   const skillsTree = await prepareSyncedSkillsTree(nextIdentityForFiles)
   const envelope = createContinuityEnvelopeForSave({
@@ -185,9 +165,8 @@ export async function runOperatorWalletRebackup(args: {
     identityRegistryAddress: step.registry.identityRegistryAddress,
     agentId: sourceAgentId,
   }
-  const publicSkills: PublicSkillsMetadata = {
-    cid: publicSkillsPin.cid,
-    agentCardCid: agentCardPin.cid,
+  const agentCard: AgentCardMetadata = {
+    cid: agentCardPin.cid,
     updatedAt: envelope.createdAt,
     status: 'pinned',
   }
@@ -196,7 +175,7 @@ export async function runOperatorWalletRebackup(args: {
     ...step.identity,
     state,
     backup,
-    publicSkills,
+    agentCard,
   }
 
   if (markdownScaffold) {
@@ -205,7 +184,7 @@ export async function runOperatorWalletRebackup(args: {
   await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'local operator-wallet snapshot' }).catch(() => null)
   await markCurrentContinuityFilesPublished(nextIdentity, {
     privateFiles: continuityFiles,
-    publicSkills: publicSkillsJson,
+    agentCard: agentCardJson,
     skills: skillsTree,
   }).catch(() => null)
   const completionMessage = nextEnsName !== undefined && nextEnsName !== ((step.identity.state as Record<string, unknown> | undefined)?.ensName as string | undefined)
@@ -284,20 +263,8 @@ async function runOperatorWalletVaultPublish(args: {
       const continuityFiles = markdownScaffold
         ? { 'SOUL.md': markdownScaffold['SOUL.md'], 'MEMORY.md': markdownScaffold['MEMORY.md'] }
         : await readContinuityFiles(nextIdentityForFiles)
-      const publicSkillsJson = await syncPublicSkillsManifest(nextIdentityForFiles)
-      const publicSkillsPin = await addToIpfs(DEFAULT_IPFS_API_URL, publicSkillsJson, fetch, { pinataJwt: step.pinataJwt })
-      assertVerifiedPin(publicSkillsPin)
-      const publicSkillEntries = await derivePublicSkillEntries(nextIdentityForFiles)
-      const augmentedPublicProfile = appendPublicSkillEntries(
-        defaultPublicSkillsProfile(nextIdentityForFiles),
-        publicSkillEntries,
-      )
-      const agentCardPin = await addToIpfs(
-        DEFAULT_IPFS_API_URL,
-        serializeAgentCard(createAgentCard(augmentedPublicProfile)),
-        fetch,
-        { pinataJwt: step.pinataJwt },
-      )
+      const agentCardJson = await syncAgentCardManifest(nextIdentityForFiles)
+      const agentCardPin = await addToIpfs(DEFAULT_IPFS_API_URL, agentCardJson, fetch, { pinataJwt: step.pinataJwt })
       assertVerifiedPin(agentCardPin)
       const skillsTree = await prepareSyncedSkillsTree(nextIdentityForFiles)
       const envelope = createContinuityEnvelopeForSave({
@@ -315,9 +282,8 @@ async function runOperatorWalletVaultPublish(args: {
       const statePin = await addToIpfs(DEFAULT_IPFS_API_URL, serializeContinuitySnapshotEnvelope(envelope), fetch, { pinataJwt: step.pinataJwt })
       assertVerifiedPin(statePin)
 
-      const publicSkills: PublicSkillsMetadata = {
-        cid: publicSkillsPin.cid,
-        agentCardCid: agentCardPin.cid,
+      const agentCard: AgentCardMetadata = {
+        cid: agentCardPin.cid,
         updatedAt: envelope.createdAt,
         status: 'pinned',
       }
@@ -329,7 +295,7 @@ async function runOperatorWalletVaultPublish(args: {
         ...(uploadedImageUri ? { image: uploadedImageUri } : {}),
       }, {
         backup: { cid: statePin.cid, envelopeVersion: envelope.envelopeVersion, createdAt: envelope.createdAt },
-        publicDiscovery: { skillsCid: publicSkills.cid, agentCardCid: publicSkills.agentCardCid, updatedAt: publicSkills.updatedAt },
+        publicDiscovery: { agentCardCid: agentCard.cid, updatedAt: agentCard.updatedAt },
         registration: { chainId: step.registry.chainId, identityRegistryAddress: step.registry.identityRegistryAddress, agentId: sourceAgentId },
         ensName: nextEnsName,
         operators: operatorsPointerFromState(state, nextEnsName),
@@ -365,7 +331,7 @@ async function runOperatorWalletVaultPublish(args: {
         ...step.identity,
         state,
         backup,
-        publicSkills,
+        agentCard,
         agentUri,
         metadataCid,
       }
@@ -383,7 +349,7 @@ async function runOperatorWalletVaultPublish(args: {
           completionMessage,
           publishedSources: {
             privateFiles: continuityFiles,
-            publicSkills: publicSkillsJson,
+            agentCard: agentCardJson,
             skills: skillsTree,
           },
         },

package/src/identity/hub/create/effects.ts

@@ -14,7 +14,6 @@ import {
 import {
   createAgentCard,
   defaultPublicSkillsProfile,
-  renderPublicSkillsJson,
   serializeAgentCard,
 } from '../../continuity/publicSkills.js'
 import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
@@ -43,17 +42,17 @@ import { awaitConfirmedReceipt } from '../shared/effects/receipts.js'
 import { assertVerifiedPin } from '../shared/effects/profilePrep.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
-type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>
+type AgentCardMetadata = NonNullable<EthagentIdentity['agentCard']>
 
 type CreatePreparedTransaction = {
   ownerAddress: Address
   agentUri: string
   metadataCid: string
   backup: BackupMetadata
-  publicSkills: PublicSkillsMetadata
+  agentCard: AgentCardMetadata
   state: Record<string, unknown>
   continuityFiles: ReturnType<typeof defaultContinuityFiles>
-  publicSkillsJson: string
+  agentCardJson: string
 }
 
 export async function runCreatePreflight(
@@ -139,10 +138,8 @@ export async function runCreateSigning(
       })
       const continuityFiles = defaultContinuityFiles(draftIdentity)
       const publicProfile = defaultPublicSkillsProfile(draftIdentity)
-      const publicSkillsJson = renderPublicSkillsJson(publicProfile)
-      const publicSkillsPin = await addToIpfs(DEFAULT_IPFS_API_URL, publicSkillsJson, fetch, { pinataJwt: step.pinataJwt })
-      assertVerifiedPin(publicSkillsPin)
-      const agentCardPin = await addToIpfs(DEFAULT_IPFS_API_URL, serializeAgentCard(createAgentCard(publicProfile)), fetch, { pinataJwt: step.pinataJwt })
+      const agentCardJson = serializeAgentCard(createAgentCard(publicProfile))
+      const agentCardPin = await addToIpfs(DEFAULT_IPFS_API_URL, agentCardJson, fetch, { pinataJwt: step.pinataJwt })
       assertVerifiedPin(agentCardPin)
       const envelope = createContinuitySnapshotEnvelope({
         ownerAddress: wallet.account,
@@ -168,9 +165,8 @@ export async function runCreateSigning(
         rpcUrl: step.registry.rpcUrl,
         identityRegistryAddress: step.registry.identityRegistryAddress,
       }
-      const publicSkills: PublicSkillsMetadata = {
-        cid: publicSkillsPin.cid,
-        agentCardCid: agentCardPin.cid,
+      const agentCard: AgentCardMetadata = {
+        cid: agentCardPin.cid,
         updatedAt: envelope.createdAt,
         status: 'pinned',
       }
@@ -181,7 +177,7 @@ export async function runCreateSigning(
         ...(typeof state.imageUrl === 'string' ? { image: state.imageUrl } : {}),
       }, {
         backup: { cid, envelopeVersion: envelope.envelopeVersion, createdAt: envelope.createdAt },
-        publicDiscovery: { skillsCid: publicSkills.cid, agentCardCid: publicSkills.agentCardCid, updatedAt: publicSkills.updatedAt },
+        publicDiscovery: { agentCardCid: agentCard.cid, updatedAt: agentCard.updatedAt },
         registration: { chainId: step.registry.chainId, identityRegistryAddress: step.registry.identityRegistryAddress },
         ownerAddress: wallet.account,
       })
@@ -197,10 +193,10 @@ export async function runCreateSigning(
           agentUri,
           metadataCid,
           backup: { ...backup, metadataCid, agentUri },
-          publicSkills,
+          agentCard,
           state,
           continuityFiles,
-          publicSkillsJson,
+          agentCardJson,
         },
       }
     },
@@ -233,11 +229,11 @@ export async function runCreateSigning(
     metadataCid: result.prepared.metadataCid,
     state: result.prepared.state,
     backup,
-    publicSkills: result.prepared.publicSkills,
+    agentCard: result.prepared.agentCard,
   }
   await writeIdentityMarkdownScaffold(nextIdentity, {
     ...defaultContinuityFiles(nextIdentity),
-    'skills.json': result.prepared.publicSkillsJson,
+    'agent-card.json': result.prepared.agentCardJson,
   })
   await recordPublishedContinuitySnapshot({ identity: nextIdentity, label: 'initial published snapshot' }).catch(() => null)
   await callbacks.onIdentityComplete(nextIdentity, `ERC-8004 agent registered · #${registered.agentId.toString()}`, 'create')

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

@@ -46,7 +46,6 @@ type AdvancedScreenProps = {
   runAdvancedSubdomainCheck: (rootName: string, label: string) => void
   onEnsSetup: EnsEditProps['onEnsSetup']
   onEnsLink: EnsEditProps['onEnsLink']
-  onWithdrawToken: () => void
 }
 
 export function renderAdvancedEnsPhase({
@@ -65,82 +64,7 @@ export function renderAdvancedEnsPhase({
   runAdvancedSubdomainCheck,
   onEnsSetup,
   onEnsLink,
-  onWithdrawToken,
 }: AdvancedScreenProps): React.ReactNode | null {
-  if (phase.kind === 'advanced-transfer-check') {
-    type TransferCheckAction = 'continue' | 'withdraw' | 'back'
-    const custody = reconciliation.custody
-    const tokenInVault = custody === 'advanced' || custody === 'mid-flow-uri-pending'
-    const tokenInOwnerWallet = custody === 'simple' || custody === 'withdrawn'
-    const probePending = custody === 'unknown' && reconciliation.rpc !== 'failing'
-    const probeFailed = reconciliation.rpc === 'failing'
-
-    const options: Array<{ value: TransferCheckAction; role?: 'section' | 'utility'; label: string; hint?: string }> = []
-    options.push({ value: 'continue', role: 'section', label: 'Setup' })
-    if (tokenInOwnerWallet) {
-      options.push({
-        value: 'continue',
-        label: 'Continue ENS Setup',
-        hint: 'Owner wallet holds this token onchain.',
-      })
-    } else if (tokenInVault) {
-      options.push({
-        value: 'withdraw',
-        label: 'Withdraw Token',
-        hint: 'Pull token out to sign ENS records. Redeposit to the Vault any time after.',
-      })
-    } else if (probePending) {
-      options.push({
-        value: 'continue',
-        label: 'Checking onchain state…',
-        hint: 'Try again in a moment.',
-      })
-    } else if (probeFailed) {
-      options.push({
-        value: 'continue',
-        label: 'Onchain check unavailable',
-        hint: 'RPC unreachable. Resolve connectivity, then retry.',
-      })
-    } else {
-      options.push({
-        value: 'continue',
-        label: 'Token Owner Unknown',
-        hint: 'Try again in a moment.',
-      })
-    }
-    options.push({ value: 'back', role: 'section', label: 'Navigation' })
-    options.push({ value: 'back', label: 'Back', hint: 'Return to setup type', role: 'utility' })
-
-    return (
-      <Surface
-        title="Token Custody Check"
-        subtitle="ENS setup continues only after the owner wallet holds this token onchain."
-        footer={footerHint('enter select · esc back')}
-      >
-        <Box marginTop={1}>
-          <Select<TransferCheckAction>
-            options={options}
-            hintLayout="inline"
-            onSubmit={choice => {
-              if (choice === 'withdraw') {
-                onWithdrawToken()
-                return
-              }
-              if (choice === 'continue' && tokenInOwnerWallet) {
-                runDiscovery('advanced')
-                return
-              }
-              if (choice === 'back') {
-                return setPhase({ kind: 'mode-select' })
-              }
-            }}
-            onCancel={() => setPhase({ kind: 'mode-select' })}
-          />
-        </Box>
-      </Surface>
-    )
-  }
-
   if (phase.kind === 'advanced-root-check') {
     return (
       <Surface

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

@@ -2,8 +2,9 @@ import React from 'react'
 import { getAddress, type Address } from 'viem'
 import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
-  AGENT_RECORD_READ_KEY_LIST,
+  AGENT_TOKEN_RECORD_KEY,
   buildAgentEnsRecords,
+  buildEnsip25Key,
   diffRecords,
   recordsFromTextMap,
 } from '../../ens/agentRecords.js'
@@ -19,6 +20,7 @@ import {
   preflightEnsRoot,
   preflightEnsSetup,
 } from '../../ens/ensAutomation.js'
+import { SUPPORTED_ERC8004_CHAINS } from '../../registry/erc8004.js'
 import {
   readCustodyMode,
   readIdentityStateString,
@@ -50,7 +52,6 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
   onEnsRecordsUpdate,
   onEnsSetup,
   onManageOperatorWalletAccess,
-  onWithdrawToken,
   initialView,
   onBack,
 }) => {
@@ -68,7 +69,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
 
   const [discovery, setDiscovery] = React.useState<DiscoveryState>({ status: 'idle' })
   const [phase, setPhase] = React.useState<EnsPhase>(() => {
-    if (initialView === 'advanced' && !hasAdvancedSetup) return { kind: 'advanced-transfer-check' }
+    if (initialView === 'advanced' && !hasAdvancedSetup) return { kind: 'pick-parent', mode: 'advanced' }
     return { kind: 'mode-select' }
   })
   const [validationError, setValidationError] = React.useState<string | null>(null)
@@ -137,8 +138,18 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     setPhase({ kind: 'validating', fullName, mode, ownerAddress: phaseOwnerAddress, operatorWallet })
     try {
       const validation = await validateAgentEnsLink(fullName, ownerAddress)
-      const currentText = validation.ok
-        ? await readEthagentTextRecords(fullName, AGENT_RECORD_READ_KEY_LIST)
+      const readKeys = identity.agentId
+        ? [
+            ...SUPPORTED_ERC8004_CHAINS.map(chain => buildEnsip25Key({
+              chainId: chain.chainId,
+              identityRegistryAddress: registry.identityRegistryAddress,
+              agentId: identity.agentId!,
+            })),
+            AGENT_TOKEN_RECORD_KEY,
+          ]
+        : []
+      const currentText = validation.ok && readKeys.length > 0
+        ? await readEthagentTextRecords(fullName, readKeys)
         : {}
       const current = recordsFromTextMap(currentText)
       const next = buildAgentEnsRecords({
@@ -252,7 +263,17 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
   const runUnlinkEnsLoading = React.useCallback((fullName: string): void => {
     setValidationError(null)
     setPhase({ kind: 'unlink-loading', fullName })
-    readEthagentTextRecords(fullName, AGENT_RECORD_READ_KEY_LIST)
+    const readKeys = identity.agentId
+      ? [
+          ...SUPPORTED_ERC8004_CHAINS.map(chain => buildEnsip25Key({
+            chainId: chain.chainId,
+            identityRegistryAddress: registry.identityRegistryAddress,
+            agentId: identity.agentId!,
+          })),
+          AGENT_TOKEN_RECORD_KEY,
+        ]
+      : []
+    readEthagentTextRecords(fullName, readKeys)
       .then(currentText => {
         const currentRecords = recordsFromTextMap(currentText)
         setPhase({
@@ -266,7 +287,7 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
         setValidationError(err instanceof Error ? err.message : String(err))
         setPhase({ kind: 'mode-select' })
       })
-  }, [])
+  }, [identity.agentId, registry.chainId, registry.identityRegistryAddress])
 
   const maintenanceScreen = renderEnsMaintenancePhase({
     phase,
@@ -307,7 +328,6 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     runAdvancedSubdomainCheck,
     onEnsSetup,
     onEnsLink,
-    onWithdrawToken,
   })
   if (advancedScreen) return advancedScreen
 

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

@@ -82,11 +82,11 @@ export function renderEnsMaintenancePhase({
     const linkHint = multiNeedsCustodySetup
       ? 'Set Advanced custody first via Custody Mode'
       : isAdvanced
-        ? 'Walks you through Root, Name, Review, and Apply'
-        : 'Walks you through Root, Name, Review, and Apply'
+        ? 'Root → Name → Review → Apply'
+        : 'Root → Name → Review → Apply'
     const options: Array<{ value: EnsAction; role?: 'section' | 'utility'; label: string; hint?: string; disabled?: boolean }> = []
     if (currentEnsName) {
-      options.push({ value: 'unlink', label: 'Unlink Name', hint: 'Removes this name from the token. Set up a different name afterward by linking again.' })
+      options.push({ value: 'unlink', label: 'Unlink Name', hint: 'Removes the name from the token. Link a different one anytime.' })
     } else {
       options.push({
         value: 'link',
@@ -116,10 +116,6 @@ export function renderEnsMaintenancePhase({
               }
               if (choice === 'link') {
                 if (multiNeedsCustodySetup) return
-                if (isAdvanced && savedOwnerAddress) {
-                  setPhase({ kind: 'advanced-transfer-check' })
-                  return
-                }
                 runDiscovery()
                 return
               }

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

@@ -4,11 +4,9 @@ import { getAddress, type Address } from 'viem'
 import { Surface } from '../../../ui/Surface.js'
 import { Select, type SelectOption } from '../../../ui/Select.js'
 import { theme } from '../../../ui/theme.js'
-import {
-  formatRecordValue,
-  recordLabel,
-  type AgentEnsRecords,
-  type AgentRecordDiff,
+import type {
+  AgentEnsRecords,
+  AgentRecordDiff,
 } from '../../ens/agentRecords.js'
 import type { EnsValidation } from '../../ens/ensLookup.js'
 import type {
@@ -23,9 +21,9 @@ import {
 import { ensValidationReasonText } from './state.js'
 import { shortAddress } from '../shared/model/format.js'
 import {
+  abbreviateHexBlobs,
   manualReasonTitle,
   modeSwitchHeading,
-  setupSwitchNotice,
 } from './editCopy.js'
 import {
   EnsSetupRow,
@@ -114,7 +112,6 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
   type Action = 'begin' | 'back'
   const isSimple = setup.mode === 'simple'
   const signerLabel = isSimple ? 'Connected wallet' : 'Owner wallet'
-  const switchNotice = setupSwitchNotice(currentEnsName, currentMode, setup.fullName, setup.mode)
   const createLabel = setup.registryAction === 'create-subdomain'
     ? 'Create Subdomain'
     : setup.registryAction === 'create-wrapped-subdomain'
@@ -140,7 +137,6 @@ export const EnsSetupReviewScreen: React.FC<EnsSetupReviewScreenProps> = ({
       ) : null}
       <Box flexDirection="column">
         <Text color={theme.dim}>{modeSwitchHeading(currentEnsName, currentMode, setup.fullName, setup.mode)}</Text>
-        {switchNotice ? <Text color={theme.dim}>{switchNotice}</Text> : null}
         <EnsSetupRow label="ENS name" value={setup.fullName} />
         <EnsSetupRow label="Parent root" value={setup.rootName} />
         <EnsSetupRow label="Subdomain label" value={setup.label} />
@@ -194,7 +190,9 @@ export const EnsSetupBlockedScreen: React.FC<EnsSetupBlockedScreenProps> = ({
           {isSimple
             ? <EnsSetupRow label="Wallet" value={fallback.ownerAddress ? shortAddress(fallback.ownerAddress) : shortAddress(fallback.operatorAddress)} />
             : (fallback.ownerAddress ? <EnsSetupRow label="Owner wallet" value={shortAddress(fallback.ownerAddress)} /> : null)}
-          {fallback.nextRecords?.token ? <EnsSetupRow label="Token link" value={fallback.nextRecords.token} /> : null}
+          {fallback.nextRecords && Object.keys(fallback.nextRecords).length > 0
+            ? <EnsSetupRow label="Attestation" value="ENSIP-25 agent-registration record" />
+            : null}
           <EnsSetupRow label="Address" value={`Set the subdomain address record to the ${isSimple ? 'connected wallet' : 'owner wallet'}.`} />
           {!isSimple
             ? (
@@ -270,8 +268,8 @@ export const UnlinkEnsReviewScreen: React.FC<UnlinkEnsReviewScreenProps> = ({
             <Text color={theme.textSubtle}>Will be cleared:</Text>
             {changedDiffs.map(diff => (
               <Text key={diff.key}>
-                <Text color={theme.dim}>{`  ${diff.key}  `}</Text>
-                <Text color={theme.accentPeriwinkle}>{formatRecordValue(diff.field, diff.current)}</Text>
+                <Text color={theme.dim}>{`  ${abbreviateHexBlobs(diff.key)}  `}</Text>
+                <Text color={theme.accentPeriwinkle}>{abbreviateHexBlobs(diff.current)}</Text>
               </Text>
             ))}
           </Box>
@@ -342,7 +340,6 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
   const changedDiffs = recordsDiff.filter(d => d.changed)
   const hasRecordChanges = changedDiffs.length > 0
   const reviewSubtitle = 'Review Ethereum Mainnet ENS address and text records before saving this ENS link. No token approval is requested.'
-  const switchNotice = setupSwitchNotice(currentEnsName, currentMode, fullName, mode)
 
   if (!validation.ok) {
     const reason = ensValidationReasonText(validation.reason)
@@ -396,7 +393,7 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
 
   const options: Array<SelectOption<ReviewAction>> = [
     { value: 'continue', role: 'section', label: modeSwitchHeading(currentEnsName, currentMode, fullName, mode) },
-    { value: 'continue', label: 'Continue Setup', hint: hasRecordChanges ? `Ethereum Mainnet: sign ${changedDiffs.length} ENS record value${changedDiffs.length === 1 ? '' : 's'}; ${registryNetworkLabel}: save token URI` : `ENS records already match; ${registryNetworkLabel}: save token URI` },
+    { value: 'continue', label: 'Continue Setup', hint: hasRecordChanges ? `Ethereum Mainnet: sign ${changedDiffs.length} record${changedDiffs.length === 1 ? '' : 's'}; ${registryNetworkLabel}: save token URI` : `Records match; ${registryNetworkLabel}: save token URI` },
     { value: 'change', label: 'Pick A Different Name', hint: 'Return to the name picker' },
     { value: 'back', role: 'section', label: 'Navigation' },
     { value: 'back', label: 'Back', hint: 'Return to Identity Hub', role: 'utility' },
@@ -414,22 +411,21 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
             <Box marginBottom={1} flexDirection="column">
               <Text color={theme.dim}>Current: <Text color={currentEnsName ? theme.text : theme.dim}>{currentEnsName || 'None'}</Text></Text>
               <Text color={theme.dim}>Next: <Text color={theme.text}>{fullName}</Text></Text>
-              {switchNotice ? <Text color={theme.dim}>{switchNotice}</Text> : null}
             </Box>
             )
           : null}
         {recordsDiff.map(diff => (
           <Text key={diff.key}>
-            <Text color={theme.dim}>{`- ${recordLabel(diff.field)}: `}</Text>
+            <Text color={theme.dim}>{`- ${abbreviateHexBlobs(diff.key)}: `}</Text>
             {diff.changed
               ? (
                 <>
-                  {renderRecordValue(diff.field, diff.current)}
+                  {renderRecordValue(diff.current)}
                   <Text color={theme.dim}>{' → '}</Text>
-                  {renderRecordValue(diff.field, diff.next)}
+                  {renderRecordValue(diff.next)}
                 </>
               )
-              : renderRecordValue(diff.field, diff.next)}
+              : renderRecordValue(diff.next)}
           </Text>
         ))}
         {!hasRecordChanges

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

@@ -4,10 +4,6 @@ import type { Address } from 'viem'
 import { Surface } from '../../../ui/Surface.js'
 import { TextInput } from '../../../ui/TextInput.js'
 import { theme } from '../../../ui/theme.js'
-import {
-  formatRecordValue,
-  type AgentEnsRecordState,
-} from '../../ens/agentRecords.js'
 import {
   isEthDomain,
   sanitizeSubdomainPrefix,
@@ -24,9 +20,11 @@ import type { EnsEditProps } from './types.js'
 
 export const footerHint = (hint: string) => <Text color={theme.dim}>{hint}</Text>
 
-export const renderRecordValue = (field: keyof AgentEnsRecordState, value: string) =>
+import { abbreviateHexBlobs } from './editCopy.js'
+
+export const renderRecordValue = (value: string) =>
   value
-    ? <Text color={theme.accentPeriwinkle}>{formatRecordValue(field, value)}</Text>
+    ? <Text color={theme.accentPeriwinkle}>{abbreviateHexBlobs(value)}</Text>
     : <Text color={theme.dim}>Unset</Text>
 
 export function rootErrorMessage(

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

@@ -135,7 +135,7 @@ export function renderSimpleEnsPhase({
           ]
         : []),
       { 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' },
+      { value: 'open-ens-domains' as DomainAction, label: 'Register .eth Name', hint: 'Opens ENS app; return once 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' }]
         : []),
@@ -356,7 +356,7 @@ export function renderSimpleEnsPhase({
           onEnsLink(phase.fullName, linkOptions)
         }}
         onCheckAgain={() => { void runValidation(phase.fullName, phase.mode, phase.ownerAddress, phase.operatorWallet) }}
-        onChange={() => setPhase(phase.mode === 'advanced' ? { kind: 'advanced-transfer-check' } : { kind: 'pick-parent' })}
+        onChange={() => setPhase({ kind: 'pick-parent', mode: phase.mode })}
         onCreate={phase.mode === 'simple' && !phase.validation.ok && phase.validation.reason === 'no-owner'
           ? () => runSimpleCreatePreflight(phase.fullName)
           : undefined}

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

@@ -34,7 +34,6 @@ type EnsFlowProps = {
   onWalletReady: (session: BrowserWalletReady | null) => void
   onTriggerRebackup: (backStep: Step, profileUpdates?: ProfileUpdates) => void
   onTriggerPublicProfileSave: (backStep: Step, profileUpdates: ProfileUpdates) => void
-  onWithdrawTokenForEns: (step: Step) => void
 }
 
 export function isEnsStep(step: Step): step is IdentityHubEnsStep {
@@ -59,7 +58,6 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
   onWalletReady,
   onTriggerRebackup,
   onTriggerPublicProfileSave,
-  onWithdrawTokenForEns,
 }) => {
   if (step.kind === 'manage-ens-operators') {
     return (
@@ -81,7 +79,6 @@ export const EnsFlow: React.FC<EnsFlowProps> = ({
       <EditProfileFlow
         step={step}
         reconciliation={reconciliation}
-        onWithdrawToken={() => onWithdrawTokenForEns(step)}
         onNameSubmit={name => {
           if (step.kind !== 'edit-profile-name') return
           onSetStep({