ethagent 3.1.2 → 3.3.0

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

@@ -6,17 +6,11 @@ import {
   prepareSyncedIdentityMarkdownScaffold,
   prepareSyncedSkillsTree,
   readContinuityFiles,
-  readPublicSkillsFile,
   writeIdentityMarkdownScaffold,
   type IdentityMarkdownScaffold,
 } from '../../continuity/storage.js'
 import {
-  appendPublicSkillEntries,
-  defaultPublicSkillsProfile as basePublicSkillsProfile,
-} from '../../continuity/publicSkills.js'
-import {
-  derivePublicSkillEntries,
-  syncPublicSkillsManifest,
+  syncAgentCardManifest,
 } from '../../continuity/skills/publicSkillsSync.js'
 import {
   createWalletRestoreAccessChallenge,
@@ -25,12 +19,8 @@ import {
   type ContinuitySkillsTree,
   type WalletChallengePurpose,
 } from '../../continuity/envelope.js'
-import {
-  createAgentCard,
-  defaultPublicSkillsProfile,
-  serializeAgentCard,
-} from '../../continuity/publicSkills.js'
 import { recordPublishedContinuitySnapshot } from '../../continuity/snapshots.js'
+import { readCustodyMode } from '../custody/state.js'
 import { addToIpfs, DEFAULT_IPFS_API_URL, isPinataUploadUrl } from '../../storage/ipfs.js'
 import {
   createErc8004PublicClient,
@@ -83,19 +73,19 @@ import {
 } from './completion.js'
 
 type BackupMetadata = NonNullable<EthagentIdentity['backup']>
-type PublicSkillsMetadata = NonNullable<EthagentIdentity['publicSkills']>
+type AgentCardMetadata = NonNullable<EthagentIdentity['agentCard']>
 
 type RebackupPreparedTransaction = {
   ownerAddress: Address
   agentUri: string
   metadataCid: string
   backup: BackupMetadata
-  publicSkills: PublicSkillsMetadata
+  agentCard: AgentCardMetadata
   identity: EthagentIdentity
   markdownScaffold?: IdentityMarkdownScaffold
   publishedSources: {
     privateFiles: ContinuityFiles
-    publicSkills: string
+    agentCard: string
     skills: ContinuitySkillsTree
   }
 }
@@ -197,8 +187,9 @@ async function runRebackupSigningInner(
     return
   }
   const snapshotOwner = ownerAddressForSnapshotSave(step.identity, step.profileUpdates)
+  const isAdvanced = readCustodyMode(step.identity.state as Record<string, unknown> | undefined) === 'advanced'
   const purpose: WalletPurpose = step.walletPurpose
-    ?? (step.vaultAddress ? 'rotate-agent-uri-vault-owner' : rebackupWalletPurpose(step.identity, step.profileUpdates))
+    ?? (step.vaultAddress && isAdvanced ? 'rotate-agent-uri-vault-owner' : rebackupWalletPurpose(step.identity, step.profileUpdates))
   const challengePurpose: WalletChallengePurpose = 'restore-owner'
   const walletAccess = walletRestoreAccessContext(step.identity, step.registry, step.profileUpdates, snapshotOwner)
   if (!walletAccess) throw new Error('Cannot back up: missing wallet restore access context')
@@ -244,20 +235,8 @@ async function runRebackupSigningInner(
       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(
-        basePublicSkillsProfile(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({
@@ -287,9 +266,8 @@ async function runRebackupSigningInner(
         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',
       }
@@ -300,7 +278,7 @@ async function runRebackupSigningInner(
         ...(uploadedImageUri ? { image: uploadedImageUri } : {}),
       }, {
         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, agentId: sourceAgentId },
         ensName: nextEnsName,
         operators: operatorsPointerFromState(state, nextEnsName),
@@ -332,12 +310,12 @@ async function runRebackupSigningInner(
             agentUri,
             metadataCid,
             backup: { ...backup, metadataCid, agentUri },
-            publicSkills,
+            agentCard,
             identity: { ...step.identity, state },
             ...(markdownScaffold ? { markdownScaffold } : {}),
             publishedSources: {
               privateFiles: continuityFiles,
-              publicSkills: publicSkillsJson,
+              agentCard: agentCardJson,
               skills: skillsTree,
             },
           },
@@ -357,12 +335,12 @@ async function runRebackupSigningInner(
           agentUri,
           metadataCid,
           backup: { ...backup, metadataCid, agentUri },
-          publicSkills,
+          agentCard,
           identity: { ...step.identity, state },
           ...(markdownScaffold ? { markdownScaffold } : {}),
           publishedSources: {
             privateFiles: continuityFiles,
-            publicSkills: publicSkillsJson,
+            agentCard: agentCardJson,
             skills: skillsTree,
           },
         },
@@ -388,7 +366,7 @@ async function runRebackupSigningInner(
     agentUri: result.prepared.agentUri,
     metadataCid: result.prepared.metadataCid,
     backup: { ...result.prepared.backup, txHash: result.txHash },
-    publicSkills: result.prepared.publicSkills,
+    agentCard: result.prepared.agentCard,
   }
   if (result.prepared.markdownScaffold) {
     await writeIdentityMarkdownScaffold(nextIdentity, result.prepared.markdownScaffold)

package/src/identity/hub/continuity/skills/NewSkillVisibilityScreen.tsx

@@ -22,7 +22,7 @@ export const NewSkillVisibilityScreen: React.FC<NewSkillVisibilityScreenProps> =
 }) => (
   <Surface
     title={`Visibility · ${name}`}
-    subtitle="Discoverable is the default. You can change it later from Change Visibility."
+    subtitle="Public is the default. You can change it later from Change Visibility."
     footer={footer}
   >
     {error && (
@@ -33,9 +33,8 @@ export const NewSkillVisibilityScreen: React.FC<NewSkillVisibilityScreenProps> =
     <Box marginTop={1}>
       <Select<SkillVisibility | 'back'>
         options={[
-          { value: 'private', label: 'Private', hint: 'Local-only. Not in skills.json.' },
-          { value: 'discoverable', label: 'Discoverable', hint: 'Default. Indexed in skills.json with description.' },
-          { value: 'public', label: 'Public', hint: 'Indexed in skills.json and Agent Card.' },
+          { value: 'private', label: 'Private', hint: 'Local-only. Not in the Agent Card.' },
+          { value: 'public', label: 'Public', hint: 'Default. Listed in the Agent Card.' },
           { value: 'back', role: 'section', label: 'Navigation' },
           { value: 'back', label: 'Back', hint: 'Return to the name step', role: 'utility' },
         ]}

package/src/identity/hub/continuity/skills/SkillActionsScreen.tsx

@@ -74,7 +74,6 @@ export const SkillActionsScreen: React.FC<SkillActionsScreenProps> = ({
 
   options.push({ value: noop, role: 'section', label: 'Visibility' })
   options.push(visibilityOption('private', visibility))
-  options.push(visibilityOption('discoverable', visibility))
   options.push(visibilityOption('public', visibility))
 
   options.push({ value: noop, role: 'section', label: 'Manage' })
@@ -83,6 +82,7 @@ export const SkillActionsScreen: React.FC<SkillActionsScreenProps> = ({
     label: 'Delete',
     hint: 'Remove this skill folder and its supporting files',
   })
+  options.push({ value: noop, role: 'section', label: 'Return' })
   options.push({
     value: { kind: 'back' },
     label: 'Back',
@@ -140,9 +140,8 @@ function visibilityOption(level: SkillVisibility, current?: SkillVisibility): Se
 }
 
 function visibilityHint(level: SkillVisibility): string {
-  if (level === 'private') return 'Local-only. Not in skills.json.'
-  if (level === 'discoverable') return 'Default. Indexed with description.'
-  return 'Indexed with description and Agent Card link.'
+  if (level === 'private') return 'Local-only. Not in the Agent Card.'
+  return 'Default. Listed in the Agent Card.'
 }
 
 function capitalize(value: string): string {

package/src/identity/hub/continuity/skills/SkillsTreeScreen.tsx

@@ -73,7 +73,7 @@ export const SkillsTreeScreen: React.FC<SkillsTreeScreenProps> = ({
     }
   }, [identity, editorOpened])
 
-  const subtitle = notice ?? 'Open a skill, create one, or remove one.'
+  const subtitle = notice ?? 'Select a skill to open, change visibility, or delete.'
   const isLoading = tree === null
   const skills = tree?.skills ?? []
   const supportingCounts = tree?.supportingCounts ?? {}
@@ -145,6 +145,7 @@ function buildOptions(
       const supportCount = supportingCounts[skill.name] ?? 0
       const meta = [capitalize(skill.visibility)]
       if (supportCount > 0) meta.push(`${supportCount + 1} files`)
+      meta.push('enter for actions')
       rows.push({
         value: { kind: 'skill', relativePath: skill.relativePath },
         label: `${branch}${skill.name}/SKILL.md`,

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

@@ -27,7 +27,7 @@ export function changedContinuitySnapshotFiles(
   const result: string[] = []
   if (changed('SOUL.md')) result.push('SOUL.md')
   if (changed('MEMORY.md')) result.push('MEMORY.md')
-  if (changed('skills.json') || changed('private-skills')) result.push('Skills')
+  if (changed('agent-card.json') || changed('private-skills')) result.push('Skills')
   return result
 }
 

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/EnsEditFlow.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 import { getAddress, type Address } from 'viem'
 import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
-  AGENT_RECORD_READ_KEY_LIST,
   buildAgentEnsRecords,
+  buildEnsip25Key,
   diffRecords,
   recordsFromTextMap,
 } from '../../ens/agentRecords.js'
@@ -137,8 +137,15 @@ 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
+        ? [buildEnsip25Key({
+            chainId: registry.chainId,
+            identityRegistryAddress: registry.identityRegistryAddress,
+            agentId: identity.agentId,
+          })]
+        : []
+      const currentText = validation.ok && readKeys.length > 0
+        ? await readEthagentTextRecords(fullName, readKeys)
         : {}
       const current = recordsFromTextMap(currentText)
       const next = buildAgentEnsRecords({
@@ -252,7 +259,14 @@ 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
+      ? [buildEnsip25Key({
+          chainId: registry.chainId,
+          identityRegistryAddress: registry.identityRegistryAddress,
+          agentId: identity.agentId,
+        })]
+      : []
+    readEthagentTextRecords(fullName, readKeys)
       .then(currentText => {
         const currentRecords = recordsFromTextMap(currentText)
         setPhase({
@@ -266,7 +280,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,

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 {
@@ -194,7 +192,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
             ? (
@@ -271,7 +271,7 @@ export const UnlinkEnsReviewScreen: React.FC<UnlinkEnsReviewScreenProps> = ({
             {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.accentPeriwinkle}>{diff.current}</Text>
               </Text>
             ))}
           </Box>
@@ -420,16 +420,16 @@ export const ReviewScreen: React.FC<ReviewScreenProps> = ({
           : null}
         {recordsDiff.map(diff => (
           <Text key={diff.key}>
-            <Text color={theme.dim}>{`- ${recordLabel(diff.field)}: `}</Text>
+            <Text color={theme.dim}>{`- ${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,9 @@ 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) =>
+export const renderRecordValue = (value: string) =>
   value
-    ? <Text color={theme.accentPeriwinkle}>{formatRecordValue(field, value)}</Text>
+    ? <Text color={theme.accentPeriwinkle}>{value}</Text>
     : <Text color={theme.dim}>Unset</Text>
 
 export function rootErrorMessage(

package/src/identity/hub/ens/editCopy.ts

@@ -18,7 +18,7 @@ export function recordsHaveCurrentValues(recordsDiff: AgentRecordDiff[]): boolea
 }
 
 export function emptyAgentEnsRecords(): AgentEnsRecords {
-  return { token: '' }
+  return {}
 }
 
 export function unlinkEnsLinkOptions(savedCustodyMode: CustodyMode | undefined, savedOwnerAddress: string): EnsLinkOptions {
@@ -84,8 +84,6 @@ export function manualReasonTitle(reason: EnsSetupBlockedPlan['reason']): string
     case 'wrapped-parent':
     case 'subdomain-wrapped':
       return 'ENS NameWrapper ownership could not be verified'
-    case 'token-record-collision':
-      return 'Subdomain already points to another token'
     case 'token-owner-mismatch':
       return 'Owner wallet does not own this ERC-8004 token'
     case 'token-owner-lookup-failed':