ethagent 3.3.0 → 3.3.1

package/README.md

@@ -53,7 +53,7 @@ The Identity Hub manages everything portable about the agent:
 - **Custody Mode** switches between Simple and Advanced by depositing the token into its Vault or unwrapping it back out.
 - **Prepare Transfer** stages a dual-wallet snapshot so the receiver can restore the agent after the token moves externally.
 - **Refetch Latest** pulls the most recent published snapshot back to local files.
-- **Switch Agent** accepts either an ENS name or a bare token ID, and loads any agent owned by or linked to the connected wallet.
+- **Switch Agent** accepts an ENS name or an ERC-8004 token ID on any supported chain, and loads any agent owned by or linked to the connected wallet.
 
 The menu surfaces drift automatically. Token ownership, vault state, ENS record alignment, and pending URI rotations are checked against the live chain when the menu opens.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethagent",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "A privacy-first AI agent with a portable Ethereum identity",
   "type": "module",
   "main": "bin/ethagent.js",

package/src/identity/hub/OperationalRoutes.tsx

@@ -281,7 +281,6 @@ export const IdentityHubOperationalRoutes: React.FC<IdentityHubOperationalRoutes
         onWalletReady={setWalletSession}
         onTriggerRebackup={triggerRebackup}
         onTriggerPublicProfileSave={triggerPublicProfileSave}
-        onWithdrawTokenForEns={currentStep => custodyFlow.beginWithdrawToken(currentStep, currentStep, 'ens')}
       />
     )
   }

package/src/identity/hub/Routes.tsx

@@ -83,7 +83,7 @@ export const IdentityHubRoutes: React.FC<{ controller: IdentityHubController }>
           <Select<'ens' | 'skip'>
             options={[
               { value: 'ens', role: 'section', label: 'Set Up Now' },
-              { value: 'ens', label: 'Set Up ENS Name', hint: 'Walks you through Root, Name, Review, and Apply' },
+              { value: 'ens', label: 'Set Up ENS Name', hint: 'Root → Name → Review → Apply' },
               { value: 'skip', role: 'section', label: 'Skip' },
               { value: 'skip', label: 'Skip For Now', hint: 'Continue to model setup; add ENS later', role: 'utility' },
             ]}

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,6 +2,7 @@ import React from 'react'
 import { getAddress, type Address } from 'viem'
 import type { BrowserWalletReady } from '../../wallet/browserWallet.js'
 import {
+  AGENT_TOKEN_RECORD_KEY,
   buildAgentEnsRecords,
   buildEnsip25Key,
   diffRecords,
@@ -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)
@@ -138,11 +139,14 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     try {
       const validation = await validateAgentEnsLink(fullName, ownerAddress)
       const readKeys = identity.agentId
-        ? [buildEnsip25Key({
-            chainId: registry.chainId,
-            identityRegistryAddress: registry.identityRegistryAddress,
-            agentId: 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)
@@ -260,11 +264,14 @@ export const EnsEditFlow: React.FC<EnsEditProps> = ({
     setValidationError(null)
     setPhase({ kind: 'unlink-loading', fullName })
     const readKeys = identity.agentId
-      ? [buildEnsip25Key({
-          chainId: registry.chainId,
-          identityRegistryAddress: registry.identityRegistryAddress,
-          agentId: 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 => {
@@ -321,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

@@ -21,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,
@@ -112,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'
@@ -138,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} />
@@ -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}>{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,13 +411,12 @@ 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}>{`- ${diff.key}: `}</Text>
+            <Text color={theme.dim}>{`- ${abbreviateHexBlobs(diff.key)}: `}</Text>
             {diff.changed
               ? (
                 <>

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

@@ -20,9 +20,11 @@ import type { EnsEditProps } from './types.js'
 
 export const footerHint = (hint: string) => <Text color={theme.dim}>{hint}</Text>
 
+import { abbreviateHexBlobs } from './editCopy.js'
+
 export const renderRecordValue = (value: string) =>
   value
-    ? <Text color={theme.accentPeriwinkle}>{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({

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

@@ -3,6 +3,12 @@ import type { AgentEnsRecords, AgentRecordDiff } from '../../ens/agentRecords.js
 import type { EnsRegistryAction, EnsSetupBlockedPlan } from '../../ens/ensAutomation.js'
 import type { CustodyMode } from '../custody/state.js'
 
+export function abbreviateHexBlobs(input: string): string {
+  return input.replace(/0x([0-9a-fA-F]{20,})/g, (_match, hex) => {
+    return `0x${hex.slice(0, 8)}...${hex.slice(-8)}`
+  })
+}
+
 export type EnsLinkOptions = {
   mode: 'simple' | 'advanced'
   ownerAddress?: Address
@@ -46,18 +52,6 @@ export function modeSwitchHeading(
   return 'Automation'
 }
 
-export function setupSwitchNotice(
-  currentEnsName: string,
-  currentMode: CustodyMode | undefined,
-  nextEnsName: string,
-  nextMode: 'simple' | 'advanced',
-): string | null {
-  if (!currentEnsName && !currentMode) return null
-  const currentTopology = currentMode === 'advanced' ? 'advanced' : currentMode === 'simple' ? 'simple' : undefined
-  if (currentEnsName === nextEnsName && currentTopology === nextMode) return null
-  return 'This replaces the saved ENS setup directly. Reset is only for clearing the current link.'
-}
-
 export function advancedSubdomainStatusText(action: EnsRegistryAction): string {
   switch (action) {
     case 'create-subdomain':

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

@@ -31,7 +31,6 @@ export type SimpleEnsPhase =
   | { kind: 'review'; fullName: string; validation: EnsValidation; recordsDiff: AgentRecordDiff[]; currentRecords: AgentEnsRecordState; nextRecords: AgentEnsRecords; mode: 'simple' | 'advanced'; ownerAddress?: Address; operatorWallet?: Address }
 
 export type AdvancedEnsPhase =
-  | { kind: 'advanced-transfer-check' }
   | { kind: 'advanced-root-check'; rootName: string }
   | { kind: 'advanced-subdomain'; rootName: string; label?: string; error?: string }
   | { kind: 'advanced-subdomain-check'; rootName: string; label: string }
@@ -71,7 +70,6 @@ export type EnsEditProps = {
   onEnsRecordsUpdate: (fullName: string, records: AgentEnsRecords, options: EnsLinkOptions, clearRecords?: boolean, currentRecords?: AgentEnsRecordState) => void
   onEnsSetup: (setup: EnsSetupPlan) => void
   onManageOperatorWalletAccess: () => void
-  onWithdrawToken: () => void
   initialView?: 'advanced'
   onBack: () => void
 }

package/src/identity/hub/profile/EditProfileFlow.tsx

@@ -26,7 +26,6 @@ type EditProfileFlowProps = {
   onEnsRecordsUpdate: (fullName: string, records: AgentEnsRecords, options: EnsLinkOptions, clearRecords?: boolean, currentRecords?: AgentEnsRecordState) => void
   onEnsSetup: (setup: EnsSetupPlan) => void
   onManageOperatorWalletAccess: () => void
-  onWithdrawToken: () => void
   onBack: () => void
   onMenu: () => void
 }
@@ -49,7 +48,6 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
   onEnsRecordsUpdate,
   onEnsSetup,
   onManageOperatorWalletAccess,
-  onWithdrawToken,
   onBack,
   onMenu,
 }) => {
@@ -101,7 +99,6 @@ export const EditProfileFlow: React.FC<EditProfileFlowProps> = ({
         onEnsRecordsUpdate={onEnsRecordsUpdate}
         onEnsSetup={onEnsSetup}
         onManageOperatorWalletAccess={onManageOperatorWalletAccess}
-        onWithdrawToken={onWithdrawToken}
         initialView={step.initialView}
         onBack={onBack}
       />